fix: prometeus vector variables as pointers (#5064)

Author: janos

pkg/api/metrics.go

@@ -28,7 +28,7 @@ type metrics struct {
 	PingRequestCount   prometheus.Counter
 	ResponseCodeCounts *prometheus.CounterVec
 
-	ContentApiDuration prometheus.HistogramVec
+	ContentApiDuration *prometheus.HistogramVec
 	UploadSpeed        *prometheus.HistogramVec
 	DownloadSpeed      *prometheus.HistogramVec
 }
@@ -59,7 +59,7 @@ func newMetrics() metrics {
 			},
 			[]string{"code", "method"},
 		),
-		ContentApiDuration: *prometheus.NewHistogramVec(prometheus.HistogramOpts{
+		ContentApiDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: m.Namespace,
 			Subsystem: subsystem,
 			Name:      "content_api_duration",

pkg/p2p/libp2p/internal/reacher/metrics.go

@@ -10,21 +10,21 @@ import (
 )
 
 type metrics struct {
-	Pings    prometheus.CounterVec
-	PingTime prometheus.HistogramVec
+	Pings    *prometheus.CounterVec
+	PingTime *prometheus.HistogramVec
 }
 
 func newMetrics() metrics {
 	subsystem := "reacher"
 
 	return metrics{
-		Pings: *prometheus.NewCounterVec(prometheus.CounterOpts{
+		Pings: prometheus.NewCounterVec(prometheus.CounterOpts{
 			Namespace: m.Namespace,
 			Subsystem: subsystem,
 			Name:      "pings",
 			Help:      "Ping counter.",
 		}, []string{"status"}),
-		PingTime: *prometheus.NewHistogramVec(prometheus.HistogramOpts{
+		PingTime: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: m.Namespace,
 			Subsystem: subsystem,
 			Name:      "ping_timer",

pkg/postage/batchstore/metrics.go

@@ -12,7 +12,7 @@ import (
 type metrics struct {
 	Commitment        prometheus.Gauge
 	Radius            prometheus.Gauge
-	UnreserveDuration prometheus.HistogramVec
+	UnreserveDuration *prometheus.HistogramVec
 }
 
 func newMetrics() metrics {
@@ -31,7 +31,7 @@ func newMetrics() metrics {
 			Name:      "radius",
 			Help:      "Radius of responsibility observed by the batchstore.",
 		}),
-		UnreserveDuration: *prometheus.NewHistogramVec(prometheus.HistogramOpts{
+		UnreserveDuration: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: m.Namespace,
 			Subsystem: subsystem,
 			Name:      "unreserve_duration",

pkg/puller/metrics.go

@@ -10,11 +10,11 @@ import (
 )
 
 type metrics struct {
-	SyncWorkerIterCounter prometheus.Counter    // counts the number of syncing iterations
-	SyncWorkerCounter     prometheus.Gauge      // count number of syncing jobs
-	SyncedCounter         prometheus.CounterVec // number of synced chunks
-	SyncWorkerErrCounter  prometheus.Counter    // count number of errors
-	MaxUintErrCounter     prometheus.Counter    // how many times we got maxuint as topmost
+	SyncWorkerIterCounter prometheus.Counter     // counts the number of syncing iterations
+	SyncWorkerCounter     prometheus.Gauge       // count number of syncing jobs
+	SyncedCounter         *prometheus.CounterVec // number of synced chunks
+	SyncWorkerErrCounter  prometheus.Counter     // count number of errors
+	MaxUintErrCounter     prometheus.Counter     // how many times we got maxuint as topmost
 }
 
 func newMetrics() metrics {
@@ -33,7 +33,7 @@ func newMetrics() metrics {
 			Name:      "worker",
 			Help:      "Total active worker jobs.",
 		}),
-		SyncedCounter: *prometheus.NewCounterVec(prometheus.CounterOpts{
+		SyncedCounter: prometheus.NewCounterVec(prometheus.CounterOpts{
 			Namespace: m.Namespace,
 			Subsystem: subsystem,
 			Name:      "synced_chunks",

pkg/pushsync/metrics.go

@@ -19,11 +19,11 @@ type metrics struct {
 	TotalOutgoing           prometheus.Counter
 	TotalOutgoingErrors     prometheus.Counter
 	InvalidStampErrors      prometheus.Counter
-	StampValidationTime     prometheus.HistogramVec
+	StampValidationTime     *prometheus.HistogramVec
 	Forwarder               prometheus.Counter
 	Storer                  prometheus.Counter
-	TotalHandlerTime        prometheus.HistogramVec
-	PushToPeerTime          prometheus.HistogramVec
+	TotalHandlerTime        *prometheus.HistogramVec
+	PushToPeerTime          *prometheus.HistogramVec
 
 	ReceiptDepth        *prometheus.CounterVec
 	ShallowReceiptDepth *prometheus.CounterVec
@@ -88,7 +88,7 @@ func newMetrics() metrics {
 			Name:      "invalid_stamps",
 			Help:      "No of invalid stamp errors.",
 		}),
-		StampValidationTime: *prometheus.NewHistogramVec(prometheus.HistogramOpts{
+		StampValidationTime: prometheus.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: m.Namespace,
 			Subsystem: subsystem,
 			Name:      "stamp_validation_time",
@@ -106,15 +106,15 @@ func newMetrics() metrics {
 			Name:      "storer",
 			Help:      "No of times the peer is a storer node.",
 		}),
-		TotalHandlerTime: *prometheus.NewHistogramVec(
+		TotalHandlerTime: prometheus.NewHistogramVec(
 			prometheus.HistogramOpts{
 				Namespace: m.Namespace,
 				Subsystem: subsystem,
 				Name:      "total_handler_time",
 				Help:      "Histogram for time taken for the handler.",
 			}, []string{"status"},
 		),
-		PushToPeerTime: *prometheus.NewHistogramVec(
+		PushToPeerTime: prometheus.NewHistogramVec(
 			prometheus.HistogramOpts{
 				Namespace: m.Namespace,
 				Subsystem: subsystem,

pkg/storer/metrics.go

@@ -17,8 +17,8 @@ import (
 
 // metrics groups storer related prometheus counters.
 type metrics struct {
-	MethodCalls             prometheus.CounterVec
-	MethodCallsDuration     prometheus.HistogramVec
+	MethodCalls             *prometheus.CounterVec
+	MethodCallsDuration     *prometheus.HistogramVec
 	ReserveSize             prometheus.Gauge
 	ReserveSizeWithinRadius prometheus.Gauge
 	ReserveCleanup          prometheus.Counter
@@ -28,7 +28,7 @@ type metrics struct {
 	ExpiredChunkCount       prometheus.Counter
 	OverCapTriggerCount     prometheus.Counter
 	ExpiredBatchCount       prometheus.Counter
-	LevelDBStats            prometheus.HistogramVec
+	LevelDBStats            *prometheus.HistogramVec
 	ExpiryTriggersCount     prometheus.Counter
 	ExpiryRunsCount         prometheus.Counter
 
@@ -40,7 +40,7 @@ func newMetrics() metrics {
 	const subsystem = "localstore"
 
 	return metrics{
-		MethodCalls: *prometheus.NewCounterVec(
+		MethodCalls: prometheus.NewCounterVec(
 			prometheus.CounterOpts{
 				Namespace: m.Namespace,
 				Subsystem: subsystem,
@@ -49,7 +49,7 @@ func newMetrics() metrics {
 			},
 			[]string{"component", "method", "status"},
 		),
-		MethodCallsDuration: *prometheus.NewHistogramVec(
+		MethodCallsDuration: prometheus.NewHistogramVec(
 			prometheus.HistogramOpts{
 				Namespace: m.Namespace,
 				Subsystem: subsystem,
@@ -138,7 +138,7 @@ func newMetrics() metrics {
 				Help:      "Number of batches expired, that were processed.",
 			},
 		),
-		LevelDBStats: *prometheus.NewHistogramVec(
+		LevelDBStats: prometheus.NewHistogramVec(
 			prometheus.HistogramOpts{
 				Namespace: m.Namespace,
 				Subsystem: subsystem,

pkg/storer/storer.go

@@ -476,7 +476,7 @@ func New(ctx context.Context, dirPath string, opts *Options) (*DB, error) {
 
 	lock := multex.New()
 	metrics := newMetrics()
-	opts.LdbStats.CompareAndSwap(nil, &metrics.LevelDBStats)
+	opts.LdbStats.CompareAndSwap(nil, metrics.LevelDBStats)
 
 	if dirPath == "" {
 		st, dbCloser, err = initInmemRepository()