Set lowercase names for the profiler to work. (#277)

* Set lowercase names for the profiler to work. * Bump versions as well --------- Co-authored-by: Alexander Garbett <[email protected]>
thought-machine · Feb 12, 2024 · ed7808e · ed7808e
1 parent 42cc7f7
commit ed7808e
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 8 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Version 11.7.2
+--------------
+    * Lower case the service names for the GCP Cloud Profiler to work
+
 Version 11.7.1
 --------------
     * Use the correct commit of the forked SDK

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-11.7.1
+11.7.2
diff --git a/cli/cli.go b/cli/cli.go
@@ -52,7 +52,7 @@ func ServeAdmin(serviceName string, opts AdminOpts, info logging.LogLevelInfo) {
 	opts.Admin.Logger = logging.MustGetLoggerNamed("github.com.thought-machine.http-admin")
 	opts.Admin.LogInfo = info
 	if opts.EnableGcpProfiling {
-		setupProfiling(serviceName)
+		setupProfiling(strings.ToLower(serviceName))
 	}
 	go admin.Serve(opts.Admin)
 }

diff --git a/elan/main.go b/elan/main.go
@@ -33,6 +33,6 @@ modes are intended for testing only.
 
 func main() {
 	_, info := cli.ParseFlagsOrDie("Elan", &opts, &opts.Logging)
-	go cli.ServeAdmin("Elan", opts.Admin, info)
+	go cli.ServeAdmin("elan", opts.Admin, info)
 	rpc.ServeForever(opts.GRPC, opts.Storage, opts.Parallelism, opts.DirCacheSize, int64(opts.KnownBlobCacheSize))
 }
diff --git a/flair/main.go b/flair/main.go
@@ -47,7 +47,7 @@ want to have more than the minimum number of instances of it (hopefully more tha
 
 func main() {
 	_, info := cli.ParseFlagsOrDie("Flair", &opts, &opts.Logging)
-	go cli.ServeAdmin("Flair", opts.Admin, info)
+	go cli.ServeAdmin("flair", opts.Admin, info)
 	cr := newReplicator(opts.Geometry, opts.Replicas, opts.LoadBalance)
 	ar := newReplicator(opts.AssetGeometry, opts.Replicas, opts.LoadBalance)
 	er := newReplicator(opts.ExecutorGeometry, opts.Replicas, opts.LoadBalance)

diff --git a/lucidity/main.go b/lucidity/main.go
@@ -38,6 +38,6 @@ to go along with Zeal, then it could refer to the GTA Lucidity in FreeSpace 2.
 
 func main() {
 	_, info := cli.ParseFlagsOrDie("Lucidity", &opts, &opts.Logging)
-	go cli.ServeAdmin("Lucidity", opts.Admin, info)
+	go cli.ServeAdmin("lucidity", opts.Admin, info)
 	rpc.ServeForever(opts.GRPC, opts.HTTPPort, time.Duration(opts.MaxAge), opts.MinProportion, opts.IAP.Audience, opts.IAP.Users)
 }
diff --git a/mettle/main.go b/mettle/main.go
@@ -157,7 +157,7 @@ updated blobs dominating much of the data downloaded.
 func main() {
 	cmd, info := cli.ParseFlagsOrDie("Mettle", &opts, &opts.Logging)
 	if cmd != "one" {
-		go cli.ServeAdmin(fmt.Sprintf("Mettle-%s", cmd), opts.Admin, info)
+		go cli.ServeAdmin(fmt.Sprintf("mettle-%s", cmd), opts.Admin, info)
 	}
 
 	if cmd == "dual" {

diff --git a/purity/main.go b/purity/main.go
@@ -64,7 +64,7 @@ retains the "personal characteristics" theme.
 func main() {
 	cmd, info := cli.ParseFlagsOrDie("Purity", &opts, &opts.Logging)
 	if cmd == "periodic" {
-		go cli.ServeAdmin("Purity", opts.Admin, info)
+		go cli.ServeAdmin("purity", opts.Admin, info)
 	}
 	if err := run(cmd); err != nil {
 		log.Fatalf("Failed: %s", err)

diff --git a/zeal/main.go b/zeal/main.go
@@ -48,7 +48,7 @@ for the Paladin skill in Diablo II since its job is to bang things down as fast
 
 func main() {
 	_, info := cli.ParseFlagsOrDie("Zeal", &opts, &opts.Logging)
-	go cli.ServeAdmin("Zeal", opts.Admin, info)
+	go cli.ServeAdmin("zeal", opts.Admin, info)
 
 	for domain, headers := range opts.Headers {
 		for name, header := range headers {