Introduce tracing

Cargo.toml

@@ -414,6 +414,8 @@ tokio-util = { version = '0.7', features = ['codec', 'compat', 'time'] }
 tower = { version = '0.4.13', features = ['timeout'] }
 tower-http = { version = '0.5.2', features = ['cors', 'trace'] }
 tracing = '0.1.40'
+tracing-appender = "0.2.3"
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 triomphe = '0.1.13'
 tynm = '0.1.10'
 typenum = '1.17.0'

ad_hoc_bench/Cargo.toml

@@ -17,6 +17,6 @@ fork_choice_control = { workspace = true }
 fork_choice_store = { workspace = true }
 futures = { workspace = true }
 jemalloc-ctl = { workspace = true }
-log = { workspace = true }
 rand = { workspace = true }
+tracing = { workspace = true }
 types = { workspace = true }

ad_hoc_bench/src/main.rs

@@ -9,7 +9,7 @@ use eth2_cache_utils::{goerli, holesky, holesky_devnet, mainnet, medalla, withdr
 use fork_choice_control::AdHocBenchController;
 use fork_choice_store::StoreConfig;
 use jemalloc_ctl::Result as JemallocResult;
-use log::info;
+use tracing::info;
 use rand::seq::SliceRandom as _;
 use types::{
     combined::{BeaconState, SignedBeaconBlock},

attestation_verifier/Cargo.toml

@@ -17,8 +17,8 @@ fork_choice_store = { workspace = true }
 futures = { workspace = true }
 helper_functions = { workspace = true }
 itertools = { workspace = true }
-log = { workspace = true }
 prometheus_metrics = { workspace = true }
 rayon = { workspace = true }
 std_ext = { workspace = true }
+tracing = {workspace = true }
 types = { workspace = true }

attestation_verifier/src/attestation_verifier.rs

@@ -22,7 +22,7 @@ use helper_functions::{
     verifier::{MultiVerifier, Triple, Verifier},
 };
 use itertools::Either;
-use log::{debug, warn};
+use tracing::{debug, warn};
 use prometheus_metrics::Metrics;
 use rayon::iter::{IntoParallelIterator as _, ParallelBridge as _, ParallelIterator as _};
 use std_ext::ArcExt as _;

block_producer/Cargo.toml

@@ -25,7 +25,6 @@ futures = { workspace = true }
 helper_functions = { workspace = true }
 itertools = { workspace = true }
 keymanager = { workspace = true }
-log = { workspace = true }
 nonzero_ext = { workspace = true }
 operation_pools = { workspace = true }
 prometheus_metrics = { workspace = true }
@@ -36,6 +35,7 @@ std_ext = { workspace = true }
 tap = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
+tracing = { workspace = true }
 transition_functions = { workspace = true }
 try_from_iterator = { workspace = true }
 tynm = { workspace = true }

block_producer/src/block_producer.rs

@@ -23,7 +23,7 @@ use futures::{
 use helper_functions::{accessors, misc, predicates};
 use itertools::{Either, Itertools as _};
 use keymanager::ProposerConfigs;
-use log::{error, info, warn};
+use tracing::{error, info, warn};
 use nonzero_ext::nonzero;
 use operation_pools::{
     AttestationAggPool, BlsToExecutionChangePool, PoolAdditionOutcome, PoolRejectionReason,

block_producer/src/eth1_storage.rs

@@ -13,7 +13,7 @@ use deposit_tree::DepositTree;
 use eth1::{DepositEvent, Eth1Block, Eth1Chain};
 use helper_functions::misc::compute_timestamp_at_slot;
 use itertools::Itertools as _;
-use log::{error, warn};
+use tracing::{error, warn};
 use prometheus_metrics::Metrics;
 use ssz::ContiguousList;
 use thiserror::Error;

builder_api/Cargo.toml

@@ -14,13 +14,13 @@ derive_more = { workspace = true }
 helper_functions = { workspace = true }
 hex-literal = { workspace = true }
 itertools = { workspace = true }
-log = { workspace = true }
 prometheus_metrics = { workspace = true }
 reqwest = { workspace = true }
 serde = { workspace = true }
 serde_utils = { workspace = true }
 ssz = { workspace = true }
 thiserror = { workspace = true }
+tracing = { workspace = true }
 typenum = { workspace = true }
 types = { workspace = true }
 

builder_api/src/api.rs

@@ -6,7 +6,7 @@ use bls::PublicKeyBytes;
 use derive_more::Constructor;
 use helper_functions::signing::SignForAllForks;
 use itertools::Itertools as _;
-use log::{debug, info};
+use tracing::{debug, info};
 use prometheus_metrics::Metrics;
 use reqwest::{Client, Response, StatusCode, Url};
 use ssz::SszHash as _;

database/Cargo.toml

@@ -13,11 +13,11 @@ fs-err = { workspace = true }
 im = { workspace = true }
 itertools = { workspace = true }
 libmdbx = { workspace = true }
-log = { workspace = true }
 snap = { workspace = true }
 std_ext = { workspace = true }
 tap = { workspace = true }
 thiserror = { workspace = true }
+tracing = { workspace = true }
 unwrap_none = { workspace = true }
 
 [dev-dependencies]

database/src/lib.rs

@@ -10,7 +10,7 @@ use bytesize::ByteSize;
 use im::OrdMap;
 use itertools::Either;
 use libmdbx::{DatabaseFlags, Environment, Geometry, WriteFlags};
-use log::info;
+use tracing::info;
 use snap::raw::{Decoder, Encoder};
 use std_ext::ArcExt as _;
 use tap::Pipe as _;

eth1/Cargo.toml

@@ -17,14 +17,14 @@ fs-err = { workspace = true }
 futures = { workspace = true }
 genesis = { workspace = true }
 itertools = { workspace = true }
-log = { workspace = true }
 prometheus_metrics = { workspace = true }
 reqwest = { workspace = true }
 ssz = { workspace = true }
 std_ext = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
 tokio-stream = { workspace = true }
+tracing = { workspace = true }
 tynm = { workspace = true }
 types = { workspace = true }
 url = { workspace = true }

eth1/src/download_manager.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use anyhow::{Context as _, Result};
 use eth1_api::{Eth1Api, Eth1ApiToMetrics, Eth1Block};
 use futures::channel::mpsc::UnboundedSender;
-use log::{info, warn};
+use tracing::{info, warn};
 use prometheus_metrics::Metrics;
 use reqwest::Client;
 use std_ext::ArcExt as _;

eth1/src/eth1_chain.rs

@@ -8,7 +8,7 @@ use futures::{
     channel::mpsc::UnboundedSender,
     stream::{Stream, TryStreamExt as _},
 };
-use log::{error, info};
+use tracing::{error, info};
 use prometheus_metrics::Metrics;
 use reqwest::Client;
 use std_ext::ArcExt as _;

eth1/src/genesis.rs

@@ -5,7 +5,7 @@ use chrono::{Local, TimeZone as _};
 use eth1_api::{DepositEvent, Eth1Block};
 use futures::stream::{Stream, TryStreamExt as _};
 use genesis::Incremental;
-use log::info;
+use tracing::info;
 use ssz::{SszRead as _, SszWrite as _};
 use thiserror::Error;
 use types::{

eth1_api/Cargo.toml

@@ -21,7 +21,6 @@ futures = { workspace = true }
 hex = { workspace = true }
 hex-literal = { workspace = true }
 jwt-simple = { workspace = true }
-log = { workspace = true }
 memoffset = { workspace = true }
 panics = { workspace = true }
 prometheus_metrics = { workspace = true }
@@ -33,6 +32,7 @@ static_assertions = { workspace = true }
 std_ext = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
+tracing = { workspace = true }
 typenum = { workspace = true }
 types = { workspace = true }
 web3 = { workspace = true }

eth1_api/src/eth1_api.rs

@@ -11,7 +11,7 @@ use execution_engine::{
     ForkChoiceUpdatedResponse, PayloadAttributes, PayloadId, PayloadStatusV1,
 };
 use futures::{channel::mpsc::UnboundedSender, lock::Mutex, Future};
-use log::warn;
+use tracing::warn;
 use prometheus_metrics::Metrics;
 use reqwest::{header::HeaderMap, Client, Url};
 use serde::{de::DeserializeOwned, Deserialize};

eth1_api/src/eth1_execution_engine.rs

@@ -5,7 +5,7 @@ use derive_more::Constructor;
 use either::Either;
 use execution_engine::{ExecutionEngine, PayloadAttributes, PayloadId, PayloadStatusV1};
 use futures::channel::{mpsc::UnboundedSender, oneshot::Sender};
-use log::{info, warn};
+use tracing::{info, warn};
 use tokio::runtime::{Builder, Handle};
 use types::{
     combined::{ExecutionPayload, ExecutionPayloadParams},

eth1_api/src/execution_service.rs

@@ -6,7 +6,7 @@ use either::Either;
 use execution_engine::{ForkChoiceUpdatedResponse, PayloadAttributes, PayloadStatusV1};
 use fork_choice_control::Wait;
 use futures::{channel::mpsc::UnboundedReceiver, StreamExt as _};
-use log::warn;
+use tracing::warn;
 use types::{
     combined::{ExecutionPayload, ExecutionPayloadParams},
     nonstandard::Phase,

eth1_api/src/messages.rs

@@ -2,7 +2,7 @@ use anyhow::Result;
 use either::Either;
 use execution_engine::{PayloadAttributes, PayloadId, PayloadStatusV1};
 use futures::channel::{mpsc::UnboundedSender, oneshot::Sender};
-use log::debug;
+use tracing::debug;
 use types::{
     combined::{ExecutionPayload, ExecutionPayloadParams},
     nonstandard::Phase,

fork_choice_control/Cargo.toml

@@ -26,7 +26,6 @@ genesis = { workspace = true }
 helper_functions = { workspace = true }
 http_api_utils = { workspace = true }
 itertools = { workspace = true }
-log = { workspace = true }
 mime = { workspace = true }
 nonzero_ext = { workspace = true }
 num_cpus = { workspace = true }
@@ -42,6 +41,7 @@ std_ext = { workspace = true }
 strum = { workspace = true }
 tap = { workspace = true }
 thiserror = { workspace = true }
+tracing = { workspace = true }
 transition_functions = { workspace = true }
 tynm = { workspace = true }
 types = { workspace = true }

fork_choice_control/src/checkpoint_sync.rs

@@ -4,7 +4,7 @@ use std::sync::Arc;
 use anyhow::{bail, Result};
 use helper_functions::misc;
 use http_api_utils::{BlockId, StateId};
-use log::info;
+use tracing::info;
 use mime::APPLICATION_OCTET_STREAM;
 use reqwest::{header::ACCEPT, Client, StatusCode, Url};
 use ssz::SszRead;

fork_choice_control/src/messages.rs

@@ -13,7 +13,7 @@ use fork_choice_store::{
     ChainLink, Store,
 };
 use helper_functions::{accessors, misc};
-use log::debug;
+use tracing::debug;
 use serde::Serialize;
 use tap::Pipe as _;
 use types::{

fork_choice_control/src/mutator.rs

@@ -39,7 +39,7 @@ use fork_choice_store::{
 use futures::channel::{mpsc::Sender as MultiSender, oneshot::Sender as OneshotSender};
 use helper_functions::{accessors, misc, predicates, verifier::NullVerifier};
 use itertools::{Either, Itertools as _};
-use log::{debug, error, info, warn};
+use tracing::{debug, error, info, warn};
 use prometheus_metrics::Metrics;
 use ssz::SszHash as _;
 use std_ext::ArcExt as _;

fork_choice_control/src/storage.rs

@@ -9,7 +9,7 @@ use fork_choice_store::{ChainLink, Store};
 use genesis::AnchorCheckpointProvider;
 use helper_functions::{accessors, misc};
 use itertools::Itertools as _;
-use log::{debug, info, warn};
+use tracing::{debug, info, warn};
 use nonzero_ext::nonzero;
 use reqwest::{Client, Url};
 use ssz::{Ssz, SszRead, SszReadDefault as _, SszWrite};

fork_choice_control/src/storage_back_sync.rs

@@ -5,7 +5,7 @@ use arithmetic::U64Ext as _;
 use features::Feature;
 use genesis::AnchorCheckpointProvider;
 use helper_functions::misc;
-use log::{info, warn};
+use tracing::{info, warn};
 use ssz::SszHash as _;
 use std_ext::ArcExt as _;
 use transition_functions::combined;

fork_choice_control/src/storage_tool.rs

@@ -2,7 +2,7 @@ use std::path::{Path, PathBuf};
 
 use anyhow::Result;
 use genesis::AnchorCheckpointProvider;
-use log::info;
+use tracing::info;
 use ssz::{SszHash as _, SszRead, SszWrite as _};
 use std_ext::ArcExt as _;
 use thiserror::Error;

fork_choice_control/src/tasks.rs

@@ -17,7 +17,7 @@ use helper_functions::{
     accessors, misc,
     verifier::{MultiVerifier, NullVerifier},
 };
-use log::{debug, warn};
+use tracing::{debug, warn};
 use prometheus_metrics::Metrics;
 use types::{
     combined::SignedBeaconBlock,

fork_choice_control/src/thread_pool.rs

@@ -17,7 +17,7 @@ use anyhow::Result;
 use derivative::Derivative;
 use derive_more::From;
 use execution_engine::ExecutionEngine;
-use log::debug;
+use tracing::debug;
 use parking_lot::{Condvar, Mutex};
 use std_ext::ArcExt as _;
 use types::preset::Preset;

grandine/Cargo.toml

@@ -36,7 +36,6 @@ hex-literal = { workspace = true }
 http_api = { workspace = true }
 itertools = { workspace = true }
 keymanager = { workspace = true }
-log = { workspace = true }
 logging = { workspace = true }
 metrics = { workspace = true }
 p2p = { workspace = true }
@@ -59,6 +58,7 @@ tap = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
 tower-http = { workspace = true }
+tracing = {workspace = true}
 types = { workspace = true }
 validator = { workspace = true }
 validator_key_cache = { workspace = true }

grandine/src/grandine_args.rs

@@ -30,7 +30,7 @@ use fork_choice_store::{StoreConfig, DEFAULT_CACHE_LOCK_TIMEOUT_MILLIS};
 use grandine_version::{APPLICATION_NAME, APPLICATION_NAME_AND_VERSION, APPLICATION_VERSION};
 use http_api::HttpApiConfig;
 use itertools::{EitherOrBoth, Itertools as _};
-use log::warn;
+use tracing::warn;
 use metrics::{MetricsServerConfig, MetricsServiceConfig};
 use p2p::{Enr, Multiaddr, NetworkConfig};
 use prometheus_metrics::{Metrics, METRICS};

grandine/src/grandine_config.rs

@@ -5,12 +5,11 @@ use builder_api::BuilderConfig;
 use eth1_api::AuthOptions;
 use features::Feature;
 use http_api::HttpApiConfig;
-use itertools::Itertools as _;
-use log::info;
 use p2p::NetworkConfig;
 use reqwest::Url;
 use runtime::{MetricsConfig, StorageConfig};
 use signer::Web3SignerConfig;
+use tracing::info;
 use types::{
     config::Config as ChainConfig,
     phase0::primitives::{ExecutionAddress, ExecutionBlockNumber, Slot, H256},
@@ -110,7 +109,7 @@ impl GrandineConfig {
             storage_config.eth1_db_size.to_string_as(true),
         );
 
-        info!("Eth1 RPC URLs: [{}]", eth1_rpc_urls.iter().format(", "));
+        info!("Eth1 RPC URLs: {:?}", eth1_rpc_urls);
         info!("graffiti: {graffiti:?}");
         info!("HTTP API address: {}", http_api_config.address);
 
@@ -151,8 +150,8 @@ impl GrandineConfig {
 
         if !web3signer_config.urls.is_empty() {
             info!(
-                "using Web3Signer API to sign validator messages (API URLs: [{}])",
-                web3signer_config.urls.iter().format(", "),
+                "using Web3Signer API to sign validator messages (API URLs: {:?})",
+                web3signer_config.urls,
             );
         }
 

grandine/src/main.rs

@@ -19,8 +19,7 @@ use fork_choice_store::StoreConfig;
 use genesis::AnchorCheckpointProvider;
 use grandine_version::APPLICATION_VERSION_WITH_PLATFORM;
 use http_api::HttpApiConfig;
-use log::{error, info, warn};
-use logging::PEER_LOG_METRICS;
+use logging::{setup_tracing, PEER_LOG_METRICS};
 use metrics::MetricsServerConfig;
 use p2p::{ListenAddr, NetworkConfig};
 use reqwest::{Client, ClientBuilder, Url};
@@ -32,6 +31,7 @@ use ssz::SszRead as _;
 use std_ext::ArcExt as _;
 use thiserror::Error;
 use tokio::runtime::Builder;
+use tracing::{error, info, warn};
 use types::{
     config::Config as ChainConfig,
     phase0::primitives::{ExecutionBlockNumber, Slot},
@@ -308,6 +308,8 @@ enum Error {
 }
 
 fn main() -> ExitCode {
+    let _guard = setup_tracing();
+    info!("Grandine firing up...");
     if let Err(error) = try_main() {
         error.downcast_ref().map(ClapError::exit);
         error!("{error:?}");