core: Add option to merge families #286
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
gjasny
commented
Jul 6, 2019
jupp0r
requested changes
Jul 8, 2019
gjasny
force-pushed
the
merge-same-families
branch
from
88478e4
to
8a102e0
Compare
gjasny
changed the title
gjasny
force-pushed
the
merge-same-families
branch
2 times, most recently
from
7d9b25d
to
42b93d1
Compare
jupp0r
requested changes
Aug 6, 2019
core/src/registry.cc
Outdated
| std::lock_guard<std::mutex> lock{mutex_}; | ||
|
|
||
| if (insert_behavior_ == InsertBehavior::Merge) { | ||
| for (auto &family : families) { |
core/include/prometheus/registry.h
Outdated
| @@ -36,6 +36,20 @@ namespace prometheus { | |||
| /// a data race. | |||
| class Registry : public Collectable { | |||
| public: | |||
| /// \brief How to deal with repeatedly added family names for a type | |||
| enum class InsertBehavior { | |||
| /// \brief Create new family object and append | |||
There was a problem hiding this comment.
Can you describe more verbosely how the algorithm works? What happens when there is no existing family with that name, what happens when there is an existing family with that name, but a different type, etc?
There was a problem hiding this comment.
ie in the doc comment for each behavior
gjasny
force-pushed
the
merge-same-families
branch
from
42b93d1
to
07d8dfb
Compare
gjasny
force-pushed
the
merge-same-families
branch
2 times, most recently
from
f4dddcd
to
1d91f0c
Compare
jupp0r
approved these changes
Oct 22, 2019
|
Just realized that the commit message needs to be updated. |
gjasny
force-pushed
the
merge-same-families
branch
from
1d91f0c
to
520153a
Compare
Add three different insert strategies for the Registry. The `NonStandardAppend` is only there and selected for backward compatibility and most likely will go away in the future.
gjasny
force-pushed
the
merge-same-families
branch
from
520153a
to
c57ae57
Compare
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.
No description provided.