actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-02-23 10:53:02 +01:00
Code Issues Releases Wiki Activity

Use http response for determining status code on errors (#46)

Browse Source 
* Use HTTP responses to determine status code for errors

* Move response.status() call in-line

* Added comment, small refactor
This commit is contained in:
Russ Weas 2021-10-21 03:47:48 -05:00 committed by GitHub
parent 032b7cd48f
commit cf8622fcf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/middleware.rs
View File

@ -1,6 +1,7 @@
use crate::{DefaultRootSpanBuilder, RequestId, RootSpan, RootSpanBuilder}; use crate::{DefaultRootSpanBuilder, RequestId, RootSpan, RootSpanBuilder};
use actix_web::body::{BodySize, MessageBody}; use actix_web::body::{BodySize, MessageBody};
use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform}; use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform};
use actix_web::http::StatusCode;
use actix_web::web::Bytes; use actix_web::web::Bytes;
use actix_web::{Error, HttpMessage, ResponseError}; use actix_web::{Error, HttpMessage, ResponseError};
use std::future::{ready, Future, Ready}; use std::future::{ready, Future, Ready};
@ -238,18 +239,18 @@ fn emit_event_on_error<B: 'static>(outcome: &Result<ServiceResponse<B>, actix_we
match outcome { match outcome {
Ok(response) => { Ok(response) => {
if let Some(err) = response.response().error() { if let Some(err) = response.response().error() {
emit_error_event(err.as_response_error()) // use the status code already constructed for the outgoing HTTP response
emit_error_event(err.as_response_error(), response.status())
} }
} }
Err(error) => { Err(error) => {
let response_error = error.as_response_error(); let response_error = error.as_response_error();
emit_error_event(response_error) emit_error_event(response_error, response_error.status_code())
} }
} }
} }
fn emit_error_event(response_error: &dyn ResponseError) { fn emit_error_event(response_error: &dyn ResponseError, status_code: StatusCode) {
let status_code = response_error.status_code();
let error_msg_prefix = "Error encountered while processing the incoming HTTP request"; let error_msg_prefix = "Error encountered while processing the incoming HTTP request";
if status_code.is_client_error() { if status_code.is_client_error() {
tracing::warn!("{}: {:?}", error_msg_prefix, response_error); tracing::warn!("{}: {:?}", error_msg_prefix, response_error);

18
src/root_span_builder.rs
View File

@ -1,6 +1,7 @@
use crate::root_span; use crate::root_span;
use actix_web::dev::{ServiceRequest, ServiceResponse}; use actix_web::dev::{ServiceRequest, ServiceResponse};
use actix_web::Error; use actix_web::http::StatusCode;
use actix_web::{Error, ResponseError};
use tracing::Span; use tracing::Span;
/// `RootSpanBuilder` allows you to customise the root span attached by /// `RootSpanBuilder` allows you to customise the root span attached by
@ -43,29 +44,30 @@ impl RootSpanBuilder for DefaultRootSpanBuilder {
match &outcome { match &outcome {
Ok(response) => { Ok(response) => {
if let Some(error) = response.response().error() { if let Some(error) = response.response().error() {
handle_error(span, error) // use the status code already constructed for the outgoing HTTP response
handle_error(span, response.status(), error.as_response_error());
} else { } else {
let code: i32 = response.response().status().as_u16().into(); let code: i32 = response.response().status().as_u16().into();
span.record("http.status_code", &code); span.record("http.status_code", &code);
span.record("otel.status_code", &"OK"); span.record("otel.status_code", &"OK");
} }
} }
Err(error) => handle_error(span, error), Err(error) => {
let response_error = error.as_response_error();
handle_error(span, response_error.status_code(), response_error);
}
}; };
} }
} }
fn handle_error(span: Span, error: &actix_web::Error) { fn handle_error(span: Span, status_code: StatusCode, response_error: &dyn ResponseError) {
let response_error = error.as_response_error();
// pre-formatting errors is a workaround for https://github.com/tokio-rs/tracing/issues/1565 // pre-formatting errors is a workaround for https://github.com/tokio-rs/tracing/issues/1565
let display = format!("{}", response_error); let display = format!("{}", response_error);
let debug = format!("{:?}", response_error); let debug = format!("{:?}", response_error);
span.record("exception.message", &tracing::field::display(display)); span.record("exception.message", &tracing::field::display(display));
span.record("exception.details", &tracing::field::display(debug)); span.record("exception.details", &tracing::field::display(debug));
let status_code = response_error.status_code();
let code: i32 = status_code.as_u16().into(); let code: i32 = status_code.as_u16().into();
span.record("http.status_code", &code); span.record("http.status_code", &code);
if status_code.is_client_error() { if status_code.is_client_error() {