Deprecate configunmarshaler package, move it to internal

Folllowup:

* When the deprecated funcs/types are removed the internal package can be moved to service/internal.
* Part of open-telemetry#4936 do not offer ability to configure ConfigUnmarshaler.

Motivation: This package is removed because with the latest addition of the `service.ConfigProvider` the usecase to change the unmarshaled config.Config can be achieved by wrapping/implementing that interface, so no clear use-case for this. In the future we can expose it again if we have good reasons.

Updates open-telemetry#4605

Signed-off-by: Bogdan Drutu <[email protected]>

CHANGELOG.md

@@ -12,6 +12,8 @@
 
 ### 🚩 Deprecations 🚩
 
+- Deprecate `configunmarshaler` package, move it to internal (#5151)
+
 ### 💡 Enhancements 💡
 
 - OTLP HTTP receiver will use HTTP/2 over TLS if client supports it (#5190) 

config/common.go

@@ -0,0 +1,9 @@
+package config
+
+func unmarshal(componentSection *Map, intoCfg interface{}) error {
+	if cu, ok := intoCfg.(Unmarshallable); ok {
+		return cu.Unmarshal(componentSection)
+	}
+
+	return componentSection.UnmarshalExact(intoCfg)
+}

config/configunmarshaler/unmarshaler.go

@@ -15,12 +15,14 @@
 package configunmarshaler // import "go.opentelemetry.io/collector/config/configunmarshaler"
 
 import (
-	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/config"
+	"go.opentelemetry.io/collector/internal/configunmarshaler"
 )
 
-// ConfigUnmarshaler is the interface that unmarshalls the collector configuration from the config.Map.
-type ConfigUnmarshaler interface {
-	// Unmarshal the configuration from the given parser and factories.
-	Unmarshal(v *config.Map, factories component.Factories) (*config.Config, error)
-}
+// Deprecated: if you need to update the config.Config implement custom (or wrap) service.ConfigProvider.
+type ConfigUnmarshaler = configunmarshaler.ConfigUnmarshaler
+
+// Deprecated: not needed since interface will be removed.
+var NewDefault = configunmarshaler.NewDefault
+
+// Deprecated: use config.UnmarshalReceiver.
+var LoadReceiver = configunmarshaler.LoadReceiver

config/exporter.go

@@ -23,6 +23,13 @@ type Exporter interface {
 	privateConfigExporter()
 }
 
+// UnmarshalExporter helper function to unmarshal an Exporter config.
+// It checks if the config implements Unmarshallable and uses that if needed.
+// It uses Map.UnmarshalExact, if
+func UnmarshalExporter(cfgMap *Map, cfg Exporter) error {
+	return unmarshal(cfgMap, cfg)
+}
+
 // ExporterSettings defines common settings for a component.Exporter configuration.
 // Specific exporters can embed this struct and extend it with more fields if needed.
 //

config/extension.go

@@ -23,6 +23,13 @@ type Extension interface {
 	privateConfigExtension()
 }
 
+// UnmarshalExtension helper function to unmarshal an Extension config.
+// It checks if the config implements Unmarshallable and uses that if needed.
+// It uses Map.UnmarshalExact, if
+func UnmarshalExtension(cfgMap *Map, cfg Extension) error {
+	return unmarshal(cfgMap, cfg)
+}
+
 // ExtensionSettings defines common settings for a component.Extension configuration.
 // Specific processors can embed this struct and extend it with more fields if needed.
 //

config/processor.go

@@ -23,6 +23,13 @@ type Processor interface {
 	privateConfigProcessor()
 }
 
+// UnmarshalProcessor helper function to unmarshal a Processor config.
+// It checks if the config implements Unmarshallable and uses that if needed.
+// It uses Map.UnmarshalExact, if
+func UnmarshalProcessor(cfgMap *Map, cfg Processor) error {
+	return unmarshal(cfgMap, cfg)
+}
+
 // ProcessorSettings defines common settings for a component.Processor configuration.
 // Specific processors can embed this struct and extend it with more fields if needed.
 //

config/receiver.go

@@ -23,6 +23,13 @@ type Receiver interface {
 	privateConfigReceiver()
 }
 
+// UnmarshalReceiver helper function to unmarshal a Receiver config.
+// It checks if the config implements Unmarshallable and uses that if needed.
+// It uses Map.UnmarshalExact, if
+func UnmarshalReceiver(cfgMap *Map, cfg Receiver) error {
+	return unmarshal(cfgMap, cfg)
+}
+
 // ReceiverSettings defines common settings for a component.Receiver configuration.
 // Specific receivers can embed this struct and extend it with more fields if needed.
 //

config/configunmarshaler/defaultunmarshaler.go → internal/configunmarshaler/defaultunmarshaler.go

@@ -25,6 +25,12 @@ import (
 	"go.opentelemetry.io/collector/config/configtelemetry"
 )
 
+// ConfigUnmarshaler is the interface that unmarshalls the collector configuration from the config.Map.
+type ConfigUnmarshaler interface {
+	// Unmarshal the configuration from the given parser and factories.
+	Unmarshal(v *config.Map, factories component.Factories) (*config.Config, error)
+}
+
 // These are errors that can be returned by Unmarshal(). Note that error codes are not part
 // of Unmarshal()'s public API, they are for internal unit testing only.
 type configErrorCode int
@@ -75,17 +81,17 @@ type configSettings struct {
 	Service    map[string]interface{}                        `mapstructure:"service"`
 }
 
-type defaultUnmarshaler struct{}
+type DefaultUnmarshaler struct{}
 
 // NewDefault returns a default ConfigUnmarshaler that unmarshalls every configuration
 // using the custom unmarshaler if present or default to strict
-func NewDefault() ConfigUnmarshaler {
-	return &defaultUnmarshaler{}
+func NewDefault() *DefaultUnmarshaler {
+	return &DefaultUnmarshaler{}
 }
 
 // Unmarshal the Config from a config.Map.
 // After the config is unmarshalled, `Validate()` must be called to validate.
-func (*defaultUnmarshaler) Unmarshal(v *config.Map, factories component.Factories) (*config.Config, error) {
+func (*DefaultUnmarshaler) Unmarshal(v *config.Map, factories component.Factories) (*config.Config, error) {
 	var cfg config.Config
 
 	// Unmarshal top level sections and validate.
@@ -154,7 +160,7 @@ func unmarshalExtensions(exts map[config.ComponentID]map[string]interface{}, fac
 
 		// Now that the default config struct is created we can Unmarshal into it,
 		// and it will apply user-defined config on top of the default.
-		if err := unmarshal(config.NewMapFromStringMap(value), extensionCfg); err != nil {
+		if err := config.UnmarshalExtension(config.NewMapFromStringMap(value), extensionCfg); err != nil {
 			return nil, errorUnmarshalError(extensionsKeyName, id, err)
 		}
 
@@ -183,7 +189,7 @@ func unmarshalService(srvRaw map[string]interface{}) (config.Service, error) {
 		},
 	}
 
-	if err := unmarshal(config.NewMapFromStringMap(srvRaw), &srv); err != nil {
+	if err := config.NewMapFromStringMap(srvRaw).UnmarshalExact(&srv); err != nil {
 		return srv, fmt.Errorf("error reading service configuration: %w", err)
 	}
 
@@ -210,7 +216,7 @@ func LoadReceiver(componentConfig *config.Map, id config.ComponentID, factory co
 
 	// Now that the default config struct is created we can Unmarshal into it,
 	// and it will apply user-defined config on top of the default.
-	if err := unmarshal(componentConfig, receiverCfg); err != nil {
+	if err := config.UnmarshalReceiver(componentConfig, receiverCfg); err != nil {
 		return nil, errorUnmarshalError(receiversKeyName, id, err)
 	}
 
@@ -259,7 +265,7 @@ func unmarshalExporters(exps map[config.ComponentID]map[string]interface{}, fact
 
 		// Now that the default config struct is created we can Unmarshal into it,
 		// and it will apply user-defined config on top of the default.
-		if err := unmarshal(config.NewMapFromStringMap(value), exporterCfg); err != nil {
+		if err := config.UnmarshalExporter(config.NewMapFromStringMap(value), exporterCfg); err != nil {
 			return nil, errorUnmarshalError(exportersKeyName, id, err)
 		}
 
@@ -287,7 +293,7 @@ func unmarshalProcessors(procs map[config.ComponentID]map[string]interface{}, fa
 
 		// Now that the default config struct is created we can Unmarshal into it,
 		// and it will apply user-defined config on top of the default.
-		if err := unmarshal(config.NewMapFromStringMap(value), processorCfg); err != nil {
+		if err := config.UnmarshalProcessor(config.NewMapFromStringMap(value), processorCfg); err != nil {
 			return nil, errorUnmarshalError(processorsKeyName, id, err)
 		}
 
@@ -297,14 +303,6 @@ func unmarshalProcessors(procs map[config.ComponentID]map[string]interface{}, fa
 	return processors, nil
 }
 
-func unmarshal(componentSection *config.Map, intoCfg interface{}) error {
-	if cu, ok := intoCfg.(config.Unmarshallable); ok {
-		return cu.Unmarshal(componentSection)
-	}
-
-	return componentSection.UnmarshalExact(intoCfg)
-}
-
 func errorUnknownType(component string, id config.ComponentID, factories []reflect.Value) error {
 	return fmt.Errorf("unknown %s type %q for %q (valid values: %v)", component, id.Type(), id, factories)
 }

service/config_provider.go

@@ -26,11 +26,11 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/config/configmapprovider"
-	"go.opentelemetry.io/collector/config/configunmarshaler"
 	"go.opentelemetry.io/collector/config/experimental/configsource"
 	"go.opentelemetry.io/collector/config/mapprovider/envmapprovider"
 	"go.opentelemetry.io/collector/config/mapprovider/filemapprovider"
 	"go.opentelemetry.io/collector/config/mapprovider/yamlmapprovider"
+	"go.opentelemetry.io/collector/internal/configunmarshaler"
 )
 
 // ConfigProvider provides the service configuration.
@@ -92,6 +92,9 @@ func MustNewConfigProvider(
 	// Safe copy, ensures the slice cannot be changed from the caller.
 	locationsCopy := make([]string, len(locations))
 	copy(locationsCopy, locations)
+	if configUnmarshaler == nil {
+		configUnmarshaler = configunmarshaler.NewDefault()
+	}
 	return &configProvider{
 		locations:          locationsCopy,
 		configMapProviders: configMapProviders,

service/config_provider_test.go

@@ -28,9 +28,9 @@ import (
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/config/configtest"
-	"go.opentelemetry.io/collector/config/configunmarshaler"
 	"go.opentelemetry.io/collector/config/experimental/configsource"
 	"go.opentelemetry.io/collector/config/mapprovider/filemapprovider"
+	"go.opentelemetry.io/collector/internal/configunmarshaler"
 )
 
 type mockProvider struct {

service/servicetest/configprovider.go

@@ -18,7 +18,7 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/config/configtest"
-	"go.opentelemetry.io/collector/config/configunmarshaler"
+	"go.opentelemetry.io/collector/internal/configunmarshaler"
 )
 
 // LoadConfig loads a config.Config  from file, and does NOT validate the configuration.