[BugFix]promql: Reject offset/@ modifiers immediately before subquery range #17852
+46
−3
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
The PromQL parser allowed invalid syntax like:
While correctly rejecting the same pattern for regular range selectors:
Solution
Added validation in the
subquery_exprgrammar rule to reject offset/@ modifiers when they appear immediately adjacent to the subquery bracket (no space between them).The fix uses position checking (
vs.PosRange.End == $2.Pos) to distinguish between:metric offset 5m[2m:10s]→ Error (adjacent tokens, invalid)metric offset 5m [2m:10s]→ Valid (spaced, subquery on offset result)This makes subquery parsing behavior consistent with
matrix_selectorrules.Testing
some_metric OFFSET 1m[5m:10s]expecting parse errorWhich issue(s) does the PR fix:
Fixes #17060
Does this PR introduce a user-facing change?