Update to latest beta
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Aode (lion) 2021-12-12 14:36:05 -06:00
parent e571e59abb
commit 4898546aa1
2 changed files with 7 additions and 10 deletions

View file

@ -1,7 +1,7 @@
[package]
name = "tracing-awc"
description = "Tracing instrumentation for the awc http client"
version = "0.1.0-beta.13"
version = "0.1.0-beta.14"
authors = ["asonix <asonix@asonix.dog"]
edition = "2018"
license = "AGPL-3.0"
@ -26,9 +26,9 @@ opentelemetry_0_15 = ["opentelemetry_0_15_pkg", "tracing-opentelemetry_0_14_pkg"
opentelemetry_0_16 = ["opentelemetry_0_16_pkg", "tracing-opentelemetry_0_16_pkg"]
[dependencies]
actix-http = { version = "=3.0.0-beta.14", default-features = false }
actix-http = { version = "=3.0.0-beta.15", default-features = false }
actix-service = "2.0.1"
awc = { version = "=3.0.0-beta.12", default-features = false }
awc = { version = "=3.0.0-beta.13", default-features = false }
bytes = "1"
futures-core = "0.3"
opentelemetry_0_13_pkg = { package = "opentelemetry", version = "0.13", optional = true }
@ -47,5 +47,5 @@ actix-rt = "2.2"
actix-web = { version = "4.0.0-beta.9", default-features = false }
opentelemetry-otlp = "0.9"
opentelemetry_0_16_pkg = { package = "opentelemetry", version = "0.16", features = ["rt-tokio"] }
tracing-actix-web = { version = "0.5.0-beta.3", features = ["opentelemetry_0_16"] }
tracing-actix-web = { version = "0.5.0-beta.3", features = ["opentelemetry_0_16"], git = "https://github.com/asonix/tracing-actix-web", branch = "riley/beta.14" }
tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter", "fmt"] }

View file

@ -1,9 +1,6 @@
use actix_http::{error::PayloadError, Payload, RequestHeadType};
use actix_http::{error::PayloadError, header::map::HeaderMap, Payload, RequestHeadType};
use actix_service::Service;
use awc::{
error::SendRequestError, http::HeaderMap, middleware::Transform, ConnectRequest,
ConnectResponse,
};
use awc::{error::SendRequestError, middleware::Transform, ConnectRequest, ConnectResponse};
use bytes::Bytes;
use futures_core::stream::Stream;
use std::{
@ -259,7 +256,7 @@ struct RequestHeaderCarrier<'a> {
impl<'a> opentelemetry::propagation::Injector for RequestHeaderCarrier<'a> {
fn set(&mut self, key: &str, value: String) {
let f = || {
use actix_http::http::{HeaderName, HeaderValue};
use actix_http::header::{HeaderName, HeaderValue};
use std::convert::TryFrom;
let key = HeaderName::from_bytes(key.as_bytes())