Put metric before label value in the "label value too long" error mes… #4018
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
3 tasks
ChinYing-Li
force-pushed
the
issue_1582_new
branch
from
f579913 to
4b7bcb9
Compare
pstibrany
reviewed
Mar 26, 2021
ChinYing-Li
force-pushed
the
issue_1582_new
branch
from
4b7bcb9 to
8c447fb
Compare
pstibrany
approved these changes
Mar 27, 2021
pkg/util/validation/errors.go
Outdated
| return &genericValidationError{ | ||
| message: "label value too long: %.200q metric %.200q", | ||
| return &labelValueTooLongError{ | ||
| message: "label value too long for metric: %.200q name %.200q", |
There was a problem hiding this comment.
I'd suggest to remove message field in labelValueTooLongError completely, and put this message into (*labelValueTooLongError).Error() method (fmt.Sprintf call), so that the message and correct order of parameters are together.
ChinYing-Li
force-pushed
the
issue_1582_new
branch
from
8c447fb to
eaaf3ff
Compare
pracucci
reviewed
Mar 29, 2021
|
@ChinYing-Li Could you fix the linter, please? |
ChinYing-Li
force-pushed
the
issue_1582_new
branch
from
4bf8bc4 to
b7b1bf8
Compare
pstibrany
approved these changes
Mar 29, 2021
pkg/util/validation/errors.go
Outdated
| } | ||
|
|
||
| func (e *labelValueTooLongError) Error() string { | ||
| return fmt.Sprintf("label value too long for metric: %.200q label valu%.200q", formatLabelSet(e.series), e.cause) |
There was a problem hiding this comment.
Suggested change
| return fmt.Sprintf("label value too long for metric: %.200q label valu%.200q", formatLabelSet(e.series), e.cause) | |
| return fmt.Sprintf("label value too long for metric: %.200q label value: %.200q", formatLabelSet(e.series), e.cause) |
ChinYing-Li
force-pushed
the
issue_1582_new
branch
from
b7b1bf8 to
590b21b
Compare
|
Sorry about the problem with linting! Just fixed that. |
ChinYing-Li
force-pushed
the
issue_1582_new
branch
from
590b21b to
dec952a
Compare
pstibrany
reviewed
Mar 29, 2021
…sage (cortexproject#1582) Signed-off-by: ChinYing-Li <[email protected]> Fix wrong message
ChinYing-Li
force-pushed
the
issue_1582_new
branch
from
dec952a to
4bcecd8
Compare
pracucci
reviewed
Mar 30, 2021
pracucci
approved these changes
Mar 30, 2021
Signed-off-by: ChinYing-Li <[email protected]>
ChinYing-Li
force-pushed
the
issue_1582_new
branch
from
f2d0715 to
7dccf7f
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.
…sage (#1582)
Signed-off-by: ChinYing-Li [email protected]
What this PR does:
This PR is #3982 applied to
d45e65ad1e90d22dbdbe224f6eb4036847b56c82.Swap the position of the metric string and the label value string in error message of
labelValueTooLong.Now the metric string is placed before the label value string.
Which issue(s) this PR fixes:
Fixes #1582
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]