Skip to content

Commit

Permalink
[chore] Remove use of fileprovider.New (#31617)
Browse files Browse the repository at this point in the history
**Description:**
Remove use of fileprovider.New, use fileprovider.NewWithSettings instead

**Link to tracking Issue:**
See open-telemetry/opentelemetry-collector#9698
  • Loading branch information
atoulme committed Mar 6, 2024
1 parent 2f1fa0e commit 4843fef
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cmd/githubgen/main.go
Expand Up @@ -93,7 +93,7 @@ type githubData struct {
}

func loadMetadata(filePath string) (metadata, error) {
cp, err := fileprovider.New().Retrieve(context.Background(), "file:"+filePath, nil)
cp, err := fileprovider.NewWithSettings(confmap.ProviderSettings{}).Retrieve(context.Background(), "file:"+filePath, nil)
if err != nil {
return metadata{}, err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/otelcontribcol/distribution_metadata_test.go
Expand Up @@ -82,7 +82,7 @@ func TestComponentsArePresent(t *testing.T) {
}

func loadMetadata(filePath string) (metadata, error) {
cp, err := fileprovider.New().Retrieve(context.Background(), "file:"+filePath, nil)
cp, err := fileprovider.NewWithSettings(confmap.ProviderSettings{}).Retrieve(context.Background(), "file:"+filePath, nil)
if err != nil {
return metadata{}, err
}
Expand Down
Expand Up @@ -215,7 +215,7 @@ service:
_, err = otelcoltest.LoadConfigAndValidate(confFile.Name(), factories)
require.NoError(t, err, "All yaml config must be valid.")

fmp := fileprovider.New()
fmp := fileprovider.NewWithSettings(confmap.ProviderSettings{})
configProvider, err := otelcol.NewConfigProvider(
otelcol.ConfigProviderSettings{
ResolverSettings: confmap.ResolverSettings{
Expand Down
Expand Up @@ -146,7 +146,7 @@ service:
Processors: processors,
}

fmp := fileprovider.New()
fmp := fileprovider.NewWithSettings(confmap.ProviderSettings{})
configProvider, err := otelcol.NewConfigProvider(
otelcol.ConfigProviderSettings{
ResolverSettings: confmap.ResolverSettings{
Expand Down
2 changes: 1 addition & 1 deletion testbed/testbed/in_process_collector.go
Expand Up @@ -57,7 +57,7 @@ func (ipp *inProcessCollector) Start(_ StartParams) error {
}
ipp.configFile = confFile.Name()

fmp := fileprovider.New()
fmp := fileprovider.NewWithSettings(confmap.ProviderSettings{})
configProvider, err := otelcol.NewConfigProvider(
otelcol.ConfigProviderSettings{
ResolverSettings: confmap.ResolverSettings{
Expand Down

0 comments on commit 4843fef

Please sign in to comment.