diff --git a/Cargo.toml b/Cargo.toml index 531bb7b..f5051f9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tracing-awc" description = "Tracing instrumentation for the awc http client" -version = "0.1.8" +version = "0.1.9" authors = ["asonix Result<(), Box> { Client::builder() @@ -47,7 +45,7 @@ fn init_opentelemetry(url: &str) -> Result<(), Box> { let tracer = opentelemetry_otlp::new_pipeline() .tracing() .with_trace_config( - opentelemetry::sdk::trace::config().with_resource(Resource::new(vec![KeyValue::new( + opentelemetry_sdk::trace::config().with_resource(Resource::new(vec![KeyValue::new( "service.name", "client-demo", )])), @@ -57,7 +55,7 @@ fn init_opentelemetry(url: &str) -> Result<(), Box> { .tonic() .with_endpoint(url), ) - .install_batch(opentelemetry::runtime::Tokio)?; + .install_batch(opentelemetry_sdk::runtime::Tokio)?; let otel_layer = tracing_opentelemetry::layer().with_tracer(tracer); diff --git a/examples/server.rs b/examples/server.rs index 55bb0fe..16715bb 100644 --- a/examples/server.rs +++ b/examples/server.rs @@ -7,13 +7,11 @@ use std::error::Error; use tracing_actix_web::TracingLogger; use tracing_subscriber::{fmt::format::FmtSpan, layer::SubscriberExt, EnvFilter, Registry}; -use opentelemetry_0_20_pkg as opentelemetry; -use tracing_opentelemetry_0_20_pkg as tracing_opentelemetry; +use opentelemetry_0_21_pkg as opentelemetry; +use tracing_opentelemetry_0_22_pkg as tracing_opentelemetry; -use opentelemetry::{ - sdk::{propagation::TraceContextPropagator, Resource}, - KeyValue, -}; +use opentelemetry::KeyValue; +use opentelemetry_sdk::{propagation::TraceContextPropagator, Resource}; #[tracing::instrument(name = "Index")] async fn index() -> impl Responder { @@ -51,7 +49,7 @@ fn init_opentelemetry(url: &str) -> Result<(), Box> { let tracer = opentelemetry_otlp::new_pipeline() .tracing() .with_trace_config( - opentelemetry::sdk::trace::config().with_resource(Resource::new(vec![KeyValue::new( + opentelemetry_sdk::trace::config().with_resource(Resource::new(vec![KeyValue::new( "service.name", "server-demo", )])), @@ -61,7 +59,7 @@ fn init_opentelemetry(url: &str) -> Result<(), Box> { .tonic() .with_endpoint(url), ) - .install_batch(opentelemetry::runtime::Tokio)?; + .install_batch(opentelemetry_sdk::runtime::Tokio)?; let otel_layer = tracing_opentelemetry::layer().with_tracer(tracer); diff --git a/src/lib.rs b/src/lib.rs index 11276b1..457eeda 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -26,6 +26,8 @@ use opentelemetry_0_18_pkg as opentelemetry; use opentelemetry_0_19_pkg as opentelemetry; #[cfg(feature = "opentelemetry_0_20")] use opentelemetry_0_20_pkg as opentelemetry; +#[cfg(feature = "opentelemetry_0_21")] +use opentelemetry_0_21_pkg as opentelemetry; #[cfg(feature = "opentelemetry_0_13")] use tracing_opentelemetry_0_12_pkg as tracing_opentelemetry; @@ -42,7 +44,9 @@ use tracing_opentelemetry_0_18_pkg as tracing_opentelemetry; #[cfg(feature = "opentelemetry_0_19")] use tracing_opentelemetry_0_19_pkg as tracing_opentelemetry; #[cfg(feature = "opentelemetry_0_20")] -use tracing_opentelemetry_0_20_pkg as tracing_opentelemetry; +use tracing_opentelemetry_0_21_pkg as tracing_opentelemetry; +#[cfg(feature = "opentelemetry_0_21")] +use tracing_opentelemetry_0_22_pkg as tracing_opentelemetry; #[cfg(any( feature = "opentelemetry_0_13", @@ -52,7 +56,8 @@ use tracing_opentelemetry_0_20_pkg as tracing_opentelemetry; feature = "opentelemetry_0_17", feature = "opentelemetry_0_18", feature = "opentelemetry_0_19", - feature = "opentelemetry_0_20" + feature = "opentelemetry_0_20", + feature = "opentelemetry_0_21", ))] pub fn root_span() -> Span { let span = tracing::info_span!("Root span", trace_id = tracing::field::Empty,); @@ -63,7 +68,8 @@ pub fn root_span() -> Span { feature = "opentelemetry_0_17", feature = "opentelemetry_0_18", feature = "opentelemetry_0_19", - feature = "opentelemetry_0_20" + feature = "opentelemetry_0_20", + feature = "opentelemetry_0_21", )))] let trace_id = span.context().span().span_context().trace_id().to_hex(); @@ -71,7 +77,8 @@ pub fn root_span() -> Span { feature = "opentelemetry_0_17", feature = "opentelemetry_0_18", feature = "opentelemetry_0_19", - feature = "opentelemetry_0_20" + feature = "opentelemetry_0_20", + feature = "opentelemetry_0_21", ))] let trace_id = { let id = span.context().span().span_context().trace_id(); @@ -277,9 +284,9 @@ where .span .get_or_insert_with(|| tracing::info_span!("HTTP Client Response Body")); - let dummy_span = this.dummy_span.get_or_insert_with(|| { - tracing::trace_span!(parent: None, "HTTP Client Response Body Inner") - }); + let dummy_span = this.dummy_span.get_or_insert_with( + || tracing::trace_span!(parent: None, "HTTP Client Response Body Inner"), + ); let body = this.body; @@ -310,7 +317,8 @@ struct RequestHeaderCarrier<'a> { feature = "opentelemetry_0_17", feature = "opentelemetry_0_18", feature = "opentelemetry_0_19", - feature = "opentelemetry_0_20" + feature = "opentelemetry_0_20", + feature = "opentelemetry_0_21", ))] impl<'a> opentelemetry::propagation::Injector for RequestHeaderCarrier<'a> { fn set(&mut self, key: &str, value: String) { @@ -346,7 +354,8 @@ fn record_otel(_headers: &mut HeaderMap, _span: &Span) { feature = "opentelemetry_0_17", feature = "opentelemetry_0_18", feature = "opentelemetry_0_19", - feature = "opentelemetry_0_20" + feature = "opentelemetry_0_20", + feature = "opentelemetry_0_21", ))] { let span = _span;