From a3c5d6b602329b38bc2bf5b38c930381de0dd6d1 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Tue, 5 Apr 2022 17:27:15 -0700 Subject: [PATCH] Revert deprecation of WithConfigUnmarshaler Signed-off-by: Bogdan Drutu --- CHANGELOG.md | 2 -- service/config_provider.go | 3 --- service/config_provider_test.go | 12 ++++++------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 069b9a8398e6..d8b075abf9a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,6 @@ ### 🚩 Deprecations 🚩 - 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. ### 💡 Enhancements 💡 @@ -45,7 +44,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...` diff --git a/service/config_provider.go b/service/config_provider.go index 90707449dfce..83172ca4251c 100644 --- a/service/config_provider.go +++ b/service/config_provider.go @@ -98,9 +98,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 diff --git a/service/config_provider_test.go b/service/config_provider_test.go index 45046995d6de..f1e71574de3e 100644 --- a/service/config_provider_test.go +++ b/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(),