diff --git a/.drone.yml b/.drone.yml index e878207..a25c1ec 100644 --- a/.drone.yml +++ b/.drone.yml @@ -29,8 +29,9 @@ steps: - cargo clippy --features opentelemetry_0_16 -- -D warnings - cargo clippy --features opentelemetry_0_17 -- -D warnings - cargo clippy --features opentelemetry_0_18 -- -D warnings - - cargo clippy --example client --features opentelemetry_0_18 -- -D warnings - - cargo clippy --example server --features opentelemetry_0_18 -- -D warnings + - cargo clippy --features opentelemetry_0_19 -- -D warnings + - cargo clippy --example client --features opentelemetry_0_19 -- -D warnings + - cargo clippy --example server --features opentelemetry_0_19 -- -D warnings trigger: event: @@ -97,8 +98,8 @@ steps: pull: always commands: - cargo check --target=$TARGET - - cargo check --target=$TARGET --example client --features opentelemetry_0_18 - - cargo check --target=$TARGET --example server --features opentelemetry_0_18 + - cargo check --target=$TARGET --example client --features opentelemetry_0_19 + - cargo check --target=$TARGET --example server --features opentelemetry_0_19 trigger: event: @@ -131,8 +132,8 @@ steps: pull: always commands: - cargo check --target=$TARGET - - cargo check --target=$TARGET --example client --features opentelemetry_0_18 - - cargo check --target=$TARGET --example server --features opentelemetry_0_18 + - cargo check --target=$TARGET --example client --features opentelemetry_0_19 + - cargo check --target=$TARGET --example server --features opentelemetry_0_19 trigger: event: @@ -165,8 +166,8 @@ steps: pull: always commands: - cargo check --target=$TARGET - - cargo check --target=$TARGET --example client --features opentelemetry_0_18 - - cargo check --target=$TARGET --example server --features opentelemetry_0_18 + - cargo check --target=$TARGET --example client --features opentelemetry_0_19 + - cargo check --target=$TARGET --example server --features opentelemetry_0_19 trigger: event: @@ -198,8 +199,8 @@ steps: pull: always commands: - cargo build --target=$TARGET - - cargo build --target=$TARGET --example client --features opentelemetry_0_18 - - cargo build --target=$TARGET --example server --features opentelemetry_0_18 + - cargo build --target=$TARGET --example client --features opentelemetry_0_19 + - cargo build --target=$TARGET --example server --features opentelemetry_0_19 trigger: event: @@ -231,8 +232,8 @@ steps: pull: always commands: - cargo build --target=$TARGET - - cargo build --target=$TARGET --example client --features opentelemetry_0_18 - - cargo build --target=$TARGET --example server --features opentelemetry_0_18 + - cargo build --target=$TARGET --example client --features opentelemetry_0_19 + - cargo build --target=$TARGET --example server --features opentelemetry_0_19 trigger: event: @@ -264,8 +265,8 @@ steps: pull: always commands: - cargo build --target=$TARGET - - cargo build --target=$TARGET --example client --features opentelemetry_0_18 - - cargo build --target=$TARGET --example server --features opentelemetry_0_18 + - cargo build --target=$TARGET --example client --features opentelemetry_0_19 + - cargo build --target=$TARGET --example server --features opentelemetry_0_19 trigger: event: diff --git a/.gitignore b/.gitignore index 96ef6c0..7893104 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /target Cargo.lock +/.envrc +/.direnv diff --git a/Cargo.toml b/Cargo.toml index cc148b0..ae4d3d9 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.6" +version = "0.1.7" authors = ["asonix Span { let span = tracing::info_span!("Root span", trace_id = tracing::field::Empty,); { use opentelemetry::trace::TraceContextExt; use tracing_opentelemetry::OpenTelemetrySpanExt; - #[cfg(not(any(feature = "opentelemetry_0_17", feature = "opentelemetry_0_18")))] + #[cfg(not(any( + feature = "opentelemetry_0_17", + feature = "opentelemetry_0_18", + feature = "opentelemetry_0_19" + )))] let trace_id = span.context().span().span_context().trace_id().to_hex(); - #[cfg(any(feature = "opentelemetry_0_17", feature = "opentelemetry_0_18"))] + #[cfg(any( + feature = "opentelemetry_0_17", + feature = "opentelemetry_0_18", + feature = "opentelemetry_0_19" + ))] let trace_id = { let id = span.context().span().span_context().trace_id(); format!("{:032x}", id) @@ -288,7 +301,8 @@ struct RequestHeaderCarrier<'a> { feature = "opentelemetry_0_15", feature = "opentelemetry_0_16", feature = "opentelemetry_0_17", - feature = "opentelemetry_0_18" + feature = "opentelemetry_0_18", + feature = "opentelemetry_0_19" ))] impl<'a> opentelemetry::propagation::Injector for RequestHeaderCarrier<'a> { fn set(&mut self, key: &str, value: String) { @@ -322,7 +336,8 @@ fn record_otel(_headers: &mut HeaderMap, _span: &Span) { feature = "opentelemetry_0_15", feature = "opentelemetry_0_16", feature = "opentelemetry_0_17", - feature = "opentelemetry_0_18" + feature = "opentelemetry_0_18", + feature = "opentelemetry_0_19" ))] { let span = _span;