Fix spans not entering correctly.

jimmygchen · jimmygchen · commit 40b84f380448 · 2025-08-07T00:18:23.000+10:00
diff --git a/beacon_node/network/src/network_beacon_processor/rpc_methods.rs b/beacon_node/network/src/network_beacon_processor/rpc_methods.rs
@@ -1041,7 +1041,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {
     }
 
     /// Handle a `DataColumnsByRange` request from the peer.
-    #[instrument(skip_all, level = "debug", fields(peer_id = %peer_id, non_custody_indices = tracing::field::Empty, client = tracing::field::Empty))]
+    #[instrument(parent = None, skip_all, level = "debug", fields(peer_id = %peer_id, non_custody_indices = tracing::field::Empty, client = tracing::field::Empty))]
     pub fn handle_data_columns_by_range_request(
         &self,
         peer_id: PeerId,
diff --git a/beacon_node/network/src/sync/network_context.rs b/beacon_node/network/src/sync/network_context.rs
@@ -516,7 +516,8 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
         peers: &HashSet<PeerId>,
         peers_to_deprioritize: &HashSet<PeerId>,
     ) -> Result<Id, RpcRequestSendError> {
-        let range_request_span = debug_span!("outgoing_range_request", range_req_id = %requester);
+        let range_request_span =
+            debug_span!(parent: None, "outgoing_range_request", range_req_id = %requester);
         let _guard = range_request_span.clone().entered();
         let active_request_count_by_peer = self.active_request_count_by_peer();
 
diff --git a/beacon_node/network/src/sync/network_context/custody.rs b/beacon_node/network/src/sync/network_context/custody.rs
@@ -104,7 +104,6 @@ impl<T: BeaconChainTypes> ActiveCustodyRequest<T> {
         resp: RpcResponseResult<DataColumnSidecarList<T::EthSpec>>,
         cx: &mut SyncNetworkContext<T>,
     ) -> CustodyRequestResult<T::EthSpec> {
-        let _guard = self.span.clone().entered();
         let Some(batch_request) = self.active_batch_columns_requests.get_mut(&req_id) else {
             warn!(
                 block_root = ?self.block_root,
@@ -114,6 +113,8 @@ impl<T: BeaconChainTypes> ActiveCustodyRequest<T> {
             return Ok(None);
         };
 
+        let _guard = batch_request.span.clone().entered();
+
         match resp {
             Ok((data_columns, seen_timestamp)) => {
                 debug!(

Original file line number	Diff line number	Diff line change
`@@ -1041,7 +1041,7 @@ impl<T: BeaconChainTypes> NetworkBeaconProcessor<T> {`
`1041`	`1041`	`}`
`1042`	`1042`
`1043`	`1043`	/// Handle a `DataColumnsByRange` request from the peer.
`1044`		`- #[instrument(skip_all, level = "debug", fields(peer_id = %peer_id, non_custody_indices = tracing::field::Empty, client = tracing::field::Empty))]`
	`1044`	`+ #[instrument(parent = None, skip_all, level = "debug", fields(peer_id = %peer_id, non_custody_indices = tracing::field::Empty, client = tracing::field::Empty))]`
`1045`	`1045`	`pub fn handle_data_columns_by_range_request(`
`1046`	`1046`	`&self,`
`1047`	`1047`	`peer_id: PeerId,`