Remove usage of deprecated configunmarshaler package (#9405)

open-telemetry · Apr 22, 2022 · 6952d7b · 6952d7b
1 parent c54e0a1
commit 6952d7b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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