diff --git a/ROADMAP.md b/ROADMAP.md index 5d6e58dd4..673452c0a 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -25,15 +25,6 @@ APIs/commands/configurations will be removed and here is a list of scheduled breaking changes. Consider changing your code/scripts/configurations if you're using anything mentioned here. -## `serv_node_version` Prometheus gauge metric - -This metric is replaced by the new `neogo_version` and `server_id` Prometheus gauge -metrics with proper version formatting. `neogo_version` contains NeoGo version -hidden under `version` label and `server_id` contains network server ID hidden -under `server_id` label. - -Removal of `serv_node_version` is scheduled for Jun-Jul 2024 (~0.107.0 release). - ## RPC error codes returned by old versions and C#-nodes NeoGo retains certain deprecated error codes: `neorpc.ErrCompatGeneric`, diff --git a/pkg/network/prometheus.go b/pkg/network/prometheus.go index b0ed5982b..3d2631947 100644 --- a/pkg/network/prometheus.go +++ b/pkg/network/prometheus.go @@ -25,16 +25,6 @@ var ( }, ) - // Deprecated: please, use neogoVersion and serverID instead. - servAndNodeVersion = prometheus.NewGaugeVec( - prometheus.GaugeOpts{ - Help: "Server and Node versions", - Name: "serv_node_version", - Namespace: "neogo", - }, - []string{"description", "value"}, - ) - neogoVersion = prometheus.NewGaugeVec( prometheus.GaugeOpts{ Help: "NeoGo version", @@ -82,7 +72,6 @@ func init() { prometheus.MustRegister( estimatedNetworkSize, peersConnected, - servAndNodeVersion, neogoVersion, serverID, poolCount, @@ -122,12 +111,6 @@ func updatePeersConnectedMetric(pConnected int) { peersConnected.Set(float64(pConnected)) } -// Deprecated: please, use setNeoGoVersion and setSeverID instead. -func setServerAndNodeVersions(nodeVer string, serverID string) { - servAndNodeVersion.WithLabelValues("Node version: ", nodeVer).Add(0) - servAndNodeVersion.WithLabelValues("Server id: ", serverID).Add(0) -} - func setNeoGoVersion(nodeVer string) { neogoVersion.WithLabelValues(nodeVer).Add(1) } diff --git a/pkg/network/server.go b/pkg/network/server.go index 4916eb4d5..24aa8614d 100644 --- a/pkg/network/server.go +++ b/pkg/network/server.go @@ -318,7 +318,6 @@ func (s *Server) Start() { for _, tr := range s.transports { go tr.Accept() } - setServerAndNodeVersions(s.UserAgent, strconv.FormatUint(uint64(s.id), 10)) setNeoGoVersion(config.Version) setSeverID(strconv.FormatUint(uint64(s.id), 10)) go s.run()