Merge of #8300

mergify[bot] · web-flow · commit 264a29570c2f · 2025-11-28T03:04:41.000Z
diff --git a/beacon_node/lighthouse_network/src/types/globals.rs b/beacon_node/lighthouse_network/src/types/globals.rs
@@ -9,7 +9,7 @@ use network_utils::enr_ext::EnrExt;
 use parking_lot::RwLock;
 use std::collections::HashSet;
 use std::sync::Arc;
-use tracing::error;
+use tracing::{debug, error};
 use types::data_column_custody_group::{compute_subnets_from_custody_group, get_custody_groups};
 use types::{ChainSpec, ColumnIndex, DataColumnSubnetId, EthSpec};
 
@@ -79,7 +79,7 @@ impl<E: EthSpec> NetworkGlobals<E> {
             sampling_subnets.extend(subnets);
         }
 
-        tracing::debug!(
+        debug!(
             cgc = custody_group_count,
             ?sampling_subnets,
             "Starting node with custody params"
diff --git a/beacon_node/lighthouse_network/tests/rpc_tests.rs b/beacon_node/lighthouse_network/tests/rpc_tests.rs
@@ -12,7 +12,7 @@ use std::sync::Arc;
 use std::time::{Duration, Instant};
 use tokio::runtime::Runtime;
 use tokio::time::sleep;
-use tracing::{Instrument, debug, error, info_span, warn};
+use tracing::{Instrument, debug, error, info, info_span, warn};
 use types::{
     BeaconBlock, BeaconBlockAltair, BeaconBlockBase, BeaconBlockBellatrix, BeaconBlockHeader,
     BlobSidecar, ChainSpec, DataColumnSidecar, DataColumnsByRootIdentifier, EmptyBlock, Epoch,
@@ -1039,7 +1039,7 @@ fn test_tcp_columns_by_root_chunked_rpc() {
             loop {
                 match sender.next_event().await {
                     NetworkEvent::PeerConnectedOutgoing(peer_id) => {
-                        tracing::info!("Sending RPC");
+                        info!("Sending RPC");
                         tokio::time::sleep(Duration::from_secs(1)).await;
                         sender
                             .send_request(peer_id, AppRequestId::Router, rpc_request.clone())
@@ -1053,7 +1053,7 @@ fn test_tcp_columns_by_root_chunked_rpc() {
                         Response::DataColumnsByRoot(Some(sidecar)) => {
                             assert_eq!(sidecar, data_column.clone());
                             messages_received += 1;
-                            tracing::info!("Chunk received");
+                            info!("Chunk received");
                         }
                         Response::DataColumnsByRoot(None) => {
                             // should be exactly messages_to_send
@@ -1080,27 +1080,27 @@ fn test_tcp_columns_by_root_chunked_rpc() {
                     } => {
                         if request_type == rpc_request {
                             // send the response
-                            tracing::info!("Receiver got request");
+                            info!("Receiver got request");
 
                             for _ in 0..messages_to_send {
                                 receiver.send_response(
                                     peer_id,
                                     inbound_request_id,
                                     rpc_response.clone(),
                                 );
-                                tracing::info!("Sending message");
+                                info!("Sending message");
                             }
                             // send the stream termination
                             receiver.send_response(
                                 peer_id,
                                 inbound_request_id,
                                 Response::DataColumnsByRoot(None),
                             );
-                            tracing::info!("Send stream term");
+                            info!("Send stream term");
                         }
                     }
                     e => {
-                        tracing::info!(?e, "Got event");
+                        info!(?e, "Got event");
                     } // Ignore other events
                 }
             }
@@ -1184,7 +1184,7 @@ fn test_tcp_columns_by_range_chunked_rpc() {
             loop {
                 match sender.next_event().await {
                     NetworkEvent::PeerConnectedOutgoing(peer_id) => {
-                        tracing::info!("Sending RPC");
+                        info!("Sending RPC");
                         sender
                             .send_request(peer_id, AppRequestId::Router, rpc_request.clone())
                             .unwrap();
@@ -1197,7 +1197,7 @@ fn test_tcp_columns_by_range_chunked_rpc() {
                         Response::DataColumnsByRange(Some(sidecar)) => {
                             assert_eq!(sidecar, data_column.clone());
                             messages_received += 1;
-                            tracing::info!("Chunk received");
+                            info!("Chunk received");
                         }
                         Response::DataColumnsByRange(None) => {
                             // should be exactly messages_to_send
@@ -1224,23 +1224,23 @@ fn test_tcp_columns_by_range_chunked_rpc() {
                     } => {
                         if request_type == rpc_request {
                             // send the response
-                            tracing::info!("Receiver got request");
+                            info!("Receiver got request");
 
                             for _ in 0..messages_to_send {
                                 receiver.send_response(
                                     peer_id,
                                     inbound_request_id,
                                     rpc_response.clone(),
                                 );
-                                tracing::info!("Sending message");
+                                info!("Sending message");
                             }
                             // send the stream termination
                             receiver.send_response(
                                 peer_id,
                                 inbound_request_id,
                                 Response::DataColumnsByRange(None),
                             );
-                            tracing::info!("Send stream term");
+                            info!("Send stream term");
                         }
                     }
                     _ => {} // Ignore other events
diff --git a/beacon_node/network/src/sync/backfill_sync/mod.rs b/beacon_node/network/src/sync/backfill_sync/mod.rs
@@ -346,7 +346,7 @@ impl<T: BeaconChainTypes> BackFillSync<T> {
                         }
                     }
                     CouplingError::BlobPeerFailure(msg) => {
-                        tracing::debug!(?batch_id, msg, "Blob peer failure");
+                        debug!(?batch_id, msg, "Blob peer failure");
                     }
                     CouplingError::InternalError(msg) => {
                         error!(?batch_id, msg, "Block components coupling internal error");
diff --git a/beacon_node/network/src/sync/block_sidecar_coupling.rs b/beacon_node/network/src/sync/block_sidecar_coupling.rs
@@ -356,7 +356,7 @@ impl<E: EthSpec> RangeBlockComponentsRequest<E> {
                 // we request the data from.
                 // If there are duplicated indices, its likely a peer sending us the same index multiple times.
                 // However we can still proceed even if there are extra columns, just log an error.
-                tracing::debug!(?block_root, ?index, "Repeated column for block_root");
+                debug!(?block_root, ?index, "Repeated column for block_root");
                 continue;
             }
         }
@@ -407,7 +407,7 @@ impl<E: EthSpec> RangeBlockComponentsRequest<E> {
                 if !data_columns_by_index.is_empty() {
                     let remaining_indices = data_columns_by_index.keys().collect::<Vec<_>>();
                     // log the error but don't return an error, we can still progress with extra columns.
-                    tracing::debug!(
+                    debug!(
                         ?block_root,
                         ?remaining_indices,
                         "Not all columns consumed for block"
@@ -427,7 +427,7 @@ impl<E: EthSpec> RangeBlockComponentsRequest<E> {
             let remaining_roots = data_columns_by_block.keys().collect::<Vec<_>>();
             // log the error but don't return an error, we can still progress with responses.
             // this is most likely an internal error with overrequesting or a client bug.
-            tracing::debug!(?remaining_roots, "Not all columns consumed for block");
+            debug!(?remaining_roots, "Not all columns consumed for block");
         }
 
         Ok(rpc_blocks)
diff --git a/beacon_node/network/src/sync/range_sync/chain.rs b/beacon_node/network/src/sync/range_sync/chain.rs
@@ -18,7 +18,7 @@ use std::collections::{BTreeMap, HashSet, btree_map::Entry};
 use std::hash::{Hash, Hasher};
 use std::marker::PhantomData;
 use strum::IntoStaticStr;
-use tracing::{Span, debug, instrument, warn};
+use tracing::{Span, debug, error, instrument, warn};
 use types::{ColumnIndex, Epoch, EthSpec, Hash256, Slot};
 
 /// Blocks are downloaded in batches from peers. This constant specifies how many epochs worth of
@@ -942,10 +942,10 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
                         }
                     }
                     CouplingError::BlobPeerFailure(msg) => {
-                        tracing::debug!(?batch_id, msg, "Blob peer failure");
+                        debug!(?batch_id, msg, "Blob peer failure");
                     }
                     CouplingError::InternalError(msg) => {
-                        tracing::error!(?batch_id, msg, "Block components coupling internal error");
+                        error!(?batch_id, msg, "Block components coupling internal error");
                     }
                 }
             }
diff --git a/boot_node/src/config.rs b/boot_node/src/config.rs
@@ -14,6 +14,7 @@ use ssz::Encode;
 use std::net::{SocketAddrV4, SocketAddrV6};
 use std::time::Duration;
 use std::{marker::PhantomData, path::PathBuf};
+use tracing::{info, warn};
 use types::EthSpec;
 
 /// A set of configuration parameters for the bootnode, established from CLI arguments.
@@ -117,15 +118,15 @@ impl<E: EthSpec> BootNodeConfig<E> {
                     let genesis_state_root = genesis_state
                         .canonical_root()
                         .map_err(|e| format!("Error hashing genesis state: {e:?}"))?;
-                    tracing::info!(root = ?genesis_state_root, "Genesis state found");
+                    info!(root = ?genesis_state_root, "Genesis state found");
                     let enr_fork = spec.enr_fork_id::<E>(
                         types::Slot::from(0u64),
                         genesis_state.genesis_validators_root(),
                     );
 
                     Some(enr_fork.as_ssz_bytes())
                 } else {
-                    tracing::warn!("No genesis state provided. No Eth2 field added to the ENR");
+                    warn!("No genesis state provided. No Eth2 field added to the ENR");
                     None
                 }
             };
diff --git a/lighthouse/src/main.rs b/lighthouse/src/main.rs
@@ -28,7 +28,7 @@ use std::path::PathBuf;
 use std::process::exit;
 use std::sync::LazyLock;
 use task_executor::ShutdownReason;
-use tracing::{Level, info};
+use tracing::{Level, info, warn};
 use tracing_subscriber::{Layer, filter::EnvFilter, layer::SubscriberExt, util::SubscriberInitExt};
 use types::{EthSpec, EthSpecId};
 use validator_client::ProductionValidatorClient;
@@ -730,7 +730,7 @@ fn run<E: EthSpec>(
 
     #[cfg(all(feature = "modern", target_arch = "x86_64"))]
     if !std::is_x86_feature_detected!("adx") {
-        tracing::warn!(
+        warn!(
             advice = "If you get a SIGILL, please try Lighthouse portable build",
             "CPU seems incompatible with optimized Lighthouse build"
         );

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ impl<T: BeaconChainTypes> BackFillSync<T> {`
`346`	`346`	`}`
`347`	`347`	`}`
`348`	`348`	`CouplingError::BlobPeerFailure(msg) => {`
`349`		`- tracing::debug!(?batch_id, msg, "Blob peer failure");`
	`349`	`+ debug!(?batch_id, msg, "Blob peer failure");`
`350`	`350`	`}`
`351`	`351`	`CouplingError::InternalError(msg) => {`
`352`	`352`	`error!(?batch_id, msg, "Block components coupling internal error");`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ use std::collections::{BTreeMap, HashSet, btree_map::Entry};`
`18`	`18`	`use std::hash::{Hash, Hasher};`
`19`	`19`	`use std::marker::PhantomData;`
`20`	`20`	`use strum::IntoStaticStr;`
`21`		`-use tracing::{Span, debug, instrument, warn};`
	`21`	`+use tracing::{Span, debug, error, instrument, warn};`
`22`	`22`	`use types::{ColumnIndex, Epoch, EthSpec, Hash256, Slot};`
`23`	`23`
`24`	`24`	`/// Blocks are downloaded in batches from peers. This constant specifies how many epochs worth of`
`@@ -942,10 +942,10 @@ impl<T: BeaconChainTypes> SyncingChain<T> {`
`942`	`942`	`}`
`943`	`943`	`}`
`944`	`944`	`CouplingError::BlobPeerFailure(msg) => {`
`945`		`- tracing::debug!(?batch_id, msg, "Blob peer failure");`
	`945`	`+ debug!(?batch_id, msg, "Blob peer failure");`
`946`	`946`	`}`
`947`	`947`	`CouplingError::InternalError(msg) => {`
`948`		`- tracing::error!(?batch_id, msg, "Block components coupling internal error");`
	`948`	`+ error!(?batch_id, msg, "Block components coupling internal error");`
`949`	`949`	`}`
`950`	`950`	`}`
`951`	`951`	`}`