Skip to content

Commit cb7e377

Browse files
Remove deprecated fields from OTel ResolverSettings (#4803)
The `Providers` and `Converters` fields of `ResolverSettings` struct were deprecated in [v0.99.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.99.0) (open-telemetry/opentelemetry-collector#9516) and removed in [v0.101.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.101.0). This refactoring is required before updating to OTel v0.101.0.
1 parent e984ed2 commit cb7e377

File tree

1 file changed

+10
-17
lines changed

1 file changed

+10
-17
lines changed

internal/pkg/otel/run.go

+10-17
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,19 @@ func newSettings(version string, configPaths []string) (*otelcol.CollectorSettin
5353
Description: buildDescription,
5454
Version: version,
5555
}
56-
converterSet := confmap.ConverterSettings{}
5756
configProviderSettings := otelcol.ConfigProviderSettings{
5857
ResolverSettings: confmap.ResolverSettings{
5958
URIs: configPaths,
60-
Providers: makeMapProvidersMap(
61-
fileprovider.NewWithSettings(confmap.ProviderSettings{}),
62-
envprovider.NewWithSettings(confmap.ProviderSettings{}),
63-
yamlprovider.NewWithSettings(confmap.ProviderSettings{}),
64-
httpprovider.NewWithSettings(confmap.ProviderSettings{}),
65-
httpsprovider.NewWithSettings(confmap.ProviderSettings{}),
66-
),
67-
Converters: []confmap.Converter{expandconverter.New(converterSet)},
59+
ProviderFactories: []confmap.ProviderFactory{
60+
fileprovider.NewFactory(),
61+
envprovider.NewFactory(),
62+
yamlprovider.NewFactory(),
63+
httpprovider.NewFactory(),
64+
httpsprovider.NewFactory(),
65+
},
66+
ConverterFactories: []confmap.ConverterFactory{
67+
expandconverter.NewFactory(),
68+
},
6869
},
6970
}
7071
provider, err := otelcol.NewConfigProvider(configProviderSettings)
@@ -81,11 +82,3 @@ func newSettings(version string, configPaths []string) (*otelcol.CollectorSettin
8182
DisableGracefulShutdown: true,
8283
}, nil
8384
}
84-
85-
func makeMapProvidersMap(providers ...confmap.Provider) map[string]confmap.Provider {
86-
ret := make(map[string]confmap.Provider, len(providers))
87-
for _, provider := range providers {
88-
ret[provider.Scheme()] = provider
89-
}
90-
return ret
91-
}

0 commit comments

Comments
 (0)