[all] Replace multierr by errors.Join

open-telemetry · Oct 6, 2023 · 6ac024b · 6ac024b
1 parent b89b819
commit 6ac024b
Show file tree

Hide file tree

Showing 50 changed files with 2,319 additions and 434 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -108,7 +108,9 @@ linters-settings:
           - pkg: github.com/pkg/errors
             desc: "Use 'errors' or 'fmt' instead of github.com/pkg/errors"
           - pkg: github.com/hashicorp/go-multierror
-            desc: "Use go.uber.org/multierr instead of github.com/hashicorp/go-multierror"
+            desc: "Use errors.Join instead of github.com/hashicorp/go-multierror"
+          - pkg: go.uber.org/multierr
+            desc: "Use errors.Join instead of go.uber.org/multierr"
         # Add a different guard rule so that we can ignore tests.
       ignore-in-test:
           deny:

diff --git a/cmd/builder/go.mod b/cmd/builder/go.mod
@@ -14,7 +14,6 @@ require (
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
-	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.26.0
 )
 
@@ -29,6 +28,7 @@ require (
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.10.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go
@@ -11,7 +11,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"go.uber.org/multierr"
 	"go.uber.org/zap"
 )
 
@@ -83,7 +82,7 @@ func NewDefaultConfig() Config {
 
 // Validate checks whether the current configuration is valid
 func (c *Config) Validate() error {
-	return multierr.Combine(
+	return errors.Join(
 		validateModules(c.Extensions),
 		validateModules(c.Receivers),
 		validateModules(c.Exporters),

diff --git a/component/componenttest/configtest.go b/component/componenttest/configtest.go
@@ -4,12 +4,11 @@
 package componenttest // import "go.opentelemetry.io/collector/component/componenttest"
 
 import (
+	"errors"
 	"fmt"
 	"reflect"
 	"regexp"
 	"strings"
-
-	"go.uber.org/multierr"
 )
 
 // The regular expression for valid config field tag.
@@ -37,17 +36,17 @@ func CheckConfigStruct(config any) error {
 // If the type is a struct it goes to each of its fields to check for the proper
 // tags.
 func validateConfigDataType(t reflect.Type) error {
-	var errs error
+	var errs []error
 
 	switch t.Kind() {
 	case reflect.Ptr:
-		errs = multierr.Append(errs, validateConfigDataType(t.Elem()))
+		errs = append(errs, validateConfigDataType(t.Elem()))
 	case reflect.Struct:
 		// Reflect on the pointed data and check each of its fields.
 		nf := t.NumField()
 		for i := 0; i < nf; i++ {
 			f := t.Field(i)
-			errs = multierr.Append(errs, checkStructFieldTags(f))
+			errs = append(errs, checkStructFieldTags(f))
 		}
 	default:
 		// The config object can carry other types but they are not used when
@@ -56,8 +55,8 @@ func validateConfigDataType(t reflect.Type) error {
 		// reflect.UnsafePointer.
 	}
 
-	if errs != nil {
-		return fmt.Errorf("type %q from package %q has invalid config settings: %w", t.Name(), t.PkgPath(), errs)
+	if err := errors.Join(errs...); err != nil {
+		return fmt.Errorf("type %q from package %q has invalid config settings: %w", t.Name(), t.PkgPath(), err)
 	}
 
 	return nil

diff --git a/component/config.go b/component/config.go
@@ -4,10 +4,9 @@
 package component // import "go.opentelemetry.io/collector/component"
 
 import (
+	"errors"
 	"reflect"
 
-	"go.uber.org/multierr"
-
 	"go.opentelemetry.io/collector/confmap"
 )
 
@@ -55,33 +54,33 @@ func validate(v reflect.Value) error {
 	case reflect.Ptr:
 		return validate(v.Elem())
 	case reflect.Struct:
-		var errs error
-		errs = multierr.Append(errs, callValidateIfPossible(v))
+		var errs []error
+		errs = append(errs, callValidateIfPossible(v))
 		// Reflect on the pointed data and check each of its fields.
 		for i := 0; i < v.NumField(); i++ {
 			if !v.Type().Field(i).IsExported() {
 				continue
 			}
-			errs = multierr.Append(errs, validate(v.Field(i)))
+			errs = append(errs, validate(v.Field(i)))
 		}
-		return errs
+		return errors.Join(errs...)
 	case reflect.Slice, reflect.Array:
-		var errs error
-		errs = multierr.Append(errs, callValidateIfPossible(v))
+		var errs []error
+		errs = append(errs, callValidateIfPossible(v))
 		// Reflect on the pointed data and check each of its fields.
 		for i := 0; i < v.Len(); i++ {
-			errs = multierr.Append(errs, validate(v.Index(i)))
+			errs = append(errs, validate(v.Index(i)))
 		}
-		return errs
+		return errors.Join(errs...)
 	case reflect.Map:
-		var errs error
-		errs = multierr.Append(errs, callValidateIfPossible(v))
+		var errs []error
+		errs = append(errs, callValidateIfPossible(v))
 		iter := v.MapRange()
 		for iter.Next() {
-			errs = multierr.Append(errs, validate(iter.Key()))
-			errs = multierr.Append(errs, validate(iter.Value()))
+			errs = append(errs, validate(iter.Key()))
+			errs = append(errs, validate(iter.Value()))
 		}
-		return errs
+		return errors.Join(errs...)
 	default:
 		return callValidateIfPossible(v)
 	}

diff --git a/component/go.mod b/component/go.mod
@@ -9,7 +9,6 @@ require (
 	go.opentelemetry.io/collector/pdata v1.0.0-rcv0015
 	go.opentelemetry.io/otel/metric v1.19.0
 	go.opentelemetry.io/otel/trace v1.19.0
-	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.26.0
 )
 
@@ -26,6 +25,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.opentelemetry.io/collector/featuregate v1.0.0-rcv0015 // indirect
 	go.opentelemetry.io/otel v1.19.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
 	golang.org/x/text v0.13.0 // indirect

diff --git a/confmap/go.mod b/confmap/go.mod
@@ -9,7 +9,6 @@ require (
 	github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4
 	github.com/stretchr/testify v1.8.4
 	go.opentelemetry.io/collector/featuregate v1.0.0-rcv0015
-	go.uber.org/multierr v1.11.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 

diff --git a/confmap/go.sum b/confmap/go.sum
@@ -21,8 +21,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
-go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

diff --git a/confmap/resolver.go b/confmap/resolver.go
@@ -10,8 +10,6 @@ import (
 	"regexp"
 	"strings"
 
-	"go.uber.org/multierr"
-
 	"go.opentelemetry.io/collector/featuregate"
 )
 
@@ -175,26 +173,26 @@ func (mr *Resolver) Watch() <-chan error {
 func (mr *Resolver) Shutdown(ctx context.Context) error {
 	close(mr.watcher)
 
-	var errs error
-	errs = multierr.Append(errs, mr.closeIfNeeded(ctx))
+	var errs []error
+	errs = append(errs, mr.closeIfNeeded(ctx))
 	for _, p := range mr.providers {
-		errs = multierr.Append(errs, p.Shutdown(ctx))
+		errs = append(errs, p.Shutdown(ctx))
 	}
 
-	return errs
+	return errors.Join(errs...)
 }
 
 func (mr *Resolver) onChange(event *ChangeEvent) {
 	mr.watcher <- event.Error
 }
 
 func (mr *Resolver) closeIfNeeded(ctx context.Context) error {
-	var err error
+	var errs []error
 	for _, ret := range mr.closers {
-		err = multierr.Append(err, ret(ctx))
+		errs = append(errs, ret(ctx))
 	}
 	mr.closers = nil
-	return err
+	return errors.Join(errs...)
 }
 
 func (mr *Resolver) retrieveValue(ctx context.Context, uri location) (*Retrieved, error) {

diff --git a/consumer/go.mod b/consumer/go.mod
@@ -17,7 +17,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/sys v0.12.0 // indirect
 	golang.org/x/text v0.13.0 // indirect

diff --git a/consumer/go.sum b/consumer/go.sum
@@ -31,8 +31,6 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
-go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

diff --git a/exporter/exporterhelper/obsexporter.go b/exporter/exporterhelper/obsexporter.go
@@ -5,14 +5,14 @@ package exporterhelper // import "go.opentelemetry.io/collector/exporter/exporte
 
 import (
 	"context"
+	"errors"
 
 	"go.opencensus.io/stats"
 	"go.opencensus.io/tag"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/trace"
-	"go.uber.org/multierr"
 	"go.uber.org/zap"
 
 	"go.opentelemetry.io/collector/component"
@@ -82,45 +82,46 @@ func (or *ObsReport) createOtelMetrics(cfg ObsReportSettings) error {
 	}
 	meter := cfg.ExporterCreateSettings.MeterProvider.Meter(exporterScope)
 
-	var errors, err error
+	var errs []error
+	var err error
 
 	or.sentSpans, err = meter.Int64Counter(
 		obsmetrics.ExporterPrefix+obsmetrics.SentSpansKey,
 		metric.WithDescription("Number of spans successfully sent to destination."),
 		metric.WithUnit("1"))
-	errors = multierr.Append(errors, err)
+	errs = append(errs, err)
 
 	or.failedToSendSpans, err = meter.Int64Counter(
 		obsmetrics.ExporterPrefix+obsmetrics.FailedToSendSpansKey,
 		metric.WithDescription("Number of spans in failed attempts to send to destination."),
 		metric.WithUnit("1"))
-	errors = multierr.Append(errors, err)
+	errs = append(errs, err)
 
 	or.sentMetricPoints, err = meter.Int64Counter(
 		obsmetrics.ExporterPrefix+obsmetrics.SentMetricPointsKey,
 		metric.WithDescription("Number of metric points successfully sent to destination."),
 		metric.WithUnit("1"))
-	errors = multierr.Append(errors, err)
+	errs = append(errs, err)
 
 	or.failedToSendMetricPoints, err = meter.Int64Counter(
 		obsmetrics.ExporterPrefix+obsmetrics.FailedToSendMetricPointsKey,
 		metric.WithDescription("Number of metric points in failed attempts to send to destination."),
 		metric.WithUnit("1"))
-	errors = multierr.Append(errors, err)
+	errs = append(errs, err)
 
 	or.sentLogRecords, err = meter.Int64Counter(
 		obsmetrics.ExporterPrefix+obsmetrics.SentLogRecordsKey,
 		metric.WithDescription("Number of log record successfully sent to destination."),
 		metric.WithUnit("1"))
-	errors = multierr.Append(errors, err)
+	errs = append(errs, err)
 
 	or.failedToSendLogRecords, err = meter.Int64Counter(
 		obsmetrics.ExporterPrefix+obsmetrics.FailedToSendLogRecordsKey,
 		metric.WithDescription("Number of log records in failed attempts to send to destination."),
 		metric.WithUnit("1"))
-	errors = multierr.Append(errors, err)
+	errs = append(errs, err)
 
-	return errors
+	return errors.Join(errs...)
 }
 
 // StartTracesOp is called at the start of an Export operation.

diff --git a/exporter/go.mod b/exporter/go.mod
@@ -16,7 +16,6 @@ require (
 	go.opentelemetry.io/otel/metric v1.19.0
 	go.opentelemetry.io/otel/sdk v1.19.0
 	go.opentelemetry.io/otel/trace v1.19.0
-	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.26.0
 	golang.org/x/sys v0.12.0
 )
@@ -53,6 +52,7 @@ require (
 	go.opentelemetry.io/collector/featuregate v1.0.0-rcv0015 // indirect
 	go.opentelemetry.io/otel/exporters/prometheus v0.42.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.19.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/net v0.15.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod
@@ -21,7 +21,6 @@ require (
 )
 
 require (
-	cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
@@ -113,3 +112,5 @@ retract (
 replace go.opentelemetry.io/collector/connector => ../../connector
 
 replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
+
+replace cloud.google.com/go => cloud.google.com/go v0.110.2