[chore] Adopt to changes in confmap.ResolverSettings API #4848
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
dmitryax
force-pushed
the
overwrite-factory
branch
from
465cf12
to
ecae16c
Compare
dmitryax
changed the title
dmitryax
force-pushed
the
overwrite-factory
branch
from
ecae16c
to
fb0cc7a
Compare
crobert-1
reviewed
May 21, 2024
| @@ -114,7 +109,6 @@ func newDiscoverer(logger *zap.Logger) (*discoverer, error) { | |||
| configs: map[string]*Config{}, | |||
| duration: duration, | |||
| mu: sync.Mutex{}, | |||
| expandConverter: expandconverter.NewFactory().Create(confmap.ConverterSettings{}), | |||
There was a problem hiding this comment.
Lint is failing as expandConverter is no longer used, looks like we can remove it from the discoverer struct.
There was a problem hiding this comment.
isn't discoverer used by the discovery mechanism somewhere?
|
Need open-telemetry/opentelemetry-collector#10203 to resolve integration tests and fix |
samiura
approved these changes
May 21, 2024
Adopt the codebase to confmap.ResolverSettings changes upstream: - `Providers` field replaced with `ProviderFactories` - `Converters` field replaced with `ConverterFactories`
dmitryax
force-pushed
the
overwrite-factory
branch
from
fb0cc7a
to
abd9776
Compare
|
I’m skipping the integration tests for now, so we can merge this separately from the core upgrade to 0.101.0 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Adopt the codebase to confmap.ResolverSettings changes upstream:
Providersfield replaced withProviderFactoriesConvertersfield replaced withConverterFactories