Add rejection tracing to all extractors (#2584)

This commit is contained in:
David Mládek 2024-03-16 22:34:18 +01:00 committed by GitHub
parent 2ce382f0ab
commit 2ec68d6c4d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 46 additions and 18 deletions

View File

@ -7,7 +7,8 @@ and this project adheres to [Semantic Versioning].
# Unreleased # Unreleased
- None. - **added:** New `tracing` feature which enables logging rejections from
built-in extractor with the `axum::rejection=trace` target ([#2596])
# 0.9.2 (13. January, 2024) # 0.9.2 (13. January, 2024)

View File

@ -12,7 +12,7 @@ repository = "https://github.com/tokio-rs/axum"
version = "0.9.2" version = "0.9.2"
[features] [features]
default = [] default = ["tracing"]
async-read-body = ["dep:tokio-util", "tokio-util?/io", "dep:tokio"] async-read-body = ["dep:tokio-util", "tokio-util?/io", "dep:tokio"]
cookie = ["dep:cookie"] cookie = ["dep:cookie"]
@ -33,6 +33,7 @@ json-lines = [
multipart = ["dep:multer"] multipart = ["dep:multer"]
protobuf = ["dep:prost"] protobuf = ["dep:prost"]
query = ["dep:serde_html_form"] query = ["dep:serde_html_form"]
tracing = ["dep:tracing", "axum-core/tracing"]
typed-header = ["dep:headers"] typed-header = ["dep:headers"]
typed-routing = ["dep:axum-macros", "dep:percent-encoding", "dep:serde_html_form", "dep:form_urlencoded"] typed-routing = ["dep:axum-macros", "dep:percent-encoding", "dep:serde_html_form", "dep:form_urlencoded"]
@ -65,6 +66,7 @@ serde_path_to_error = { version = "0.1.8", optional = true }
tokio = { version = "1.19", optional = true } tokio = { version = "1.19", optional = true }
tokio-stream = { version = "0.1.9", optional = true } tokio-stream = { version = "0.1.9", optional = true }
tokio-util = { version = "0.7", optional = true } tokio-util = { version = "0.7", optional = true }
tracing = { version = "0.1.37", default-features = false, optional = true }
[dev-dependencies] [dev-dependencies]
axum = { path = "../axum", version = "0.7.2" } axum = { path = "../axum", version = "0.7.2" }

View File

@ -81,11 +81,16 @@ impl IntoResponse for FormRejection {
fn into_response(self) -> Response { fn into_response(self) -> Response {
match self { match self {
Self::RawFormRejection(inner) => inner.into_response(), Self::RawFormRejection(inner) => inner.into_response(),
Self::FailedToDeserializeForm(inner) => ( Self::FailedToDeserializeForm(inner) => {
StatusCode::BAD_REQUEST, let body = format!("Failed to deserialize form: {inner}");
format!("Failed to deserialize form: {inner}"), let status = StatusCode::BAD_REQUEST;
) axum_core::__log_rejection!(
.into_response(), rejection_type = Self,
body_text = body,
status = status,
);
(status, body).into_response()
}
} }
} }
} }

View File

@ -379,7 +379,13 @@ pub struct InvalidBoundary;
impl IntoResponse for InvalidBoundary { impl IntoResponse for InvalidBoundary {
fn into_response(self) -> Response { fn into_response(self) -> Response {
(self.status(), self.body_text()).into_response() let body = self.body_text();
axum_core::__log_rejection!(
rejection_type = Self,
body_text = body,
status = self.status(),
);
(self.status(), body).into_response()
} }
} }

View File

@ -114,11 +114,16 @@ pub enum QueryRejection {
impl IntoResponse for QueryRejection { impl IntoResponse for QueryRejection {
fn into_response(self) -> Response { fn into_response(self) -> Response {
match self { match self {
Self::FailedToDeserializeQueryString(inner) => ( Self::FailedToDeserializeQueryString(inner) => {
StatusCode::BAD_REQUEST, let body = format!("Failed to deserialize query string: {inner}");
format!("Failed to deserialize query string: {inner}"), let status = StatusCode::BAD_REQUEST;
) axum_core::__log_rejection!(
.into_response(), rejection_type = Self,
body_text = body,
status = status,
);
(status, body).into_response()
}
} }
} }
} }

View File

@ -21,6 +21,7 @@
//! `multipart` | Enables the `Multipart` extractor | No //! `multipart` | Enables the `Multipart` extractor | No
//! `protobuf` | Enables the `Protobuf` extractor and response | No //! `protobuf` | Enables the `Protobuf` extractor and response | No
//! `query` | Enables the `Query` extractor | No //! `query` | Enables the `Query` extractor | No
//! `tracing` | Log rejections from built-in extractors | Yes
//! `typed-routing` | Enables the `TypedPath` routing utilities | No //! `typed-routing` | Enables the `TypedPath` routing utilities | No
//! `typed-header` | Enables the `TypedHeader` extractor and response | No //! `typed-header` | Enables the `TypedHeader` extractor and response | No
//! //!

View File

@ -274,12 +274,13 @@ impl std::error::Error for MultipartError {
impl IntoResponse for MultipartError { impl IntoResponse for MultipartError {
fn into_response(self) -> Response { fn into_response(self) -> Response {
let body = self.body_text();
axum_core::__log_rejection!( axum_core::__log_rejection!(
rejection_type = Self, rejection_type = Self,
body_text = self.body_text(), body_text = body,
status = self.status(), status = self.status(),
); );
(self.status(), self.body_text()).into_response() (self.status(), body).into_response()
} }
} }

View File

@ -398,12 +398,13 @@ impl FailedToDeserializePathParams {
impl IntoResponse for FailedToDeserializePathParams { impl IntoResponse for FailedToDeserializePathParams {
fn into_response(self) -> Response { fn into_response(self) -> Response {
let body = self.body_text();
axum_core::__log_rejection!( axum_core::__log_rejection!(
rejection_type = Self, rejection_type = Self,
body_text = self.body_text(), body_text = body,
status = self.status(), status = self.status(),
); );
(self.status(), self.body_text()).into_response() (self.status(), body).into_response()
} }
} }
@ -530,7 +531,13 @@ impl std::error::Error for InvalidUtf8InPathParam {}
impl IntoResponse for InvalidUtf8InPathParam { impl IntoResponse for InvalidUtf8InPathParam {
fn into_response(self) -> Response { fn into_response(self) -> Response {
(self.status(), self.body_text()).into_response() let body = self.body_text();
axum_core::__log_rejection!(
rejection_type = Self,
body_text = body,
status = self.status(),
);
(self.status(), body).into_response()
} }
} }