frontend: Add back split and cache to range middlewares

It was removed here: #10742 by mistake Also, change `TestMiddlewaresConsistency` so that we catch those
grafana · Mar 4, 2025 · 313f2fd · 313f2fd
1 parent aa846dc
commit 313f2fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/pkg/frontend/querymiddleware/roundtrip.go b/pkg/frontend/querymiddleware/roundtrip.go
@@ -400,6 +400,8 @@ func newQueryMiddlewares(
 			log,
 			registerer,
 		)
+
+		queryRangeMiddleware = append(queryRangeMiddleware, newInstrumentMiddleware("split_by_interval_and_results_cache", metrics), splitAndCacheMiddleware)
 	}
 
 	queryInstantMiddleware = append(queryInstantMiddleware,

diff --git a/pkg/frontend/querymiddleware/roundtrip_test.go b/pkg/frontend/querymiddleware/roundtrip_test.go
@@ -673,6 +673,7 @@ func TestMiddlewaresConsistency(t *testing.T) {
 	var allNames []string
 	for _, middlewares := range middlewaresByRequestType {
 		allNames = append(allNames, getMiddlewareNames(middlewares.instances)...)
+		allNames = append(allNames, middlewares.exceptions...)
 	}
 	slices.Sort(allNames)
 	allNames = slices.Compact(allNames)
-Original file line number
+Diff line change
@@ Expand Up / @@ -400,6 +400,8 @@ func newQueryMiddlewares( @@
     			log,
     			registerer,
     		)
+    		queryRangeMiddleware = append(queryRangeMiddleware, newInstrumentMiddleware("split_by_interval_and_results_cache", metrics), splitAndCacheMiddleware)
     	}
     	queryInstantMiddleware = append(queryInstantMiddleware,
@@ Expand Down @@