Skip to content

Commit

Permalink
[chore] Remove usage of Providers in confmap.ResolverSettings (#3…
Browse files Browse the repository at this point in the history
…3113)

**Description:** <Describe what has changed.>
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->

`Providers` has been deprecated since v0.99.0.

Needed for
open-telemetry/opentelemetry-collector#10173.
  • Loading branch information
evan-bradley authored May 17, 2024
1 parent f727003 commit e96879b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 12 deletions.
5 changes: 2 additions & 3 deletions exporter/datadogexporter/integrationtest/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,11 @@ func getIntegrationTestCollector(t *testing.T, cfgStr string, url string, factor
_, err = otelcoltest.LoadConfigAndValidate(confFile.Name(), factories)
require.NoError(t, err, "All yaml config must be valid.")

fmp := fileprovider.NewFactory().Create(confmap.ProviderSettings{})
configProvider, err := otelcol.NewConfigProvider(
otelcol.ConfigProviderSettings{
ResolverSettings: confmap.ResolverSettings{
URIs: []string{confFile.Name()},
Providers: map[string]confmap.Provider{fmp.Scheme(): fmp},
URIs: []string{confFile.Name()},
ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()},
},
})
require.NoError(t, err)
Expand Down
5 changes: 2 additions & 3 deletions exporter/elasticsearchexporter/integrationtest/collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,10 @@ func (c *recreatableOtelCol) Start(_ testbed.StartParams) error {
return err
}

fmp := fileprovider.NewFactory().Create(confmap.ProviderSettings{})
cfgProviderSettings := otelcol.ConfigProviderSettings{
ResolverSettings: confmap.ResolverSettings{
URIs: []string{confFile.Name()},
Providers: map[string]confmap.Provider{fmp.Scheme(): fmp},
URIs: []string{confFile.Name()},
ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()},
},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,11 @@ service:
Processors: processors,
}

fmp := fileprovider.NewFactory().Create(confmap.ProviderSettings{})
configProvider, err := otelcol.NewConfigProvider(
otelcol.ConfigProviderSettings{
ResolverSettings: confmap.ResolverSettings{
URIs: []string{confFile.Name()},
Providers: map[string]confmap.Provider{fmp.Scheme(): fmp},
URIs: []string{confFile.Name()},
ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()},
},
})
require.NoError(t, err)
Expand Down
5 changes: 2 additions & 3 deletions testbed/testbed/in_process_collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,11 @@ func (ipp *inProcessCollector) Start(_ StartParams) error {
}
ipp.configFile = confFile.Name()

fmp := fileprovider.NewFactory().Create(confmap.ProviderSettings{})
configProvider, err := otelcol.NewConfigProvider(
otelcol.ConfigProviderSettings{
ResolverSettings: confmap.ResolverSettings{
URIs: []string{ipp.configFile},
Providers: map[string]confmap.Provider{fmp.Scheme(): fmp},
URIs: []string{ipp.configFile},
ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()},
},
})
if err != nil {
Expand Down

0 comments on commit e96879b

Please sign in to comment.