Make all registry methods thread safe #201
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
matthieuprat
commented
Aug 25, 2020
| @@ -22,7 +22,7 @@ def register(metric) | |||
| name = metric.name | |||
|
|
|||
| @mutex.synchronize do | |||
| if exist?(name.to_sym) | |||
| if @metrics.key?(name.to_sym) | |||
There was a problem hiding this comment.
I made this change because Mutex is not re-entrant. I guess we could use a Monitor instead but inlining the exist? method actually makes the code slightly more readable in my opinion.
The registry is backed by a Hash, which is not guaranteed to be thread safe on all interpreters. For peace of mind, this change synchronizes all accesses to the metrics hash. Another option would have been to use a [thread-safe Hash][1] instead of a Hash but this would have meant adding Ruby Concurrent as a dependency, which I'm assuming we don't want. Ref: prometheus#184 (comment) [1]: https://github.com/ruby-concurrency/concurrent-ruby/blob/v1.1.7/lib/concurrent-ruby/concurrent/hash.rb Signed-off-by: Matthieu Prat <matthieuprat@gocardless.com>
matthieuprat
force-pushed
the
mprat/resgistry-thread-safety
branch
from
e067f95
to
c3836b2
Compare
dmagliola
approved these changes
Oct 7, 2020
|
Sorry I somehow missed this for a month and a half! |
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 registry is backed by a Hash, which is not guaranteed to be thread
safe on all interpreters. For peace of mind, this change synchronizes
all accesses to the metrics hash.
Another option would have been to use a thread-safe Hash instead of
a Hash but this would have meant adding Ruby Concurrent as a
dependency, which I'm assuming we don't want.
Ref: #184 (comment)