Validate label names #236
Merged
Validate label names #236
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
Sinjo
force-pushed
the
sinjo-validate-label-names
branch
from
9c4ff92 to
b06f8e7
Compare
dmagliola
reviewed
Jan 4, 2022
|
|
||
| unless key.to_s =~ LABEL_NAME_REGEX | ||
| msg = "label name must match /#{LABEL_NAME_REGEX}/" | ||
| raise InvalidLabelError, msg |
There was a problem hiding this comment.
Does rubocop complain if we inline this msg?
There was a problem hiding this comment.
No, in the sense that we don't run rubocop on this project. I think I must have wanted a shorter line, but I'm happy to change it.
There was a problem hiding this comment.
I'd inline it, for readability. The separate var had me scanning the code for where else we use it
dmagliola
approved these changes
Jan 4, 2022
dmagliola
reviewed
Jan 4, 2022
Looks like a regex replacement was run against this file and was a little too eager. Signed-off-by: Chris Sinjakli <chris@sinjakli.co.uk>
Sinjo
force-pushed
the
sinjo-validate-label-names
branch
2 times, most recently
from
1efd685 to
3fc686d
Compare
Up to now, we've only been performing limited validation of label names. This commit validates that the characters use match the regex `/\A[a-zA-Z_][a-zA-Z0-9_]*\Z/` as specified by: https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels Signed-off-by: Chris Sinjakli <chris@sinjakli.co.uk>
Sinjo
force-pushed
the
sinjo-validate-label-names
branch
from
3fc686d to
3519342
Compare
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.
Up to now, we've only been performing limited validation of label names.
This commit validates that the characters use match the regex
/\A[a-zA-Z_][a-zA-Z0-9_]*\Z/as specified by:https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels
I ran into this while working on #234 for #186, but thought I'd separate it out into its own PR.
It's technically a breaking change, but I can't imagine Prometheus would have been happy scraping labels with these names to begin with. On top of that, our master branch already has breaking changes on it for the 3.0 release, so I figure one more doesn't hurt.