Add lookbackDelta and EnableStepStats back to query frontend config

Author: rubywtl

pkg/cortex/modules.go

@@ -534,12 +534,13 @@ func (t *Cortex) initQueryFrontendTripperware() (serv services.Service, err erro
 		shardedPrometheusCodec,
 		t.Cfg.Querier.LookbackDelta,
 		t.Cfg.Frontend.DistributedExecEnabled,
+		t.Cfg.Querier.EnablePerStepStats,
 	)
 	if err != nil {
 		return nil, err
 	}
 
-	instantQueryMiddlewares, err := instantquery.Middlewares(util_log.Logger, t.Overrides, instantQueryCodec, queryAnalyzer, t.Cfg.Querier.LookbackDelta, t.Cfg.Frontend.DistributedExecEnabled)
+	instantQueryMiddlewares, err := instantquery.Middlewares(util_log.Logger, t.Overrides, instantQueryCodec, queryAnalyzer, t.Cfg.Querier.LookbackDelta, t.Cfg.Frontend.DistributedExecEnabled, t.Cfg.Querier.EnablePerStepStats)
 	if err != nil {
 		return nil, err
 	}

pkg/querier/tripperware/instantquery/instant_query_middlewares.go

@@ -16,6 +16,7 @@ func Middlewares(
 	queryAnalyzer querysharding.Analyzer,
 	lookbackDelta time.Duration,
 	distributedExecEnabled bool,
+	enablePerStepStats bool,
 ) ([]tripperware.Middleware, error) {
 	m := []tripperware.Middleware{
 		NewLimitsMiddleware(limits, lookbackDelta),
@@ -24,7 +25,7 @@ func Middlewares(
 
 	if distributedExecEnabled {
 		m = append(m,
-			tripperware.LogicalPlanGenMiddleware())
+			tripperware.LogicalPlanGenMiddleware(enablePerStepStats, lookbackDelta))
 	}
 
 	return m, nil

pkg/querier/tripperware/instantquery/instant_query_middlewares_test.go

@@ -61,6 +61,7 @@ func TestRoundTrip(t *testing.T) {
 		qa,
 		5*time.Minute,
 		false, // distributedExecEnabled
+		false, // enablePerStepStats
 	)
 	require.NoError(t, err)
 
@@ -173,6 +174,7 @@ func TestRoundTripWithAndWithoutDistributedExec(t *testing.T) {
 				qa,
 				5*time.Minute,
 				tc.distributedEnabled,
+				false, // enablePerStepStats
 			)
 			require.NoError(t, err)
 

pkg/querier/tripperware/logical_plan_gen_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"strconv"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 )
@@ -120,7 +121,7 @@ func TestLogicalPlanGeneration(t *testing.T) {
 		t.Run(strconv.Itoa(i)+"_"+tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			middleware := LogicalPlanGenMiddleware()
+			middleware := LogicalPlanGenMiddleware(false, 5*time.Minute)
 
 			handler := middleware.Wrap(HandlerFunc(func(_ context.Context, req Request) (Response, error) {
 				return nil, nil

pkg/querier/tripperware/logicalplan_gen.go

@@ -15,16 +15,20 @@ const (
 	stepBatch = 10
 )
 
-func LogicalPlanGenMiddleware() Middleware {
+func LogicalPlanGenMiddleware(enablePerStepStats bool, lookBackDelta time.Duration) Middleware {
 	return MiddlewareFunc(func(next Handler) Handler {
 		return logicalPlanGen{
-			next: next,
+			next:               next,
+			enablePerStepStats: enablePerStepStats,
+			lookBackDelta:      lookBackDelta,
 		}
 	})
 }
 
 type logicalPlanGen struct {
-	next Handler
+	next               Handler
+	enablePerStepStats bool
+	lookBackDelta      time.Duration
 }
 
 func (l logicalPlanGen) NewLogicalPlan(qs string, start time.Time, end time.Time, step time.Duration) (*logicalplan.Plan, error) {
@@ -36,17 +40,17 @@ func (l logicalPlanGen) NewLogicalPlan(qs string, start time.Time, end time.Time
 			End:                start,
 			Step:               0,
 			StepsBatch:         stepBatch,
-			LookbackDelta:      0,
-			EnablePerStepStats: false,
+			LookbackDelta:      l.lookBackDelta,
+			EnablePerStepStats: l.enablePerStepStats,
 		}
 	} else {
 		qOpts = query.Options{
 			Start:              start,
 			End:                end,
 			Step:               step,
 			StepsBatch:         stepBatch,
-			LookbackDelta:      0,
-			EnablePerStepStats: false,
+			LookbackDelta:      l.lookBackDelta,
+			EnablePerStepStats: l.enablePerStepStats,
 		}
 	}
 

pkg/querier/tripperware/queryrange/query_range_middlewares.go

@@ -103,6 +103,7 @@ func Middlewares(
 	shardedPrometheusCodec tripperware.Codec,
 	lookbackDelta time.Duration,
 	distributedExecEnabled bool,
+	enablePerStepStats bool,
 ) ([]tripperware.Middleware, cache.Cache, error) {
 	// Metric used to keep track of each middleware execution duration.
 	metrics := tripperware.NewInstrumentMiddlewareMetrics(registerer)
@@ -141,7 +142,7 @@ func Middlewares(
 	if distributedExecEnabled {
 		queryRangeMiddleware = append(queryRangeMiddleware,
 			tripperware.InstrumentMiddleware("range_logical_plan_gen", metrics),
-			tripperware.LogicalPlanGenMiddleware())
+			tripperware.LogicalPlanGenMiddleware(enablePerStepStats, lookbackDelta))
 	}
 
 	return queryRangeMiddleware, c, nil

pkg/querier/tripperware/queryrange/query_range_middlewares_test.go

@@ -68,6 +68,7 @@ func TestRoundTrip(t *testing.T) {
 		ShardedPrometheusCodec,
 		5*time.Minute,
 		false, // distributedExecEnabled
+		false, // enablePerStepStats
 	)
 	require.NoError(t, err)
 
@@ -192,6 +193,7 @@ func TestRoundTripWithAndWithoutDistributedExec(t *testing.T) {
 				ShardedPrometheusCodec,
 				5*time.Minute,
 				tc.distributedEnabled,
+				false, // enablePerStepStats
 			)
 			require.NoError(t, err)