From c1f5a445fcf9613cb0109627e3871d749e95834c Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 30 May 2024 10:30:48 +0200 Subject: [PATCH] Use Go 1.20 error joining instead of multierr This still allows the errors to be unwrapped, and drops the direct dependency on multierr. Signed-off-by: Stephen Kitt --- server/embed/config.go | 3 +-- server/go.mod | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/embed/config.go b/server/embed/config.go index 6a4dac475..17b88e11d 100644 --- a/server/embed/config.go +++ b/server/embed/config.go @@ -30,7 +30,6 @@ import ( "sync" "time" - "go.uber.org/multierr" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" "google.golang.org/grpc" @@ -1140,7 +1139,7 @@ func (cfg *Config) GetDNSClusterNames() ([]string, error) { zap.Error(httpCerr), ) - return clusterStrs, multierr.Combine(cerr, httpCerr) + return clusterStrs, errors.Join(cerr, httpCerr) } func (cfg *Config) InitialClusterFromName(name string) (ret string) { diff --git a/server/go.mod b/server/go.mod index eecb3e44e..2ef0a9148 100644 --- a/server/go.mod +++ b/server/go.mod @@ -36,7 +36,6 @@ require ( go.opentelemetry.io/otel v1.27.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 go.opentelemetry.io/otel/sdk v1.27.0 - go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 golang.org/x/crypto v0.23.0 golang.org/x/net v0.25.0 @@ -66,6 +65,7 @@ require ( go.opentelemetry.io/otel/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect + go.uber.org/multierr v1.11.0 // indirect golang.org/x/sys v0.20.0 // indirect golang.org/x/text v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect