[feat/query] Update the Prometheus-related code to utilize the new annotations package, and adjust the signatures of the query methods to support context passing.

src/m3ninx/index/segment/fst/fst_terms_iterator.go

@@ -95,7 +95,7 @@ func (f *fstTermsIter) Next() bool {
 
 	if f.firstNext {
 		f.firstNext = false
-		if err := f.iter.Reset(f.opts.fst, nil, nil, nil); err != nil {
+		if err := f.iter.Reset(f.opts.fst, nil, nil, nil, true); err != nil {
 			f.handleIterErr(err)
 			return false
 		}

src/query/api/v1/handler/prom/common.go

@@ -27,7 +27,7 @@ import (
 
 	jsoniter "github.com/json-iterator/go"
 	promql "github.com/prometheus/prometheus/promql/parser"
-	promstorage "github.com/prometheus/prometheus/storage"
+	"github.com/prometheus/prometheus/util/annotations"
 
 	xhttp "github.com/m3db/m3/src/x/net/http"
 )
@@ -68,7 +68,7 @@ type response struct {
 }
 
 // Respond responds with HTTP OK status code and writes response JSON to response body.
-func Respond(w http.ResponseWriter, data interface{}, warnings promstorage.Warnings) error {
+func Respond(w http.ResponseWriter, data interface{}, warnings annotations.Annotations) error {
 	statusMessage := statusSuccess
 	var warningStrings []string
 	for _, warning := range warnings {

src/query/api/v1/handler/prom/mocks.go

@@ -23,16 +23,14 @@ package prom
 import (
 	"context"
 	"errors"
+	"log/slog"
+	"os"
 	"time"
 
-	"github.com/go-kit/kit/log"
-	kitlogzap "github.com/go-kit/kit/log/zap"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/promql"
 	promstorage "github.com/prometheus/prometheus/storage"
-	"go.uber.org/zap/zapcore"
-
-	"github.com/m3db/m3/src/x/instrument"
+	"github.com/prometheus/prometheus/util/annotations"
 )
 
 type mockQuerier struct {
@@ -44,12 +42,13 @@ type mockSeriesSet struct {
 	promstorage.SeriesSet
 }
 
-func (m *mockSeriesSet) Next() bool                     { return false }
-func (m *mockSeriesSet) At() promstorage.Series         { return nil }
-func (m *mockSeriesSet) Err() error                     { return nil }
-func (m *mockSeriesSet) Warnings() promstorage.Warnings { return nil }
+func (m *mockSeriesSet) Next() bool                        { return false }
+func (m *mockSeriesSet) At() promstorage.Series            { return nil }
+func (m *mockSeriesSet) Err() error                        { return nil }
+func (m *mockSeriesSet) Warnings() annotations.Annotations { return nil }
 
 func (q *mockQuerier) Select(
+	ctx context.Context,
 	sortSeries bool,
 	hints *promstorage.SelectHints,
 	labelMatchers ...*labels.Matcher,
@@ -60,11 +59,11 @@ func (q *mockQuerier) Select(
 	return &mockSeriesSet{mockOptions: q.mockOptions}
 }
 
-func (*mockQuerier) LabelValues(string, ...*labels.Matcher) ([]string, promstorage.Warnings, error) {
+func (*mockQuerier) LabelValues(context.Context, string, *promstorage.LabelHints, ...*labels.Matcher) ([]string, annotations.Annotations, error) {
 	return nil, nil, errors.New("not implemented")
 }
 
-func (*mockQuerier) LabelNames(...*labels.Matcher) ([]string, promstorage.Warnings, error) {
+func (*mockQuerier) LabelNames(context.Context, *promstorage.LabelHints, ...*labels.Matcher) ([]string, annotations.Annotations, error) {
 	return nil, nil, errors.New("not implemented")
 }
 
@@ -84,7 +83,7 @@ type mockQueryable struct {
 	mockOptions
 }
 
-func (q *mockQueryable) Querier(_ context.Context, _, _ int64) (promstorage.Querier, error) {
+func (q *mockQueryable) Querier(_, _ int64) (promstorage.Querier, error) {
 	return &mockQuerier{mockOptions: q.mockOptions}, nil
 }
 
@@ -94,10 +93,9 @@ func durationMilliseconds(d time.Duration) int64 {
 
 func newMockPromQLEngine() *promql.Engine {
 	var (
-		instrumentOpts = instrument.NewOptions()
-		kitLogger      = kitlogzap.NewZapSugarLogger(instrumentOpts.Logger(), zapcore.InfoLevel)
-		opts           = promql.EngineOpts{
-			Logger:     log.With(kitLogger, "component", "query engine"),
+		slogLogger = slog.New(slog.NewJSONHandler(os.Stdout, nil))
+		opts       = promql.EngineOpts{
+			Logger:     slogLogger,
 			MaxSamples: 100,
 			Timeout:    1 * time.Minute,
 			NoStepSubqueryIntervalFn: func(rangeMillis int64) int64 {

src/query/api/v1/handler/prom/read.go

@@ -61,7 +61,9 @@ var (
 				return nil, err
 			}
 			return engine.NewRangeQuery(
+				context.Background(),
 				queryable,
+				nil,
 				params.Query,
 				params.Start.ToTime(),
 				params.End.ToTime(),
@@ -79,7 +81,9 @@ var (
 				return nil, err
 			}
 			return engine.NewInstantQuery(
+				context.Background(),
 				queryable,
+				nil,
 				params.Query,
 				params.Now)
 		}
@@ -178,7 +182,7 @@ func (h *readHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	for _, warn := range resultMetadata.Warnings {
-		res.Warnings = append(res.Warnings, errors.New(warn.Message))
+		res.Warnings.Add(errors.New(warn.Message))
 	}
 
 	query := params.Query
@@ -288,7 +292,7 @@ func (h *readHandler) limitReturnedData(query string,
 		}
 
 		for _, d := range m {
-			datapointCount := len(d.Points)
+			datapointCount := len(d.Floats)
 			if fetchOpts.ReturnedSeriesLimit > 0 && series+1 > fetchOpts.ReturnedSeriesLimit {
 				limited = true
 				break

src/query/api/v1/handler/prom/read_test.go

@@ -335,9 +335,9 @@ func TestLimitedReturnedDataVector(t *testing.T) {
 
 	r := &promql.Result{
 		Value: promql.Vector{
-			{Point: promql.Point{T: 1, V: 1.0}},
-			{Point: promql.Point{T: 2, V: 2.0}},
-			{Point: promql.Point{T: 3, V: 3.0}},
+			{T: 1, F: 1.0},
+			{T: 2, F: 2.0},
+			{T: 3, F: 3.0},
 		},
 	}
 
@@ -450,17 +450,17 @@ func TestLimitedReturnedDataMatrix(t *testing.T) {
 
 	r := &promql.Result{
 		Value: promql.Matrix{
-			{Points: []promql.Point{
-				{T: 1, V: 1.0},
+			{Floats: []promql.FPoint{
+				{T: 1, F: 1.0},
 			}},
-			{Points: []promql.Point{
-				{T: 1, V: 1.0},
-				{T: 2, V: 2.0},
+			{Floats: []promql.FPoint{
+				{T: 1, F: 1.0},
+				{T: 2, F: 2.0},
 			}},
-			{Points: []promql.Point{
-				{T: 1, V: 1.0},
-				{T: 2, V: 2.0},
-				{T: 3, V: 3.0},
+			{Floats: []promql.FPoint{
+				{T: 1, F: 1.0},
+				{T: 2, F: 2.0},
+				{T: 3, F: 3.0},
 			}},
 		},
 	}
@@ -580,7 +580,7 @@ func TestLimitedReturnedDataMatrix(t *testing.T) {
 			seriesCount := len(m)
 			datapointCount := 0
 			for _, d := range m {
-				datapointCount += len(d.Points)
+				datapointCount += len(d.Floats)
 			}
 
 			if limited.Limited {

src/query/api/v1/middleware/rewrite.go

@@ -355,7 +355,7 @@ type fakeQueryable struct {
 	calculatedEndTime   time.Time
 }
 
-func (f *fakeQueryable) Querier(ctx context.Context, mint, maxt int64) (promstorage.Querier, error) {
+func (f *fakeQueryable) Querier(mint, maxt int64) (promstorage.Querier, error) {
 	f.calculatedStartTime = xtime.FromUnixMillis(mint)
 	f.calculatedEndTime = xtime.FromUnixMillis(maxt)
 	// fail here to cause prometheus to give up on query execution
@@ -371,9 +371,9 @@ func (f *fakeQueryable) calculateQueryBounds(
 	var query promql.Query
 	if f.instant {
 		// startTime and endTime are the same for instant queries
-		query, err = f.engine.NewInstantQuery(f, q, start)
+		query, err = f.engine.NewInstantQuery(context.Background(), f, nil, q, start)
 	} else {
-		query, err = f.engine.NewRangeQuery(f, q, start, end, step)
+		query, err = f.engine.NewRangeQuery(context.Background(), f, nil, q, start, end, step)
 	}
 	if err != nil {
 		return err

src/query/api/v1/middleware/rewrite_test.go

@@ -23,18 +23,17 @@ package middleware
 import (
 	"bytes"
 	"io/ioutil"
+	"log/slog"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
+	"os"
 	"testing"
 	"time"
 
-	"github.com/go-kit/kit/log"
-	kitlogzap "github.com/go-kit/kit/log/zap"
 	"github.com/gorilla/mux"
 	"github.com/prometheus/prometheus/promql"
 	"github.com/stretchr/testify/require"
-	"go.uber.org/zap/zapcore"
 
 	"github.com/m3db/m3/src/query/api/v1/handler/prometheus/handleroptions"
 	"github.com/m3db/m3/src/query/storage/m3/storagemetadata"
@@ -355,10 +354,9 @@ func durationMilliseconds(d time.Duration) int64 {
 
 func makeBaseOpts(t *testing.T, r *mux.Router, addPromEngine bool) Options {
 	var (
-		instrumentOpts = instrument.NewOptions()
-		kitLogger      = kitlogzap.NewZapSugarLogger(instrumentOpts.Logger(), zapcore.InfoLevel)
-		engineOpts     = promql.EngineOpts{
-			Logger:     log.With(kitLogger, "component", "query engine"),
+		slogLogger = slog.New(slog.NewJSONHandler(os.Stdout, nil))
+		engineOpts = promql.EngineOpts{
+			Logger:     slogLogger,
 			MaxSamples: 100,
 			Timeout:    1 * time.Minute,
 			NoStepSubqueryIntervalFn: func(rangeMillis int64) int64 {

src/query/server/query.go

@@ -23,21 +23,19 @@ package server
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"math/rand"
 	"net"
 	"net/http"
 	"os"
 	"strings"
 	"time"
 
-	"github.com/go-kit/kit/log"
-	kitlogzap "github.com/go-kit/kit/log/zap"
 	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	extprom "github.com/prometheus/client_golang/prometheus"
 	prometheuspromql "github.com/prometheus/prometheus/promql"
 	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/h2c"
 	"google.golang.org/grpc"
@@ -1376,9 +1374,9 @@ func newPromQLEngine(
 
 	instrumentOpts.Logger().Debug("creating new PromQL engine", zap.Duration("lookbackDelta", lookbackDelta))
 	var (
-		kitLogger = kitlogzap.NewZapSugarLogger(instrumentOpts.Logger(), zapcore.InfoLevel)
-		opts      = prometheuspromql.EngineOpts{
-			Logger:        log.With(kitLogger, "component", "prometheus_engine"),
+		slogLogger = slog.New(slog.NewJSONHandler(os.Stdout, nil))
+		opts       = prometheuspromql.EngineOpts{
+			Logger:        slogLogger,
 			Reg:           registry,
 			MaxSamples:    cfg.Query.Prometheus.MaxSamplesPerQueryOrDefault(),
 			Timeout:       cfg.Query.TimeoutOrDefault(),