From 3e35c7d9eb4d6680c65f83f650044fe35e8aea84 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Fri, 9 Feb 2024 20:18:45 +0100 Subject: [PATCH] Replace let _ with let _enter See discussion here: https://github.com/rust-lang/rust-clippy/issues/8246 tl;dr: `let _` drops immediately, so for anything that has Guard like behavior, it will not work as expected. `let _enter` will ensure that the guard is dropped at the end of the scope. --- axum-tracing-opentelemetry/src/middleware/trace_extractor.rs | 2 +- tonic-tracing-opentelemetry/src/middleware/client.rs | 2 +- tonic-tracing-opentelemetry/src/middleware/server.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/axum-tracing-opentelemetry/src/middleware/trace_extractor.rs b/axum-tracing-opentelemetry/src/middleware/trace_extractor.rs index 221e52e..a5031d9 100644 --- a/axum-tracing-opentelemetry/src/middleware/trace_extractor.rs +++ b/axum-tracing-opentelemetry/src/middleware/trace_extractor.rs @@ -135,7 +135,7 @@ where tracing::Span::none() }; let future = { - let _ = span.enter(); + let _enter = span.enter(); self.inner.call(req) }; ResponseFuture { diff --git a/tonic-tracing-opentelemetry/src/middleware/client.rs b/tonic-tracing-opentelemetry/src/middleware/client.rs index 82bd8b1..8a627e2 100644 --- a/tonic-tracing-opentelemetry/src/middleware/client.rs +++ b/tonic-tracing-opentelemetry/src/middleware/client.rs @@ -64,7 +64,7 @@ where let span = otel_http::grpc_client::make_span_from_request(&req); otel_http::inject_context(&find_context_from_tracing(&span), req.headers_mut()); let future = { - let _ = span.enter(); + let _enter = span.enter(); self.inner.call(req) }; ResponseFuture { diff --git a/tonic-tracing-opentelemetry/src/middleware/server.rs b/tonic-tracing-opentelemetry/src/middleware/server.rs index af51520..ef8cf9c 100644 --- a/tonic-tracing-opentelemetry/src/middleware/server.rs +++ b/tonic-tracing-opentelemetry/src/middleware/server.rs @@ -86,7 +86,7 @@ where tracing::Span::none() }; let future = { - let _ = span.enter(); + let _enter = span.enter(); self.inner.call(req) }; ResponseFuture {