Skip to content

Commit d509246

Browse files
authored
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.
1 parent f67084a commit d509246

File tree

8 files changed

+3
-9
lines changed

8 files changed

+3
-9
lines changed

beacon_node/beacon_chain/src/validator_monitor.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@ pub struct ValidatorMonitor<E: EthSpec> {
406406

407407
impl<E: EthSpec> ValidatorMonitor<E> {
408408
#[instrument(parent = None,
409-
level = "info",
410409
name = "validator_monitor",
411410
skip_all
412411
)]

beacon_node/network/src/subnet_service/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ impl<T: BeaconChainTypes> SubnetService<T> {
114114

115115
/// Establish the service based on the passed configuration.
116116
#[instrument(parent = None,
117-
level = "info",
118117
fields(service = "subnet_service"),
119118
name = "subnet_service",
120119
skip_all

beacon_node/network/src/sync/backfill_sync/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ pub struct BackFillSync<T: BeaconChainTypes> {
148148

149149
impl<T: BeaconChainTypes> BackFillSync<T> {
150150
#[instrument(parent = None,
151-
level = "info",
152151
name = "backfill_sync",
153152
skip_all
154153
)]

beacon_node/network/src/sync/block_lookups/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ impl<T: BeaconChainTypes> BlockLookups<T> {
139139

140140
#[cfg(test)]
141141
#[instrument(parent = None,
142-
level = "info",
143142
fields(service = "lookup_sync"),
144143
name = "lookup_sync",
145144
skip_all

beacon_node/network/src/sync/peer_sampling.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ impl<T: BeaconChainTypes> Sampling<T> {
3939

4040
#[cfg(test)]
4141
#[instrument(parent = None,
42-
level = "info",
4342
fields(service = "sampling"),
4443
name = "sampling",
4544
skip_all

beacon_node/network/src/sync/range_sync/chain.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
153153
}
154154

155155
/// Check if the chain has peers from which to process batches.
156-
#[instrument(parent = None,level = "info", fields(chain = self.id , service = "range_sync"), skip_all)]
156+
#[instrument(parent = None,fields(chain = self.id , service = "range_sync"), skip_all)]
157157
pub fn available_peers(&self) -> usize {
158158
self.peers.len()
159159
}
@@ -211,7 +211,7 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
211211

212212
/// A block has been received for a batch on this chain.
213213
/// If the block correctly completes the batch it will be processed if possible.
214-
#[instrument(parent = None,level = "info", fields(chain = self.id , service = "range_sync"), skip_all)]
214+
#[instrument(parent = None, fields(chain = self.id , service = "range_sync"), skip_all)]
215215
pub fn on_block_response(
216216
&mut self,
217217
network: &mut SyncNetworkContext<T>,

beacon_node/network/src/sync/range_sync/range.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ where
8282
T: BeaconChainTypes,
8383
{
8484
#[instrument(parent = None,
85-
level = "info",
8685
fields(component = "range_sync"),
8786
name = "range_sync",
8887
skip_all

common/task_executor/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ impl TaskExecutor {
9292
/// This function should only be used during testing. In production, prefer to obtain an
9393
/// instance of `Self` via a `environment::RuntimeContext` (see the `lighthouse/environment`
9494
/// crate).
95-
#[instrument(parent = None,level = "info", fields(service = service_name), name = "task_executor", skip_all)]
95+
#[instrument(parent = None,fields(service = service_name), name = "task_executor", skip_all)]
9696
pub fn new<T: Into<HandleProvider>>(
9797
handle: T,
9898
exit: async_channel::Receiver<()>,

0 commit comments

Comments
 (0)