Revert deprecation of WithConfigUnmarshaler

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

CHANGELOG.md

@@ -15,8 +15,6 @@
 
 - Deprecate configmapprovider package, replace with mapconverter (#5167)
 - Deprecate `service.MustNewConfigProvider` and `service.MustNewDefaultConfigProvider`in favor of `service.NewConfigProvider` (#4762)
-  - There is no equivalent to provide custom ConfigUnmarshaler, if you need to apply changes to the parsed config wrap the default ConfigProvider.
->>>>>>> 2daa6ab9 (Change deprecated NewConfigProvider to use options and do input validation)
 
 ### 💡 Enhancements 💡
 
@@ -50,7 +48,6 @@
 
 - Move MapProvider to config, split providers in their own package (#5030)
 - API related to `pdata.AttributeValue` is deprecated in favor of `pdata.Value` (#4978)
-- API related to `pdata.AttributeValue` is deprecated in favor of `pdata.Value` (#4975)
   - `pdata.AttributeValue` struct is deprecated in favor of `pdata.Value`
   - `pdata.AttributeValueType` type is deprecated in favor of `pdata.ValueType`
   - `pdata.AttributeValueType...` constants are deprecated in favor of `pdata.ValueType...`

service/command.go

@@ -16,10 +16,10 @@ package service // import "go.opentelemetry.io/collector/service"
 
 import (
 	"github.com/spf13/cobra"
-	"go.opentelemetry.io/collector/config/mapconverter/overwritepropertiesmapconverter"
 
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/config/mapconverter/expandmapconverter"
+	"go.opentelemetry.io/collector/config/mapconverter/overwritepropertiesmapconverter"
 	"go.opentelemetry.io/collector/service/featuregate"
 )
 

service/config_provider.go

@@ -99,9 +99,6 @@ func WithConfigMapConverters(c []config.MapConverterFunc) ConfigProviderOption {
 }
 
 // WithConfigUnmarshaler overwrites the default unmarshaler.
-// Deprecated: [v0.49.0] because providing custom ConfigUnmarshaler is not necessary since users can wrap/implement
-// ConfigProvider if needed to change the resulted config. This functionality will be kept for at least 2 minor versions,
-// and if nobody express a need for it will be removed.
 func WithConfigUnmarshaler(c configunmarshaler.ConfigUnmarshaler) ConfigProviderOption {
 	return func(opts *configProvider) {
 		opts.configUnmarshaler = c

service/config_provider_test.go

@@ -34,7 +34,7 @@ import (
 )
 
 type mockProvider struct {
-	shceme string
+	scheme string
 	retM   *config.Map
 	errR   error
 	errS   error
@@ -56,10 +56,10 @@ func (m *mockProvider) Retrieve(_ context.Context, _ string, watcher config.Watc
 }
 
 func (m *mockProvider) Scheme() string {
-	if m.shceme == "" {
+	if m.scheme == "" {
 		return "mock"
 	}
-	return m.shceme
+	return m.scheme
 }
 
 func (m *mockProvider) Shutdown(context.Context) error {
@@ -100,7 +100,7 @@ func TestConfigProvider_Errors(t *testing.T) {
 			locations: []string{"mock:", "err:"},
 			parserProvider: []config.MapProvider{
 				&mockProvider{},
-				&mockProvider{shceme: "err", errR: errors.New("retrieve_err")},
+				&mockProvider{scheme: "err", errR: errors.New("retrieve_err")},
 			},
 			configUnmarshaler: configunmarshaler.NewDefault(),
 			expectNewErr:      true,
@@ -133,7 +133,7 @@ func TestConfigProvider_Errors(t *testing.T) {
 			parserProvider: func() []config.MapProvider {
 				cfgMap, err := configtest.LoadConfigMap(filepath.Join("testdata", "otelcol-nop.yaml"))
 				require.NoError(t, err)
-				return []config.MapProvider{&mockProvider{}, &mockProvider{shceme: "err", retM: cfgMap, errW: errors.New("watch_err")}}
+				return []config.MapProvider{&mockProvider{}, &mockProvider{scheme: "err", retM: cfgMap, errW: errors.New("watch_err")}}
 			}(),
 			configUnmarshaler: configunmarshaler.NewDefault(),
 			expectWatchErr:    true,
@@ -146,7 +146,7 @@ func TestConfigProvider_Errors(t *testing.T) {
 				require.NoError(t, err)
 				return []config.MapProvider{
 					&mockProvider{},
-					&mockProvider{shceme: "err", retM: cfgMap, errC: errors.New("close_err")},
+					&mockProvider{scheme: "err", retM: cfgMap, errC: errors.New("close_err")},
 				}
 			}(),
 			configUnmarshaler: configunmarshaler.NewDefault(),