Skip to content

Commit 7dfa263

Browse files
committed
fixup! fixup! fixup! fixup! fixup! fixup! refactor(log): reimplement log using tracing
1 parent 653f8cc commit 7dfa263

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

src/test.rs

+2-14
Original file line numberDiff line numberDiff line change
@@ -239,16 +239,13 @@ type Tracer = ();
239239

240240
/// A tracer for the tests.
241241
pub(crate) static TRACER: Lazy<Tracer> = Lazy::new(|| {
242-
use tracing_subscriber::Registry;
243-
244242
#[cfg(feature = "otel")]
245243
{
246-
use crate::cli::log::{telemetry, telemetry_default_tracer};
244+
use crate::cli::log::telemetry_default_tracer;
247245

248246
use opentelemetry::global;
249247
use opentelemetry_sdk::propagation::TraceContextPropagator;
250248
use tokio::runtime::Handle;
251-
use tracing_subscriber::layer::SubscriberExt as _;
252249

253250
// Use the current runtime, or the sync test runtime otherwise.
254251
let handle = match Handle::try_current() {
@@ -259,16 +256,7 @@ pub(crate) static TRACER: Lazy<Tracer> = Lazy::new(|| {
259256
let _guard = handle.enter();
260257

261258
global::set_text_map_propagator(TraceContextPropagator::new());
262-
let tracer = telemetry_default_tracer().unwrap();
263-
let telemetry = telemetry(tracer.clone());
264-
let subscriber = Registry::default().with(telemetry);
265-
tracing::subscriber::set_global_default(subscriber).unwrap();
266-
tracer
267-
}
268-
#[cfg(not(feature = "otel"))]
269-
{
270-
let subscriber = Registry::default();
271-
tracing::subscriber::set_global_default(subscriber).unwrap();
259+
telemetry_default_tracer().unwrap()
272260
}
273261
});
274262

0 commit comments

Comments
 (0)