Add more context to traces

jimmygchen · jimmygchen · commit 5f1869265b75 · 2025-08-15T16:48:03.000+10:00
diff --git a/beacon_node/network/src/sync/network_context.rs b/beacon_node/network/src/sync/network_context.rs
@@ -519,8 +519,12 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
         peers: &HashSet<PeerId>,
         peers_to_deprioritize: &HashSet<PeerId>,
     ) -> Result<Id, RpcRequestSendError> {
-        let range_request_span =
-            debug_span!(parent: None, SPAN_OUTGOING_RANGE_REQUEST, range_req_id = %requester);
+        let range_request_span = debug_span!(
+            parent: None,
+            SPAN_OUTGOING_RANGE_REQUEST,
+            range_req_id = %requester,
+            peers = peers.len()
+        );
         let _guard = range_request_span.clone().entered();
         let active_request_count_by_peer = self.active_request_count_by_peer();
 
@@ -854,7 +858,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
             // block and the peer must have it.
             true,
             BlocksByRootRequestItems::new(request),
-            // TODO: implement
+            // Not implemented
             Span::none(),
         );
 
@@ -952,7 +956,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
             // have imported the block+blobs.
             true,
             BlobsByRootRequestItems::new(request),
-            // TODO: implement
+            // Not implemented
             Span::none(),
         );
 
diff --git a/beacon_node/network/src/sync/network_context/requests.rs b/beacon_node/network/src/sync/network_context/requests.rs
@@ -135,7 +135,7 @@ impl<K: Eq + Hash, T: ActiveRequestItems> ActiveRequests<K, T> {
                             // Received an invalid item
                             Err(e) => {
                                 request.state = State::Errored;
-                                request.span.record("result", "Errored");
+                                request.span.record("result", format!("Errored: {e:?}"));
                                 Some(Err(e.into()))
                             }
                         }
@@ -182,7 +182,7 @@ impl<K: Eq + Hash, T: ActiveRequestItems> ActiveRequests<K, T> {
                 // may be the last message for this request.
                 let request = entry.remove();
                 let _guard = request.span.clone().entered();
-                request.span.record("result", "RPCError");
+                request.span.record("result", format!("RPCError: {e:?}"));
                 match request.state {
                     // Received error while request is still active, propagate error.
                     State::Active(_) => Some(Err(e.into())),
diff --git a/beacon_node/network/src/sync/range_sync/chain.rs b/beacon_node/network/src/sync/range_sync/chain.rs
@@ -127,7 +127,13 @@ pub enum ChainSyncingState {
 
 impl<T: BeaconChainTypes> SyncingChain<T> {
     #[allow(clippy::too_many_arguments)]
-    #[instrument(name = SPAN_SYNCING_CHAIN, parent = None, level="debug")]
+    #[instrument(
+        name = SPAN_SYNCING_CHAIN,
+        parent = None,
+        level="debug",
+        skip(id),
+        fields(chain_id = %id)
+    )]
     pub fn new(
         id: Id,
         start_epoch: Epoch,
