diff --git a/eth/protocols/eth/broadcast.go b/eth/protocols/eth/broadcast.go index 55284ede7a..d90a83c704 100644 --- a/eth/protocols/eth/broadcast.go +++ b/eth/protocols/eth/broadcast.go @@ -27,11 +27,11 @@ import ( var ( broadcastSendTxsLenGauge = metrics.NewRegisteredGauge("eth/protocols/eth/broadcast/direct/txs", nil) - broadcastSendTxsFailCounter = metrics.NewRegisteredCounter("eth/protocols/eth/broadcast/direct/fail", nil) + broadcastSendTxsFailMeter = metrics.NewRegisteredMeter("eth/protocols/eth/broadcast/direct/fail", nil) broadcastSendHashesLenGauge = metrics.NewRegisteredGauge("eth/protocols/eth/broadcast/direct/hashes", nil) broadcastSendQueueLenGauge = metrics.NewRegisteredGauge("eth/protocols/eth/broadcast/direct/queue", nil) broadcastAnnoTxsLenGauge = metrics.NewRegisteredGauge("eth/protocols/eth/broadcast/anno/txs", nil) - broadcastAnnoTxsFailCounter = metrics.NewRegisteredCounter("eth/protocols/eth/broadcast/anno/fail", nil) + broadcastAnnoTxsFailMeter = metrics.NewRegisteredMeter("eth/protocols/eth/broadcast/anno/fail", nil) broadcastAnnoHashesLenGauge = metrics.NewRegisteredGauge("eth/protocols/eth/broadcast/anno/hashes", nil) broadcastAnnoQueueLenGauge = metrics.NewRegisteredGauge("eth/protocols/eth/broadcast/anno/queue", nil) ) @@ -109,7 +109,7 @@ func (p *Peer) broadcastTransactions() { broadcastSendTxsLenGauge.Update(int64(len(txs))) if err := p.SendTransactions(txs); err != nil { log.Debug("Sending transactions", "count", len(txs), "err", err) - broadcastSendTxsFailCounter.Inc(1) + broadcastSendTxsFailMeter.Mark(1) fail <- err return } @@ -184,7 +184,7 @@ func (p *Peer) announceTransactions() { broadcastAnnoTxsLenGauge.Update(int64(len(pending))) if err := p.sendPooledTransactionHashes(pending); err != nil { log.Debug("Sending transaction announcements", "count", len(pending), "err", err) - broadcastAnnoTxsFailCounter.Inc(1) + broadcastAnnoTxsFailMeter.Mark(1) fail <- err return } diff --git a/eth/protocols/eth/handlers.go b/eth/protocols/eth/handlers.go index 71731ebf58..367d9a4dbc 100644 --- a/eth/protocols/eth/handlers.go +++ b/eth/protocols/eth/handlers.go @@ -29,17 +29,17 @@ import ( ) var ( - newPooledTxHashesFailCounter = metrics.NewRegisteredCounter("eth/protocols/eth/handlers/newpooledtxhashes/fail", nil) + newPooledTxHashesFailMeter = metrics.NewRegisteredMeter("eth/protocols/eth/handlers/newpooledtxhashes/fail", nil) newPooledTxHashesLenGauge = metrics.NewRegisteredGauge("eth/protocols/eth/handlers/newpooledtxhashes/len", nil) - getPooledTxsFailCounter = metrics.NewRegisteredCounter("eth/protocols/eth/handlers/getpooledtxs/fail", nil) + getPooledTxsFailMeter = metrics.NewRegisteredMeter("eth/protocols/eth/handlers/getpooledtxs/fail", nil) getPooledTxsQueryLenGauge = metrics.NewRegisteredGauge("eth/protocols/eth/handlers/getpooledtxs/query", nil) getPooledTxsRetrievedLenGauge = metrics.NewRegisteredGauge("eth/protocols/eth/handlers/getpooledtxs/retrieved", nil) - handleTxsFailCounter = metrics.NewRegisteredCounter("eth/protocols/eth/handlers/handletxs/fail", nil) + handleTxsFailMeter = metrics.NewRegisteredMeter("eth/protocols/eth/handlers/handletxs/fail", nil) handleTxsLenGauge = metrics.NewRegisteredGauge("eth/protocols/eth/handlers/handletxs/len", nil) - handleTxsNilCounter = metrics.NewRegisteredCounter("eth/protocols/eth/handlers/handletxs/nil", nil) - pooledTxs66FailCounter = metrics.NewRegisteredCounter("eth/protocols/eth/handlers/pooledtxs66/fail", nil) + handleTxsNilMeter = metrics.NewRegisteredMeter("eth/protocols/eth/handlers/handletxs/nil", nil) + pooledTxs66FailMeter = metrics.NewRegisteredMeter("eth/protocols/eth/handlers/pooledtxs66/fail", nil) pooledTxs66LenGauge = metrics.NewRegisteredGauge("eth/protocols/eth/handlers/pooledtxs66/len", nil) - pooledTxs66NilCounter = metrics.NewRegisteredCounter("eth/protocols/eth/handlers/pooledtxs66/nil", nil) + pooledTxs66NilMeter = metrics.NewRegisteredMeter("eth/protocols/eth/handlers/pooledtxs66/nil", nil) ) // handleGetBlockHeaders66 is the eth/66 version of handleGetBlockHeaders @@ -339,7 +339,7 @@ func handleNewPooledTransactionHashes(backend Backend, msg Decoder, peer *Peer) ann := new(NewPooledTransactionHashesPacket) if err := msg.Decode(ann); err != nil { log.Debug("Failed to decode `NewPooledTransactionHashesPacket`", "peer", peer.String(), "err", err) - newPooledTxHashesFailCounter.Inc(1) + newPooledTxHashesFailMeter.Mark(1) return fmt.Errorf("%w: message %v: %v", errDecode, msg, err) } // Schedule all the unknown hashes for retrieval @@ -356,7 +356,7 @@ func handleGetPooledTransactions66(backend Backend, msg Decoder, peer *Peer) err var query GetPooledTransactionsPacket66 if err := msg.Decode(&query); err != nil { log.Debug("Failed to decode `GetPooledTransactionsPacket66`", "peer", peer.String(), "err", err) - getPooledTxsFailCounter.Inc(1) + getPooledTxsFailMeter.Mark(1) return fmt.Errorf("%w: message %v: %v", errDecode, msg, err) } hashes, txs := answerGetPooledTransactions(backend, query.GetPooledTransactionsPacket, peer) @@ -402,7 +402,7 @@ func handleTransactions(backend Backend, msg Decoder, peer *Peer) error { // Transactions can be processed, parse all of them and deliver to the pool var txs TransactionsPacket if err := msg.Decode(&txs); err != nil { - handleTxsFailCounter.Inc(1) + handleTxsFailMeter.Mark(1) log.Debug("Failed to decode `TransactionsPacket`", "peer", peer.String(), "err", err) return fmt.Errorf("%w: message %v: %v", errDecode, msg, err) } @@ -411,7 +411,7 @@ func handleTransactions(backend Backend, msg Decoder, peer *Peer) error { for i, tx := range txs { // Validate and mark the remote transaction if tx == nil { - handleTxsNilCounter.Inc(1) + handleTxsNilMeter.Mark(1) log.Debug("handleTransactions: transaction is nil", "peer", peer.String(), "i", i) return fmt.Errorf("%w: transaction %d is nil", errDecode, i) } @@ -428,7 +428,7 @@ func handlePooledTransactions66(backend Backend, msg Decoder, peer *Peer) error // Transactions can be processed, parse all of them and deliver to the pool var txs PooledTransactionsPacket66 if err := msg.Decode(&txs); err != nil { - pooledTxs66FailCounter.Inc(1) + pooledTxs66FailMeter.Mark(1) log.Debug("Failed to decode `PooledTransactionsPacket66`", "peer", peer.String(), "err", err) return fmt.Errorf("%w: message %v: %v", errDecode, msg, err) } @@ -437,7 +437,7 @@ func handlePooledTransactions66(backend Backend, msg Decoder, peer *Peer) error for i, tx := range txs.PooledTransactionsPacket { // Validate and mark the remote transaction if tx == nil { - pooledTxs66NilCounter.Inc(1) + pooledTxs66NilMeter.Mark(1) log.Debug("handlePooledTransactions: transaction is nil", "peer", peer.String(), "i", i) return fmt.Errorf("%w: transaction %d is nil", errDecode, i) } diff --git a/params/version.go b/params/version.go index 913407c954..222269799f 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 5 // Major version component of the current release VersionMinor = 7 // Minor version component of the current release - VersionPatch = 4 // Patch version component of the current release + VersionPatch = 5 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string )