diff --git a/Cargo.lock b/Cargo.lock index 34a4eb2de2..7c927a02b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -522,7 +522,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" name = "autodoc" version = "0.1.0" dependencies = [ - "env_logger 0.11.8", + "env_logger", "log", ] @@ -2379,19 +2379,6 @@ dependencies = [ "regex", ] -[[package]] -name = "env_logger" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.11.8" @@ -4930,7 +4917,6 @@ dependencies = [ "log", "opentelemetry", "opentelemetry-jaeger", - "pretty_env_logger", "schemars", "serde", "serde_json", @@ -4975,7 +4961,6 @@ dependencies = [ "nym-cli-commands", "nym-network-defaults", "nym-validator-client", - "pretty_env_logger", "serde", "serde_json", "tap", @@ -6071,7 +6056,6 @@ dependencies = [ "nym-sphinx", "nym-task", "nym-types", - "pretty_env_logger", "publicsuffix", "rand 0.8.5", "regex", @@ -6430,7 +6414,6 @@ dependencies = [ "nym-topology", "nym-validator-client", "parking_lot", - "pretty_env_logger", "rand 0.8.5", "reqwest 0.12.15", "serde", @@ -7774,16 +7757,6 @@ dependencies = [ "yansi", ] -[[package]] -name = "pretty_env_logger" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" -dependencies = [ - "env_logger 0.10.2", - "log", -] - [[package]] name = "primeorder" version = "0.13.6" diff --git a/Cargo.toml b/Cargo.toml index f21cf66aca..70520b94b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -286,7 +286,6 @@ pem = "0.8" petgraph = "0.6.5" pin-project = "1.1" pin-project-lite = "0.2.16" -pretty_env_logger = "0.5.0" publicsuffix = "2.3.0" quote = "1" rand = "0.8.5" diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml index eb788f7aa8..337bebf2a9 100644 --- a/clients/native/Cargo.toml +++ b/clients/native/Cargo.toml @@ -46,6 +46,7 @@ nym-bandwidth-controller = { path = "../../common/bandwidth-controller" } nym-bin-common = { path = "../../common/bin-common", features = [ "output_format", "clap", + "basic_tracing", ] } nym-client-core = { path = "../../common/client-core", features = [ "fs-credentials-storage", diff --git a/clients/native/src/main.rs b/clients/native/src/main.rs index abeb07a647..d00f0b5e51 100644 --- a/clients/native/src/main.rs +++ b/clients/native/src/main.rs @@ -4,7 +4,7 @@ use std::error::Error; use clap::{crate_name, crate_version, Parser}; -use nym_bin_common::logging::{maybe_print_banner, setup_logging}; +use nym_bin_common::logging::{maybe_print_banner, setup_tracing_logger}; use nym_network_defaults::setup_env; pub mod client; @@ -20,7 +20,7 @@ async fn main() -> Result<(), Box> { if !args.no_banner { maybe_print_banner(crate_name!(), crate_version!()); } - setup_logging(); + setup_tracing_logger(); if let Err(err) = commands::execute(args).await { log::error!("{err}"); diff --git a/clients/socks5/Cargo.toml b/clients/socks5/Cargo.toml index d6592b77ca..c3b4b06e2c 100644 --- a/clients/socks5/Cargo.toml +++ b/clients/socks5/Cargo.toml @@ -27,6 +27,7 @@ zeroize = { workspace = true } nym-bin-common = { path = "../../common/bin-common", features = [ "output_format", "clap", + "basic_tracing", ] } nym-client-core = { path = "../../common/client-core", features = [ "fs-credentials-storage", diff --git a/clients/socks5/src/main.rs b/clients/socks5/src/main.rs index 8ad4ddf954..36161d3dcd 100644 --- a/clients/socks5/src/main.rs +++ b/clients/socks5/src/main.rs @@ -4,7 +4,7 @@ use std::error::Error; use clap::{crate_name, crate_version, Parser}; -use nym_bin_common::logging::{maybe_print_banner, setup_logging}; +use nym_bin_common::logging::{maybe_print_banner, setup_tracing_logger}; use nym_network_defaults::setup_env; mod commands; @@ -19,7 +19,7 @@ async fn main() -> Result<(), Box> { if !args.no_banner { maybe_print_banner(crate_name!(), crate_version!()); } - setup_logging(); + setup_tracing_logger(); if let Err(err) = commands::execute(args).await { log::error!("{err}"); diff --git a/common/bin-common/Cargo.toml b/common/bin-common/Cargo.toml index 51cfa31b19..aa75898ec4 100644 --- a/common/bin-common/Cargo.toml +++ b/common/bin-common/Cargo.toml @@ -13,7 +13,6 @@ clap_complete = { workspace = true, optional = true } clap_complete_fig = { workspace = true, optional = true } const-str = { workspace = true } log = { workspace = true } -pretty_env_logger = { workspace = true } schemars = { workspace = true, features = ["preserve_order"], optional = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true, optional = true } diff --git a/common/bin-common/src/logging/mod.rs b/common/bin-common/src/logging/mod.rs index ffbe6a6cb0..b5a9c68e40 100644 --- a/common/bin-common/src/logging/mod.rs +++ b/common/bin-common/src/logging/mod.rs @@ -21,29 +21,6 @@ pub struct LoggingSettings { // well, we need to implement something here at some point... } -// I'd argue we should start transitioning from `log` to `tracing` -pub fn setup_logging() { - let mut log_builder = pretty_env_logger::formatted_timed_builder(); - if let Ok(s) = ::std::env::var("RUST_LOG") { - log_builder.parse_filters(&s); - } else { - // default to 'Info' - log_builder.filter(None, log::LevelFilter::Info); - } - - log_builder - .filter_module("hyper", log::LevelFilter::Warn) - .filter_module("tokio_reactor", log::LevelFilter::Warn) - .filter_module("reqwest", log::LevelFilter::Warn) - .filter_module("mio", log::LevelFilter::Warn) - .filter_module("want", log::LevelFilter::Warn) - .filter_module("tungstenite", log::LevelFilter::Warn) - .filter_module("tokio_tungstenite", log::LevelFilter::Warn) - .filter_module("handlebars", log::LevelFilter::Warn) - .filter_module("sled", log::LevelFilter::Warn) - .init(); -} - // don't call init so that we could attach additional layers #[cfg(feature = "basic_tracing")] pub fn build_tracing_logger() -> impl tracing_subscriber::layer::SubscriberExt { diff --git a/nym-network-monitor/Cargo.toml b/nym-network-monitor/Cargo.toml index a5862e0188..c693cb5b19 100644 --- a/nym-network-monitor/Cargo.toml +++ b/nym-network-monitor/Cargo.toml @@ -30,7 +30,7 @@ utoipa-swagger-ui = { workspace = true, features = ["axum"] } tokio-postgres = { workspace = true } # internal -nym-bin-common = { path = "../common/bin-common" } +nym-bin-common = { path = "../common/bin-common", features = ["basic_tracing"] } nym-client-core = { path = "../common/client-core" } nym-crypto = { path = "../common/crypto" } nym-network-defaults = { path = "../common/network-defaults" } diff --git a/nym-network-monitor/src/main.rs b/nym-network-monitor/src/main.rs index f285446a30..73d4f01414 100644 --- a/nym-network-monitor/src/main.rs +++ b/nym-network-monitor/src/main.rs @@ -178,7 +178,7 @@ async fn nym_topology_from_env() -> anyhow::Result { #[tokio::main] async fn main() -> Result<()> { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); let args = Args::parse(); diff --git a/nym-wallet/Cargo.lock b/nym-wallet/Cargo.lock index 3efcb8f461..a49995c433 100644 --- a/nym-wallet/Cargo.lock +++ b/nym-wallet/Cargo.lock @@ -4039,6 +4039,8 @@ dependencies = [ "pretty_env_logger", "schemars", "serde", + "tracing", + "tracing-subscriber", "utoipa", "vergen", ] @@ -4430,7 +4432,6 @@ dependencies = [ "log", "nym-bin-common", "nym-store-cipher", - "pretty_env_logger", "serde_json", ] diff --git a/nym-wallet/nym-wallet-recovery-cli/Cargo.toml b/nym-wallet/nym-wallet-recovery-cli/Cargo.toml index a0523ae3c7..5d78d02d41 100644 --- a/nym-wallet/nym-wallet-recovery-cli/Cargo.toml +++ b/nym-wallet/nym-wallet-recovery-cli/Cargo.toml @@ -11,8 +11,7 @@ base64 = "0.13" bip39 = { version = "2.0.0", features = ["zeroize"] } clap = { version = "4.0", features = ["derive"] } log = "0.4" -pretty_env_logger = "0.4" serde_json = "1.0.0" -nym-bin-common = { path = "../../common/bin-common" } -nym-store-cipher = { path = "../../common/store-cipher" } \ No newline at end of file +nym-bin-common = { path = "../../common/bin-common", features = ["basic_tracing"] } +nym-store-cipher = { path = "../../common/store-cipher" } diff --git a/nym-wallet/nym-wallet-recovery-cli/src/main.rs b/nym-wallet/nym-wallet-recovery-cli/src/main.rs index 813e53c376..0162eaa826 100644 --- a/nym-wallet/nym-wallet-recovery-cli/src/main.rs +++ b/nym-wallet/nym-wallet-recovery-cli/src/main.rs @@ -8,7 +8,7 @@ use anyhow::{anyhow, Result}; use clap::Parser; -use nym_bin_common::logging::setup_logging; +use nym_bin_common::logging::setup_tracing_logger; use nym_store_cipher::{ Aes256Gcm, Algorithm, EncryptedData, KdfInfo, Params, StoreCipher, Version, ARGON2_SALT_SIZE, CURRENT_VERSION, @@ -52,7 +52,7 @@ enum ParseMode { } fn main() -> Result<()> { - setup_logging(); + setup_tracing_logger(); let args = Args::parse(); let file = File::open(args.file)?; let parse = if args.raw { diff --git a/sdk/ffi/cpp/Cargo.toml b/sdk/ffi/cpp/Cargo.toml index 7b49a98540..8ac5f608db 100644 --- a/sdk/ffi/cpp/Cargo.toml +++ b/sdk/ffi/cpp/Cargo.toml @@ -13,7 +13,7 @@ crate-type = ["cdylib"] tokio = { workspace = true, features = ["full"] } # Nym clients, addressing, packet format, common tools (logging), ffi shared nym-sdk = { path = "../../rust/nym-sdk/" } -nym-bin-common = { path = "../../../common/bin-common" } +nym-bin-common = { path = "../../../common/bin-common", features = ["basic_tracing"] } nym-sphinx-anonymous-replies = { path = "../../../common/nymsphinx/anonymous-replies" } nym-ffi-shared = { path = "../shared" } lazy_static = { workspace = true } diff --git a/sdk/ffi/cpp/src/lib.rs b/sdk/ffi/cpp/src/lib.rs index 0c4784dc4e..110f0e2fbe 100644 --- a/sdk/ffi/cpp/src/lib.rs +++ b/sdk/ffi/cpp/src/lib.rs @@ -12,7 +12,7 @@ use crate::types::types::{CMessageCallback, CStringCallback, ReceivedMessage, St #[no_mangle] pub extern "C" fn init_logging() { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); } #[no_mangle] diff --git a/sdk/ffi/go/Cargo.toml b/sdk/ffi/go/Cargo.toml index 584ef8546e..f24697e107 100644 --- a/sdk/ffi/go/Cargo.toml +++ b/sdk/ffi/go/Cargo.toml @@ -13,7 +13,7 @@ name = "nym_go_ffi" uniffi = { workspace = true, features = ["cli"] } # Nym clients, addressing, packet format, common tools (logging), ffi shared nym-sdk = { path = "../../rust/nym-sdk/" } -nym-bin-common = { path = "../../../common/bin-common" } +nym-bin-common = { path = "../../../common/bin-common", features = ["basic_tracing"] } nym-sphinx-anonymous-replies = { path = "../../../common/nymsphinx/anonymous-replies" } nym-ffi-shared = { path = "../shared" } # Async runtime diff --git a/sdk/ffi/go/src/lib.rs b/sdk/ffi/go/src/lib.rs index 83656c1b76..6950a6e4e7 100644 --- a/sdk/ffi/go/src/lib.rs +++ b/sdk/ffi/go/src/lib.rs @@ -35,7 +35,7 @@ enum GoWrapError { #[no_mangle] fn init_logging() { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); } #[no_mangle] diff --git a/sdk/rust/nym-sdk/Cargo.toml b/sdk/rust/nym-sdk/Cargo.toml index c95118cf3c..ff74e7a708 100644 --- a/sdk/rust/nym-sdk/Cargo.toml +++ b/sdk/rust/nym-sdk/Cargo.toml @@ -77,11 +77,10 @@ dirs.workspace = true [dev-dependencies] anyhow = { workspace = true } dotenvy = { workspace = true } -pretty_env_logger = { workspace = true } reqwest = { workspace = true, features = ["json", "socks"] } thiserror = { workspace = true } tokio = { workspace = true, features = ["full"] } -nym-bin-common = { path = "../../../common/bin-common" } +nym-bin-common = { path = "../../../common/bin-common", features = ["basic_tracing"] } # extra dependencies for libp2p examples #libp2p = { git = "https://github.com/ChainSafe/rust-libp2p.git", rev = "e3440d25681df380c9f0f8cfdcfd5ecc0a4f2fb6", features = [ "identify", "macros", "ping", "tokio", "tcp", "dns", "websocket", "noise", "mplex", "yamux", "gossipsub" ]} diff --git a/sdk/rust/nym-sdk/examples/bandwidth.rs b/sdk/rust/nym-sdk/examples/bandwidth.rs index bc30d1f65e..510c225946 100644 --- a/sdk/rust/nym-sdk/examples/bandwidth.rs +++ b/sdk/rust/nym-sdk/examples/bandwidth.rs @@ -6,7 +6,7 @@ use nym_sdk::mixnet::MixnetMessageSender; #[tokio::main] async fn main() -> anyhow::Result<()> { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); // right now, only sandbox has coconut setup // this should be run from the `sdk/rust/nym-sdk` directory setup_env(Some("../../../envs/sandbox.env")); diff --git a/sdk/rust/nym-sdk/examples/builder.rs b/sdk/rust/nym-sdk/examples/builder.rs index c06fc55913..f0da9afc11 100644 --- a/sdk/rust/nym-sdk/examples/builder.rs +++ b/sdk/rust/nym-sdk/examples/builder.rs @@ -3,7 +3,7 @@ use nym_sdk::mixnet::MixnetMessageSender; #[tokio::main] async fn main() { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); // Create client builder, including ephemeral keys. The builder can be usable in the context // where you don't want to connect just yet. diff --git a/sdk/rust/nym-sdk/examples/builder_with_storage.rs b/sdk/rust/nym-sdk/examples/builder_with_storage.rs index b733239f5f..51fbc6b598 100644 --- a/sdk/rust/nym-sdk/examples/builder_with_storage.rs +++ b/sdk/rust/nym-sdk/examples/builder_with_storage.rs @@ -4,7 +4,7 @@ use std::path::PathBuf; #[tokio::main] async fn main() { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); // Specify some config options let config_dir = PathBuf::from("/tmp/mixnet-client"); diff --git a/sdk/rust/nym-sdk/examples/change_gateway.rs b/sdk/rust/nym-sdk/examples/change_gateway.rs index 7a6771a7b9..d4ad49536c 100644 --- a/sdk/rust/nym-sdk/examples/change_gateway.rs +++ b/sdk/rust/nym-sdk/examples/change_gateway.rs @@ -3,7 +3,7 @@ #[tokio::main] async fn main() { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); todo!() } diff --git a/sdk/rust/nym-sdk/examples/client_pool.rs b/sdk/rust/nym-sdk/examples/client_pool.rs index 27c452ec19..432564218c 100644 --- a/sdk/rust/nym-sdk/examples/client_pool.rs +++ b/sdk/rust/nym-sdk/examples/client_pool.rs @@ -12,7 +12,7 @@ use tokio::signal::ctrl_c; // Run with: cargo run --example client_pool -- ../../../envs/.env #[tokio::main] async fn main() -> Result<()> { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); setup_env(std::env::args().nth(1)); let conn_pool = ClientPool::new(2); // Start the Client Pool with 2 Clients always being kept in reserve diff --git a/sdk/rust/nym-sdk/examples/custom_topology_provider.rs b/sdk/rust/nym-sdk/examples/custom_topology_provider.rs index 7cd5a6f50c..805152708a 100644 --- a/sdk/rust/nym-sdk/examples/custom_topology_provider.rs +++ b/sdk/rust/nym-sdk/examples/custom_topology_provider.rs @@ -63,7 +63,7 @@ impl TopologyProvider for MyTopologyProvider { #[tokio::main] async fn main() { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); let nym_api = "https://validator.nymtech.net/api/".parse().unwrap(); let my_topology_provider = MyTopologyProvider::new(nym_api); diff --git a/sdk/rust/nym-sdk/examples/libp2p_shared/transport.rs b/sdk/rust/nym-sdk/examples/libp2p_shared/transport.rs index 938acd68e1..46a81a8577 100644 --- a/sdk/rust/nym-sdk/examples/libp2p_shared/transport.rs +++ b/sdk/rust/nym-sdk/examples/libp2p_shared/transport.rs @@ -538,7 +538,7 @@ mod test { Multiaddr, StreamMuxer, }; use log::info; - use nym_bin_common::logging::setup_logging; + use nym_bin_common::logging::setup_tracing_logger; use nym_sdk::mixnet::MixnetClient; use std::{pin::Pin, str::FromStr, sync::atomic::Ordering}; use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender}; @@ -573,7 +573,7 @@ mod test { #[tokio::test] async fn test_transport_connection() { - setup_logging(); + setup_tracing_logger(); let client = MixnetClient::connect_new().await.unwrap(); let (dialer_notify_inbound_tx, mut dialer_notify_inbound_rx) = unbounded_channel(); diff --git a/sdk/rust/nym-sdk/examples/manually_handle_storage.rs b/sdk/rust/nym-sdk/examples/manually_handle_storage.rs index 05ce8ebf01..87ba92c2ec 100644 --- a/sdk/rust/nym-sdk/examples/manually_handle_storage.rs +++ b/sdk/rust/nym-sdk/examples/manually_handle_storage.rs @@ -8,7 +8,7 @@ use nym_topology::provider_trait::async_trait; #[tokio::main] async fn main() { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); // Just some plain data to pretend we have some external storage that the application // implementer is using. diff --git a/sdk/rust/nym-sdk/examples/manually_overwrite_topology.rs b/sdk/rust/nym-sdk/examples/manually_overwrite_topology.rs index 38c2b3d7f3..0b9ee0adef 100644 --- a/sdk/rust/nym-sdk/examples/manually_overwrite_topology.rs +++ b/sdk/rust/nym-sdk/examples/manually_overwrite_topology.rs @@ -7,7 +7,7 @@ use nym_topology::{NymTopology, RoutingNode, SupportedRoles}; #[tokio::main] async fn main() { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); // Passing no config makes the client fire up an ephemeral session and figure shit out on its own let mut client = mixnet::MixnetClient::connect_new().await.unwrap(); diff --git a/sdk/rust/nym-sdk/examples/parallel_sending_and_receiving.rs b/sdk/rust/nym-sdk/examples/parallel_sending_and_receiving.rs index ca9b843717..b42ad5ef04 100644 --- a/sdk/rust/nym-sdk/examples/parallel_sending_and_receiving.rs +++ b/sdk/rust/nym-sdk/examples/parallel_sending_and_receiving.rs @@ -7,7 +7,7 @@ use nym_sdk::mixnet::MixnetMessageSender; #[tokio::main] async fn main() { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); // Passing no config makes the client fire up an ephemeral session and figure stuff out on its own let mut client = mixnet::MixnetClient::connect_new().await.unwrap(); diff --git a/sdk/rust/nym-sdk/examples/sandbox.rs b/sdk/rust/nym-sdk/examples/sandbox.rs index 7d92b63202..c3407a2124 100644 --- a/sdk/rust/nym-sdk/examples/sandbox.rs +++ b/sdk/rust/nym-sdk/examples/sandbox.rs @@ -6,7 +6,7 @@ use nym_sdk::mixnet::MixnetMessageSender; // An example of creating a client relying on a testnet, in this case Sandbox. #[tokio::main] async fn main() -> anyhow::Result<()> { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); // relative root is `sdk/rust/nym-sdk/` for fallback file path let env_path = std::env::var("NYM_ENV_PATH").unwrap_or_else(|_| "../../../envs/sandbox.env".to_string()); diff --git a/sdk/rust/nym-sdk/examples/simple.rs b/sdk/rust/nym-sdk/examples/simple.rs index 00ad24dc9a..55ecfb886d 100644 --- a/sdk/rust/nym-sdk/examples/simple.rs +++ b/sdk/rust/nym-sdk/examples/simple.rs @@ -3,7 +3,7 @@ use nym_sdk::mixnet::MixnetMessageSender; #[tokio::main] async fn main() { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); // Passing no config makes the client fire up an ephemeral session and figure shit out on its own // let mut client = mixnet::MixnetClient::connect_new().await.unwrap(); diff --git a/sdk/rust/nym-sdk/examples/socks5.rs b/sdk/rust/nym-sdk/examples/socks5.rs index 05732db53b..a80c65b56d 100644 --- a/sdk/rust/nym-sdk/examples/socks5.rs +++ b/sdk/rust/nym-sdk/examples/socks5.rs @@ -2,7 +2,7 @@ use nym_sdk::mixnet; #[tokio::main] async fn main() { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); println!("Connecting receiver"); let mut receiving_client = mixnet::MixnetClient::connect_new().await.unwrap(); diff --git a/sdk/rust/nym-sdk/examples/surb_reply.rs b/sdk/rust/nym-sdk/examples/surb_reply.rs index 649c8aaf7e..74f9162470 100644 --- a/sdk/rust/nym-sdk/examples/surb_reply.rs +++ b/sdk/rust/nym-sdk/examples/surb_reply.rs @@ -7,7 +7,7 @@ use tempfile::TempDir; #[tokio::main] async fn main() { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); // Specify some config options let config_dir: PathBuf = TempDir::new().unwrap().path().to_path_buf(); diff --git a/sdk/rust/nym-sdk/src/tcp_proxy/bin/proxy_server.rs b/sdk/rust/nym-sdk/src/tcp_proxy/bin/proxy_server.rs index 44686b438a..942cbd5317 100644 --- a/sdk/rust/nym-sdk/src/tcp_proxy/bin/proxy_server.rs +++ b/sdk/rust/nym-sdk/src/tcp_proxy/bin/proxy_server.rs @@ -19,7 +19,7 @@ struct Args { #[tokio::main] async fn main() -> Result<()> { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); let args = Args::parse(); diff --git a/service-providers/authenticator/Cargo.toml b/service-providers/authenticator/Cargo.toml index aed5a68870..b181420010 100644 --- a/service-providers/authenticator/Cargo.toml +++ b/service-providers/authenticator/Cargo.toml @@ -32,6 +32,7 @@ nym-authenticator-requests = { path = "../../common/authenticator-requests" } nym-bin-common = { path = "../../common/bin-common", features = [ "clap", "output_format", + "basic_tracing", ] } nym-client-core = { path = "../../common/client-core", features = ["cli"] } nym-config = { path = "../../common/config" } diff --git a/service-providers/authenticator/src/main.rs b/service-providers/authenticator/src/main.rs index 37e46f9047..0883e64a99 100644 --- a/service-providers/authenticator/src/main.rs +++ b/service-providers/authenticator/src/main.rs @@ -8,7 +8,7 @@ async fn main() -> anyhow::Result<()> { use clap::Parser; let args = cli::Cli::parse(); - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); nym_network_defaults::setup_env(args.config_env_file.as_ref()); if !args.no_banner { diff --git a/service-providers/ip-packet-router/Cargo.toml b/service-providers/ip-packet-router/Cargo.toml index 14cedf7743..c69d1caa20 100644 --- a/service-providers/ip-packet-router/Cargo.toml +++ b/service-providers/ip-packet-router/Cargo.toml @@ -17,7 +17,7 @@ clap.workspace = true etherparse = { workspace = true } futures = { workspace = true } log = { workspace = true } -nym-bin-common = { path = "../../common/bin-common", features = ["clap"] } +nym-bin-common = { path = "../../common/bin-common", features = ["clap", "basic_tracing"] } nym-client-core = { path = "../../common/client-core" } nym-config = { path = "../../common/config" } nym-crypto = { path = "../../common/crypto" } diff --git a/service-providers/ip-packet-router/src/main.rs b/service-providers/ip-packet-router/src/main.rs index 17e5040ab3..f1987ed6ab 100644 --- a/service-providers/ip-packet-router/src/main.rs +++ b/service-providers/ip-packet-router/src/main.rs @@ -10,7 +10,7 @@ async fn main() -> anyhow::Result<()> { use clap::Parser; let args = cli::Cli::parse(); - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); nym_network_defaults::setup_env(args.config_env_file.as_ref()); if !args.no_banner { diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml index ef44ea1197..43794da9c1 100644 --- a/service-providers/network-requester/Cargo.toml +++ b/service-providers/network-requester/Cargo.toml @@ -26,7 +26,6 @@ futures = { workspace = true } humantime-serde = { workspace = true } ipnetwork = { workspace = true } log = { workspace = true } -pretty_env_logger = { workspace = true } publicsuffix = { workspace = true } rand = { workspace = true } regex = { workspace = true } @@ -44,7 +43,7 @@ zeroize = { workspace = true } # internal nym-async-file-watcher = { path = "../../common/async-file-watcher" } -nym-bin-common = { path = "../../common/bin-common", features = ["output_format", "clap"] } +nym-bin-common = { path = "../../common/bin-common", features = ["output_format", "clap", "basic_tracing"] } nym-client-core = { path = "../../common/client-core", features = ["cli", "fs-gateways-storage", "fs-surb-storage"] } nym-client-websocket-requests = { path = "../../clients/native/websocket-requests" } nym-config = { path = "../../common/config" } diff --git a/service-providers/network-requester/src/main.rs b/service-providers/network-requester/src/main.rs index d43cf2a180..686019b575 100644 --- a/service-providers/network-requester/src/main.rs +++ b/service-providers/network-requester/src/main.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-only use clap::{crate_name, crate_version, Parser}; -use nym_bin_common::logging::{maybe_print_banner, setup_logging}; +use nym_bin_common::logging::{maybe_print_banner, setup_tracing_logger}; use nym_network_defaults::setup_env; mod cli; @@ -21,7 +21,7 @@ async fn main() -> anyhow::Result<()> { if !args.no_banner { maybe_print_banner(crate_name!(), crate_version!()); } - setup_logging(); + setup_tracing_logger(); cli::execute(args).await?; diff --git a/tools/nym-cli/Cargo.toml b/tools/nym-cli/Cargo.toml index 4df9ddd361..b4fa637ee9 100644 --- a/tools/nym-cli/Cargo.toml +++ b/tools/nym-cli/Cargo.toml @@ -14,7 +14,6 @@ clap_complete_fig = { workspace = true } dotenvy = { workspace = true } inquire = { workspace = true } log = { workspace = true } -pretty_env_logger = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } tokio = { workspace = true, features = ["net", "rt-multi-thread", "macros", "signal"] } @@ -23,7 +22,7 @@ anyhow = { workspace = true } tap = { workspace = true } nym-cli-commands = { path = "../../common/commands" } -nym-bin-common = { path = "../../common/bin-common"} +nym-bin-common = { path = "../../common/bin-common", features = ["basic_tracing"] } nym-validator-client = { path = "../../common/client-libs/validator-client", features = ["http-client"] } nym-network-defaults = { path = "../../common/network-defaults" } diff --git a/tools/nym-cli/src/main.rs b/tools/nym-cli/src/main.rs index 7854dbb0d2..9fa5a3d9dd 100644 --- a/tools/nym-cli/src/main.rs +++ b/tools/nym-cli/src/main.rs @@ -3,7 +3,7 @@ use clap::{CommandFactory, Parser, Subcommand}; use log::{error, warn}; -use nym_bin_common::logging::setup_logging; +use nym_bin_common::logging::setup_tracing_logger; use nym_cli_commands::context::{get_network_details, ClientArgs}; use nym_validator_client::nyxd::AccountId; @@ -150,7 +150,7 @@ async fn wait_for_interrupt() { #[tokio::main] async fn main() -> anyhow::Result<()> { - setup_logging(); + setup_tracing_logger(); let cli = Cli::parse(); diff --git a/tools/nym-nr-query/Cargo.toml b/tools/nym-nr-query/Cargo.toml index 8309e7e9c8..f5ec6f6475 100644 --- a/tools/nym-nr-query/Cargo.toml +++ b/tools/nym-nr-query/Cargo.toml @@ -10,7 +10,7 @@ license.workspace = true anyhow = { workspace = true } clap = { workspace = true, features = ["cargo", "derive"]} log = { workspace = true } -nym-bin-common = { path = "../../common/bin-common", features = ["output_format"] } +nym-bin-common = { path = "../../common/bin-common", features = ["output_format", "basic_tracing"] } nym-network-defaults = { path = "../../common/network-defaults" } nym-sdk = { path = "../../sdk/rust/nym-sdk" } nym-service-providers-common = { path = "../../service-providers/common" } diff --git a/tools/nym-nr-query/src/main.rs b/tools/nym-nr-query/src/main.rs index 477d3937c9..67980d638f 100644 --- a/tools/nym-nr-query/src/main.rs +++ b/tools/nym-nr-query/src/main.rs @@ -312,7 +312,7 @@ async fn main() -> anyhow::Result<()> { let args = Cli::parse(); if args.debug { - nym_bin_common::logging::setup_logging(); + nym_bin_common::logging::setup_tracing_logger(); } nym_network_defaults::setup_env(args.config_env_file.as_ref());