diff --git a/cmd/jaeger/internal/command.go b/cmd/jaeger/internal/command.go index b53e22e4307..d33d6fc5aba 100644 --- a/cmd/jaeger/internal/command.go +++ b/cmd/jaeger/internal/command.go @@ -10,6 +10,13 @@ import ( "github.com/spf13/cobra" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap" + "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/otelcol" "github.com/jaegertracing/jaeger/pkg/version" @@ -30,6 +37,20 @@ func Command() *cobra.Command { settings := otelcol.CollectorSettings{ BuildInfo: info, Factories: Components, + ConfigProviderSettings: otelcol.ConfigProviderSettings{ + ResolverSettings: confmap.ResolverSettings{ + ProviderFactories: []confmap.ProviderFactory{ + envprovider.NewFactory(), + fileprovider.NewFactory(), + httpprovider.NewFactory(), + httpsprovider.NewFactory(), + yamlprovider.NewFactory(), + }, + ConverterFactories: []confmap.ConverterFactory{ + expandconverter.NewFactory(), + }, + }, + }, } cmd := otelcol.NewCommand(settings) diff --git a/go.mod b/go.mod index ee5a286915e..efb2b60ba99 100644 --- a/go.mod +++ b/go.mod @@ -45,6 +45,12 @@ require ( go.opentelemetry.io/collector/config/configretry v0.102.1 go.opentelemetry.io/collector/config/configtls v0.102.1 go.opentelemetry.io/collector/confmap v0.102.1 + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.102.1 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.1 + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1 + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1 go.opentelemetry.io/collector/connector v0.102.1 go.opentelemetry.io/collector/connector/forwardconnector v0.102.1 go.opentelemetry.io/collector/consumer v0.102.1 @@ -186,12 +192,6 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.9.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.102.1 // indirect go.opentelemetry.io/collector/config/internal v0.102.1 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.102.1 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.102.1 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.102.1 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.102.1 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.102.1 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.102.1 // indirect go.opentelemetry.io/collector/exporter/debugexporter v0.102.1 go.opentelemetry.io/collector/extension/auth v0.102.1 // indirect go.opentelemetry.io/collector/featuregate v1.9.0 // indirect