use scheme directly in providerModules map keys

Signed-off-by: ChrsMark <[email protected]>
open-telemetry · Jan 16, 2025 · c645175 · c645175
1 parent cb1e2fc
commit c645175
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/cmd/builder/internal/builder/templates/main.go.tmpl b/cmd/builder/internal/builder/templates/main.go.tmpl
@@ -47,7 +47,7 @@ func main() {
 			},
 		}, ProviderModules: map[string]string{
 			{{- range .ConfmapProviders}}
-			"{{.Name}}": "{{.GoMod}}",
+			{{.Name}}.NewFactory().Create(confmap.ProviderSettings{}).Scheme(): "{{.GoMod}}",
 			{{- end}}
            },
 	}

diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go
diff --git a/otelcol/command_components.go b/otelcol/command_components.go
@@ -116,14 +116,10 @@ func newComponentsCommand(set CollectorSettings) *cobra.Command {
 			}
 			components.BuildInfo = set.BuildInfo
 
-			confmapProviderFactories := set.ConfigProviderSettings.ResolverSettings.ProviderFactories
-			for _, confmapProvider := range confmapProviderFactories {
-				provider := confmapProvider.Create(set.ConfigProviderSettings.ResolverSettings.ProviderSettings)
-				scheme := provider.Scheme()
-				module := set.ProviderModules[scheme+"provider"]
+			for providerScheme, providerModuleModule := range set.ProviderModules {
 				components.Providers = append(components.Providers, componentWithoutStability{
-					Name:   scheme,
-					Module: module,
+					Name:   providerScheme,
+					Module: providerModuleModule,
 				})
 			}
 

diff --git a/otelcol/command_components_test.go b/otelcol/command_components_test.go
@@ -22,8 +22,8 @@ func TestNewBuildSubCommand(t *testing.T) {
 		Factories:              nopFactories,
 		ConfigProviderSettings: newDefaultConfigProviderSettings(t, []string{filepath.Join("testdata", "otelcol-nop.yaml")}),
 		ProviderModules: map[string]string{
-			"envprovider":  "go.opentelemetry.io/collector/confmap/provider/envprovider v1.2.3",
-			"fileprovider": "go.opentelemetry.io/collector/confmap/provider/fileprovider v1.2.3",
+			"env":  "go.opentelemetry.io/collector/confmap/provider/envprovider v1.2.3",
+			"file": "go.opentelemetry.io/collector/confmap/provider/fileprovider v1.2.3",
 		},
 	}
 	cmd := NewCommand(set)