Using promauto to initialize the metric and testutil in tests

eko · Oct 26, 2019 · 140d01b · 140d01b
1 parent 256357e
commit 140d01b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/metrics/prometheus.go b/metrics/prometheus.go
@@ -3,6 +3,7 @@ package metrics
 import (
 	"github.com/eko/gocache/codec"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
 )
 
 const (
@@ -20,15 +21,14 @@ type Prometheus struct {
 }
 
 func initCacheCollector(namespace string) *prometheus.GaugeVec {
-	c := prometheus.NewGaugeVec(
+	c := promauto.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Name:      "collector",
 			Namespace: namespace,
 			Help:      "This represent the number of items in cache",
 		},
 		[]string{"service", "store", "metric"},
 	)
-	prometheus.MustRegister(c)
 	return c
 }
 

diff --git a/metrics/prometheus_test.go b/metrics/prometheus_test.go
@@ -7,7 +7,7 @@ import (
 	mocksCodec "github.com/eko/gocache/test/mocks/codec"
 	mocksStore "github.com/eko/gocache/test/mocks/store"
 	"github.com/prometheus/client_golang/prometheus"
-	dto "github.com/prometheus/client_model/go"
+	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -33,11 +33,13 @@ func TestRecord(t *testing.T) {
 	metrics.Record("redis", "hit_count", 6)
 
 	// Then
-	dtoMetric := &dto.Metric{}
-	metric, _ := metrics.collector.GetMetricWithLabelValues("my-test-service-name", "redis", "hit_count")
-	metric.Write(dtoMetric)
+	metric, err := metrics.collector.GetMetricWithLabelValues("my-test-service-name", "redis", "hit_count")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	v := testutil.ToFloat64(metric)
 
-	assert.Equal(t, float64(6), dtoMetric.GetGauge().GetValue())
+	assert.Equal(t, float64(6), v)
 }
 
 func TestRecordFromCodec(t *testing.T) {
@@ -105,10 +107,12 @@ func TestRecordFromCodec(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		dtoMetric := &dto.Metric{}
-		metric, _ := metrics.collector.GetMetricWithLabelValues("my-test-service-name", "redis", tc.metricName)
-		metric.Write(dtoMetric)
+		metric, err := metrics.collector.GetMetricWithLabelValues("my-test-service-name", "redis", tc.metricName)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		v := testutil.ToFloat64(metric)
 
-		assert.Equal(t, tc.expected, dtoMetric.GetGauge().GetValue())
+		assert.Equal(t, tc.expected, v)
 	}
 }