move provider modules to collector settings

Signed-off-by: ChrsMark <[email protected]>

Author: ChrsMark

cmd/builder/internal/builder/templates/main.go.tmpl

@@ -33,11 +33,7 @@ func main() {
 					{{- range .ConfmapProviders}}
 					{{.Name}}.NewFactory(),
 					{{- end}}
-				}, ProviderModules: map[string]string{
-                    {{- range .ConfmapProviders}}
-                    "{{.Name}}": "{{.GoMod}}",
-                    {{- end}}
-                },
+				},
 				{{- if .ConfmapConverters }}
 				ConverterFactories: []confmap.ConverterFactory{
 					{{- range .ConfmapConverters}}
@@ -47,9 +43,13 @@ func main() {
 				{{- end }}
 				{{- if .ConfResolver.DefaultURIScheme }}
 				DefaultScheme: "{{ .ConfResolver.DefaultURIScheme }}",
-				{{- end }}
+		        {{- end }}
 			},
-		},
+		}, ProviderModules: map[string]string{
+                {{- range .ConfmapProviders}}
+                "{{.Name}}": "{{.GoMod}}",
+                {{- end}}
+           },
 	}
 
 	if err := run(set); err != nil {

cmd/otelcorecol/main.go

@@ -39,9 +39,6 @@ type ResolverSettings struct {
 	// It is required to have at least one factory.
 	ProviderFactories []ProviderFactory
 
-	// ProviderModules maps provider types to their respective go modules.
-	ProviderModules map[string]string
-
 	// DefaultScheme is the scheme that is used if ${} syntax is used but no schema is provided.
 	// If no DefaultScheme is set, ${} with no schema will not be expanded.
 	// It is strongly recommended to set "env" as the default scheme to align with the

confmap/resolver.go

@@ -69,6 +69,9 @@ type CollectorSettings struct {
 	// confmap.Providers watch for configuration changes.
 	ConfigProviderSettings ConfigProviderSettings
 
+	// ProviderModules maps provider types to their respective go modules.
+	ProviderModules map[string]string
+
 	// LoggingOptions provides a way to change behavior of zap logging.
 	LoggingOptions []zap.Option
 

otelcol/collector.go

@@ -576,13 +576,14 @@ func newDefaultConfigProviderSettings(tb testing.TB, uris []string) ConfigProvid
 	return ConfigProviderSettings{
 		ResolverSettings: confmap.ResolverSettings{
 			URIs: uris,
-			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",
-			},
 			ProviderFactories: []confmap.ProviderFactory{
 				fileProvider,
 				newEnvProvider(),
+			}, ProviderSettings: confmap.ProviderSettings{
+				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",
+				},
 			},
 		},
 	}

otelcol/collector_test.go

@@ -120,7 +120,7 @@ func newComponentsCommand(set CollectorSettings) *cobra.Command {
 			for _, confmapProvider := range confmapProviderFactories {
 				provider := confmapProvider.Create(set.ConfigProviderSettings.ResolverSettings.ProviderSettings)
 				scheme := provider.Scheme()
-				module := set.ConfigProviderSettings.ResolverSettings.ProviderModules[scheme+"provider"]
+				module := set.ProviderModules[scheme+"provider"]
 				components.Providers = append(components.Providers, componentWithoutStability{
 					Name:   scheme,
 					Module: module,