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

Update to actix-web beta.14 (#61)

Browse Source 
* Update to actix-web beta.14

* Fix HeaderMap import
This commit is contained in:
Riley 2021-12-13 09:45:34 -06:00 committed by GitHub
parent ae7040a54e
commit 14147286ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 7 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.13", default-features = false } actix-web = { version = "=4.0.0-beta.14", 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
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.13" actix-web = "=4.0.0-beta.14"
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.13" actix-web = "=4.0.0-beta.14"
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/otel.rs
View File

@ -21,11 +21,11 @@ use tracing_opentelemetry_0_16_pkg as tracing_opentelemetry;
use opentelemetry::propagation::Extractor; use opentelemetry::propagation::Extractor;
pub(crate) struct RequestHeaderCarrier<'a> { pub(crate) struct RequestHeaderCarrier<'a> {
headers: &'a actix_web::http::HeaderMap, headers: &'a actix_web::http::header::HeaderMap,
} }
impl<'a> RequestHeaderCarrier<'a> { impl<'a> RequestHeaderCarrier<'a> {
pub(crate) fn new(headers: &'a actix_web::http::HeaderMap) -> Self { pub(crate) fn new(headers: &'a actix_web::http::header::HeaderMap) -> Self {
RequestHeaderCarrier { headers } RequestHeaderCarrier { headers }
} }
} }

2
src/request_id.rs
View File

@ -1,4 +1,4 @@
use actix_web::dev::Payload; use actix_web::{dev::Payload, HttpMessage};
use actix_web::{FromRequest, HttpRequest, ResponseError}; use actix_web::{FromRequest, HttpRequest, ResponseError};
use std::future::{ready, Ready}; use std::future::{ready, Ready};
use uuid::Uuid; use uuid::Uuid;

2
src/root_span.rs
View File

@ -1,4 +1,4 @@
use actix_web::dev::Payload; use actix_web::{dev::Payload, HttpMessage};
use actix_web::{FromRequest, HttpRequest, ResponseError}; use actix_web::{FromRequest, HttpRequest, ResponseError};
use std::future::{ready, Ready}; use std::future::{ready, Ready};
use tracing::Span; use tracing::Span;