forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 19:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core, eth/catalyst: update spanEnd to use error pointer

Browse source
This commit is contained in:
jonny rhea 2026-02-14 11:47:06 -06:00
parent adb8e8fb23
commit e68c5b213d
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/blockchain.go
View file

@ -2168,7 +2168,7 @@ func (bc *BlockChain) ProcessBlock(ctx context.Context, parentRoot common.Hash,
pstart := time.Now()
pctx, _, spanEnd := telemetry.StartSpan(ctx, "bc.processor.Process")
res, err := bc.processor.Process(pctx, block, statedb, bc.cfg.VmConfig)
spanEnd(err)
spanEnd(&err)
if err != nil {
bc.reportBadBlock(block, res, err)
return nil, err
@ -2178,7 +2178,7 @@ func (bc *BlockChain) ProcessBlock(ctx context.Context, parentRoot common.Hash,
vstart := time.Now()
_, _, spanEnd = telemetry.StartSpan(ctx, "bc.validator.ValidateState")
err = bc.validator.ValidateState(block, statedb, res, false)
spanEnd(err)
spanEnd(&err)
if err != nil {
bc.reportBadBlock(block, res, err)
return nil, err
@ -2662,7 +2662,7 @@ func (bc *BlockChain) reorg(oldHead *types.Header, newHead *types.Header) error
// procedure.
func (bc *BlockChain) InsertBlockWithoutSetHead(ctx context.Context, block *types.Block, makeWitness bool) (witness *stateless.Witness, err error) {
_, _, spanEnd := telemetry.StartSpan(ctx, "core.blockchain.InsertBlockWithoutSetHead")
defer spanEnd(err)
defer spanEnd(&err)
if !bc.chainmu.TryLock() {
return nil, errChainStopped
}

4
core/state_processor.go
View file

@ -108,7 +108,7 @@ func (p *StateProcessor) Process(ctx context.Context, block *types.Block, stated
telemetry.Int64Attribute("tx.index", int64(i)),
)
receipt, err := ApplyTransactionWithEVM(msg, gp, statedb, blockNumber, blockHash, context.Time, tx, usedGas, evm)
spanEnd(err)
spanEnd(&err)
if err != nil {
return nil, fmt.Errorf("could not apply tx %d [%v]: %w", i, tx.Hash().Hex(), err)
}
@ -134,7 +134,7 @@ func (p *StateProcessor) Process(ctx context.Context, block *types.Block, stated
// postExecution processes the post-execution system calls if Prague is enabled.
func postExecution(ctx context.Context, config *params.ChainConfig, block *types.Block, allLogs []*types.Log, evm *vm.EVM) (requests [][]byte, err error) {
_, _, spanEnd := telemetry.StartSpan(ctx, "core.postExecution")
defer spanEnd(err)
defer spanEnd(&err)
// Read requests if Prague is enabled.
if config.IsPrague(block.Number(), block.Time()) {
requests = [][]byte{}

2
eth/catalyst/api.go
View file

@ -719,7 +719,7 @@ func (api *ConsensusAPI) newPayload(ctx context.Context, params engine.Executabl
telemetry.Int64Attribute("tx.count", int64(len(params.Transactions))),
}
ctx, _, spanEnd := telemetry.StartSpan(ctx, "engine.newPayload", attrs...)
defer spanEnd(err)
defer spanEnd(&err)
api.newPayloadLock.Lock()
defer api.newPayloadLock.Unlock()