Shuffle rtacing inits for proper backtraces

erooster-mail · Sep 8, 2023 · 37d52c7 · 37d52c7
1 parent 259380e
commit 37d52c7
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/crates/erooster/src/main.rs b/crates/erooster/src/main.rs
@@ -64,17 +64,25 @@ async fn main() -> Result<()> {
  // Setup the rest of our logging
  cfg_if::cfg_if! {
  if #[cfg(feature = "jaeger")] {
- use tracing_error::ErrorLayer;
  use tracing_subscriber::layer::SubscriberExt;
  use tracing_subscriber::util::SubscriberInitExt;
- let tracer = opentelemetry_jaeger::new_agent_pipeline().with_service_name(env!("CARGO_PKG_NAME")).with_auto_split_batch(true).install_batch(opentelemetry::runtime::Tokio)?;
+ let tracer = opentelemetry_jaeger::new_agent_pipeline()
+ .with_service_name(env!("CARGO_PKG_NAME"))
+ .with_auto_split_batch(true)
+ .install_batch(opentelemetry::runtime::Tokio)?;
  tracing_subscriber::Registry::default()
- .with(tracing_subscriber::fmt::Layer::default())
  .with(ErrorLayer::default())
+ .with(tracing_subscriber::fmt::Layer::default())
  .with(tracing_opentelemetry::layer().with_tracer(tracer))
  .init();
  } else {
- tracing_subscriber::fmt::init();
+ use tracing_error::ErrorLayer;
+ use tracing_subscriber::layer::SubscriberExt;
+ use tracing_subscriber::util::SubscriberInitExt;
+ tracing_subscriber::Registry::default()
+ .with(ErrorLayer::default())
+ .with(tracing_subscriber::fmt::Layer::default())
+ .init();
  }
  }