Skip to content

Commit 6005ae8

Browse files
authored
[chore] Remove use of deprecated ConfigProvider (#33323)
1 parent f1a07c9 commit 6005ae8

File tree

3 files changed

+13
-27
lines changed

3 files changed

+13
-27
lines changed

exporter/datadogexporter/integrationtest/integration_test.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -271,18 +271,14 @@ func getIntegrationTestCollector(t *testing.T, cfgStr string, url string, factor
271271
_, err = otelcoltest.LoadConfigAndValidate(confFile.Name(), factories)
272272
require.NoError(t, err, "All yaml config must be valid.")
273273

274-
configProvider, err := otelcol.NewConfigProvider(
275-
otelcol.ConfigProviderSettings{
274+
appSettings := otelcol.CollectorSettings{
275+
Factories: func() (otelcol.Factories, error) { return factories, nil },
276+
ConfigProviderSettings: otelcol.ConfigProviderSettings{
276277
ResolverSettings: confmap.ResolverSettings{
277278
URIs: []string{confFile.Name()},
278279
ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()},
279280
},
280-
})
281-
require.NoError(t, err)
282-
283-
appSettings := otelcol.CollectorSettings{
284-
Factories: func() (otelcol.Factories, error) { return factories, nil },
285-
ConfigProvider: configProvider,
281+
},
286282
BuildInfo: component.BuildInfo{
287283
Command: "otelcol",
288284
Description: "OpenTelemetry Collector",

receiver/prometheusreceiver/internal/staleness_end_to_end_test.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,18 +146,14 @@ service:
146146
Processors: processors,
147147
}
148148

149-
configProvider, err := otelcol.NewConfigProvider(
150-
otelcol.ConfigProviderSettings{
149+
appSettings := otelcol.CollectorSettings{
150+
Factories: func() (otelcol.Factories, error) { return factories, nil },
151+
ConfigProviderSettings: otelcol.ConfigProviderSettings{
151152
ResolverSettings: confmap.ResolverSettings{
152153
URIs: []string{confFile.Name()},
153154
ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()},
154155
},
155-
})
156-
require.NoError(t, err)
157-
158-
appSettings := otelcol.CollectorSettings{
159-
Factories: func() (otelcol.Factories, error) { return factories, nil },
160-
ConfigProvider: configProvider,
156+
},
161157
BuildInfo: component.BuildInfo{
162158
Command: "otelcol",
163159
Description: "OpenTelemetry Collector",

testbed/testbed/in_process_collector.go

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,15 @@ func (ipp *inProcessCollector) Start(_ StartParams) error {
5757
}
5858
ipp.configFile = confFile.Name()
5959

60-
configProvider, err := otelcol.NewConfigProvider(
61-
otelcol.ConfigProviderSettings{
60+
settings := otelcol.CollectorSettings{
61+
BuildInfo: component.NewDefaultBuildInfo(),
62+
Factories: func() (otelcol.Factories, error) { return ipp.factories, nil },
63+
ConfigProviderSettings: otelcol.ConfigProviderSettings{
6264
ResolverSettings: confmap.ResolverSettings{
6365
URIs: []string{ipp.configFile},
6466
ProviderFactories: []confmap.ProviderFactory{fileprovider.NewFactory()},
6567
},
66-
})
67-
if err != nil {
68-
return err
69-
}
70-
71-
settings := otelcol.CollectorSettings{
72-
BuildInfo: component.NewDefaultBuildInfo(),
73-
Factories: func() (otelcol.Factories, error) { return ipp.factories, nil },
74-
ConfigProvider: configProvider,
68+
},
7569
SkipSettingGRPCLogger: true,
7670
}
7771

0 commit comments

Comments
 (0)