Upgrade mimir-prometheus #10826
Merged
Upgrade mimir-prometheus #10826
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
1 task
0457ed9 to
ef0e1c2
Compare
… range Brings in change from #10586
…te` and `increase` if the second point is a reset (prometheus/prometheus#15902)
71c0ab9 to
6f913d7
Compare
50c217f to
001ae48
Compare
jhesketh
reviewed
Mar 12, 2025
| }, | ||
| }, | ||
| } | ||
|
|
There was a problem hiding this comment.
What about a test case for when the second last point and last point change types, and don't change types (in both orders)?
There was a problem hiding this comment.
This is quite difficult to test completely due to prometheus/prometheus#14172.
The test cases added upstream and included in this PR should cover most of the scenarios: float then float, float then histogram and histogram then histogram. Histogram then float is blocked by prometheus/prometheus#14172.
Are there other scenarios you had in mind?
There was a problem hiding this comment.
I missed those, thanks. lgtm
jhesketh
approved these changes
Mar 12, 2025
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 upgrades mimir-prometheus to include the changes from grafana/mimir-prometheus#837.
I've added a changelog entry for one of the fixes in that set of changes, however the remainder don't seem worthy of a changelog entry (eg. because they're not relevant for Mimir, or are for experimental native histograms).
I've tried to build up this PR incrementally. I would suggest reviewing each commit separately.
Which issue(s) this PR fixes or relates to
(none)
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.