Add back lookback delta

Signed-off-by: Justin Jung <[email protected]>

Author: justinjung04

docs/configuration/config-file-reference.md

@@ -5091,14 +5091,15 @@ otel:
 # Regex that the query string should match. If not set, it won't be checked.
 [regex: <string> | default = ""]
 
-# Time window that the query should be within. If not set, it won't be checked.
+# Time window that the evaluated query (including subqueries and querier
+# lookback period) should be within. If not set, it won't be checked.
 time_window:
-  # Start of the time window that the query should be within. If set to 0, it
-  # won't be checked.
+  # Start of the time window that the evaluated query (including subqueries and
+  # querier lookback period) should be within. If set to 0, it won't be checked.
   [start: <int> | default = 0]
 
-  # End of the time window that the query should be within. If set to 0, it
-  # won't be checked.
+  # End of the time window that the evaluated query (including subqueries and
+  # querier lookback period) should be within. If set to 0, it won't be checked.
   [end: <int> | default = 0]
 ```
 

pkg/cortex/modules.go

@@ -478,6 +478,7 @@ func (t *Cortex) initQueryFrontendTripperware() (serv services.Service, err erro
 		queryAnalyzer,
 		t.Cfg.Querier.DefaultEvaluationInterval,
 		t.Cfg.Querier.MaxSubQuerySteps,
+		t.Cfg.Querier.LookbackDelta,
 	)
 
 	return services.NewIdleService(nil, func(_ error) error {

pkg/querier/tripperware/priority.go

@@ -17,7 +17,7 @@ var (
 	errParseExpr = errors.New("failed to parse expr")
 )
 
-func GetPriority(r *http.Request, userID string, limits Limits, now time.Time) (int64, error) {
+func GetPriority(r *http.Request, userID string, limits Limits, now time.Time, lookbackDelta time.Duration) (int64, error) {
 	isQuery := strings.HasSuffix(r.URL.Path, "/query")
 	isQueryRange := strings.HasSuffix(r.URL.Path, "/query_range")
 	queryPriority := limits.QueryPriority(userID)
@@ -54,9 +54,10 @@ func GetPriority(r *http.Request, userID string, limits Limits, now time.Time) (
 	}
 
 	es := &parser.EvalStmt{
-		Expr:  expr,
-		Start: util.TimeFromMillis(startTime),
-		End:   util.TimeFromMillis(endTime),
+		Expr:          expr,
+		Start:         util.TimeFromMillis(startTime),
+		End:           util.TimeFromMillis(endTime),
+		LookbackDelta: lookbackDelta,
 	}
 
 	minTime, maxTime := promql.FindMinMaxTime(es)

pkg/querier/tripperware/priority_test.go

@@ -68,7 +68,7 @@ func Test_GetPriorityShouldReturnDefaultPriorityIfNotEnabledOrInvalidQueryString
 		t.Run(testName, func(t *testing.T) {
 			limits.queryPriority.Enabled = testData.queryPriorityEnabled
 			req, _ := http.NewRequest(http.MethodPost, testData.url, bytes.NewReader([]byte{}))
-			priority, err := GetPriority(req, "", limits, now)
+			priority, err := GetPriority(req, "", limits, now, 0)
 			if err != nil {
 				assert.Equal(t, testData.err, err)
 			} else {
@@ -132,7 +132,7 @@ func Test_GetPriorityShouldConsiderRegex(t *testing.T) {
 			limits.queryPriority.Priorities[0].QueryAttributes[0].Regex = testData.regex
 			limits.queryPriority.Priorities[0].QueryAttributes[0].CompiledRegex = regexp.MustCompile(testData.regex)
 			req, _ := http.NewRequest(http.MethodPost, "/query?query="+testData.query, bytes.NewReader([]byte{}))
-			priority, err := GetPriority(req, "", limits, now)
+			priority, err := GetPriority(req, "", limits, now, 0)
 			assert.NoError(t, err)
 			assert.Equal(t, int64(testData.expectedPriority), priority)
 		})
@@ -165,6 +165,7 @@ func Test_GetPriorityShouldConsiderStartAndEndTime(t *testing.T) {
 		start            time.Time
 		end              time.Time
 		expectedPriority int
+		lookbackDelta    time.Duration
 	}
 
 	tests := map[string]testCase{
@@ -217,6 +218,11 @@ func Test_GetPriorityShouldConsiderStartAndEndTime(t *testing.T) {
 			end:              now.Add(-10 * time.Minute),
 			expectedPriority: 0,
 		},
+		"should consider lookback delta": {
+			time:             now.Add(-45 * time.Minute),
+			expectedPriority: 0,
+			lookbackDelta:    2 * time.Minute,
+		},
 	}
 
 	for testName, testData := range tests {
@@ -231,7 +237,7 @@ func Test_GetPriorityShouldConsiderStartAndEndTime(t *testing.T) {
 				url = "/query?query=sum(up)"
 			}
 			req, _ := http.NewRequest(http.MethodPost, url, bytes.NewReader([]byte{}))
-			priority, err := GetPriority(req, "", limits, now)
+			priority, err := GetPriority(req, "", limits, now, testData.lookbackDelta)
 			assert.NoError(t, err)
 			assert.Equal(t, int64(testData.expectedPriority), priority)
 		})
@@ -286,7 +292,7 @@ func Test_GetPriorityShouldNotConsiderStartAndEndTimeIfEmpty(t *testing.T) {
 				url = "/query?query=sum(up)"
 			}
 			req, _ := http.NewRequest(http.MethodPost, url, bytes.NewReader([]byte{}))
-			priority, err := GetPriority(req, "", limits, now)
+			priority, err := GetPriority(req, "", limits, now, 0)
 			assert.NoError(t, err)
 			assert.Equal(t, int64(1), priority)
 		})

pkg/querier/tripperware/queryrange/query_range_middlewares_test.go

@@ -74,7 +74,6 @@ func TestRoundTrip(t *testing.T) {
 		qa,
 		time.Minute,
 		0,
-		0,
 	)
 
 	for i, tc := range []struct {

pkg/querier/tripperware/roundtrip.go

@@ -105,6 +105,7 @@ func NewQueryTripperware(
 	queryAnalyzer querysharding.Analyzer,
 	defaultSubQueryInterval time.Duration,
 	maxSubQuerySteps int64,
+	lookbackDelta time.Duration,
 ) Tripperware {
 	// Per tenant query metrics.
 	queriesPerTenant := promauto.With(registerer).NewCounterVec(prometheus.CounterOpts{
@@ -159,7 +160,7 @@ func NewQueryTripperware(
 					}
 
 					if limits != nil && limits.QueryPriority(userStr).Enabled {
-						priority, err := GetPriority(r, userStr, limits, now)
+						priority, err := GetPriority(r, userStr, limits, now, lookbackDelta)
 						if err != nil && err == errParseExpr {
 							// If query is invalid, no need to go through tripperwares
 							// for further splitting.

pkg/querier/tripperware/roundtrip_test.go

@@ -201,6 +201,7 @@ func TestRoundTrip(t *testing.T) {
 				querysharding.NewQueryAnalyzer(),
 				time.Minute,
 				tc.maxSubQuerySteps,
+				0,
 			)
 			resp, err := tw(downstream).RoundTrip(req)
 			if tc.expectedErr == nil {

pkg/util/validation/limits.go

@@ -64,13 +64,13 @@ type PriorityDef struct {
 
 type QueryAttribute struct {
 	Regex         string     `yaml:"regex" json:"regex" doc:"nocli|description=Regex that the query string should match. If not set, it won't be checked."`
-	TimeWindow    TimeWindow `yaml:"time_window" json:"time_window" doc:"nocli|description=Time window that the query should be within. If not set, it won't be checked."`
+	TimeWindow    TimeWindow `yaml:"time_window" json:"time_window" doc:"nocli|description=Time window that the evaluated query (including subqueries and querier lookback period) should be within. If not set, it won't be checked."`
 	CompiledRegex *regexp.Regexp
 }
 
 type TimeWindow struct {
-	Start model.Duration `yaml:"start" json:"start" doc:"nocli|description=Start of the time window that the query should be within. If set to 0, it won't be checked.|default=0"`
-	End   model.Duration `yaml:"end" json:"end" doc:"nocli|description=End of the time window that the query should be within. If set to 0, it won't be checked.|default=0"`
+	Start model.Duration `yaml:"start" json:"start" doc:"nocli|description=Start of the time window that the evaluated query (including subqueries and querier lookback period) should be within. If set to 0, it won't be checked.|default=0"`
+	End   model.Duration `yaml:"end" json:"end" doc:"nocli|description=End of the time window that the evaluated query (including subqueries and querier lookback period) should be within. If set to 0, it won't be checked.|default=0"`
 }
 
 // Limits describe all the limits for users; can be used to describe global default