metrics: set the highest priority for metrics service.

Metrics port should be opened before all other ports, and start served before all other services. Refs: #2428. Signed-off-by: Ekaterina Pavlova <[email protected]>
nspcc-dev · Nov 14, 2023 · 69e53e4 · 69e53e4
1 parent 59a8198
commit 69e53e4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ Changelog for NeoFS Node
 - Transaction witness scope no longer uses CustomGroups relying on more strict Rules now (#2619)
 - New optimized SDK version is integrated (#2622)
 - IR uses internal LOCODE DB from Go package (#2610)
+- The priority of metrics service is increased (#2428)
 
 ### Removed
 - deprecated `no-precheck` flag of `neofs-cli container set-eacl` (#2496)

diff --git a/cmd/neofs-node/main.go b/cmd/neofs-node/main.go
@@ -79,6 +79,8 @@ func initAndLog(c *cfg, name string, initializer func(*cfg)) {
 }
 
 func initApp(c *cfg) {
+	initAndLog(c, "prometheus", initMetrics)
+	initAndLog(c, "gRPC", initGRPC)
 	initLocalStorage(c)
 
 	c.ctx, c.ctxCancel = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
@@ -88,7 +90,6 @@ func initApp(c *cfg) {
 		fatalOnErr(c.cfgObject.cfgLocalStorage.localStorage.Init())
 	})
 
-	initAndLog(c, "gRPC", initGRPC)
 	initAndLog(c, "netmap", initNetmapService)
 	initAndLog(c, "accounting", initAccountingService)
 	initAndLog(c, "container", initContainerService)
@@ -97,7 +98,6 @@ func initApp(c *cfg) {
 	initAndLog(c, "notification", initNotifications)
 	initAndLog(c, "object", initObjectService)
 	initAndLog(c, "pprof", initProfiler)
-	initAndLog(c, "prometheus", initMetrics)
 	initAndLog(c, "tree", initTreeService)
 	initAndLog(c, "control", initControlService)
 

diff --git a/cmd/neofs-node/metrics.go b/cmd/neofs-node/metrics.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	"context"
-
 	metricsconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/metrics"
 	httputil "github.com/nspcc-dev/neofs-node/pkg/util/http"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -26,12 +24,11 @@ func initMetrics(c *cfg) {
 		),
 	)
 
-	c.workers = append(c.workers, newWorkerFromFunc(func(context.Context) {
-		runAndLog(c, "metrics", false, func(c *cfg) {
+	go func() {
+		runAndLog(c, "metrics", true, func(c *cfg) {
 			fatalOnErr(srv.Serve())
 		})
-	}))
-
+	}()
 	c.closers = append(c.closers, func() {
 		c.log.Debug("shutting down metrics service")