Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove usage of deprecated configunmarshaler package #9405

Merged
merged 1 commit into from
Apr 22, 2022
Merged

Remove usage of deprecated configunmarshaler package #9405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions receiver/prometheusreceiver/internal/staleness_end_to_end_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)

Expand Down
11 changes: 6 additions & 5 deletions receiver/receivercreator/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions testbed/testbed/in_process_collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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
Expand Down