Do not parse string of empty matchers #5980
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
This fixes a bug in the index gateway when querying values for a label.
Since the gRPC handler for LabelValuesForMetricName in the index gateway
allows empty matchers in the LabelValuesForMetricNameRequest, we need to
check if the matchers string is an empty matcher (`{}`) before we parse
the string.
This bug was introduced with the index gateway api refactoring in #5892
Fixes: #5965
Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
kavirajk
reviewed
Apr 21, 2022
| matchers, err = syntax.ParseMatchers(req.Matchers) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| names, err := g.indexQuerier.LabelValuesForMetricName(ctx, instanceID, req.From, req.Through, req.MetricName, req.LabelName, matchers...) |
There was a problem hiding this comment.
Hope it's ok to pass empty []*labels.Matcher to g.indexQuerier.LabelValuesForMetricName when req.Matchers == syntax.EmptyMatchers
Also can you add a test?
There was a problem hiding this comment.
The index store checks for len(matchers):
loki/pkg/storage/stores/series/series_index_store.go
Lines 239 to 241 in ea59e4b
kavirajk
approved these changes
Apr 21, 2022
chaudum
added a commit
that referenced
this pull request
Apr 21, 2022
This fixes a bug in the index gateway when querying values for a label.
Since the gRPC handler for LabelValuesForMetricName in the index gateway
allows empty matchers in the LabelValuesForMetricNameRequest, we need to
check if the matchers string is an empty matcher (`{}`) before we parse
the string.
This bug was introduced with the index gateway api refactoring in #5892
Fixes: #5965
Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
chaudum
added a commit
that referenced
this pull request
Apr 21, 2022
This fixes a bug in the index gateway when querying values for a label.
Since the gRPC handler for LabelValuesForMetricName in the index gateway
allows empty matchers in the LabelValuesForMetricNameRequest, we need to
check if the matchers string is an empty matcher (`{}`) before we parse
the string.
This bug was introduced with the index gateway api refactoring in #5892
Fixes: #5965
Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
This was referenced Jun 28, 2022
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:
This fixes a bug in the index gateway when querying values for a label.
Since the gRPC handler for LabelValuesForMetricName in the index gateway
allows empty matchers in the LabelValuesForMetricNameRequest, we need to
check if the matchers string is an empty matcher (
{}) before we parsethe string.
This bug was introduced with the index gateway api refactoring in #5892
Signed-off-by: Christian Haudum christian.haudum@gmail.com
Which issue(s) this PR fixes:
Fixes: #5965
Special notes for your reviewer:
Checklist
CHANGELOG.md.docs/sources/upgrading/_index.md