Make linter happy.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
grafana · Feb 5, 2024 · f61fca3 · f61fca3
1 parent 526d274
commit f61fca3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/compactor/blocks_cleaner.go b/pkg/compactor/blocks_cleaner.go
@@ -731,7 +731,7 @@ type noopGaugeVec struct {
 }
 
 func newNoopGaugeVec() *noopGaugeVec {
-	return &noopGaugeVec{g: prometheus.NewGauge(prometheus.GaugeOpts{})}
+	return &noopGaugeVec{g: promauto.With(nil).NewGauge(prometheus.GaugeOpts{})}
 }
 
 func (n *noopGaugeVec) WithLabelValues(...string) prometheus.Gauge {

diff --git a/pkg/compactor/blocks_cleaner_test.go b/pkg/compactor/blocks_cleaner_test.go
@@ -22,6 +22,7 @@ import (
 	"github.com/grafana/dskit/services"
 	"github.com/oklog/ulid"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -1074,7 +1075,7 @@ func TestComputeCompactionJobs(t *testing.T) {
 
 	userBucket := bucket.NewUserBucketClient(user, bucketClient, nil)
 	// Mark block for no-compaction.
-	require.NoError(t, block.MarkForNoCompact(context.Background(), log.NewNopLogger(), userBucket, blockMarkedForNoCompact, block.CriticalNoCompactReason, "testing", prometheus.NewCounter(prometheus.CounterOpts{})))
+	require.NoError(t, block.MarkForNoCompact(context.Background(), log.NewNopLogger(), userBucket, blockMarkedForNoCompact, block.CriticalNoCompactReason, "testing", promauto.With(nil).NewCounter(prometheus.CounterOpts{})))
 
 	cleaner := NewBlocksCleaner(cfg, bucketClient, tsdb.AllUsers, cfgProvider, log.NewNopLogger(), nil)
 	split, merge, err := cleaner.computeCompactionJobs(context.Background(), user, userBucket, &index)