Merge pull request #3712 from nspcc-dev/move-metrics

*: move metric `neogo_version` out of pkg/network

cli/server/metrics.go

@@ -0,0 +1,23 @@
+package server
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+var neogoVersion = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Help:      "NeoGo version",
+		Name:      "version",
+		Namespace: "neogo",
+	},
+	[]string{"version"})
+
+func setNeoGoVersion(nodeVer string) {
+	neogoVersion.WithLabelValues(nodeVer).Add(1)
+}
+
+func init() {
+	prometheus.MustRegister(
+		neogoVersion,
+	)
+}

cli/server/server.go

@@ -506,7 +506,7 @@ func startServer(ctx *cli.Context) error {
 	errChan := make(chan error)
 	rpcServer := rpcsrv.New(chain, cfg.ApplicationConfiguration.RPC, serv, oracleSrv, log, errChan)
 	serv.AddService(rpcServer)
-
+	setNeoGoVersion(config.Version)
 	serv.Start()
 	if !cfg.ApplicationConfiguration.RPC.StartWhenSynchronized {
 		// Run RPC server in a separate routine. This is necessary to avoid a potential

pkg/network/prometheus.go

@@ -24,15 +24,6 @@ var (
 			Namespace: "neogo",
 		},
 	)
-
-	neogoVersion = prometheus.NewGaugeVec(
-		prometheus.GaugeOpts{
-			Help:      "NeoGo version",
-			Name:      "version",
-			Namespace: "neogo",
-		},
-		[]string{"version"})
-
 	serverID = prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Help:      "network server ID",
@@ -72,7 +63,6 @@ func init() {
 	prometheus.MustRegister(
 		estimatedNetworkSize,
 		peersConnected,
-		neogoVersion,
 		serverID,
 		poolCount,
 		blockQueueLength,
@@ -111,10 +101,6 @@ func updatePeersConnectedMetric(pConnected int) {
 	peersConnected.Set(float64(pConnected))
 }
 
-func setNeoGoVersion(nodeVer string) {
-	neogoVersion.WithLabelValues(nodeVer).Add(1)
-}
-
 func setSeverID(id string) {
 	serverID.WithLabelValues(id).Add(1)
 }

pkg/network/server.go

@@ -318,7 +318,6 @@ func (s *Server) Start() {
 	for _, tr := range s.transports {
 		go tr.Accept()
 	}
-	setNeoGoVersion(config.Version)
 	setSeverID(strconv.FormatUint(uint64(s.id), 10))
 	go s.run()
 }