Skip to content

Commit d340231

Browse files
committed
Set parent to None on network beacon processors to prevent inheriting libp2p spans.
1 parent c0991f5 commit d340231

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

beacon_node/network/src/network_beacon_processor/gossip_methods.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
603603
}
604604
}
605605

606-
#[instrument(skip_all, level = "trace", fields(slot = ?column_sidecar.slot(), block_root = ?column_sidecar.block_root(), index = column_sidecar.index))]
606+
#[instrument(skip_all, level = "trace", fields(slot = ?column_sidecar.slot(), block_root = ?column_sidecar.block_root(), index = column_sidecar.index), parent = None)]
607607
pub async fn process_gossip_data_column_sidecar(
608608
self: &Arc<Self>,
609609
message_id: MessageId,
@@ -761,7 +761,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
761761
}
762762

763763
#[allow(clippy::too_many_arguments)]
764-
#[instrument(skip_all, level = "trace", fields(slot = ?blob_sidecar.slot(), block_root = ?blob_sidecar.block_root(), index = blob_sidecar.index))]
764+
#[instrument(skip_all, level = "trace", fields(slot = ?blob_sidecar.slot(), block_root = ?blob_sidecar.block_root(), index = blob_sidecar.index), parent = None)]
765765
pub async fn process_gossip_blob(
766766
self: &Arc<Self>,
767767
message_id: MessageId,
@@ -1099,7 +1099,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
10991099
///
11001100
/// Raises a log if there are errors.
11011101
#[allow(clippy::too_many_arguments)]
1102-
#[instrument(skip_all, fields(block_root = tracing::field::Empty))]
1102+
#[instrument(skip_all, fields(block_root = tracing::field::Empty), parent = None)]
11031103
pub async fn process_gossip_block(
11041104
self: Arc<Self>,
11051105
message_id: MessageId,
@@ -1430,7 +1430,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
14301430
///
14311431
/// Raises a log if there are errors.
14321432
#[instrument(skip_all)]
1433-
pub async fn process_gossip_verified_block(
1433+
async fn process_gossip_verified_block(
14341434
self: Arc<Self>,
14351435
peer_id: PeerId,
14361436
verified_block: GossipVerifiedBlock<T>,

beacon_node/network/src/network_beacon_processor/sync_methods.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
9797

9898
/// Attempt to process a block received from a direct RPC request.
9999
#[allow(clippy::too_many_arguments)]
100-
#[instrument(skip_all, fields(?block_root))]
100+
#[instrument(skip_all, fields(?block_root), parent = None)]
101101
pub async fn process_rpc_block(
102102
self: Arc<NetworkBeaconProcessor<T>>,
103103
block_root: Hash256,
@@ -244,7 +244,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
244244
}
245245

246246
/// Attempt to process a list of blobs received from a direct RPC request.
247-
#[instrument(skip_all, fields(?block_root, outcome = tracing::field::Empty))]
247+
#[instrument(skip_all, fields(?block_root, outcome = tracing::field::Empty), parent = None)]
248248
pub async fn process_rpc_blobs(
249249
self: Arc<NetworkBeaconProcessor<T>>,
250250
block_root: Hash256,
@@ -334,7 +334,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
334334
});
335335
}
336336

337-
#[instrument(skip_all, fields(?block_root))]
337+
#[instrument(skip_all, fields(?block_root), parent = None)]
338338
pub async fn process_rpc_custody_columns(
339339
self: Arc<NetworkBeaconProcessor<T>>,
340340
block_root: Hash256,
@@ -420,7 +420,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
420420

421421
/// Attempt to import the chain segment (`blocks`) to the beacon chain, informing the sync
422422
/// thread if more blocks are needed to process it.
423-
#[instrument(skip_all, fields(sync_type = ?sync_type, downloaded_blocks = downloaded_blocks.len(), imported_blocks = tracing::field::Empty))]
423+
#[instrument(skip_all, fields(sync_type = ?sync_type, downloaded_blocks = downloaded_blocks.len(), imported_blocks = tracing::field::Empty), parent = None)]
424424
pub async fn process_chain_segment(
425425
&self,
426426
sync_type: ChainSegmentProcessId,

0 commit comments

Comments
 (0)