Skip to content

Commit

Permalink
refactor: use default log level env if it exists
Browse files Browse the repository at this point in the history
Signed-off-by: bsbds <[email protected]>
  • Loading branch information
bsbds committed Sep 20, 2024
1 parent 8529fea commit 055ed49
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions crates/xline/src/utils/trace.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
use anyhow::{Ok, Result};
use anyhow::Result;
use opentelemetry::global;
use opentelemetry::trace::TracerProvider;
use opentelemetry_contrib::trace::exporter::jaeger_json::JaegerJsonExporter;
use opentelemetry_sdk::runtime::Tokio;
use tracing::warn;
use tracing_appender::non_blocking::WorkerGuard;
use tracing_subscriber::layer::SubscriberExt;
use tracing_subscriber::{fmt::format, util::SubscriberInitExt, Layer};
use tracing_subscriber::util::SubscriberInitExt;
use tracing_subscriber::EnvFilter;
use tracing_subscriber::{fmt::format, Layer};
use utils::config::{file_appender, LogConfig, RotationConfig, TraceConfig};

/// Return a Box trait from the config
Expand Down Expand Up @@ -66,16 +68,19 @@ pub fn init_subscriber(
.with_filter(tracing_subscriber::EnvFilter::from_default_env());
let writer = generate_writer(name, log_config);
let (non_blocking, guard) = tracing_appender::non_blocking(writer);
let filter = EnvFilter::try_from_default_env()
.unwrap_or_else(|_| EnvFilter::default().add_directive((*log_config.level()).into()));
let log_layer = tracing_subscriber::fmt::layer()
.event_format(format().compact())
.with_writer(non_blocking)
.with_ansi(false)
.with_filter(*log_config.level());
.with_filter(filter);

tracing_subscriber::registry()
.with(jaeger_fmt_layer)
.with(jaeger_online_layer)
.with(jaeger_offline_layer)
.with(log_layer)
.try_init()?;
Ok(Some(guard))
anyhow::Ok(Some(guard))
}

0 comments on commit 055ed49

Please sign in to comment.