Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions internal/component/otelcol/auth/basic/basic.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func (args Arguments) Validate() error {

// ConvertClient implements auth.Arguments.
func (args Arguments) ConvertClient() (otelcomponent.Config, error) {
c := &basicauthextension.Config{}
c := basicauthextension.NewFactory().CreateDefaultConfig().(*basicauthextension.Config)
// If the client config is specified, ignore the deprecated
// username and password attributes.
if args.ClientAuth != nil {
Expand All @@ -127,8 +127,10 @@ func (args Arguments) ConvertClient() (otelcomponent.Config, error) {

// ConvertServer implements auth.Arguments.
func (args Arguments) ConvertServer() (otelcomponent.Config, error) {
c := &basicauthextension.Config{
Htpasswd: &basicauthextension.HtpasswdSettings{},
c := basicauthextension.NewFactory().CreateDefaultConfig().(*basicauthextension.Config)
if c.Htpasswd == nil {
// The inline append below needs a non-nil Htpasswd.
c.Htpasswd = &basicauthextension.HtpasswdSettings{}
}
if args.Htpasswd != nil {
c.Htpasswd = args.Htpasswd.convert()
Expand Down
6 changes: 3 additions & 3 deletions internal/component/otelcol/auth/headers/headers.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ func (args Arguments) ConvertClient() (otelcomponent.Config, error) {
}

// OtelExtensionConfig does not implement ServerAuth
return &headerssetterextension.Config{
HeadersConfig: upstreamHeaders,
}, nil
cfg := headerssetterextension.NewFactory().CreateDefaultConfig().(*headerssetterextension.Config)
cfg.HeadersConfig = upstreamHeaders
return cfg, nil
}

// ConvertServer returns nil since theheaders extension does not support server authentication.
Expand Down
11 changes: 5 additions & 6 deletions internal/component/otelcol/auth/sigv4/sigv4.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,16 @@ func (args *Arguments) SetToDefault() {

// ConvertClient implements auth.Arguments.
func (args Arguments) ConvertClient() (otelcomponent.Config, error) {
res := sigv4authextension.Config{
Region: args.Region,
Service: args.Service,
AssumeRole: *args.AssumeRole.Convert(),
}
res := sigv4authextension.NewFactory().CreateDefaultConfig().(*sigv4authextension.Config)
res.Region = args.Region
res.Service = args.Service
res.AssumeRole = *args.AssumeRole.Convert()
// sigv4authextension.Config has a private member called "credsProvider" which gets initialized when we call Validate().
// If we don't call validate, the unit tests for this component will fail.
if err := res.Validate(); err != nil {
return nil, err
}
return &res, nil
return res, nil
}

// ConvertServer returns nil since the sigv4 extension does not support server authentication.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (args Arguments) Convert() (otelcomponent.Config, error) {
}
}

var result attributesprocessor.Config
result := *attributesprocessor.NewFactory().CreateDefaultConfig().(*attributesprocessor.Config)
err := mapstructure.Decode(input, &result)

if err != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func (args Arguments) Convert() (otelcomponent.Config, error) {
input["db_sanitizer"] = args.DBSanitizer.convert()
}

var result redactionprocessor.Config
result := *redactionprocessor.NewFactory().CreateDefaultConfig().(*redactionprocessor.Config)
if err := mapstructure.Decode(input, &result); err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion internal/component/otelcol/processor/span/span.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func (args Arguments) Convert() (otelcomponent.Config, error) {
}
}

var result spanprocessor.Config
result := *spanprocessor.NewFactory().CreateDefaultConfig().(*spanprocessor.Config)
err := mapstructure.Decode(input, &result)

if err != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,8 @@ type ConsumerArguments struct {
}

func (a Arguments) Convert() (collectorComponent.Config, error) {
cfg := &fluentforwardreceiver.Config{
ListenAddress: a.Endpoint,
}
cfg := fluentforwardreceiver.NewFactory().CreateDefaultConfig().(*fluentforwardreceiver.Config)
cfg.ListenAddress = a.Endpoint
return cfg, nil
}

Expand Down
Loading