From 0aa54efed126d0dc041487c5ce1bbee1712e5772 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 21 Apr 2022 17:33:54 -0700 Subject: [PATCH] Remove usage of deprecated configunmarshaler package --- .../internal/staleness_end_to_end_test.go | 2 -- receiver/receivercreator/runner.go | 11 ++++++----- testbed/testbed/in_process_collector.go | 2 -- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/receiver/prometheusreceiver/internal/staleness_end_to_end_test.go b/receiver/prometheusreceiver/internal/staleness_end_to_end_test.go index f3dc4e418b68..5fed6b838bac 100644 --- a/receiver/prometheusreceiver/internal/staleness_end_to_end_test.go +++ b/receiver/prometheusreceiver/internal/staleness_end_to_end_test.go @@ -35,7 +35,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configunmarshaler" "go.opentelemetry.io/collector/config/mapprovider/filemapprovider" "go.opentelemetry.io/collector/processor/batchprocessor" "go.opentelemetry.io/collector/service" @@ -165,7 +164,6 @@ service: service.ConfigProviderSettings{ Locations: []string{confFile.Name()}, MapProviders: map[string]config.MapProvider{fmp.Scheme(): fmp}, - Unmarshaler: configunmarshaler.NewDefault(), //nolint:staticcheck }) require.NoError(t, err) diff --git a/receiver/receivercreator/runner.go b/receiver/receivercreator/runner.go index a64c2cbd477a..45c16c34e718 100644 --- a/receiver/receivercreator/runner.go +++ b/receiver/receivercreator/runner.go @@ -21,7 +21,6 @@ import ( "github.com/spf13/cast" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configunmarshaler" "go.opentelemetry.io/collector/consumer" ) @@ -92,14 +91,16 @@ func (run *receiverRunner) loadRuntimeReceiverConfig( return nil, fmt.Errorf("failed to merge template config from discovered runtime values: %v", err) } - receiverConfig, err := configunmarshaler.LoadReceiver(mergedConfig, receiver.id, factory) //nolint:staticcheck - if err != nil { + receiverCfg := factory.CreateDefaultConfig() + receiverCfg.SetIDName(receiver.id.Name()) + + if err := config.UnmarshalReceiver(mergedConfig, receiverCfg); err != nil { return nil, fmt.Errorf("failed to load template config: %v", err) } // Sets dynamically created receiver to something like receiver_creator/1/redis{endpoint="localhost:6380"}. // TODO: Need to make sure this is unique (just endpoint is probably not totally sufficient). - receiverConfig.SetIDName(fmt.Sprintf("%s/%s{endpoint=%q}", receiver.id.Name(), run.idNamespace, cast.ToString(mergedConfig.Get(endpointConfigKey)))) - return receiverConfig, nil + receiverCfg.SetIDName(fmt.Sprintf("%s/%s{endpoint=%q}", receiver.id.Name(), run.idNamespace, cast.ToString(mergedConfig.Get(endpointConfigKey)))) + return receiverCfg, nil } // createRuntimeReceiver creates a receiver that is discovered at runtime. diff --git a/testbed/testbed/in_process_collector.go b/testbed/testbed/in_process_collector.go index f22659c94ab0..d16efc3bf2b3 100644 --- a/testbed/testbed/in_process_collector.go +++ b/testbed/testbed/in_process_collector.go @@ -25,7 +25,6 @@ import ( "github.com/shirou/gopsutil/v3/process" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configunmarshaler" "go.opentelemetry.io/collector/config/mapprovider/filemapprovider" "go.opentelemetry.io/collector/service" ) @@ -75,7 +74,6 @@ func (ipp *inProcessCollector) Start(args StartParams) error { service.ConfigProviderSettings{ Locations: []string{ipp.configFile}, MapProviders: map[string]config.MapProvider{fmp.Scheme(): fmp}, - Unmarshaler: configunmarshaler.NewDefault(), //nolint:staticcheck }) if err != nil { return err