diff --git a/common/gateway-requests/src/types/text_request/mod.rs b/common/gateway-requests/src/types/text_request/mod.rs index d489dd91e9..b560b5be0b 100644 --- a/common/gateway-requests/src/types/text_request/mod.rs +++ b/common/gateway-requests/src/types/text_request/mod.rs @@ -14,7 +14,6 @@ use nym_sphinx::DestinationAddressBytes; use nym_statistics_common::types::SessionType; use opentelemetry::trace::TraceContextExt; use serde::{Deserialize, Serialize}; -use std::panic; use std::str::FromStr; use tracing::{instrument, warn}; use tungstenite::Message; diff --git a/nym-node/src/logging.rs b/nym-node/src/logging.rs index 01e3b7bfb9..8e3ef96326 100644 --- a/nym-node/src/logging.rs +++ b/nym-node/src/logging.rs @@ -6,6 +6,7 @@ use tracing::{info, warn}; use tracing_subscriber::filter::Directive; use tracing_subscriber::layer::SubscriberExt; use tracing_subscriber::util::SubscriberInitExt; +use tracing_subscriber::{fmt, Layer}; // Signoz use opentelemetry::trace::TracerProvider; @@ -20,6 +21,7 @@ use opentelemetry_semantic_conventions::resource::{DEPLOYMENT_ENVIRONMENT_NAME, use opentelemetry_semantic_conventions::SCHEMA_URL; use tracing_core::Level; use tracing_opentelemetry::{MetricsLayer, OpenTelemetryLayer}; +use tracing_subscriber::fmt::format::FmtSpan; pub(crate) fn granual_filtered_env() -> anyhow::Result { fn directive_checked(directive: impl Into) -> anyhow::Result { @@ -48,8 +50,15 @@ pub(crate) fn build_tracing_logger() -> anyhow::Result { let meter_provider = init_meter_provider()?; let tracer = tracer_provider.tracer("tracing-otel-subscriber"); + let fmt_layer = fmt::layer() + .json() + .with_writer(std::io::stderr) + .with_span_events(FmtSpan::NEW | FmtSpan::CLOSE) + .with_span_list(false) + .with_current_span(true); + let registry = tracing_subscriber::registry() - .with(default_tracing_fmt_layer(std::io::stderr)) + .with(fmt_layer) .with(granual_filtered_env()?) .with(tracing_subscriber::filter::LevelFilter::from_level( Level::DEBUG,