Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
refactor(log): replace the TELEMETRY_DEFAULT_TARCER singleton with …
…a function
  • Loading branch information
rami3l committed Jun 18, 2024
commit 2261e266da6b8e6218757aaa857c57c04ae29d78
10 changes: 4 additions & 6 deletions src/cli/log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ use tracing_subscriber::{
EnvFilter, Layer,
};

#[cfg(feature = "otel")]
use once_cell::sync::Lazy;
#[cfg(feature = "otel")]
use opentelemetry_sdk::trace::Tracer;

Expand Down Expand Up @@ -131,16 +129,16 @@ where
EnvFilter::new("rustup=TRACE")
};
tracing_opentelemetry::layer()
.with_tracer(TELEMETRY_DEFAULT_TRACER.clone())
.with_tracer(telemetry_default_tracer())
.with_filter(env_filter)
}

/// The default `opentelemetry` tracer used across Rustup.
///
/// # Note
/// The initializer function will panic if not called within the context of a [`tokio`] runtime.
/// This function will panic if not called within the context of a [`tokio`] runtime.
#[cfg(feature = "otel")]
static TELEMETRY_DEFAULT_TRACER: Lazy<Tracer> = Lazy::new(|| {
fn telemetry_default_tracer() -> Tracer {
use std::time::Duration;

use opentelemetry::KeyValue;
Expand All @@ -164,4 +162,4 @@ static TELEMETRY_DEFAULT_TRACER: Lazy<Tracer> = Lazy::new(|| {
)
.install_batch(opentelemetry_sdk::runtime::Tokio)
.expect("error installing `OtlpTracePipeline` in the current `tokio` runtime")
});
}