Add more metrics

- Uptime
- Peer libp2p user agents

Author: ulope

rolling-shutter/keyper/keypermetrics/metrics.go

@@ -1,9 +1,25 @@
 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",
@@ -80,6 +96,7 @@ 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/p2p/metrics.go

@@ -5,6 +5,7 @@ import (
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/rs/zerolog/log"
 )
 
 var metricsP2PMessageValidationTime = prometheus.NewHistogramVec(
@@ -57,6 +58,16 @@ var metricsP2PPeerPing = prometheus.NewGaugeVec(
 	[]string{"our_id", "peer_id"},
 )
 
+var metricsP2PPeerUserAgent = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Namespace: "shutter",
+		Subsystem: "p2p",
+		Name:      "peer_user_agent",
+		Help:      "Collection of the user agent of a peer ID.",
+	},
+	[]string{"peer_id", "user_agent"},
+)
+
 func collectPeerAddresses(p peer.AddrInfo) {
 	for _, multiAddr := range p.Addrs {
 		metricsP2PPeerTuples.WithLabelValues(p.ID.String(), multiAddr.String()).Set(1)
@@ -69,6 +80,7 @@ func init() {
 	prometheus.MustRegister(metricsP2PPeerTuples)
 	prometheus.MustRegister(metricsP2PPeerConnectedness)
 	prometheus.MustRegister(metricsP2PPeerPing)
+	prometheus.MustRegister(metricsP2PPeerUserAgent)
 }
 
 func updatePeersMetrics(h host.Host, peerIds mapset.Set[peer.ID]) {
@@ -80,5 +92,13 @@ func updatePeersMetrics(h host.Host, peerIds mapset.Set[peer.ID]) {
 		if peerPing != 0 {
 			metricsP2PPeerPing.WithLabelValues(ourID, p.String()).Set(peerPing.Seconds())
 		}
+		ua, err := h.Peerstore().Get(p, "AgentVersion")
+		if err != nil {
+			log.Warn().Str("peer", p.String()).Msg("Can't get user agent for peer")
+			continue
+		}
+		if ua != nil {
+			metricsP2PPeerUserAgent.WithLabelValues(p.String(), ua.(string)).Set(1)
+		}
 	}
 }