From 216cabb72a6e2d83d182e37b76ed7bbd162d9a0c Mon Sep 17 00:00:00 2001 From: Dominik Rosiek Date: Mon, 8 Apr 2024 13:53:57 +0200 Subject: [PATCH 1/3] feat: add missing configproviders (httpprovider, httpsprovider, yamlprovider) Signed-off-by: Dominik Rosiek --- otelcolbuilder/cmd/configprovider.go | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/otelcolbuilder/cmd/configprovider.go b/otelcolbuilder/cmd/configprovider.go index 26141cd3f2..92043fb758 100644 --- a/otelcolbuilder/cmd/configprovider.go +++ b/otelcolbuilder/cmd/configprovider.go @@ -26,6 +26,8 @@ import ( "go.opentelemetry.io/collector/confmap/converter/expandconverter" "go.opentelemetry.io/collector/confmap/provider/envprovider" "go.opentelemetry.io/collector/confmap/provider/fileprovider" + "go.opentelemetry.io/collector/confmap/provider/httpprovider" + "go.opentelemetry.io/collector/confmap/provider/httpsprovider" "go.opentelemetry.io/collector/confmap/provider/yamlprovider" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/otelcol" @@ -91,11 +93,20 @@ func NewConfigProvider(locations []string) (otelcol.ConfigProvider, error) { // for the logic we're emulating here // we only add the glob provider, everything else should be the same func NewConfigProviderSettings(locations []string) otelcol.ConfigProviderSettings { + converterSet := confmap.ConverterSettings{} + providerSet := confmap.ProviderSettings{} return otelcol.ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ - URIs: locations, - Providers: makeMapProvidersMap(fileprovider.New(), envprovider.New(), yamlprovider.New(), globprovider.New()), - Converters: []confmap.Converter{expandconverter.New(confmap.ConverterSettings{})}, + URIs: locations, + Providers: makeMapProvidersMap( + fileprovider.NewWithSettings(providerSet), + envprovider.NewWithSettings(providerSet), + yamlprovider.NewWithSettings(providerSet), + httpprovider.NewWithSettings(providerSet), + httpsprovider.NewWithSettings(providerSet), + globprovider.New(), + ), + Converters: []confmap.Converter{expandconverter.New(converterSet)}, }, } } From cec230a751cd1c0346f30560bef0fe41163f3279 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek Date: Mon, 8 Apr 2024 13:54:54 +0200 Subject: [PATCH 2/3] chore: changelog Signed-off-by: Dominik Rosiek --- .changelog/1528.changed.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 .changelog/1528.changed.txt diff --git a/.changelog/1528.changed.txt b/.changelog/1528.changed.txt new file mode 100644 index 0000000000..da112404b0 --- /dev/null +++ b/.changelog/1528.changed.txt @@ -0,0 +1 @@ +feat: add missing configproviders (httpprovider, httpsprovider, yamlprovider) \ No newline at end of file From cfb21c1b36328d6eb115052e9084e45cf249f853 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> Date: Wed, 10 Apr 2024 10:11:31 +0200 Subject: [PATCH 3/3] Update 1528.changed.txt --- .changelog/1528.changed.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/1528.changed.txt b/.changelog/1528.changed.txt index da112404b0..3be6aace45 100644 --- a/.changelog/1528.changed.txt +++ b/.changelog/1528.changed.txt @@ -1 +1 @@ -feat: add missing configproviders (httpprovider, httpsprovider, yamlprovider) \ No newline at end of file +feat: add missing configproviders (httpprovider, httpsprovider)