Bump prometheus and thanos to master (#3000)

* Bump prometheus and thanos to master

Signed-off-by: Ben Ye <[email protected]>

* add changelog entry

Signed-off-by: Ben Ye <[email protected]>

* Rebased and fixed CHANGELOG entry ordering

Signed-off-by: Marco Pracucci <[email protected]>

* Reverted logic to pass userID to pusherAppender just for clarity

Signed-off-by: Marco Pracucci <[email protected]>

Co-authored-by: Marco Pracucci <[email protected]>

Author: yeya24

CHANGELOG.md

@@ -7,6 +7,7 @@
   * `cortex_ingester_received_files`
   * `cortex_ingester_received_bytes_total`
   * `cortex_ingester_sent_bytes_total`
+* [CHANGE] Experimental blocks storage: the `operation` label value `getrange` has changed into `get_range` for the metrics `thanos_store_bucket_cache_operation_requests_total` and `thanos_store_bucket_cache_operation_hits_total`. #3000
 * [CHANGE] Experimental Delete Series: `/api/v1/admin/tsdb/delete_series` and `/api/v1/admin/tsdb/cancel_delete_request` purger APIs to return status code `204` instead of `200` for success. #2946
 * [ENHANCEMENT] Add support for azure storage in China, German and US Government environments. #2988
 * [ENHANCEMENT] Query-tee: added a small tolerance to floating point sample values comparison. #2994

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d
 	github.com/armon/go-metrics v0.3.3
-	github.com/aws/aws-sdk-go v1.33.5
+	github.com/aws/aws-sdk-go v1.33.12
 	github.com/blang/semver v3.5.0+incompatible
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
 	github.com/cespare/xxhash v1.1.0
@@ -44,19 +44,18 @@ require (
 	github.com/prometheus/alertmanager v0.21.0
 	github.com/prometheus/client_golang v1.7.1
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.10.0
-	github.com/prometheus/prometheus v1.8.2-0.20200722151933-4a8531a64b32
+	github.com/prometheus/common v0.11.1
+	github.com/prometheus/prometheus v1.8.2-0.20200811193703-869f1bc587e6
 	github.com/rafaeljusto/redigomock v0.0.0-20190202135759-257e089e14a1
 	github.com/segmentio/fasthash v0.0.0-20180216231524-a72b379d632e
 	github.com/spf13/afero v1.2.2
 	github.com/stretchr/testify v1.5.1
-	github.com/thanos-io/thanos v0.13.1-0.20200731083140-69b87607decf
-	github.com/uber/jaeger-client-go v2.24.0+incompatible
+	github.com/thanos-io/thanos v0.13.1-0.20200807203500-9b578afb4763
+	github.com/uber/jaeger-client-go v2.25.0+incompatible
 	github.com/weaveworks/common v0.0.0-20200625145055-4b1847531bc9
 	go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50
 	go.etcd.io/etcd v0.5.0-alpha.5.0.20200520232829-54ba9589114f
 	go.uber.org/atomic v1.6.0
-	go.uber.org/zap v1.14.1 // indirect
 	golang.org/x/net v0.0.0-20200707034311-ab3426394381
 	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e

go.sum

@@ -760,7 +760,7 @@ func createTSDBBlock(t *testing.T, dir string, minT, maxT int64, externalLabels
 	for i, ts := range []int64{minT, maxT - 1} {
 		lbls := labels.Labels{labels.Label{Name: "series_id", Value: strconv.Itoa(i)}}
 
-		app := db.Appender()
+		app := db.Appender(context.Background())
 		_, err := app.Add(lbls, ts, float64(i))
 		require.NoError(t, err)
 

pkg/compactor/compactor_test.go

@@ -60,7 +60,7 @@ func BenchmarkRangeQuery(b *testing.B) {
 	numIntervals := 8640 + 10000
 
 	for s := 0; s < numIntervals; s++ {
-		a := storage.Appender()
+		a := storage.Appender(context.Background())
 		ts := int64(s * 10000) // 10s interval.
 		for i, metric := range metrics {
 			err := a.AddFast(refs[i], ts, float64(s))

pkg/configs/legacy_promql/bench_test.go

@@ -31,7 +31,7 @@ func TestDeriv(t *testing.T) {
 	defer storage.Close()
 	engine := NewEngine(nil, nil, 10, 10*time.Second)
 
-	a := storage.Appender()
+	a := storage.Appender(context.Background())
 
 	metric := labels.FromStrings("__name__", "foo")
 	_, err := a.Add(metric, 1493712816939, 1.0)

pkg/configs/legacy_promql/functions_test.go

@@ -421,7 +421,7 @@ func (t *Test) exec(tc testCommand) error {
 		t.clear()
 
 	case *loadCmd:
-		app := t.storage.Appender()
+		app := t.storage.Appender(context.Background())
 		if err := cmd.append(app); err != nil {
 			app.Rollback()
 			return err
@@ -617,8 +617,8 @@ func (a adapter) ChunkQuerier(ctx context.Context, mint, maxt int64) (storage.Ch
 }
 
 // Appender returns a new appender against the storage.
-func (a adapter) Appender() storage.Appender {
-	return a.db.Appender()
+func (a adapter) Appender(ctx context.Context) storage.Appender {
+	return a.db.Appender(ctx)
 }
 
 // Close closes the storage and all its underlying resources.

pkg/configs/legacy_promql/test.go

@@ -401,7 +401,7 @@ func (i *Ingester) v2Push(ctx context.Context, req *client.WriteRequest) (*clien
 	startAppend := time.Now()
 
 	// Walk the samples, appending them to the users database
-	app := db.Appender()
+	app := db.Appender(ctx)
 	for _, ts := range req.Timeseries {
 		// Check if we already have a cached reference for this series. Be aware
 		// that even if we have a reference it's not guaranteed to be still valid.

pkg/ingester/ingester_v2.go

@@ -1692,7 +1692,7 @@ func TestHeadCompactionOnStartup(t *testing.T) {
 		l := labels.Labels{{Name: "n", Value: "v"}}
 		for i := 0; i < numFullChunks; i++ {
 			// Not using db.Appender() as it checks for compaction.
-			app := head.Appender()
+			app := head.Appender(context.Background())
 			_, err := app.Add(l, int64(i)*chunkRange+1, 9.99)
 			require.NoError(t, err)
 			_, err = app.Add(l, int64(i+1)*chunkRange, 9.99)

pkg/ingester/ingester_v2_test.go

@@ -188,7 +188,7 @@ func mockTSDB(t *testing.T, mint model.Time, samples int, step, chunkOffset time
 		_ = head.Close()
 	})
 
-	app := head.Appender()
+	app := head.Appender(context.Background())
 
 	l := labels.Labels{
 		{Name: model.MetricNameLabel, Value: "foo"},