Make code compile again

Signed-off-by: Alvin Lin <[email protected]>

Author: alvinlin123

go.mod

@@ -19,6 +19,7 @@ require (
 	github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
 	github.com/felixge/fgprof v0.9.1
 	github.com/fsouza/fake-gcs-server v1.7.0
+	github.com/go-kit/kit v0.12.0
 	github.com/go-kit/log v0.2.0
 	github.com/go-openapi/strfmt v0.21.0
 	github.com/go-openapi/swag v0.19.15

pkg/compactor/compactor.go

@@ -72,6 +72,7 @@ var (
 			true,  // Enable vertical compaction
 			reg,
 			blocksMarkedForDeletion,
+			prometheus.NewCounter(prometheus.CounterOpts{}),
 			garbageCollectedBlocks,
 			metadata.NoneFunc,
 			cfg)

pkg/compactor/shuffle_sharding_grouper.go

@@ -13,7 +13,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/prometheus/prometheus/pkg/labels"
+	"github.com/prometheus/prometheus/model/labels"
 	"github.com/thanos-io/thanos/pkg/block/metadata"
 	"github.com/thanos-io/thanos/pkg/compact"
 	"github.com/thanos-io/thanos/pkg/objstore"
@@ -26,6 +26,7 @@ type ShuffleShardingGrouper struct {
 	enableVerticalCompaction bool
 	reg                      prometheus.Registerer
 	blocksMarkedForDeletion  prometheus.Counter
+	blocksMarkedForNoCompact prometheus.Counter
 	garbageCollectedBlocks   prometheus.Counter
 	hashFunc                 metadata.HashFunc
 	compactions              *prometheus.CounterVec
@@ -43,6 +44,7 @@ func NewShuffleShardingGrouper(
 	enableVerticalCompaction bool,
 	reg prometheus.Registerer,
 	blocksMarkedForDeletion prometheus.Counter,
+	blocksMarkedForNoCompact prometheus.Counter,
 	garbageCollectedBlocks prometheus.Counter,
 	hashFunc metadata.HashFunc,
 	compactorCfg Config,
@@ -58,6 +60,7 @@ func NewShuffleShardingGrouper(
 		enableVerticalCompaction: enableVerticalCompaction,
 		reg:                      reg,
 		blocksMarkedForDeletion:  blocksMarkedForDeletion,
+		blocksMarkedForNoCompact: blocksMarkedForNoCompact,
 		garbageCollectedBlocks:   garbageCollectedBlocks,
 		hashFunc:                 hashFunc,
 		// Metrics are copied from Thanos DefaultGrouper constructor
@@ -135,6 +138,7 @@ func (g *ShuffleShardingGrouper) Groups(blocks map[ulid.ULID]*metadata.Meta) (re
 				g.verticalCompactions.WithLabelValues(groupKey),
 				g.garbageCollectedBlocks,
 				g.blocksMarkedForDeletion,
+				g.blocksMarkedForNoCompact,
 				g.hashFunc,
 			)
 			if err != nil {

pkg/compactor/shuffle_sharding_grouper_test.go

@@ -149,6 +149,7 @@ func TestShuffleShardingGrouper_Groups(t *testing.T) {
 				prometheus.NewRegistry(),
 				nil,
 				nil,
+				nil,
 				metadata.NoneFunc,
 				*compactorCfg)
 			actual, err := g.Groups(testData.blocks)