Refactor collectors to use config structs #2812
Open
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
Add a new pattern to allow moving the flag handling out of the collector package and into a separate package. This allows collector package users to create their own config or flag handling. Signed-off-by: Ben Kochie <superq@gmail.com>
mattdurham
reviewed
Sep 27, 2023
mattdurham
reviewed
Sep 27, 2023
| } | ||
| err = c.compileIncludeFlags(flagsInclude, bugsInclude) | ||
| err = c.compileIncludeFlags(c.config.CPU.FlagsInclude, c.config.CPU.BugsInclude) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("fail to compile --collector.cpu.info.flags-include and --collector.cpu.info.bugs-include, the values of them must be regular expressions: %w", err) |
There was a problem hiding this comment.
Global statement about error messages referencing flags, might not need to change this for this initial push but since these can come from any source we should change to a more generic name.
There was a problem hiding this comment.
Yeah, i couldn't come with an elegant solution for now. We can change it later 👍
Merging config changes to the working branch
…r into refactor_collectors
…r into refactor_collectors
…les." This reverts commit a372120.
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 is a continuation of the initial work done here.)
The PR refactors node exporter to decouple collectors' config from kingpin flags. This allows that
the exporter can be embedded in other libraries and run multiple instances of it by removing the global state
that avoids that. Example here.
The definition of config params has been moved to structs in a central config struct (
NodeCollectorConfigincollector/config.go) that gathers all config params for all the collectors. The registration of kingpin has been move toflags.gowhere all the flags are parsed to populate the main collector config.Some of the logic to support deprecated old flags (i.e
UnitIncludeSet) has been moved from global vars to part of the collectorsconfig struct. Extra refactors in
collector.gowere needed to remove the global state.Addionally, we could refactor (in a separated PR):
flags.goand move them to be exportable.Related: grafana/alloy#548