-
Notifications
You must be signed in to change notification settings - Fork 538
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Ensure native histograms counter reset hints are corrected when merging results from different sources #9909
Open
fionaliao
wants to merge
36
commits into
main
Choose a base branch
from
fl/counter-resets-ooonh
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
krajorama
reviewed
Nov 15, 2024
fionaliao
force-pushed
the
fl/counter-resets-ooonh
branch
from
November 18, 2024 15:48
18d9cf2
to
d9c34a7
Compare
fionaliao
requested review from
stevesg,
grafanabot and
a team
as code owners
November 26, 2024 21:49
Implementation and testing is done (pending CI), but I want to extract the mimir-prometheus update into a separate PR before removing the "WIP" |
Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
fionaliao
force-pushed
the
fl/counter-resets-ooonh
branch
from
November 27, 2024 17:50
7b27917
to
0f4f294
Compare
fionaliao
changed the title
WIP: fix counter resets when merging batches
Ensure counter reset hints are corrected when merging batches
Nov 27, 2024
mimir-prometheus update was done as part of #10033 |
fionaliao
force-pushed
the
fl/counter-resets-ooonh
branch
from
November 27, 2024 18:17
e7d5fb6
to
24bea3c
Compare
fionaliao
commented
Nov 27, 2024
krajorama
reviewed
Nov 28, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looking good a few nits added first round
Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
fionaliao
changed the title
Ensure counter reset hints are corrected when merging batches
Ensure native histograms counter reset hints are corrected when merging results from different sources
Nov 28, 2024
krajorama
approved these changes
Nov 28, 2024
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
When merging samples from different iterators, histogram counter reset hints need to be recalculated. The
mergeIterator
currently does not do so. This PR fixes that by remembering the iterator for a sample in a batch, so when the next sample comes along, the iterators for the two samples can be compared and an unknown counter reset hint is set for the next sample if the iterators don't match. See prometheus/prometheus#15346 for related discussion.Which issue(s) this PR fixes or relates to
Fixes #
Checklist
CHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]
.about-versioning.md
updated with experimental features.