Fix native histogram data loss in split_by_interval merge due to broken minTime() sort#7555
Merged
yeya24 merged 1 commit intoMay 28, 2026
Conversation
…ordering for split_by_interval merge Signed-off-by: Paurush Garg <paurushg@amazon.com>
Member
|
Thanks, can you add a changelog? |
danielblando
approved these changes
May 27, 2026
Contributor
danielblando
left a comment
danielblando
left a comment
There was a problem hiding this comment.
Thanks, but before merging lets add the CHANGELOG for bugfix as Sungjin commented
SungJin1212
approved these changes
May 28, 2026
4 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
…ordering for split_by_interval merge
What this PR does:
Fixes minTime() in pkg/querier/tripperware/merge.go to handle native histogram-only responses when sorting sub-interval responses before merging.
When split_by_interval splits a range query and merges the results, MergeResponse sorts responses by minTime() to ensure chronological order before the dedup/merge logic runs. However, minTime() only checked SampleStream.Samples[0] — for native histogram queries like sum(rate(nh_metric[20m])), the result is a FloatHistogram stored in SampleStream.Histograms with Samples empty. This caused minTime() to return -1 for all sub-interval responses.
Tests
Added TestMinTime covering: empty matrix, float-only, histogram-only, both, and empty stream cases.
Which issue(s) this PR fixes:
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]docs/configuration/v1-guarantees.mdupdated if this PR introduces experimental flags