[Metrics] Fix series handling of conflicting string and integer values #5659
Conversation
This file contains hidden or 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
mdisibio
commented
Sep 17, 2025
| Value StaticMapKey | ||
| } | ||
|
|
||
| type SeriesMapKey [maxGroupBys]SeriesMapLabel |
There was a problem hiding this comment.
This is the core change. SeriesSet changed to use a map key that is comparable and preserves the static type. This is the same approach used in the by() operator itself (GroupingAggregator), but with also the label name.
mdisibio
requested review from
carles-grafana,
electron0zero,
ie-pham,
javiermolinar,
joe-elliott,
mapno,
mattdurham,
ruslan-mikhailov,
stoewer,
yvrhdn and
zalegrala
as code owners
ruslan-mikhailov
approved these changes
Sep 19, 2025
ruslan-mikhailov
approved these changes
Sep 23, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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:
TraceQL metrics has incorrect results when grouping by an attribute with overlapping string and integer values. I.e.
rate() by (span.http.status_code)where the data contains 500 (int) and "500" (string). Because we internally down-cast to strings for inserting intoSeriesSetmaps viapromLabels. This fix updates SeriesSet to preserve the types in the map key, and eliminates promLabels entirely (to be sure there are no remaining gaps), and return two distinct time series.Which issue(s) this PR fixes:
Fixes #5350
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]