@@ -239,16 +239,13 @@ type Tracer = ();
239
239
240
240
/// A tracer for the tests.
241
241
pub ( crate ) static TRACER : Lazy < Tracer > = Lazy :: new ( || {
242
- use tracing_subscriber:: Registry ;
243
-
244
242
#[ cfg( feature = "otel" ) ]
245
243
{
246
- use crate :: cli:: log:: { telemetry , telemetry_default_tracer} ;
244
+ use crate :: cli:: log:: telemetry_default_tracer;
247
245
248
246
use opentelemetry:: global;
249
247
use opentelemetry_sdk:: propagation:: TraceContextPropagator ;
250
248
use tokio:: runtime:: Handle ;
251
- use tracing_subscriber:: layer:: SubscriberExt as _;
252
249
253
250
// Use the current runtime, or the sync test runtime otherwise.
254
251
let handle = match Handle :: try_current ( ) {
@@ -259,16 +256,7 @@ pub(crate) static TRACER: Lazy<Tracer> = Lazy::new(|| {
259
256
let _guard = handle. enter ( ) ;
260
257
261
258
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 ( )
272
260
}
273
261
} ) ;
274
262
0 commit comments