Fix workspace assumptions, format, and fix unused warnings

Author: asonix

tracing-actix-web/Cargo.toml

@@ -15,12 +15,11 @@ readme = "README.md"
 description = "Structured logging middleware for actix-web."
 keywords = ["http", "actix-web", "tracing", "logging"]
 categories = ["asynchronous", "web-programming"]
-
-repository.workspace = true
-homepage.workspace = true
-license.workspace = true
-edition.workspace = true
-rust-version.workspace = true
+repository = "https://github.com/actix/actix-extras"
+homepage = "https://actix.rs"
+license = "MIT OR Apache-2.0"
+edition = "2021"
+rust-version = "1.82"
 
 [features]
 default = ["emit_event_on_error"]

tracing-actix-web/examples/custom-root-span/src/main.rs

@@ -1,13 +1,14 @@
-use actix_web::body::MessageBody;
-use actix_web::dev::{ServiceRequest, ServiceResponse};
-use actix_web::{web, App, Error, HttpServer};
-use opentelemetry::trace::TracerProvider;
-use opentelemetry::{global, KeyValue};
+use std::{io, sync::LazyLock};
+
+use actix_web::{
+    body::MessageBody,
+    dev::{ServiceRequest, ServiceResponse},
+    web, App, Error, HttpServer,
+};
+use opentelemetry::{global, trace::TracerProvider, KeyValue};
 use opentelemetry_otlp::WithExportConfig;
 use opentelemetry_sdk::{propagation::TraceContextPropagator, Resource};
 use opentelemetry_semantic_conventions::resource;
-use std::io;
-use std::sync::LazyLock;
 use tracing::Span;
 use tracing_actix_web::{DefaultRootSpanBuilder, RootSpan, RootSpanBuilder, TracingLogger};
 use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer};

tracing-actix-web/examples/opentelemetry/src/main.rs

@@ -1,11 +1,10 @@
+use std::{io, sync::LazyLock};
+
 use actix_web::{web, App, HttpServer};
-use opentelemetry::trace::TracerProvider;
-use opentelemetry::{global, KeyValue};
+use opentelemetry::{global, trace::TracerProvider, KeyValue};
 use opentelemetry_otlp::WithExportConfig;
 use opentelemetry_sdk::{propagation::TraceContextPropagator, Resource};
 use opentelemetry_semantic_conventions::resource;
-use std::io;
-use std::sync::LazyLock;
 use tracing_actix_web::TracingLogger;
 use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer};
 use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry};

tracing-actix-web/examples/request-id-response-header/src/main.rs

@@ -1,9 +1,10 @@
+use std::io;
+
 use actix_web::{
     dev::Service,
     http::header::{HeaderName, HeaderValue},
     web, App, HttpMessage, HttpServer,
 };
-use std::io;
 use tracing_actix_web::{RequestId, TracingLogger};
 
 async fn hello() -> &'static str {

tracing-actix-web/src/middleware.rs

@@ -1,22 +1,27 @@
-use crate::{DefaultRootSpanBuilder, RequestId, RootSpan, RootSpanBuilder};
-use actix_web::body::{BodySize, MessageBody};
-use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform};
-use actix_web::http::StatusCode;
-use actix_web::web::Bytes;
-use actix_web::{Error, HttpMessage, ResponseError};
-use std::future::{ready, Future, Ready};
-use std::pin::Pin;
-use std::task::{Context, Poll};
+use std::{
+    future::{ready, Future, Ready},
+    pin::Pin,
+    task::{Context, Poll},
+};
+
+use actix_web::{
+    body::{BodySize, MessageBody},
+    dev::{Service, ServiceRequest, ServiceResponse, Transform},
+    web::Bytes,
+    Error, HttpMessage,
+};
 use tracing::Span;
 
+use crate::{DefaultRootSpanBuilder, RequestId, RootSpan, RootSpanBuilder};
+
 /// `TracingLogger` is a middleware to capture structured diagnostic when processing an HTTP request.
 /// Check the crate-level documentation for an in-depth introduction.
 ///
 /// `TracingLogger` is designed as a drop-in replacement of [`actix-web`]'s [`Logger`].
 ///
 /// # Usage
 ///
-/// Register `TracingLogger` as a middleware for your application using `.wrap` on `App`.  
+/// Register `TracingLogger` as a middleware for your application using `.wrap` on `App`.
 /// In this example we add a [`tracing::Subscriber`] to output structured logs to the console.
 ///
 /// ```rust
@@ -235,6 +240,7 @@ where
     }
 }
 
+#[cfg(feature = "emit_event_on_error")]
 fn emit_event_on_error<B: 'static>(outcome: &Result<ServiceResponse<B>, actix_web::Error>) {
     match outcome {
         Ok(response) => {
@@ -250,7 +256,11 @@ fn emit_event_on_error<B: 'static>(outcome: &Result<ServiceResponse<B>, actix_we
     }
 }
 
-fn emit_error_event(response_error: &dyn ResponseError, status_code: StatusCode) {
+#[cfg(feature = "emit_event_on_error")]
+fn emit_error_event(
+    response_error: &dyn actix_web::ResponseError,
+    status_code: actix_web::http::StatusCode,
+) {
     let error_msg_prefix = "Error encountered while processing the incoming HTTP request";
     if status_code.is_client_error() {
         tracing::warn!("{}: {:?}", error_msg_prefix, response_error);

tracing-actix-web/src/otel.rs

@@ -1,5 +1,5 @@
 use actix_web::dev::ServiceRequest;
-
+use opentelemetry::propagation::Extractor;
 #[cfg(feature = "opentelemetry_0_13")]
 use opentelemetry_0_13_pkg as opentelemetry;
 #[cfg(feature = "opentelemetry_0_14")]
@@ -38,7 +38,6 @@ use opentelemetry_0_29_pkg as opentelemetry;
 use opentelemetry_0_30_pkg as opentelemetry;
 #[cfg(feature = "opentelemetry_0_31")]
 use opentelemetry_0_31_pkg as opentelemetry;
-
 #[cfg(feature = "opentelemetry_0_13")]
 use tracing_opentelemetry_0_12_pkg as tracing_opentelemetry;
 #[cfg(feature = "opentelemetry_0_14")]
@@ -78,8 +77,6 @@ use tracing_opentelemetry_0_31_pkg as tracing_opentelemetry;
 #[cfg(feature = "opentelemetry_0_31")]
 use tracing_opentelemetry_0_32_pkg as tracing_opentelemetry;
 
-use opentelemetry::propagation::Extractor;
-
 pub(crate) struct RequestHeaderCarrier<'a> {
     headers: &'a actix_web::http::header::HeaderMap,
 }

tracing-actix-web/src/request_id.rs

@@ -1,6 +1,6 @@
-use actix_web::{dev::Payload, HttpMessage};
-use actix_web::{FromRequest, HttpRequest, ResponseError};
 use std::future::{ready, Ready};
+
+use actix_web::{dev::Payload, FromRequest, HttpMessage, HttpRequest, ResponseError};
 use uuid::Uuid;
 
 /// A unique identifier generated for each incoming request.

tracing-actix-web/src/root_span.rs

@@ -1,6 +1,6 @@
-use actix_web::{dev::Payload, HttpMessage};
-use actix_web::{FromRequest, HttpRequest, ResponseError};
 use std::future::{ready, Ready};
+
+use actix_web::{dev::Payload, FromRequest, HttpMessage, HttpRequest, ResponseError};
 use tracing::Span;
 
 #[derive(Clone)]

tracing-actix-web/src/root_span_builder.rs

@@ -1,10 +1,13 @@
-use crate::root_span;
-use actix_web::body::MessageBody;
-use actix_web::dev::{ServiceRequest, ServiceResponse};
-use actix_web::http::StatusCode;
-use actix_web::{Error, ResponseError};
+use actix_web::{
+    body::MessageBody,
+    dev::{ServiceRequest, ServiceResponse},
+    http::StatusCode,
+    Error, ResponseError,
+};
 use tracing::Span;
 
+use crate::root_span;
+
 /// `RootSpanBuilder` allows you to customise the root span attached by
 /// [`TracingLogger`] to incoming requests.
 ///

tracing-actix-web/src/root_span_macro.rs

@@ -142,13 +142,16 @@ pub mod private {
     //! in the code generated by the `root_span` macro.
     //! Items in this module are not part of the public interface of `tracing-actix-web` - they are considered
     //! implementation details and will change without notice in patch, minor and major releases.
-    use crate::RequestId;
-    use actix_web::dev::ServiceRequest;
-    use actix_web::http::{Method, Version};
     use std::borrow::Cow;
 
+    use actix_web::{
+        dev::ServiceRequest,
+        http::{Method, Version},
+    };
     pub use tracing;
 
+    use crate::RequestId;
+
     #[doc(hidden)]
     // We need to allow unused variables because the function
     // body is empty if the user of the library chose not to activate