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

[receiver/rabbitmqreceiver] use errors.Join instead of multierr #31779

Merged
merged 1 commit into from
Mar 15, 2024
Merged

[receiver/rabbitmqreceiver] use errors.Join instead of multierr #31779

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
11 changes: 5 additions & 6 deletions receiver/rabbitmqreceiver/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"go.opentelemetry.io/collector/config/confighttp"
"go.opentelemetry.io/collector/config/configopaque"
"go.opentelemetry.io/collector/receiver/scraperhelper"
"go.uber.org/multierr"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver/internal/metadata"
)
Expand All @@ -37,20 +36,20 @@ type Config struct {

// Validate validates the configuration by checking for missing or invalid fields
func (cfg *Config) Validate() error {
var err error
var err []error
dmitryax marked this conversation as resolved.
Show resolved Hide resolved
if cfg.Username == "" {
err = multierr.Append(err, errMissingUsername)
err = append(err, errMissingUsername)
dmitryax marked this conversation as resolved.
Show resolved Hide resolved
}

if cfg.Password == "" {
err = multierr.Append(err, errMissingPassword)
err = append(err, errMissingPassword)
}

_, parseErr := url.Parse(cfg.Endpoint)
if parseErr != nil {
wrappedErr := fmt.Errorf("%s: %w", errInvalidEndpoint.Error(), parseErr)
err = multierr.Append(err, wrappedErr)
err = append(err, wrappedErr)
}

return err
return errors.Join(err...)
}
13 changes: 6 additions & 7 deletions receiver/rabbitmqreceiver/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package rabbitmqreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver"

import (
"errors"
"fmt"
"path/filepath"
"testing"
Expand All @@ -13,7 +14,6 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/confighttp"
"go.opentelemetry.io/collector/confmap/confmaptest"
"go.uber.org/multierr"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver/internal/metadata"
)
Expand All @@ -31,11 +31,10 @@ func TestValidate(t *testing.T) {
Endpoint: "invalid://endpoint: 12efg",
},
},
expectedErr: multierr.Combine(
expectedErr: errors.Join(
errMissingUsername,
errMissingPassword,
fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`),
),
fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`)),
},
{
desc: "missing password and invalid endpoint",
Expand All @@ -45,7 +44,7 @@ func TestValidate(t *testing.T) {
Endpoint: "invalid://endpoint: 12efg",
},
},
expectedErr: multierr.Combine(
expectedErr: errors.Join(
errMissingPassword,
fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`),
),
Expand All @@ -58,7 +57,7 @@ func TestValidate(t *testing.T) {
Endpoint: "invalid://endpoint: 12efg",
},
},
expectedErr: multierr.Combine(
expectedErr: errors.Join(
errMissingUsername,
fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`),
),
Expand All @@ -72,7 +71,7 @@ func TestValidate(t *testing.T) {
Endpoint: "invalid://endpoint: 12efg",
},
},
expectedErr: multierr.Combine(
expectedErr: errors.Join(
fmt.Errorf("%w: %s", errInvalidEndpoint, `parse "invalid://endpoint: 12efg": invalid port ": 12efg" after host`),
),
},
Expand Down
2 changes: 1 addition & 1 deletion receiver/rabbitmqreceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ require (
go.opentelemetry.io/otel/metric v1.24.0
go.opentelemetry.io/otel/trace v1.24.0
go.uber.org/goleak v1.3.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
)

Expand Down Expand Up @@ -65,6 +64,7 @@ require (
go.opentelemetry.io/otel/exporters/prometheus v0.46.0 // indirect
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.24.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
Expand Down
Loading