From eb080799ec48bf2251ab0c8612967bf844587008 Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Tue, 19 Mar 2019 17:35:01 -0400 Subject: [PATCH] Fix spans in regular_sync (#2031) * Fix spans in regular_sync * more regular sync ctx fixes * rename --- beacon-chain/sync/regular_sync.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/beacon-chain/sync/regular_sync.go b/beacon-chain/sync/regular_sync.go index 2f0b97200f..4cf03b4176 100644 --- a/beacon-chain/sync/regular_sync.go +++ b/beacon-chain/sync/regular_sync.go @@ -307,7 +307,7 @@ func (rs *RegularSync) receiveBlock(msg p2p.Message) { return } - beaconState, err := rs.db.State(msg.Ctx) + beaconState, err := rs.db.State(ctx) if err != nil { log.Errorf("Failed to get beacon state: %v", err) return @@ -519,7 +519,7 @@ func (rs *RegularSync) receiveAttestation(msg p2p.Message) { } // Skip if attestation slot is older than last finalized slot in state. - beaconState, err := rs.db.State(msg.Ctx) + beaconState, err := rs.db.State(ctx) if err != nil { log.Errorf("Failed to get beacon state: %v", err) return @@ -531,7 +531,7 @@ func (rs *RegularSync) receiveAttestation(msg p2p.Message) { return } - _, sendAttestationSpan := trace.StartSpan(ctx, "beacon-chain.sync.sendAttestation") + ctx, sendAttestationSpan := trace.StartSpan(ctx, "beacon-chain.sync.sendAttestation") log.WithField("attestationHash", fmt.Sprintf("%#x", attestationRoot)).Debug("Sending newly received attestation to subscribers") rs.operationsService.IncomingAttFeed().Send(attestation) sentAttestation.Inc() @@ -556,7 +556,7 @@ func (rs *RegularSync) receiveExitRequest(msg p2p.Message) { log.Debugf("Received, skipping exit request #%x", h) return } - _, sendExitReqSpan := trace.StartSpan(ctx, "sendExitRequest") + ctx, sendExitReqSpan := trace.StartSpan(ctx, "sendExitRequest") log.WithField("exitReqHash", fmt.Sprintf("%#x", h)). Debug("Forwarding validator exit request to subscribed services") rs.operationsService.IncomingExitFeed().Send(exit) @@ -713,12 +713,9 @@ func (rs *RegularSync) handleUnseenAttestationsRequest(msg p2p.Message) { } func (rs *RegularSync) broadcastCanonicalBlock(ctx context.Context, announce *pb.BeaconBlockAnnounce) { - _, span := trace.StartSpan(ctx, "beacon-chain.sync.broadcastCanonicalBlock") + ctx, span := trace.StartSpan(ctx, "beacon-chain.sync.broadcastCanonicalBlock") defer span.End() - - _, sendBlockAnnounceSpan := trace.StartSpan(ctx, "beacon-chain.sync.sendBlockAnnounce") log.Debugf("Announcing canonical block %#x", announce.Hash) rs.p2p.Broadcast(ctx, announce) sentBlockAnnounce.Inc() - sendBlockAnnounceSpan.End() }