actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-04-22 09:54:53 +02:00
Code Issues Releases Wiki Activity

Update to latest actix-web (#59)

Browse Source
This commit is contained in:
DW 2021-12-01 04:48:51 -05:00 committed by GitHub
parent 46455193d0
commit d726662f80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -27,7 +27,7 @@ opentelemetry_0_16 = ["opentelemetry_0_16_pkg", "tracing-opentelemetry_0_16_pkg"
emit_event_on_error = [] emit_event_on_error = []
[dependencies] [dependencies]
actix-web = { version = "=4.0.0-beta.12", default-features = false } actix-web = { version = "=4.0.0-beta.13", default-features = false }
pin-project = "1.0.0" pin-project = "1.0.0"
tracing = "0.1.19" tracing = "0.1.19"
tracing-futures = "0.2.4" tracing-futures = "0.2.4"

2
README.md
View File

@ -39,7 +39,7 @@ Add `tracing-actix-web` to your dependencies:
# ... # ...
tracing-actix-web = "0.5.0-beta.3" tracing-actix-web = "0.5.0-beta.3"
tracing = "0.1" tracing = "0.1"
actix-web = "4.0.0-beta.12" actix-web = "4.0.0-beta.13"
``` ```
`tracing-actix-web` exposes three feature flags: `tracing-actix-web` exposes three feature flags:

2
examples/custom-root-span/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
actix-web = "=4.0.0-beta.12" actix-web = "=4.0.0-beta.13"
opentelemetry = { version = "0.16", features = ["rt-tokio-current-thread"] } opentelemetry = { version = "0.16", features = ["rt-tokio-current-thread"] }
opentelemetry-jaeger = { version = "0.15", features = ["rt-tokio-current-thread"] } opentelemetry-jaeger = { version = "0.15", features = ["rt-tokio-current-thread"] }
tracing-opentelemetry = { version = "0.16" } tracing-opentelemetry = { version = "0.16" }

2
examples/opentelemetry/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
[dependencies] [dependencies]
actix-web = "=4.0.0-beta.12" actix-web = "=4.0.0-beta.13"
tracing = "0.1.19" tracing = "0.1.19"
opentelemetry = { version = "0.16", features = ["rt-tokio-current-thread"] } opentelemetry = { version = "0.16", features = ["rt-tokio-current-thread"] }
opentelemetry-jaeger = { version = "0.15", features = ["rt-tokio-current-thread"] } opentelemetry-jaeger = { version = "0.15", features = ["rt-tokio-current-thread"] }

4
src/lib.rs
View File

@ -12,7 +12,7 @@
//! # ... //! # ...
//! tracing-actix-web = "0.5.0-beta.3" //! tracing-actix-web = "0.5.0-beta.3"
//! tracing = "0.1" //! tracing = "0.1"
//! actix-web = "4.0.0-beta.12" //! actix-web = "4.0.0-beta.13"
//! ``` //! ```
//! //!
//! `tracing-actix-web` exposes three feature flags: //! `tracing-actix-web` exposes three feature flags:
@ -234,7 +234,7 @@
//! Check out the [relevant example in the GitHub repository](https://github.com/LukeMathWalker/tracing-actix-web/tree/main/examples/opentelemetry) for reference. //! Check out the [relevant example in the GitHub repository](https://github.com/LukeMathWalker/tracing-actix-web/tree/main/examples/opentelemetry) for reference.
//! //!
//! [root span]: crate::RootSpan //! [root span]: crate::RootSpan
//! [`actix-web`]: https://docs.rs/actix-web/4.0.0-beta.6/actix_web/index.html //! [`actix-web`]: https://docs.rs/actix-web/4.0.0-beta.13/actix_web/index.html
mod middleware; mod middleware;
mod request_id; mod request_id;
mod root_span; mod root_span;

4
src/middleware.rs
View File

@ -76,8 +76,8 @@ use tracing::Span;
/// ``` /// ```
/// ///
/// [`actix-web`]: https://docs.rs/actix-web /// [`actix-web`]: https://docs.rs/actix-web
/// [`Logger`]: https://docs.rs/actix-web/4.0.0-beta.9/actix_web/middleware/struct.Logger.html /// [`Logger`]: https://docs.rs/actix-web/4.0.0-beta.13/actix_web/middleware/struct.Logger.html
/// [`Compat`]: https://docs.rs/actix-web/4.0.0-beta.9/actix_web/middleware/struct.Compat.html /// [`Compat`]: https://docs.rs/actix-web/4.0.0-beta.13/actix_web/middleware/struct.Compat.html
/// [`tracing`]: https://docs.rs/tracing /// [`tracing`]: https://docs.rs/tracing
pub struct TracingLogger<RootSpan: RootSpanBuilder> { pub struct TracingLogger<RootSpan: RootSpanBuilder> {
root_span_builder: std::marker::PhantomData<RootSpan>, root_span_builder: std::marker::PhantomData<RootSpan>,