Skip to content

Commit

Permalink
Change requested in PR: Move to errors.join
Browse files Browse the repository at this point in the history
  • Loading branch information
crobert-1 committed Jan 24, 2024
1 parent b6283bf commit cda6406
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion receiver/otlpreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ require (
go.opentelemetry.io/otel/metric v1.22.0
go.opentelemetry.io/otel/trace v1.22.0
go.uber.org/goleak v1.3.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.26.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4
google.golang.org/grpc v1.60.1
Expand Down Expand Up @@ -82,6 +81,7 @@ require (
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
Expand Down
3 changes: 1 addition & 2 deletions receiver/otlpreceiver/otlp.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"net/http"
"sync"

"go.uber.org/multierr"
"go.uber.org/zap"
"google.golang.org/grpc"

Expand Down Expand Up @@ -177,7 +176,7 @@ func (r *otlpReceiver) Start(ctx context.Context, host component.Host) error {
// It's possible that a valid GRPC server configuration was specified,
// but an invalid HTTP configuration. If that's the case, the successfully
// started GRPC server must be shutdown to ensure no goroutines are leaked.
return multierr.Append(err, r.Shutdown(ctx))
return errors.Join(err, r.Shutdown(ctx))
}

return nil
Expand Down

0 comments on commit cda6406

Please sign in to comment.