[metrics]: Eliminate global Prometheus registry#207
Open
pseudomuto wants to merge 1 commit intomainfrom
Open
Conversation
Metrics in prometheus_defs.go were registered against prometheus.DefaultRegisterer in an init() function. Creating two Proxy instances in the same process would panic with a duplicate registration error, making it impossible to run multiple proxies or run certain tests without process isolation. I replaced the package-level vars and init() with a metrics.Registry struct that registers its collectors against an injected prometheus.Registerer and prometheus.Gatherer. Thread *metrics.Registry through all callers. Wire it via fx in proxy/fx.go and metrics/fx.go. * Metric names, namespaces, subsystems, and label names are identical to the former package-level variables. * Added TestNewProxy_TwoInstancesInSameProcess as a regression test.
1ccb5a4 to
293d6dc
Compare
This file contains hidden or 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
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 was changed
I replaced the package-level vars and init() with a metrics.Registry struct that registers its collectors against an injected prometheus.Registerer and prometheus.Gatherer. Then I threaded *metrics.Registry through all callers.
Notes
Why?
Metrics in prometheus_defs.go were registered against prometheus.DefaultRegisterer in an init() function. Creating two Proxy instances in the same process would panic with a duplicate registration error, making it impossible to run multiple proxies or run certain tests without process isolation.