remove enableStepStats from query frontend

Signed-off-by: rubywtl <[email protected]>

Author: rubywtl

pkg/cortex/modules.go

@@ -534,13 +534,12 @@ 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, t.Cfg.Querier.EnablePerStepStats)
+	instantQueryMiddlewares, err := instantquery.Middlewares(util_log.Logger, t.Overrides, instantQueryCodec, queryAnalyzer, t.Cfg.Querier.LookbackDelta, t.Cfg.Frontend.DistributedExecEnabled)
 	if err != nil {
 		return nil, err
 	}

pkg/querier/tripperware/distributed_query.go

@@ -15,12 +15,11 @@ const (
 	stepBatch = 10
 )
 
-func DistributedQueryMiddleware(enablePerStepStats bool, lookBackDelta time.Duration) Middleware {
+func DistributedQueryMiddleware(lookBackDelta time.Duration) Middleware {
 	return MiddlewareFunc(func(next Handler) Handler {
 		return distributedQueryMiddleware{
-			next:               next,
-			enablePerStepStats: enablePerStepStats,
-			lookBackDelta:      lookBackDelta,
+			next:          next,
+			lookBackDelta: lookBackDelta,
 		}
 	})
 }
@@ -33,9 +32,8 @@ func getStartAndEnd(start time.Time, end time.Time, step time.Duration) (time.Ti
 }
 
 type distributedQueryMiddleware struct {
-	next               Handler
-	enablePerStepStats bool
-	lookBackDelta      time.Duration
+	next          Handler
+	lookBackDelta time.Duration
 }
 
 func (d distributedQueryMiddleware) newLogicalPlan(qs string, start time.Time, end time.Time, step time.Duration) (*logicalplan.Plan, error) {
@@ -48,7 +46,7 @@ func (d distributedQueryMiddleware) newLogicalPlan(qs string, start time.Time, e
 		Step:               step,
 		StepsBatch:         stepBatch,
 		LookbackDelta:      d.lookBackDelta,
-		EnablePerStepStats: d.enablePerStepStats,
+		EnablePerStepStats: false, // Hardcoded value that will be re-populated again in the querier stage
 	}
 
 	expr, err := parser.NewParser(qs, parser.WithFunctions(parser.Functions)).ParseExpr()

pkg/querier/tripperware/distributed_query_test.go

@@ -121,7 +121,7 @@ func TestLogicalPlanGeneration(t *testing.T) {
 		t.Run(strconv.Itoa(i)+"_"+tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			middleware := DistributedQueryMiddleware(false, 5*time.Minute)
+			middleware := DistributedQueryMiddleware(5 * time.Minute)
 
 			handler := middleware.Wrap(HandlerFunc(func(_ context.Context, req Request) (Response, error) {
 				return nil, nil

pkg/querier/tripperware/instantquery/instant_query_middlewares.go

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

pkg/querier/tripperware/instantquery/instant_query_middlewares_test.go

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

pkg/querier/tripperware/queryrange/query_range_middlewares.go

@@ -103,7 +103,6 @@ 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)
@@ -142,7 +141,7 @@ func Middlewares(
 	if distributedExecEnabled {
 		queryRangeMiddleware = append(queryRangeMiddleware,
 			tripperware.InstrumentMiddleware("range_logical_plan_gen", metrics),
-			tripperware.DistributedQueryMiddleware(enablePerStepStats, lookbackDelta))
+			tripperware.DistributedQueryMiddleware(lookbackDelta))
 	}
 
 	return queryRangeMiddleware, c, nil

pkg/querier/tripperware/queryrange/query_range_middlewares_test.go

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