replace multierr with errors.Join (#1224)

Author: gammazero

dht.go

@@ -2,6 +2,7 @@ package dht
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"math"
 	"math/rand"
@@ -34,7 +35,6 @@ import (
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/multiformats/go-base32"
 	ma "github.com/multiformats/go-multiaddr"
-	"go.uber.org/multierr"
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/proto"
 )
@@ -865,22 +865,26 @@ func (dht *IpfsDHT) Close() error {
 	dht.cancel()
 	dht.wg.Wait()
 
-	var wg sync.WaitGroup
+	errc := make(chan error)
 	closes := [...]func() error{
 		dht.rtRefreshManager.Close,
 		dht.providerStore.Close,
 	}
-	var errors [len(closes)]error
-	wg.Add(len(errors))
-	for i, c := range closes {
-		go func(i int, c func() error) {
-			defer wg.Done()
-			errors[i] = c()
-		}(i, c)
+	for _, c := range closes {
+		go func(c func() error) {
+			errc <- c()
+		}(c)
 	}
-	wg.Wait()
 
-	return multierr.Combine(errors[:]...)
+	var errs []error
+	for range len(closes) {
+		err := <-errc
+		if err != nil {
+			errs = append(errs, err)
+		}
+	}
+
+	return errors.Join(errs...)
 }
 
 func mkDsKey(s string) ds.Key {

dual/dual.go

@@ -4,6 +4,7 @@ package dual
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"sync"
 
@@ -22,7 +23,6 @@ import (
 	"github.com/libp2p/go-libp2p/core/routing"
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"
-	"go.uber.org/multierr"
 )
 
 const (
@@ -311,10 +311,11 @@ func combineErrors(erra, errb error) error {
 	// table), return the other.
 	if erra == kb.ErrLookupFailure {
 		return errb
-	} else if errb == kb.ErrLookupFailure {
+	}
+	if errb == kb.ErrLookupFailure {
 		return erra
 	}
-	return multierr.Append(erra, errb)
+	return errors.Join(erra, errb)
 }
 
 // Bootstrap allows callers to hint to the routing system to get into a

go.mod

@@ -35,7 +35,6 @@ require (
 	go.opentelemetry.io/otel v1.39.0
 	go.opentelemetry.io/otel/metric v1.39.0
 	go.opentelemetry.io/otel/trace v1.39.0
-	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.1
 	gonum.org/v1/gonum v0.17.0
 	google.golang.org/protobuf v1.36.11
@@ -136,6 +135,7 @@ require (
 	go.uber.org/dig v1.19.0 // indirect
 	go.uber.org/fx v1.24.0 // indirect
 	go.uber.org/mock v0.5.2 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	golang.org/x/crypto v0.47.0 // indirect
 	golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect

rtrefresh/rt_refresh_manager.go

@@ -2,6 +2,7 @@ package rtrefresh
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"sync"
 	"sync/atomic"
@@ -16,7 +17,6 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"
-	"go.uber.org/multierr"
 )
 
 var logger = logging.Logger("dht/RtRefreshManager")
@@ -241,10 +241,10 @@ func (r *RtRefreshManager) doRefresh(ctx context.Context, forceRefresh bool) err
 	ctx, span := internal.StartSpan(ctx, "RefreshManager.doRefresh")
 	defer span.End()
 
-	var merr error
+	var errs []error
 
 	if err := r.queryForSelf(ctx); err != nil {
-		merr = multierr.Append(merr, err)
+		errs = append(errs, err)
 	}
 
 	refreshCpls := r.rt.GetTrackedCplsForRefresh()
@@ -261,7 +261,7 @@ func (r *RtRefreshManager) doRefresh(ctx context.Context, forceRefresh bool) err
 	for c := range refreshCpls {
 		cpl := uint(c)
 		if err := rfnc(cpl); err != nil {
-			merr = multierr.Append(merr, err)
+			errs = append(errs, err)
 		} else {
 			// If we see a gap at a Cpl in the Routing table, we ONLY refresh up until the maximum cpl we
 			// have in the Routing Table OR (2 * (Cpl+ 1) with the gap), whichever is smaller.
@@ -274,10 +274,10 @@ func (r *RtRefreshManager) doRefresh(ctx context.Context, forceRefresh bool) err
 				lastCpl := min(2*(c+1), len(refreshCpls)-1)
 				for i := c + 1; i < lastCpl+1; i++ {
 					if err := rfnc(uint(i)); err != nil {
-						merr = multierr.Append(merr, err)
+						errs = append(errs, err)
 					}
 				}
-				return merr
+				return errors.Join(errs...)
 			}
 		}
 	}
@@ -288,7 +288,7 @@ func (r *RtRefreshManager) doRefresh(ctx context.Context, forceRefresh bool) err
 		return ctx.Err()
 	}
 
-	return merr
+	return errors.Join(errs...)
 }
 
 func min(a int, b int) int {