distributor: report OTLP parse errors back to client #10588
+164
−107
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
Signed-off-by: Vladimir Varankin <[email protected]>
Signed-off-by: Vladimir Varankin <[email protected]>
Signed-off-by: Vladimir Varankin <[email protected]>
|
@aknuds1 I think you may be the best one for the review here (it is not urgent, though) |
narqo
commented
Feb 5, 2025
|
Taking a look! |
aknuds1
reviewed
Feb 5, 2025
There was a problem hiding this comment.
Please see comments. Mainly, I think you should avoid the inlining since I think it's a step in the wrong direction (towards less readable code). Also if I'm not mistaken, the inlining is just a (significant) stylistic change so it shouldn't be done in this PR, which is meant to fix a bug.
pkg/distributor/otel.go
Outdated
| level.Debug(spanLogger).Log( | ||
| "msg", "OTLP to Prometheus conversion complete", | ||
| "metric_count", metricCount, | ||
| "metric_dropped", metricDropped, |
There was a problem hiding this comment.
Suggested change
| "metric_dropped", metricDropped, | |
| "metrics_dropped", metricsDropped, |
Signed-off-by: Vladimir Varankin <[email protected]>
Co-authored-by: Arve Knudsen <[email protected]>
aknuds1
approved these changes
Feb 6, 2025
| @@ -203,6 +291,7 @@ func OTLPHandler( | |||
| level.Debug(spanLogger).Log( | |||
| "msg", "OTLP to Prometheus conversion complete", | |||
| "metric_count", metricCount, | |||
| "metric_dropped", metricsDropped, | |||
There was a problem hiding this comment.
Plural metrics are dropped:
Suggested change
| "metric_dropped", metricsDropped, | |
| "metrics_dropped", metricsDropped, |
Comment on lines
+476
to
+478
|
|
||
| mimirTS := c.converter.TimeSeries() | ||
| return mimirTS |
There was a problem hiding this comment.
[Nit] Easier to read:
Suggested change
| mimirTS := c.converter.TimeSeries() | |
| return mimirTS | |
| return c.converter.TimeSeries() |
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
This PR comes with mostly structural changes. The idea here is that, currently,
OTLPHandlersilently drops series, it couldn't parse. This makes it complicated for the users, who see the increase in the dropped OTLP series due to a parse error, but who don't have access to the internal logs (e.g. when Mimir is deployed in Grafana Cloud).Here, the handler holds the errors received during the OTLP conversion, and, if there wasn't any explicit issues from the downstream push services, it returns the status 400 (it's up for a debate if this new behaviour is more correct; refer to the internal discussion https://github.com/grafana/mimir-squad/issues/2716).
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.