Parse duration expressions in accordance with promql #5275
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SasSwart
changed the title
pkg/logql/lex.go
Outdated
| @@ -240,21 +240,27 @@ func tryScanDuration(number string, l *scanner.Scanner) (time.Duration, bool) { | |||
| return 0, false | |||
| } | |||
| // we've found more characters before a whitespace or the end | |||
| d, err := time.ParseDuration(sb.String()) | |||
| var duration time.Duration | |||
| prometheusDuration, err := model.ParseDuration(sb.String()) | |||
There was a problem hiding this comment.
A comment here explaining why we're doing this would be helpful
Add a comment to explain why both promql and time's ParseDuration methods are used
sandeepsukhani
approved these changes
Feb 21, 2022
pkg/logql/lex.go
Outdated
| duration = time.Duration(prometheusDuration) | ||
| } | ||
|
|
||
| return duration, nil | ||
| } | ||
|
|
||
| func isDurationRune(r rune) bool { | ||
| // "ns", "us" (or "µs"), "ms", "s", "m", "h". |
There was a problem hiding this comment.
I think we should keep this comment in sync with what we have in the switch case. While we are at it, can you please also order it the same manner as the switch case?
There was a problem hiding this comment.
Thanks for the feedback! Agreed, and done.
dannykopping
approved these changes
Feb 21, 2022
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What this PR does / why we need it:
Add support for promql-like duration units in logql
Which issue(s) this PR fixes:
Fixes #5199
Special notes for your reviewer:
Checklist
CHANGELOG.mdabout the changes.