Remove instrumenting log level (#7636)

https://github.com/sigp/lighthouse/issues/7155


  Theres some additional places we set instrumenting log levels that wasn't covered in #7620
This commit is contained in:
Eitan Seri-Levi
2025-06-24 09:29:10 +03:00
committed by GitHub
parent fd643c310c
commit 56b2d4b525
8 changed files with 33 additions and 144 deletions

View File

@@ -439,7 +439,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// emit metrics and logs on a per-validator basis (rather than just an
/// aggregated basis).
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -450,7 +449,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Add some validators to `self` for additional monitoring.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -473,7 +471,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Add an unaggregated attestation
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -492,7 +489,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
}
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -504,7 +500,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Reads information from the given `state`. The `state` *must* be valid (i.e, able to be
/// imported).
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -622,7 +617,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Add missed non-finalized blocks for the monitored validators
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -724,7 +718,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
}
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -743,7 +736,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Process the unaggregated attestations generated by the service `attestation_simulator_service`
/// and check if the attestation qualifies for a reward matching the flags source/target/head
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -821,7 +813,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// We allow disabling tracking metrics on an individual validator basis
/// since it can result in untenable cardinality with high validator counts.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -835,7 +826,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
}
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1118,7 +1108,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
}
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1131,7 +1120,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Returns the number of validators monitored by `self`.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1142,7 +1130,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Return the `id`'s of all monitored validators.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1152,7 +1139,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
}
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1166,7 +1152,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
}
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1179,7 +1164,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
}
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1191,7 +1175,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// If `self.auto_register == true`, add the `validator_index` to `self.monitored_validators`.
/// Otherwise, do nothing.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1219,7 +1202,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Process a block received on gossip.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1236,7 +1218,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Process a block received on the HTTP API from a local validator.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1252,7 +1233,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
}
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1297,7 +1277,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register an attestation seen on the gossip network.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1318,7 +1297,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register an attestation seen on the HTTP API.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1338,7 +1316,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
}
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1430,7 +1407,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
}
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1554,7 +1530,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
///
/// Note: Blocks that get orphaned will skew the inclusion distance calculation.
#[instrument(parent = None,
level = "info",
name = "validator_monitor",
skip_all
)]
@@ -1634,7 +1609,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register a sync committee message received over gossip.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1655,7 +1629,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register a sync committee message received over the http api.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1676,7 +1649,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register a sync committee message.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1731,7 +1703,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register a sync committee contribution received over gossip.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1754,7 +1725,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register a sync committee contribution received over the http api.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1777,7 +1747,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register a sync committee contribution.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1865,7 +1834,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register that the `sync_aggregate` was included in a *valid* `BeaconBlock`.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1908,7 +1876,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register an exit from the gossip network.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1919,7 +1886,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register an exit from the HTTP API.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1930,7 +1896,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register an exit included in a *valid* beacon block.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1940,7 +1905,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
}
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1969,7 +1933,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register a proposer slashing from the gossip network.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1980,7 +1943,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register a proposer slashing from the HTTP API.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -1991,7 +1953,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register a proposer slashing included in a *valid* `BeaconBlock`.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -2001,7 +1962,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
}
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -2040,7 +2000,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register an attester slashing from the gossip network.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -2051,7 +2010,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register an attester slashing from the HTTP API.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -2062,7 +2020,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
/// Register an attester slashing included in a *valid* `BeaconBlock`.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -2072,7 +2029,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
}
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all
@@ -2119,7 +2075,6 @@ impl<E: EthSpec> ValidatorMonitor<E> {
///
/// Should be called whenever Prometheus is scraping Lighthouse.
#[instrument(parent = None,
level = "info",
fields(service = "validator_monitor"),
name = "validator_monitor",
skip_all