Skip to content

fix(middleware): connection_drop_prevention_handler loses tracing context and amplifies panics #5611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dimazzq92 wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −2
Open

fix(middleware): connection_drop_prevention_handler loses tracing context and amplifies panics #5611

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cac3fc1
fix(middleware): connection_drop_prevention_handler loses tracing con…
dimazzq92 Aug 12, 2026
58b3704
style(middleware): use structured tracing log fields as requested by …
dimazzq92 Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions crates/macro_middleware/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
use axum::{
body::Body,
extract::Request,
http::{Method, Response},
http::{Method, Response, StatusCode},
middleware::Next,
};
use tracing::Instrument;

#[cfg(feature = "cloud_storage")]
pub mod cloud_storage;
Expand All @@ -19,7 +20,23 @@ mod error_handler;
pub async fn connection_drop_prevention_handler(req: Request, next: Next) -> Response<Body> {
match req.method() {
&Method::PUT | &Method::POST | &Method::PATCH | &Method::DELETE => {
tokio::task::spawn(next.run(req)).await.unwrap()
let span = tracing::Span::current();
let handle = tokio::task::spawn(next.run(req).instrument(span));

match handle.await {
Ok(response) => response,
Err(err) => {
if err.is_panic() {
tracing::error!(error=?err, "request handler panicked");
} else {
tracing::error!(error=?err, "request handler task was cancelled");
}
Response::builder()
.status(StatusCode::INTERNAL_SERVER_ERROR)
.body(Body::empty())
.unwrap()
}
}
}
_ => next.run(req).await,
}
Expand Down