From d50924677a34f63eb51cc45e1c356f492711ea77 Mon Sep 17 00:00:00 2001
From: Age Manning <Age@AgeManning.com>
Date: Fri, 20 Jun 2025 17:44:59 +1000
Subject: [PATCH] Remove instrumenting log level (#7620)

I think this should resolve #7155


This removes the level field from the instrumenting we were doing across a range of functions. The level will now default to the level of the log.
---
 beacon_node/beacon_chain/src/validator_monitor.rs | 1 -
 beacon_node/network/src/subnet_service/mod.rs     | 1 -
 beacon_node/network/src/sync/backfill_sync/mod.rs | 1 -
 beacon_node/network/src/sync/block_lookups/mod.rs | 1 -
 beacon_node/network/src/sync/peer_sampling.rs     | 1 -
 beacon_node/network/src/sync/range_sync/chain.rs  | 4 ++--
 beacon_node/network/src/sync/range_sync/range.rs  | 1 -
 common/task_executor/src/lib.rs                   | 2 +-
 8 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/beacon_node/beacon_chain/src/validator_monitor.rs b/beacon_node/beacon_chain/src/validator_monitor.rs
index 16f4e3f143..c4846b1a89 100644
--- a/beacon_node/beacon_chain/src/validator_monitor.rs
+++ b/beacon_node/beacon_chain/src/validator_monitor.rs
@@ -406,7 +406,6 @@ pub struct ValidatorMonitor<E: EthSpec> {
 
 impl<E: EthSpec> ValidatorMonitor<E> {
     #[instrument(parent = None,
-        level = "info",
         name = "validator_monitor",
         skip_all
     )]
diff --git a/beacon_node/network/src/subnet_service/mod.rs b/beacon_node/network/src/subnet_service/mod.rs
index 5340538e52..fb177a11e7 100644
--- a/beacon_node/network/src/subnet_service/mod.rs
+++ b/beacon_node/network/src/subnet_service/mod.rs
@@ -114,7 +114,6 @@ impl<T: BeaconChainTypes> SubnetService<T> {
 
     /// Establish the service based on the passed configuration.
     #[instrument(parent = None,
-        level = "info",
         fields(service = "subnet_service"),
         name = "subnet_service",
         skip_all
diff --git a/beacon_node/network/src/sync/backfill_sync/mod.rs b/beacon_node/network/src/sync/backfill_sync/mod.rs
index 7064e8053f..035349c475 100644
--- a/beacon_node/network/src/sync/backfill_sync/mod.rs
+++ b/beacon_node/network/src/sync/backfill_sync/mod.rs
@@ -148,7 +148,6 @@ pub struct BackFillSync<T: BeaconChainTypes> {
 
 impl<T: BeaconChainTypes> BackFillSync<T> {
     #[instrument(parent = None,
-        level = "info",
         name = "backfill_sync",
         skip_all
     )]
diff --git a/beacon_node/network/src/sync/block_lookups/mod.rs b/beacon_node/network/src/sync/block_lookups/mod.rs
index 96b088747b..a7f2e0d434 100644
--- a/beacon_node/network/src/sync/block_lookups/mod.rs
+++ b/beacon_node/network/src/sync/block_lookups/mod.rs
@@ -139,7 +139,6 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
 
     #[cfg(test)]
     #[instrument(parent = None,
-        level = "info",
         fields(service = "lookup_sync"),
         name = "lookup_sync",
         skip_all
diff --git a/beacon_node/network/src/sync/peer_sampling.rs b/beacon_node/network/src/sync/peer_sampling.rs
index 59b751787e..2e011cd7f9 100644
--- a/beacon_node/network/src/sync/peer_sampling.rs
+++ b/beacon_node/network/src/sync/peer_sampling.rs
@@ -39,7 +39,6 @@ impl<T: BeaconChainTypes> Sampling<T> {
 
     #[cfg(test)]
     #[instrument(parent = None,
-        level = "info",
         fields(service = "sampling"),
         name = "sampling",
         skip_all
diff --git a/beacon_node/network/src/sync/range_sync/chain.rs b/beacon_node/network/src/sync/range_sync/chain.rs
index 6100d322b8..4e924d2d35 100644
--- a/beacon_node/network/src/sync/range_sync/chain.rs
+++ b/beacon_node/network/src/sync/range_sync/chain.rs
@@ -153,7 +153,7 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
     }
 
     /// Check if the chain has peers from which to process batches.
-    #[instrument(parent = None,level = "info", fields(chain = self.id , service = "range_sync"), skip_all)]
+    #[instrument(parent = None,fields(chain = self.id , service = "range_sync"), skip_all)]
     pub fn available_peers(&self) -> usize {
         self.peers.len()
     }
@@ -211,7 +211,7 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
 
     /// A block has been received for a batch on this chain.
     /// If the block correctly completes the batch it will be processed if possible.
-    #[instrument(parent = None,level = "info", fields(chain = self.id , service = "range_sync"), skip_all)]
+    #[instrument(parent = None, fields(chain = self.id , service = "range_sync"), skip_all)]
     pub fn on_block_response(
         &mut self,
         network: &mut SyncNetworkContext<T>,
diff --git a/beacon_node/network/src/sync/range_sync/range.rs b/beacon_node/network/src/sync/range_sync/range.rs
index 57304bce5d..2a093f6f8c 100644
--- a/beacon_node/network/src/sync/range_sync/range.rs
+++ b/beacon_node/network/src/sync/range_sync/range.rs
@@ -82,7 +82,6 @@ where
     T: BeaconChainTypes,
 {
     #[instrument(parent = None,
-        level = "info",
         fields(component = "range_sync"),
         name = "range_sync",
         skip_all
diff --git a/common/task_executor/src/lib.rs b/common/task_executor/src/lib.rs
index b47e30cb68..507dfeda4e 100644
--- a/common/task_executor/src/lib.rs
+++ b/common/task_executor/src/lib.rs
@@ -92,7 +92,7 @@ impl TaskExecutor {
     /// This function should only be used during testing. In production, prefer to obtain an
     /// instance of `Self` via a `environment::RuntimeContext` (see the `lighthouse/environment`
     /// crate).
-    #[instrument(parent = None,level = "info", fields(service = service_name), name = "task_executor", skip_all)]
+    #[instrument(parent = None,fields(service = service_name), name = "task_executor", skip_all)]
     pub fn new<T: Into<HandleProvider>>(
         handle: T,
         exit: async_channel::Receiver<()>,