Chore: Upgrade Prometheus (#4374)

* Chore: Upgrade Prometheus

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Chore: Upgrade Prometheus

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

Author: aknuds1

cmd/query-tee/main.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/go-kit/kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/weaveworks/common/logging"
 	"github.com/weaveworks/common/server"
 
@@ -35,7 +36,7 @@ func main() {
 
 	// Run the instrumentation server.
 	registry := prometheus.NewRegistry()
-	registry.MustRegister(prometheus.NewGoCollector())
+	registry.MustRegister(collectors.NewGoCollector())
 
 	i := querytee.NewInstrumentationServer(cfg.ServerMetricsPort, registry)
 	if err := i.Start(); err != nil {

go.mod

@@ -3,7 +3,7 @@ module github.com/cortexproject/cortex
 go 1.16
 
 require (
-	cloud.google.com/go/bigtable v1.2.0
+	cloud.google.com/go/bigtable v1.3.0
 	cloud.google.com/go/storage v1.10.0
 	github.com/Azure/azure-pipeline-go v0.2.2
 	github.com/Azure/azure-storage-blob-go v0.8.0
@@ -12,7 +12,7 @@ require (
 	github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15
 	github.com/alicebob/miniredis/v2 v2.14.3
 	github.com/armon/go-metrics v0.3.6
-	github.com/aws/aws-sdk-go v1.38.35
+	github.com/aws/aws-sdk-go v1.38.60
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
 	github.com/cespare/xxhash v1.1.0
 	github.com/dustin/go-humanize v1.0.0
@@ -45,28 +45,28 @@ require (
 	github.com/opentracing-contrib/go-stdlib v1.0.0
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/alertmanager v0.22.1-0.20210603124511-8b584eb2265e
-	github.com/prometheus/client_golang v1.10.0
+	github.com/prometheus/alertmanager v0.22.3-0.20210628111558-8491f816296b
+	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.26.1-0.20210603143733-6ef301f414bf
-	github.com/prometheus/prometheus v1.8.2-0.20210510213326-e313ffa8abf6
+	github.com/prometheus/common v0.29.0
+	github.com/prometheus/prometheus v1.8.2-0.20210720084720-59d02b5ef003
 	github.com/segmentio/fasthash v0.0.0-20180216231524-a72b379d632e
 	github.com/sony/gobreaker v0.4.1
 	github.com/spf13/afero v1.2.2
 	github.com/stretchr/testify v1.7.0
 	github.com/thanos-io/thanos v0.19.1-0.20210427154226-d5bd651319d2
-	github.com/uber/jaeger-client-go v2.28.0+incompatible
+	github.com/uber/jaeger-client-go v2.29.1+incompatible
 	github.com/weaveworks/common v0.0.0-20210419092856-009d1eebd624
 	go.etcd.io/bbolt v1.3.5
-	go.etcd.io/etcd v0.5.0-alpha.5.0.20200520232829-54ba9589114f
+	go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
 	go.etcd.io/etcd/client/v3 v3.5.0-alpha.0.0.20210225194612-fa82d11a958a
 	go.etcd.io/etcd/server/v3 v3.5.0-alpha.0.0.20210225194612-fa82d11a958a
-	go.uber.org/atomic v1.7.0
-	golang.org/x/net v0.0.0-20210525063256-abc453219eb5
+	go.uber.org/atomic v1.8.0
+	golang.org/x/net v0.0.0-20210610132358-84b48f89b13b
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
-	google.golang.org/api v0.46.0
-	google.golang.org/grpc v1.37.0
+	golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6
+	google.golang.org/api v0.48.0
+	google.golang.org/grpc v1.38.0
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 	sigs.k8s.io/yaml v1.2.0

go.sum

@@ -57,7 +57,7 @@ var (
 	}
 
 	DefaultBlocksCompactorFactory = func(ctx context.Context, cfg Config, logger log.Logger, reg prometheus.Registerer) (compact.Compactor, compact.Planner, error) {
-		compactor, err := tsdb.NewLeveledCompactor(ctx, reg, logger, cfg.BlockRanges.ToMilliseconds(), downsample.NewPool())
+		compactor, err := tsdb.NewLeveledCompactor(ctx, reg, logger, cfg.BlockRanges.ToMilliseconds(), downsample.NewPool(), nil)
 		if err != nil {
 			return nil, nil, err
 		}

pkg/compactor/compactor.go

@@ -958,7 +958,7 @@ func createTSDBBlock(t *testing.T, bkt objstore.Bucket, userID string, minT, max
 		MinBlockDuration:  int64(2 * 60 * 60 * 1000), // 2h period
 		MaxBlockDuration:  int64(2 * 60 * 60 * 1000), // 2h period
 		RetentionDuration: int64(15 * 86400 * 1000),  // 15 days
-	})
+	}, nil)
 	require.NoError(t, err)
 
 	db.DisableCompactions()

pkg/compactor/compactor_test.go

@@ -564,7 +564,7 @@ func NewStorage(t T) storage.Storage {
 	db, err := tsdb.Open(dir, nil, nil, &tsdb.Options{
 		MinBlockDuration: int64(24 * time.Hour / time.Millisecond),
 		MaxBlockDuration: int64(24 * time.Hour / time.Millisecond),
-	})
+	}, nil)
 	if err != nil {
 		t.Fatalf("Opening test storage failed: %s", err)
 	}

pkg/configs/legacy_promql/test.go

@@ -369,6 +369,7 @@ func (c RulesConfig) parseV2() (map[string][]rules.Rule, error) {
 						labels.FromMap(rl.Labels),
 						labels.FromMap(rl.Annotations),
 						nil,
+						"",
 						true,
 						log.With(util_log.Logger, "alert", rl.Alert.Value),
 					))
@@ -417,7 +418,14 @@ func (c RulesConfig) parseV1() (map[string][]rules.Rule, error) {
 				}
 
 				rule = rules.NewAlertingRule(
-					r.Name, expr, r.Duration, r.Labels, r.Annotations, nil, true,
+					r.Name,
+					expr,
+					r.Duration,
+					r.Labels,
+					r.Annotations,
+					nil,
+					"",
+					true,
 					log.With(util_log.Logger, "alert", r.Name),
 				)
 

pkg/configs/userconfig/config.go

@@ -91,6 +91,7 @@ func TestParseLegacyAlerts(t *testing.T) {
 			labels.Label{Name: "message", Value: "I am a message"},
 		},
 		nil,
+		"",
 		true,
 		log.With(util_log.Logger, "alert", "TestAlert"),
 	)

pkg/configs/userconfig/config_test.go

@@ -1566,6 +1566,10 @@ func (i *Ingester) createTSDB(userID string) (*userTSDB, error) {
 		instanceSeriesCount: &i.TSDBState.seriesCount,
 	}
 
+	enableExemplars := false
+	if i.cfg.BlocksStorageConfig.TSDB.MaxExemplars > 0 {
+		enableExemplars = true
+	}
 	// Create a new user database
 	db, err := tsdb.Open(udir, userLogger, tsdbPromReg, &tsdb.Options{
 		RetentionDuration:         i.cfg.BlocksStorageConfig.TSDB.Retention.Milliseconds(),
@@ -1578,8 +1582,9 @@ func (i *Ingester) createTSDB(userID string) (*userTSDB, error) {
 		WALSegmentSize:            i.cfg.BlocksStorageConfig.TSDB.WALSegmentSizeBytes,
 		SeriesLifecycleCallback:   userDB,
 		BlocksToDelete:            userDB.blocksToDelete,
-		MaxExemplars:              i.cfg.BlocksStorageConfig.TSDB.MaxExemplars,
-	})
+		EnableExemplarStorage:     enableExemplars,
+		MaxExemplars:              int64(i.cfg.BlocksStorageConfig.TSDB.MaxExemplars),
+	}, nil)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to open TSDB: %s", udir)
 	}

pkg/ingester/ingester_v2.go

@@ -3317,7 +3317,7 @@ func TestHeadCompactionOnStartup(t *testing.T) {
 			NoLockfile:        true,
 			MinBlockDuration:  chunkRange,
 			MaxBlockDuration:  chunkRange,
-		})
+		}, nil)
 		require.NoError(t, err)
 
 		db.DisableCompactions()