Combine the Push and Pull metric controllers #1378
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
added 17 commits
November 27, 2020 22:52
jmacd
requested review from
Aneurysm9,
evantorrie,
lizthegrey,
MrAlias and
XSAM
as code owners
|
Reviewers, I'll try to modify this PR so that the diffs show more clearly. |
jmacd
commented
Dec 1, 2020
krnowak
reviewed
Dec 14, 2020
This was referenced Dec 22, 2020
|
@bogdandrutu Please review. |
Aneurysm9
approved these changes
Jan 12, 2021
|
I propose we merge this. |
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.
This combines the two metric controllers due to (1) substantial overlap and (2) a real use documented in open-telemetry/opentelemetry-specification#1207 (@sagikazarmark). This adds a new example demonstrating how to export to both Prometheus (Pull) and OTLP (Push).
To combine these features, the controller's
Start()method becomes optional, since starting the controller is not needed when using manualCollect()calls (a Pull-Only) configuration.Although the diff looks quite large, this is not much more than a simple combination of the code. In
controller.gothe structure is essentially the formerpush.gowith two methods frompull.goadded (Collect()andForEach()).Support for export and collection timeouts is introduced & tested. This closes an old TODO about where the context for asynchronous instruments comes from (with tests).
Fixes #1349.
Fixes #998.