From bbc42f5279900d5c83b8577fdd21b2245b8c0a2a Mon Sep 17 00:00:00 2001 From: kant Date: Thu, 30 Nov 2023 17:41:32 -0800 Subject: [PATCH] adding block size metric in both worker and clique.go files --- consensus/clique/clique.go | 2 -- miner/worker.go | 10 ++++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index 879427ec06..9118edce07 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -589,8 +589,6 @@ func (c *Clique) FinalizeAndAssemble(chain consensus.ChainHeaderReader, header * // Assemble and return the final block for sealing. block := types.NewBlock(header, txs, nil, receipts, trie.NewStackTrie(nil)) - fmt.Println("*************CLIQUE*************************************") - fmt.Printf("clique.go block_size_in_bytes: %v\n", int64(block.Size())) if metrics.Enabled { metrics.GetOrRegisterGauge(blockSizeGaugeName, nil).Update(int64(block.Size())) } diff --git a/miner/worker.go b/miner/worker.go index ee84ee8282..9788e60780 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -19,6 +19,7 @@ package miner import ( "errors" "fmt" + "github.com/ethereum/go-ethereum/metrics" "math/big" "sync" "sync/atomic" @@ -77,6 +78,8 @@ var ( errBlockInterruptedByNewHead = errors.New("new head arrived while building block") errBlockInterruptedByRecommit = errors.New("recommit interrupt while building block") errBlockInterruptedByTimeout = errors.New("timeout while building block") + + blockSizeGaugeName = "clique/block_size_in_bytes" ) // environment is the worker's current environment and holds all @@ -1122,10 +1125,9 @@ func (w *worker) commit(env *environment, interval func(), update bool, start ti env := env.copy() // Withdrawals are set to nil here, because this is only called in PoW. block, err := w.engine.FinalizeAndAssemble(w.chain, env.header, env.state, env.txs, nil, env.receipts, nil) - //log.PrintOrigins(true) - //log.Info(fmt.Sprintf("block_size_in_bytes: %v", int64(block.Size()))) - fmt.Println("********************************************************") - fmt.Printf("block_size_in_bytes: %v\n", int64(block.Size())) + if metrics.Enabled { + metrics.GetOrRegisterGauge(blockSizeGaugeName, nil).Update(int64(block.Size())) + } if err != nil { return err }