Skip to content

test(clitools): revive run_inprocess() #3891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 18, 2024
Merged

test(clitools): revive run_inprocess() #3891

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
618e072
test(clitools): revive `run_inprocess()`
rami3l Jun 16, 2024
2261e26
refactor(log): replace the `TELEMETRY_DEFAULT_TARCER` singleton with …
rami3l Jun 18, 2024
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
10 changes: 4 additions & 6 deletions src/cli/log.rs
View file
Open in desktop
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")
});
}