@@ -53,18 +53,19 @@ func newSettings(version string, configPaths []string) (*otelcol.CollectorSettin
53
53
Description : buildDescription ,
54
54
Version : version ,
55
55
}
56
- converterSet := confmap.ConverterSettings {}
57
56
configProviderSettings := otelcol.ConfigProviderSettings {
58
57
ResolverSettings : confmap.ResolverSettings {
59
58
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
+ },
68
69
},
69
70
}
70
71
provider , err := otelcol .NewConfigProvider (configProviderSettings )
@@ -81,11 +82,3 @@ func newSettings(version string, configPaths []string) (*otelcol.CollectorSettin
81
82
DisableGracefulShutdown : true ,
82
83
}, nil
83
84
}
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