misc: bump prometheus to latest nightly

Signed-off-by: Michael Hoffmann <[email protected]>

engine/bench_test.go

@@ -26,11 +26,12 @@ func BenchmarkChunkDecoding(b *testing.B) {
 	storage := setupStorage(b, 1000, 3, 720)
 	defer storage.Close()
 
+	ctx := context.Background()
 	start := time.Unix(0, 0)
 	end := start.Add(6 * time.Hour)
 	step := time.Second * 30
 
-	querier, err := storage.Querier(context.Background(), start.UnixMilli(), end.UnixMilli())
+	querier, err := storage.Querier(start.UnixMilli(), end.UnixMilli())
 	testutil.Ok(b, err)
 
 	matcher, err := labels.NewMatcher(labels.MatchEqual, labels.MetricName, "http_requests_total")
@@ -41,7 +42,7 @@ func BenchmarkChunkDecoding(b *testing.B) {
 		for c := 0; c < b.N; c++ {
 			numIterations := 0
 
-			ss := querier.Select(false, nil, matcher)
+			ss := querier.Select(ctx, false, nil, matcher)
 			series := make([]chunkenc.Iterator, 0)
 			for ss.Next() {
 				series = append(series, ss.At().Iterator(nil))
@@ -60,7 +61,7 @@ func BenchmarkChunkDecoding(b *testing.B) {
 		b.ResetTimer()
 		for c := 0; c < b.N; c++ {
 			numIterations := 0
-			ss := querier.Select(false, nil, matcher)
+			ss := querier.Select(ctx, false, nil, matcher)
 			series := make([]chunkenc.Iterator, 0)
 			for ss.Next() {
 				series = append(series, ss.At().Iterator(nil))

engine/distributed_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/storage"
+	"github.com/prometheus/prometheus/util/annotations"
 
 	"github.com/thanos-io/promql-engine/api"
 	"github.com/thanos-io/promql-engine/engine"
@@ -289,14 +290,7 @@ func TestDistributedAggregations(t *testing.T) {
 											testutil.Ok(t, err)
 											promResult := promQry.Exec(ctx)
 
-											roundValues(promResult)
-											roundValues(distResult)
-
-											// Instant queries have no guarantees on result ordering.
-											sortByLabels(promResult)
-											sortByLabels(distResult)
-
-											testutil.Equals(t, promResult, distResult)
+											testutil.WithGoCmp(comparer).Equals(t, promResult, distResult)
 										})
 									}
 
@@ -316,9 +310,7 @@ func TestDistributedAggregations(t *testing.T) {
 										testutil.Ok(t, err)
 										promResult := promQry.Exec(ctx)
 
-										roundValues(promResult)
-										roundValues(distResult)
-										testutil.Equals(t, promResult, distResult)
+										testutil.WithGoCmp(comparer).Equals(t, promResult, distResult)
 									})
 								})
 							}
@@ -334,7 +326,7 @@ func TestDistributedEngineWarnings(t *testing.T) {
 	querier := &storage.MockQueryable{
 		MockQuerier: &storage.MockQuerier{
 			SelectMockFunction: func(sortSeries bool, hints *storage.SelectHints, matchers ...*labels.Matcher) storage.SeriesSet {
-				return newWarningsSeriesSet(storage.Warnings{errors.New("test warning")})
+				return newWarningsSeriesSet(annotations.New().Add(errors.New("test warning")))
 			},
 		},
 	}

engine/engine.go

@@ -547,10 +547,7 @@ type compatibilityQuery struct {
 func (q *compatibilityQuery) Exec(ctx context.Context) (ret *promql.Result) {
 	ctx = warnings.NewContext(ctx)
 	defer func() {
-		warns := warnings.FromContext(ctx)
-		if len(warns) > 0 {
-			ret.Warnings = warns
-		}
+		ret.Warnings = warnings.FromContext(ctx)
 	}()
 
 	// Handle case with strings early on as this does not need us to process samples.