More places where errors.Join was used

Signed-off-by: Pablo Baeyens <pablo.baeyens@datadoghq.com>

cmd/agent/app/reporter/grpc/collector_proxy.go

@@ -15,7 +15,6 @@
 package grpc
 
 import (
-	"errors"
 	"io"
 
 	"go.uber.org/zap"
@@ -25,6 +24,7 @@ import (
 	grpcManager "github.com/jaegertracing/jaeger/cmd/agent/app/configmanager/grpc"
 	"github.com/jaegertracing/jaeger/cmd/agent/app/reporter"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
+	"github.com/jaegertracing/jaeger/pkg/multierror"
 )
 
 // ProxyBuilder holds objects communicating with collector
@@ -74,9 +74,9 @@ func (b ProxyBuilder) GetManager() configmanager.ClientConfigManager {
 
 // Close closes connections used by proxy.
 func (b ProxyBuilder) Close() error {
-	return errors.Join(
+	return multierror.Wrap([]error{
 		b.reporter.Close(),
 		b.tlsCloser.Close(),
 		b.GetConn().Close(),
-	)
+	})
 }

pkg/config/tlscfg/cert_watcher.go

@@ -17,7 +17,6 @@ package tlscfg
 import (
 	"crypto/tls"
 	"crypto/x509"
-	"errors"
 	"fmt"
 	"io"
 	"path/filepath"
@@ -26,6 +25,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/pkg/fswatcher"
+	"github.com/jaegertracing/jaeger/pkg/multierror"
 )
 
 const (
@@ -84,7 +84,7 @@ func (w *certWatcher) Close() error {
 	for _, w := range w.watchers {
 		errs = append(errs, w.Close())
 	}
-	return errors.Join(errs...)
+	return multierror.Wrap(errs)
 }
 
 func (w *certWatcher) certificate() *tls.Certificate {