Fix(query-frontend): /label/<name>/values endpoint to use right set of middlewares
#6072
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
…dleware
Previously, only `/label/` and `/labels` endpoint were using correct tripperware middleware
on the query frontend(e.g: stats collector middleware)
This PR fixes it for `/label/<name>/values` endpoint as well.
This is useful to support `metrics.go` stats middleware for `label/{name}/values` endpoint as well.
Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
kavirajk
changed the title
/label/<name>/values endpoint to use right mid…/label/<name>/values endpoint to use right set of middlewares
dannykopping
approved these changes
May 2, 2022
| @@ -232,7 +232,7 @@ func getOperation(path string) string { | |||
| return QueryRangeOp | |||
| case strings.HasSuffix(path, "/series"): | |||
| return SeriesOp | |||
| case strings.HasSuffix(path, "/labels") || strings.HasSuffix(path, "/label"): | |||
| case strings.HasSuffix(path, "/labels") || strings.HasSuffix(path, "/label") || strings.HasSuffix(path, "/values"): | |||
There was a problem hiding this comment.
This function feels a bit flimsy, and could introduce some interesting bugs in the future.
We should refactor this at some point
There was a problem hiding this comment.
Thanks for adding a test!
kavirajk
commented
May 2, 2022
| @@ -232,7 +232,7 @@ func getOperation(path string) string { | |||
| return QueryRangeOp | |||
| case strings.HasSuffix(path, "/series"): | |||
| return SeriesOp | |||
| case strings.HasSuffix(path, "/labels") || strings.HasSuffix(path, "/label"): | |||
| case strings.HasSuffix(path, "/labels") || strings.HasSuffix(path, "/label") || strings.HasSuffix(path, "/values"): | |||
There was a problem hiding this comment.
Q: Does anyone know why middeware chain was disabled for /labels/<name>/values endpoint on the query frontend?
We in fact have a test to lock that behaviour.
https://github.com/grafana/loki/blob/main/pkg/querier/queryrange/roundtrip_test.go#L390-L400 (which is the only test failing for this PR)
I wanted this support so that middlewares like metrics.go stats collector can work on this endpoints too. (#5971)
Any thoughts?
There was a problem hiding this comment.
If no protest, I can remove that test!
There was a problem hiding this comment.
I bet it was omitted by mistake
Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
kavirajk
added a commit
that referenced
this pull request
May 3, 2022
…el values endpoint
When encode/decode `http.Request` into `querybase.Request` we re-create request.Path.
Before this PR, both `/labels/` and `/labels/{name}/values` endpoint was decoding into same URL path `/labels/` before
forwarding to the querier. So it always returns label names as response.
This bug became visible after enabling all the middleware for `/labels/{name}/values` endpoint as well via #6072
Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
Merged
4 tasks
kavirajk
added a commit
that referenced
this pull request
May 3, 2022
…el values endpoint (#6084) When encode/decode `http.Request` into `querybase.Request` we re-create request.Path. Before this PR, both `/labels/` and `/labels/{name}/values` endpoint was decoding into same URL path `/labels/` before forwarding to the querier. So it always returns label names as response. This bug became visible after enabling all the middleware for `/labels/{name}/values` endpoint as well via #6072 Signed-off-by: Kaviraj <kavirajkanagaraj@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:
Previously, only
/label/and/labelsendpoint were using correct tripperware middlewareon the query frontend(e.g: stats collector middleware)
This PR fixes it for
/label/<name>/valuesendpoint as well.This is useful to support
metrics.gostats middleware forlabel/{name}/valuesendpointSigned-off-by: Kaviraj kavirajkanagaraj@gmail.com
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Related to #5971
Checklist
CHANGELOG.md.docs/sources/upgrading/_index.md