Skip to content

Commit

Permalink
Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
LukeMathWalker committed Sep 29, 2024
1 parent b3a2697 commit 70e8f75
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 36 deletions.
15 changes: 8 additions & 7 deletions tracing-actix-web/examples/custom-root-span/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
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, runtime::TokioCurrentThread, trace::Config, 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};
Expand Down
7 changes: 3 additions & 4 deletions tracing-actix-web/examples/opentelemetry/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
use std::{io, sync::LazyLock};

Check failure on line 1 in tracing-actix-web/examples/opentelemetry/src/main.rs

View workflow job for this annotation

GitHub Actions / Linux / msrv

use of unstable library feature 'lazy_cell'

Check failure on line 1 in tracing-actix-web/examples/opentelemetry/src/main.rs

View workflow job for this annotation

GitHub Actions / macOS / msrv

use of unstable library feature 'lazy_cell'

Check failure on line 1 in tracing-actix-web/examples/opentelemetry/src/main.rs

View workflow job for this annotation

GitHub Actions / Windows / msrv

use of unstable library feature 'lazy_cell'

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, runtime::TokioCurrentThread, trace::Config, 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};
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
22 changes: 14 additions & 8 deletions tracing-actix-web/src/middleware.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
use crate::{DefaultRootSpanBuilder, RequestId, RootSpan, RootSpanBuilder};
use actix_web::body::{BodySize, MessageBody};
use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform};
use actix_web::web::Bytes;
use actix_web::{Error, HttpMessage};
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.
///
Expand Down
5 changes: 1 addition & 4 deletions tracing-actix-web/src/otel.rs
Original file line number Diff line number Diff line change
@@ -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")]
Expand All @@ -26,7 +26,6 @@ use opentelemetry_0_23_pkg as opentelemetry;
use opentelemetry_0_24_pkg as opentelemetry;
#[cfg(feature = "opentelemetry_0_25")]
use opentelemetry_0_25_pkg as opentelemetry;

#[cfg(feature = "opentelemetry_0_13")]
use tracing_opentelemetry_0_12_pkg as tracing_opentelemetry;
#[cfg(feature = "opentelemetry_0_14")]
Expand Down Expand Up @@ -54,8 +53,6 @@ use tracing_opentelemetry_0_25_pkg as tracing_opentelemetry;
#[cfg(feature = "opentelemetry_0_25")]
use tracing_opentelemetry_0_26_pkg as tracing_opentelemetry;

use opentelemetry::propagation::Extractor;

pub(crate) struct RequestHeaderCarrier<'a> {
headers: &'a actix_web::http::header::HeaderMap,
}
Expand Down
4 changes: 2 additions & 2 deletions tracing-actix-web/src/request_id.rs
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions tracing-actix-web/src/root_span.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
13 changes: 8 additions & 5 deletions tracing-actix-web/src/root_span_builder.rs
Original file line number Diff line number Diff line change
@@ -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.
///
Expand Down
9 changes: 6 additions & 3 deletions tracing-actix-web/src/root_span_macro.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 70e8f75

Please sign in to comment.