Skip to content

refactor(otelcol): Seed factory defaults where Alloy already assigns them (group 2 of 5) #7085

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

Open
kgeckhart wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(otelcol): Seed factory defaults where Alloy already assigns them (group 2 of 5) #7085

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
10 changes: 3 additions & 7 deletions internal/component/otelcol/exporter/googlecloud/googlecloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
package googlecloud

import (
"time"

"github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter"
otelcomponent "go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/pipeline"
Expand Down Expand Up @@ -64,11 +61,10 @@ func (args *Arguments) SetToDefault() {

// Convert implements exporter.Arguments.
func (args Arguments) Convert() (otelcomponent.Config, error) {
var result googlecloudexporter.Config
// We need to assign default values first to populate fields with unexported functions
result.Config = collector.DefaultConfig()
// The factory default seeds the embedded collector.DefaultConfig(), which
// populates fields holding unexported functions.
result := *googlecloudexporter.NewFactory().CreateDefaultConfig().(*googlecloudexporter.Config)

result.TimeoutSettings.Timeout = 12 * time.Second // https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/70d8986fa3a30e1f26927abffe1880345e2afa3f/exporter/googlecloudexporter/factory.go#L48
q, err := args.Queue.Convert()
if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion internal/component/otelcol/exporter/googlecloudpubsub/googlecloudpubsub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (args *Arguments) SetToDefault() {
}

func (args Arguments) Convert() (otelcomponent.Config, error) {
var result googlecloudpubsubexporter.Config
result := *googlecloudpubsubexporter.NewFactory().CreateDefaultConfig().(*googlecloudpubsubexporter.Config)

result.BackOffConfig = *args.Retry.Convert()

Expand Down
2 changes: 1 addition & 1 deletion internal/component/otelcol/processor/cumulativetodelta/cumulativetodelta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func (args *Arguments) Validate() error {

// Convert implements processor.Arguments.
func (args Arguments) Convert() (otelcomponent.Config, error) {
var result cumulativetodeltaprocessor.Config
result := *cumulativetodeltaprocessor.NewFactory().CreateDefaultConfig().(*cumulativetodeltaprocessor.Config)

result.MaxStaleness = args.MaxStaleness

Expand Down
2 changes: 1 addition & 1 deletion internal/component/otelcol/receiver/file_stats/types_convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var _ receiver.Arguments = Arguments{}

// Convert implements receiver.Arguments.
func (args Arguments) Convert() (otelcomponent.Config, error) {
var out filestatsreceiver.Config
out := *filestatsreceiver.NewFactory().CreateDefaultConfig().(*filestatsreceiver.Config)

out.ControllerConfig = *args.Controller.Convert()
out.Include = args.Include
Expand Down
2 changes: 1 addition & 1 deletion internal/component/otelcol/receiver/kafka/kafka.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ func (args Arguments) Convert() (otelcomponent.Config, error) {
input := make(map[string]any)
input["auth"] = args.Authentication.Convert()

var result kafkareceiver.Config
result := *kafkareceiver.NewFactory().CreateDefaultConfig().(*kafkareceiver.Config)
err := mapstructure.Decode(input, &result)
if err != nil {
return nil, err
Expand Down
12 changes: 11 additions & 1 deletion internal/component/otelcol/receiver/kafka/kafka_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ func TestArguments_UnmarshalAlloy(t *testing.T) {
Topics: []string{"otlp_spans"},
Encoding: "otlp_proto",
},
Profiles: kafkareceiver.TopicEncodingConfig{
Topics: []string{"otlp_profiles"},
Encoding: "otlp_proto",
},
HeaderExtraction: kafkareceiver.HeaderExtraction{
ExtractHeaders: false,
Headers: []string{},
Expand Down Expand Up @@ -164,6 +168,10 @@ func TestArguments_UnmarshalAlloy(t *testing.T) {
Encoding: "zipkin_json",
ExcludeTopics: []string{"^traces-debug-.*$"},
},
Profiles: kafkareceiver.TopicEncodingConfig{
Topics: []string{"otlp_profiles"},
Encoding: "otlp_proto",
},
ClientConfig: configkafka.ClientConfig{
Brokers: []string{"10.10.10.10:9092"},
ProtocolVersion: "2.0.0",
Expand Down Expand Up @@ -588,7 +596,9 @@ func TestArguments_Auth(t *testing.T) {

actual := actualPtr.(*kafkareceiver.Config)

var expected kafkareceiver.Config
// Seed the same way Convert does, so the case only has to spell out
// what it overrides on top of the upstream defaults.
expected := *kafkareceiver.NewFactory().CreateDefaultConfig().(*kafkareceiver.Config)
err = mapstructure.Decode(tc.expected, &expected)
require.NoError(t, err)

Expand Down
Loading