mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-10 04:01:51 +00:00
Integrate tracing (#6339)
Tracing Integration
- [reference](5bbf1859e9/projects/project-ideas.md (L297))
- [x] replace slog & log with tracing throughout the codebase
- [x] implement custom crit log
- [x] make relevant changes in the formatter
- [x] replace sloggers
- [x] re-write SSE logging components
cc: @macladson @eserilev
This commit is contained in:
@@ -53,9 +53,7 @@ impl<E: EthSpec> BootNodeConfig<E> {
|
||||
|
||||
let mut network_config = NetworkConfig::default();
|
||||
|
||||
let logger = slog_scope::logger();
|
||||
|
||||
set_network_config(&mut network_config, matches, &data_dir, &logger)?;
|
||||
set_network_config(&mut network_config, matches, &data_dir)?;
|
||||
|
||||
// Set the Enr Discovery ports to the listening ports if not present.
|
||||
if let Some(listening_addr_v4) = network_config.listen_addrs().v4() {
|
||||
@@ -85,7 +83,7 @@ impl<E: EthSpec> BootNodeConfig<E> {
|
||||
network_config.discv5_config.enr_update = false;
|
||||
}
|
||||
|
||||
let private_key = load_private_key(&network_config, &logger);
|
||||
let private_key = load_private_key(&network_config);
|
||||
let local_key = CombinedKey::from_libp2p(private_key)?;
|
||||
|
||||
let local_enr = if let Some(dir) = matches.get_one::<String>("network-dir") {
|
||||
@@ -104,7 +102,7 @@ impl<E: EthSpec> BootNodeConfig<E> {
|
||||
|
||||
if eth2_network_config.genesis_state_is_known() {
|
||||
let mut genesis_state = eth2_network_config
|
||||
.genesis_state::<E>(genesis_state_url.as_deref(), genesis_state_url_timeout, &logger).await?
|
||||
.genesis_state::<E>(genesis_state_url.as_deref(), genesis_state_url_timeout).await?
|
||||
.ok_or_else(|| {
|
||||
"The genesis state for this network is not known, this is an unsupported mode"
|
||||
.to_string()
|
||||
@@ -113,7 +111,7 @@ impl<E: EthSpec> BootNodeConfig<E> {
|
||||
let genesis_state_root = genesis_state
|
||||
.canonical_root()
|
||||
.map_err(|e| format!("Error hashing genesis state: {e:?}"))?;
|
||||
slog::info!(logger, "Genesis state found"; "root" => ?genesis_state_root);
|
||||
tracing::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(),
|
||||
@@ -121,10 +119,7 @@ impl<E: EthSpec> BootNodeConfig<E> {
|
||||
|
||||
Some(enr_fork.as_ssz_bytes())
|
||||
} else {
|
||||
slog::warn!(
|
||||
logger,
|
||||
"No genesis state provided. No Eth2 field added to the ENR"
|
||||
);
|
||||
tracing::warn!("No genesis state provided. No Eth2 field added to the ENR");
|
||||
None
|
||||
}
|
||||
};
|
||||
@@ -160,7 +155,7 @@ impl<E: EthSpec> BootNodeConfig<E> {
|
||||
.map_err(|e| format!("Failed to build ENR: {:?}", e))?
|
||||
};
|
||||
|
||||
use_or_load_enr(&local_key, &mut local_enr, &network_config, &logger)?;
|
||||
use_or_load_enr(&local_key, &mut local_enr, &network_config)?;
|
||||
local_enr
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user