From 66041f133c3d79fb0eaa2d42191fafee5e4af31c Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Fri, 5 May 2023 14:24:33 +0300 Subject: [PATCH] refactor: improve tracing --- src/handler.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/handler.rs b/src/handler.rs index 64001f3..2a2c88d 100644 --- a/src/handler.rs +++ b/src/handler.rs @@ -73,9 +73,7 @@ fn make_span_trace(req: &Request) -> Span { let mut query_map = query .and_then(|v| serde_qs::from_str::, Cow>>(v).ok()) .unwrap_or_else(HashMap::new); - if query_map.contains_key("token") { - query_map.insert(Cow::Borrowed("token"), Cow::Borrowed("")); - } + query_map.remove("token"); let request_id = req .headers() @@ -86,19 +84,15 @@ fn make_span_trace(req: &Request) -> Span { if query_map.is_empty() { tracing::debug_span!( "request", - method = %req.method(), path = %req.uri().path(), - version = ?req.version(), id = %request_id, ) } else { let query_display = QueryDisplay { map: query_map }; tracing::debug_span!( "request", - method = %req.method(), path = %req.uri().path(), query = %query_display, - version = ?req.version(), id = %request_id, ) } @@ -109,8 +103,9 @@ pub(super) async fn handler(state: AppState) -> Result<(Router, Router), AppErro .make_span_with(make_span_trace) .on_request(|req: &Request, _span: &Span| { tracing::debug!( - "started processing request with headers: {:?}", - req.headers() + "started processing request {} on {:?}", + req.method(), + req.version(), ) });