@@ -464,18 +464,16 @@ fn init_tracer_provider(endpoint: &Option<String>, resource: Resource) -> Tracer
464464 provider
465465}
466466
467+ pub type OtelLayerType = Layered <
468+ LogCourier < Registry > ,
469+ Layered < OpenTelemetryLayer < Registry , Tracer > , MetricsLayer < Registry > , Registry > ,
470+ Registry ,
471+ > ;
467472// Construct tracing-subscriber layers and return ExporterGuard for opentelemetry-related termination processing
468473pub fn otel_tracing_subscriber (
469474 crate_name : & ' static str ,
470475 package_version : & ' static str ,
471- ) -> (
472- Layered <
473- LogCourier < Registry > ,
474- Layered < OpenTelemetryLayer < Registry , Tracer > , MetricsLayer < Registry > , Registry > ,
475- Registry ,
476- > ,
477- ProviderGuard ,
478- ) {
476+ ) -> ( OtelLayerType , ProviderGuard ) {
479477 global:: set_text_map_propagator ( TraceContextPropagator :: new ( ) ) ;
480478
481479 let resource = resource ( crate_name, package_version) ;
@@ -487,11 +485,7 @@ pub fn otel_tracing_subscriber(
487485 let meter = init_meter_provider ( & endpoint, resource. clone ( ) ) ;
488486 let logger = init_log_subscriber ( & endpoint, resource) ;
489487
490- let layers: Layered <
491- LogCourier < Registry > ,
492- Layered < OpenTelemetryLayer < Registry , Tracer > , MetricsLayer < Registry > , Registry > ,
493- Registry ,
494- > = MetricsLayer :: new ( meter. clone ( ) )
488+ let layers: OtelLayerType = MetricsLayer :: new ( meter. clone ( ) )
495489 . and_then ( OpenTelemetryLayer :: new ( tracer. tracer ( "shuttle-telemetry" ) ) )
496490 . and_then ( LogCourier :: new ( logger. logger ( "shuttle-telemetry" ) ) ) ;
497491
0 commit comments