[chore] Remove use of deprecated ConfigProvider (open-telemetry#33323)

AmadeusITGroup · Jul 11, 2024 · 6b858df · 6b858df
1 parent 97afa59
commit 6b858df
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 27 deletions.
diff --git a/exporter/datadogexporter/integrationtest/integration_test.go b/exporter/datadogexporter/integrationtest/integration_test.go
@@ -271,18 +271,14 @@ 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.")
 
- configProvider, err := otelcol.NewConfigProvider(
- otelcol.ConfigProviderSettings{
+ appSettings := otelcol.CollectorSettings{
+ Factories: func() (otelcol.Factories, error) { return factories, nil },
+ ConfigProviderSettings: otelcol.ConfigProviderSettings{
  ResolverSettings: confmap.ResolverSettings{
  URIs: []string{confFile.Name()},
  ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()},
  },
- })
- require.NoError(t, err)
-
- appSettings := otelcol.CollectorSettings{
- Factories: func() (otelcol.Factories, error) { return factories, nil },
- ConfigProvider: configProvider,
+ },
  BuildInfo: component.BuildInfo{
  Command: "otelcol",
  Description: "OpenTelemetry Collector",

diff --git a/receiver/prometheusreceiver/internal/staleness_end_to_end_test.go b/receiver/prometheusreceiver/internal/staleness_end_to_end_test.go
@@ -146,18 +146,14 @@ service:
  Processors: processors,
  }
 
- configProvider, err := otelcol.NewConfigProvider(
- otelcol.ConfigProviderSettings{
+ appSettings := otelcol.CollectorSettings{
+ Factories: func() (otelcol.Factories, error) { return factories, nil },
+ ConfigProviderSettings: otelcol.ConfigProviderSettings{
  ResolverSettings: confmap.ResolverSettings{
  URIs: []string{confFile.Name()},
  ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()},
  },
- })
- require.NoError(t, err)
-
- appSettings := otelcol.CollectorSettings{
- Factories: func() (otelcol.Factories, error) { return factories, nil },
- ConfigProvider: configProvider,
+ },
  BuildInfo: component.BuildInfo{
  Command: "otelcol",
  Description: "OpenTelemetry Collector",

diff --git a/testbed/testbed/in_process_collector.go b/testbed/testbed/in_process_collector.go
@@ -57,21 +57,15 @@ func (ipp *inProcessCollector) Start(_ StartParams) error {
  }
  ipp.configFile = confFile.Name()
 
- configProvider, err := otelcol.NewConfigProvider(
- otelcol.ConfigProviderSettings{
+ settings := otelcol.CollectorSettings{
+ BuildInfo: component.NewDefaultBuildInfo(),
+ Factories: func() (otelcol.Factories, error) { return ipp.factories, nil },
+ ConfigProviderSettings: otelcol.ConfigProviderSettings{
  ResolverSettings: confmap.ResolverSettings{
  URIs: []string{ipp.configFile},
  ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()},
  },
- })
- if err != nil {
- return err
- }
-
- settings := otelcol.CollectorSettings{
- BuildInfo: component.NewDefaultBuildInfo(),
- Factories: func() (otelcol.Factories, error) { return ipp.factories, nil },
- ConfigProvider: configProvider,
+ },
  SkipSettingGRPCLogger: true,
  }