metric: avoid mutex deadlock and fix HdrHistogram.TotalSum #102085
Merged
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
The method was calling ToPrometheusMetric, which expects the mutex to be unlocked. However, it was also locking the mutex. This commit fixes the deadlock. The commit also fixes the implementation, which was broken. `ToPrometheusMetric` does not populate `prometheusgo.Metric.Summary`, so the use of `GetSummary` was broken. The two bugs indicate a lack of testing coverage for this newly introduced functionality (in a28aa6c). We should add some. Epic: None Release note: None
|
This change is |
This was referenced Apr 22, 2023
dhartunian
approved these changes
Apr 24, 2023
There was a problem hiding this comment.
thank you @nvanbenschoten obs infra will follow up with testing here.
Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status:complete! 0 of 0 LGTMs obtained (waiting on @abarganier)
|
Thanks @dhartunian! bors r+ |
abarganier
approved these changes
Apr 24, 2023
There was a problem hiding this comment.
Reviewable status:
-- commits line 11 at r1:
Ack. I'm bringing it up with the team if it's time to once again rip out the legacy HdrHistogram, or if we should keep it around for a bit longer. If we do end up keeping it around, we'll expand the test coverage.
Code quote:
The two bugs indicate a lack of testing coverage for this newly introduced
functionality (in a28aa6cb). We should add some.
|
Build succeeded: |
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.
The method was calling
ToPrometheusMetric, which expects the mutex to be unlocked. However, it was also locking the mutex. This commit fixes the deadlock.The commit also fixes the implementation, which was broken.
ToPrometheusMetricdoes not populateprometheusgo.Metric.Summary, so the use ofGetSummarywas broken.The two bugs indicate a lack of testing coverage for this newly introduced functionality (in a28aa6c). We should add some.
Epic: None
Release note: None