revert changes from previous commit

This commit is contained in:
Floriane TUERNAL SABOTINOV
2025-08-27 15:35:09 +02:00
parent 57d2824521
commit 89fe17f19c
2 changed files with 19 additions and 2 deletions
+18 -1
View File
@@ -3,9 +3,9 @@ mod trace_id_format;
use tracing::{info, Level};
use tracing_subscriber::filter::Directive;
use tracing_subscriber::fmt;
use tracing_subscriber::layer::SubscriberExt;
use tracing_subscriber::util::SubscriberInitExt;
use tracing_subscriber::{fmt, Layer};
use crate::logging::{default_tracing_env_filter, default_tracing_fmt_layer};
use crate::opentelemetry::error::TracingError;
@@ -72,6 +72,23 @@ pub(crate) fn build_tracing_logger() -> Result<impl SubscriberExt, TracingError>
}
pub fn setup_tracing_logger() -> Result<(), TracingError> {
let stderr_layer =
default_tracing_fmt_layer(std::io::stderr).with_filter(granual_filtered_env()?);
cfg_if::cfg_if! {if #[cfg(feature = "tokio-console")] {
// instrument tokio console subscriber needs RUSTFLAGS="--cfg tokio_unstable" at build time
let console_layer = console_subscriber::spawn();
tracing_subscriber::registry()
.with(console_layer)
.with(stderr_layer)
.init();
} else {
tracing_subscriber::registry()
.with(stderr_layer)
.init();
}}
build_tracing_logger()?.init();
Ok(())
}
+1 -1
View File
@@ -7,7 +7,7 @@ use tempfile::TempDir;
#[tokio::main]
async fn main() {
nym_bin_common::opentelemetry::setup_tracing_logger().unwrap();
nym_bin_common::logging::setup_tracing_logger();
// Specify some config options
let config_dir: PathBuf = TempDir::new().unwrap().path().to_path_buf();