Replace usage of utils.Err with errors.Join (#3167)

Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>
ava-labs · Jul 2, 2024 · e20115c · e20115c
1 parent deeab24
commit e20115c
Show file tree

Hide file tree

Showing 55 changed files with 114 additions and 139 deletions.
diff --git a/api/server/metrics.go b/api/server/metrics.go
@@ -4,12 +4,11 @@
 package server
 
 import (
+	"errors"
 	"net/http"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
-
-	"github.com/ava-labs/avalanchego/utils"
 )
 
 type metrics struct {
@@ -43,7 +42,7 @@ func newMetrics(registerer prometheus.Registerer) (*metrics, error) {
 		),
 	}
 
-	err := utils.Err(
+	err := errors.Join(
 		registerer.Register(m.numProcessing),
 		registerer.Register(m.numCalls),
 		registerer.Register(m.totalDuration),

diff --git a/cache/metercacher/metrics.go b/cache/metercacher/metrics.go
@@ -4,9 +4,9 @@
 package metercacher
 
 import (
-	"github.com/prometheus/client_golang/prometheus"
+	"errors"
 
-	"github.com/ava-labs/avalanchego/utils"
+	"github.com/prometheus/client_golang/prometheus"
 )
 
 const (
@@ -78,7 +78,7 @@ func newMetrics(
 			Help:      "fraction of cache filled",
 		}),
 	}
-	return m, utils.Err(
+	return m, errors.Join(
 		reg.Register(m.getCount),
 		reg.Register(m.getTime),
 		reg.Register(m.putCount),

diff --git a/database/leveldb/metrics.go b/database/leveldb/metrics.go
@@ -4,12 +4,11 @@
 package leveldb
 
 import (
+	"errors"
 	"strconv"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/syndtr/goleveldb/leveldb"
-
-	"github.com/ava-labs/avalanchego/utils"
 )
 
 var levelLabels = []string{"level"}
@@ -161,7 +160,7 @@ func newMetrics(reg prometheus.Registerer) (metrics, error) {
 		currentStats: &leveldb.DBStats{},
 	}
 
-	err := utils.Err(
+	err := errors.Join(
 		reg.Register(m.writesDelayedCount),
 		reg.Register(m.writesDelayedDuration),
 		reg.Register(m.writeIsDelayed),

diff --git a/database/meterdb/db.go b/database/meterdb/db.go
@@ -5,12 +5,12 @@ package meterdb
 
 import (
 	"context"
+	"errors"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/ava-labs/avalanchego/database"
-	"github.com/ava-labs/avalanchego/utils"
 )
 
 const methodLabel = "method"
@@ -125,7 +125,7 @@ func New(
 			methodLabels,
 		),
 	}
-	return meterDB, utils.Err(
+	return meterDB, errors.Join(
 		reg.Register(meterDB.calls),
 		reg.Register(meterDB.duration),
 		reg.Register(meterDB.size),

diff --git a/genesis/config.go b/genesis/config.go
@@ -177,7 +177,7 @@ func init() {
 	unparsedFujiConfig := UnparsedConfig{}
 	unparsedLocalConfig := UnparsedConfig{}
 
-	err := utils.Err(
+	err := errors.Join(
 		json.Unmarshal(mainnetGenesisConfigJSON, &unparsedMainnetConfig),
 		json.Unmarshal(fujiGenesisConfigJSON, &unparsedFujiConfig),
 		json.Unmarshal(localGenesisConfigJSON, &unparsedLocalConfig),

diff --git a/indexer/index.go b/indexer/index.go
@@ -15,7 +15,6 @@ import (
 	"github.com/ava-labs/avalanchego/database/versiondb"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow"
-	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/timer/mockable"
 )
@@ -99,7 +98,7 @@ func newIndex(
 
 // Close this index
 func (i *index) Close() error {
-	return utils.Err(
+	return errors.Join(
 		i.indexToContainer.Close(),
 		i.containerToIndex.Close(),
 		i.vDB.Close(),

diff --git a/message/messages.go b/message/messages.go
@@ -13,7 +13,6 @@ import (
 
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/proto/pb/p2p"
-	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/compression"
 	"github.com/ava-labs/avalanchego/utils/constants"
 	"github.com/ava-labs/avalanchego/utils/logging"
@@ -178,7 +177,7 @@ func newMsgBuilder(
 
 		maxMessageTimeout: maxMessageTimeout,
 	}
-	return mb, utils.Err(
+	return mb, errors.Join(
 		metrics.Register(mb.count),
 		metrics.Register(mb.duration),
 	)

diff --git a/network/ip_tracker.go b/network/ip_tracker.go
@@ -5,14 +5,14 @@ package network
 
 import (
 	"crypto/rand"
+	"errors"
 	"sync"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/zap"
 
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow/validators"
-	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/bloom"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
 	"github.com/ava-labs/avalanchego/utils/ips"
@@ -63,7 +63,7 @@ func newIPTracker(
 		connected:            make(map[ids.NodeID]*ips.ClaimedIPPort),
 		gossipableIndices:    make(map[ids.NodeID]int),
 	}
-	err = utils.Err(
+	err = errors.Join(
 		registerer.Register(tracker.numTrackedIPs),
 		registerer.Register(tracker.numGossipableIPs),
 	)

diff --git a/network/metrics.go b/network/metrics.go
@@ -4,14 +4,14 @@
 package network
 
 import (
+	"errors"
 	"sync"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/network/peer"
-	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/set"
 )
 
@@ -135,7 +135,7 @@ func newMetrics(
 		peerConnectedStartTimes: make(map[ids.NodeID]float64),
 	}
 
-	err := utils.Err(
+	err := errors.Join(
 		registerer.Register(m.numTracked),
 		registerer.Register(m.numPeers),
 		registerer.Register(m.numSubnetPeers),

diff --git a/network/p2p/gossip/gossip.go b/network/p2p/gossip/gossip.go
@@ -17,7 +17,6 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/network/p2p"
 	"github.com/ava-labs/avalanchego/snow/engine/common"
-	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/bloom"
 	"github.com/ava-labs/avalanchego/utils/buffer"
 	"github.com/ava-labs/avalanchego/utils/logging"
@@ -150,7 +149,7 @@ func NewMetrics(
 			typeLabels,
 		),
 	}
-	err := utils.Err(
+	err := errors.Join(
 		metrics.Register(m.count),
 		metrics.Register(m.bytes),
 		metrics.Register(m.tracking),

diff --git a/network/p2p/network.go b/network/p2p/network.go
@@ -6,6 +6,7 @@ package p2p
 import (
 	"context"
 	"encoding/binary"
+	"errors"
 	"strconv"
 	"sync"
 	"time"
@@ -15,7 +16,6 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow/engine/common"
 	"github.com/ava-labs/avalanchego/snow/validators"
-	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/set"
 	"github.com/ava-labs/avalanchego/version"
@@ -81,7 +81,7 @@ func NewNetwork(
 		),
 	}
 
-	err := utils.Err(
+	err := errors.Join(
 		registerer.Register(metrics.msgTime),
 		registerer.Register(metrics.msgCount),
 	)

diff --git a/network/p2p/peer_tracker.go b/network/p2p/peer_tracker.go
@@ -4,6 +4,7 @@
 package p2p
 
 import (
+	"errors"
 	"math"
 	"math/rand"
 	"sync"
@@ -13,7 +14,6 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/ava-labs/avalanchego/ids"
-	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/heap"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/set"
@@ -113,7 +113,7 @@ func NewPeerTracker(
 		},
 	}
 
-	err := utils.Err(
+	err := errors.Join(
 		registerer.Register(t.metrics.numTrackedPeers),
 		registerer.Register(t.metrics.numResponsivePeers),
 		registerer.Register(t.metrics.averageBandwidth),

diff --git a/network/peer/metrics.go b/network/peer/metrics.go
@@ -4,12 +4,12 @@
 package peer
 
 import (
+	"errors"
 	"strconv"
 
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/ava-labs/avalanchego/message"
-	"github.com/ava-labs/avalanchego/utils"
 )
 
 const (
@@ -82,7 +82,7 @@ func NewMetrics(registerer prometheus.Registerer) (*Metrics, error) {
 			ioOpLabels,
 		),
 	}
-	return m, utils.Err(
+	return m, errors.Join(
 		registerer.Register(m.ClockSkewCount),
 		registerer.Register(m.ClockSkewSum),
 		registerer.Register(m.NumFailedToParse),

diff --git a/network/throttling/inbound_resource_throttler.go b/network/throttling/inbound_resource_throttler.go
@@ -5,6 +5,7 @@ package throttling
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"sync"
 	"time"
@@ -13,7 +14,6 @@ import (
 
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow/networking/tracker"
-	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/timer/mockable"
 )
 
@@ -80,7 +80,7 @@ func newSystemThrottlerMetrics(namespace string, reg prometheus.Registerer) (*sy
 			Help:      "Number of nodes we're waiting to read a message from because their usage is too high",
 		}),
 	}
-	err := utils.Err(
+	err := errors.Join(
 		reg.Register(m.totalWaits),
 		reg.Register(m.totalNoWaits),
 		reg.Register(m.awaitingAcquire),

diff --git a/network/throttling/outbound_msg_throttler.go b/network/throttling/outbound_msg_throttler.go
@@ -4,13 +4,14 @@
 package throttling
 
 import (
+	"errors"
+
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/zap"
 
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/message"
 	"github.com/ava-labs/avalanchego/snow/validators"
-	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/constants"
 	"github.com/ava-labs/avalanchego/utils/logging"
 )
@@ -196,7 +197,7 @@ func (m *outboundMsgThrottlerMetrics) initialize(registerer prometheus.Registere
 		Name: "throttler_outbound_awaiting_release",
 		Help: "Number of messages waiting to be sent",
 	})
-	return utils.Err(
+	return errors.Join(
 		registerer.Register(m.acquireSuccesses),
 		registerer.Register(m.acquireFailures),
 		registerer.Register(m.remainingAtLargeBytes),

diff --git a/node/node.go b/node/node.go
@@ -1217,7 +1217,7 @@ func (n *Node) initVMs() error {
 
 	// Register the VMs that Avalanche supports
 	eUpgradeTime := version.GetEUpgradeTime(n.Config.NetworkID)
-	err := utils.Err(
+	err := errors.Join(
 		n.VMManager.RegisterFactory(context.TODO(), constants.PlatformVMID, &platformvm.Factory{
 			Config: platformconfig.Config{
 				Chains:                    n.chainManager,

diff --git a/snow/engine/avalanche/bootstrap/metrics.go b/snow/engine/avalanche/bootstrap/metrics.go
@@ -4,9 +4,9 @@
 package bootstrap
 
 import (
-	"github.com/prometheus/client_golang/prometheus"
+	"errors"
 
-	"github.com/ava-labs/avalanchego/utils"
+	"github.com/prometheus/client_golang/prometheus"
 )
 
 type metrics struct {
@@ -33,7 +33,7 @@ func (m *metrics) Initialize(registerer prometheus.Registerer) error {
 		Help: "Number of transactions accepted during bootstrapping",
 	})
 
-	return utils.Err(
+	return errors.Join(
 		registerer.Register(m.numFetchedVts),
 		registerer.Register(m.numAcceptedVts),
 		registerer.Register(m.numFetchedTxs),

diff --git a/snow/engine/avalanche/bootstrap/queue/jobs.go b/snow/engine/avalanche/bootstrap/queue/jobs.go
@@ -5,6 +5,7 @@ package queue
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
@@ -16,7 +17,6 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow"
 	"github.com/ava-labs/avalanchego/snow/engine/common"
-	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/set"
 	"github.com/ava-labs/avalanchego/utils/timer"
 )
@@ -424,7 +424,7 @@ func (jm *JobsWithMissing) cleanRunnableStack(ctx context.Context) error {
 		}
 	}
 
-	return utils.Err(
+	return errors.Join(
 		runnableJobsIter.Error(),
 		jm.Commit(),
 	)