Move uptime to general metrics

Author: ulope

rolling-shutter/keyper/keypermetrics/metrics.go

@@ -1,25 +1,9 @@
 package keypermetrics
 
 import (
-	"time"
-
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-var startTime = time.Now()
-
-var metricsKeyperUptime = prometheus.NewGaugeFunc(
-	prometheus.GaugeOpts{
-		Namespace: "shutter",
-		Subsystem: "keyper",
-		Name:      "uptime_seconds",
-		Help:      "Number of seconds the Keyper has been running",
-	},
-	func() float64 {
-		return float64(time.Since(startTime).Milliseconds()) / 1000
-	},
-)
-
 var MetricsKeyperCurrentBlockL1 = prometheus.NewGauge(
 	prometheus.GaugeOpts{
 		Namespace: "shutter",
@@ -96,7 +80,6 @@ var MetricsKeyperBatchConfigInfo = prometheus.NewGaugeVec(
 	[]string{"batch_config_index", "keyper_addresses"})
 
 func InitMetrics() {
-	prometheus.MustRegister(metricsKeyperUptime)
 	prometheus.MustRegister(MetricsKeyperCurrentBlockL1)
 	prometheus.MustRegister(MetricsKeyperCurrentBlockShuttermint)
 	prometheus.MustRegister(MetricsKeyperCurrentEon)

rolling-shutter/medley/metricsserver/metricsserver.go

@@ -14,6 +14,8 @@ import (
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/service"
 )
 
+var startTime = time.Now()
+
 var metricsGoBuildInfo = prometheus.NewGauge(
 	prometheus.GaugeOpts{
 		Namespace: "go",
@@ -26,9 +28,22 @@ var metricsGoBuildInfo = prometheus.NewGauge(
 	},
 )
 
+var metricsUptime = prometheus.NewGaugeFunc(
+	prometheus.GaugeOpts{
+		Namespace: "",
+		Subsystem: "",
+		Name:      "uptime_seconds",
+		Help:      "Number of seconds the Node has been running",
+	},
+	func() float64 {
+		return float64(time.Since(startTime).Milliseconds()) / 1000
+	},
+)
+
 func init() {
 	metricsGoBuildInfo.Set(1)
 	prometheus.MustRegister(metricsGoBuildInfo)
+	prometheus.MustRegister(metricsUptime)
 }
 
 type MetricsServer struct {