diff --git a/src/main.rs b/src/main.rs index 71b3a2fd..9222e17a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -38,12 +38,11 @@ use tokio::{ use tower::ServiceBuilder; use tower_http::{ catch_panic::CatchPanicLayer, - classify::ServerErrorsFailureClass, cors::{self, CorsLayer}, trace::{DefaultOnFailure, DefaultOnRequest, DefaultOnResponse, TraceLayer}, ServiceBuilderExt as _, }; -use tracing::{debug, error, info, trace, warn, Level, Span}; +use tracing::{debug, error, info, trace, warn, Level}; use tracing_subscriber::{prelude::*, reload, EnvFilter, Registry}; use utils::{ clap, @@ -456,16 +455,14 @@ fn compression_layer(server: &Server) -> tower_http::compression::CompressionLay compression_layer } -fn tracing_span(request: &http::Request) -> Span { - let path = request.extensions().get::(); - let uri = &request.uri().to_string(); - - if let Some(path) = path { - let path = path.as_str(); - tracing::info_span!("router:", %path, %uri) +fn tracing_span(request: &http::Request) -> tracing::Span { + let path = if let Some(path) = request.extensions().get::() { + path.as_str() } else { - tracing::info_span!("router:", %uri) - } + &request.uri().to_string() + }; + + tracing::info_span!("router:", %path) } /// Non-async initializations