From 4c25fe978aca86005fb04936ba2d3b7ddf5b5e45 Mon Sep 17 00:00:00 2001 From: terence tsao Date: Thu, 4 Feb 2021 12:23:50 -0800 Subject: [PATCH] Update span names (#8394) Co-authored-by: Raul Jordan --- beacon-chain/core/state/transition.go | 22 +++++++++++----------- beacon-chain/state/stategen/replay.go | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/beacon-chain/core/state/transition.go b/beacon-chain/core/state/transition.go index 365a8b048a5c..bfbc4c2a25d0 100644 --- a/beacon-chain/core/state/transition.go +++ b/beacon-chain/core/state/transition.go @@ -71,7 +71,7 @@ func ExecuteStateTransition( return nil, errors.New("nil block") } - ctx, span := trace.StartSpan(ctx, "beacon-chain.ChainService.ExecuteStateTransition") + ctx, span := trace.StartSpan(ctx, "core.state.ExecuteStateTransition") defer span.End() var err error // Execute per slots transition. @@ -127,7 +127,7 @@ func ExecuteStateTransitionNoVerifyAnySig( return nil, nil, errors.New("nil block") } - ctx, span := trace.StartSpan(ctx, "beacon-chain.ChainService.ExecuteStateTransitionNoVerifyAttSigs") + ctx, span := trace.StartSpan(ctx, "core.state.ExecuteStateTransitionNoVerifyAttSigs") defer span.End() var err error @@ -173,7 +173,7 @@ func CalculateStateRoot( state *stateTrie.BeaconState, signed *ethpb.SignedBeaconBlock, ) ([32]byte, error) { - ctx, span := trace.StartSpan(ctx, "beacon-chain.ChainService.CalculateStateRoot") + ctx, span := trace.StartSpan(ctx, "core.state.CalculateStateRoot") defer span.End() if ctx.Err() != nil { traceutil.AnnotateError(span, ctx.Err()) @@ -229,7 +229,7 @@ func CalculateStateRoot( // previous_block_root = hash_tree_root(state.latest_block_header) // state.block_roots[state.slot % SLOTS_PER_HISTORICAL_ROOT] = previous_block_root func ProcessSlot(ctx context.Context, state *stateTrie.BeaconState) (*stateTrie.BeaconState, error) { - ctx, span := trace.StartSpan(ctx, "beacon-chain.ChainService.state.ProcessSlot") + ctx, span := trace.StartSpan(ctx, "core.state.ProcessSlot") defer span.End() span.AddAttributes(trace.Int64Attribute("slot", int64(state.Slot()))) @@ -274,7 +274,7 @@ func ProcessSlotsUsingNextSlotCache( parentState *stateTrie.BeaconState, parentRoot []byte, slot uint64) (*stateTrie.BeaconState, error) { - ctx, span := trace.StartSpan(ctx, "beacon-chain.ChainService.ProcessSlotsUsingNextSlotCache") + ctx, span := trace.StartSpan(ctx, "core.state.ProcessSlotsUsingNextSlotCache") defer span.End() // Check whether the parent state has been advanced by 1 slot in next slot cache. @@ -312,7 +312,7 @@ func ProcessSlotsUsingNextSlotCache( // state.slot += 1 // ] func ProcessSlots(ctx context.Context, state *stateTrie.BeaconState, slot uint64) (*stateTrie.BeaconState, error) { - ctx, span := trace.StartSpan(ctx, "beacon-chain.ChainService.ProcessSlots") + ctx, span := trace.StartSpan(ctx, "core.state.ProcessSlots") defer span.End() if state == nil { return nil, errors.New("nil state") @@ -416,7 +416,7 @@ func ProcessBlock( state *stateTrie.BeaconState, signed *ethpb.SignedBeaconBlock, ) (*stateTrie.BeaconState, error) { - ctx, span := trace.StartSpan(ctx, "beacon-chain.ChainService.state.ProcessBlock") + ctx, span := trace.StartSpan(ctx, "core.state.ProcessBlock") defer span.End() var err error @@ -447,7 +447,7 @@ func ProcessBlockNoVerifyAnySig( state *stateTrie.BeaconState, signed *ethpb.SignedBeaconBlock, ) (*bls.SignatureSet, *stateTrie.BeaconState, error) { - ctx, span := trace.StartSpan(ctx, "beacon-chain.ChainService.state.ProcessBlockNoVerifyAnySig") + ctx, span := trace.StartSpan(ctx, "core.state.ProcessBlockNoVerifyAnySig") defer span.End() state, err := b.ProcessBlockHeaderNoVerify(state, signed.Block) @@ -523,7 +523,7 @@ func ProcessOperationsNoVerifyAttsSigs( ctx context.Context, state *stateTrie.BeaconState, signedBeaconBlock *ethpb.SignedBeaconBlock) (*stateTrie.BeaconState, error) { - ctx, span := trace.StartSpan(ctx, "beacon-chain.ChainService.state.ProcessOperationsNoVerifyAttsSigs") + ctx, span := trace.StartSpan(ctx, "core.state.ProcessOperationsNoVerifyAttsSigs") defer span.End() if _, err := VerifyOperationLengths(ctx, state, signedBeaconBlock); err != nil { @@ -621,7 +621,7 @@ func CanProcessEpoch(state *stateTrie.BeaconState) bool { // ProcessEpochPrecompute describes the per epoch operations that are performed on the beacon state. // It's optimized by pre computing validator attested info and epoch total/attested balances upfront. func ProcessEpochPrecompute(ctx context.Context, state *stateTrie.BeaconState) (*stateTrie.BeaconState, error) { - ctx, span := trace.StartSpan(ctx, "beacon-chain.ChainService.state.ProcessEpochPrecompute") + ctx, span := trace.StartSpan(ctx, "core.state.ProcessEpochPrecompute") defer span.End() span.AddAttributes(trace.Int64Attribute("epoch", int64(helpers.CurrentEpoch(state)))) @@ -671,7 +671,7 @@ func ProcessBlockForStateRoot( state *stateTrie.BeaconState, signed *ethpb.SignedBeaconBlock, ) (*stateTrie.BeaconState, error) { - ctx, span := trace.StartSpan(ctx, "beacon-chain.ChainService.state.ProcessBlockForStateRoot") + ctx, span := trace.StartSpan(ctx, "core.state.ProcessBlockForStateRoot") defer span.End() state, err := b.ProcessBlockHeaderNoVerify(state, signed.Block) diff --git a/beacon-chain/state/stategen/replay.go b/beacon-chain/state/stategen/replay.go index b9a84e029f2f..db87766e3450 100644 --- a/beacon-chain/state/stategen/replay.go +++ b/beacon-chain/state/stategen/replay.go @@ -122,7 +122,7 @@ func executeStateTransitionStateGen( return nil, errUnknownBlock } - ctx, span := trace.StartSpan(ctx, "beacon-chain.ChainService.ExecuteStateTransitionStateGen") + ctx, span := trace.StartSpan(ctx, "stategen.ExecuteStateTransitionStateGen") defer span.End() var err error @@ -148,7 +148,7 @@ func executeStateTransitionStateGen( // There's no skip slot cache involved given state gen only works with already stored block and state in DB. // WARNING: This method should not be used for future slot. func processSlotsStateGen(ctx context.Context, state *stateTrie.BeaconState, slot uint64) (*stateTrie.BeaconState, error) { - ctx, span := trace.StartSpan(ctx, "beacon-chain.ChainService.ProcessSlotsStateGen") + ctx, span := trace.StartSpan(ctx, "stategen.ProcessSlotsStateGen") defer span.End() if state == nil { return nil, errUnknownState