Update to otel 0.18

.drone.yml

@@ -28,8 +28,9 @@ steps:
   - cargo clippy --features opentelemetry_0_15 -- -D warnings
   - cargo clippy --features opentelemetry_0_16 -- -D warnings
   - cargo clippy --features opentelemetry_0_17 -- -D warnings
-  - cargo clippy --example client --features opentelemetry_0_17 -- -D warnings
-  - cargo clippy --example server --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
 
 trigger:
   event:
@@ -96,8 +97,8 @@ steps:
   pull: always
   commands:
   - cargo check --target=$TARGET
-  - cargo check --target=$TARGET --example client --features opentelemetry_0_17
-  - cargo check --target=$TARGET --example server --features opentelemetry_0_17
+  - cargo check --target=$TARGET --example client --features opentelemetry_0_18
+  - cargo check --target=$TARGET --example server --features opentelemetry_0_18
 
 trigger:
   event:
@@ -130,8 +131,8 @@ steps:
   pull: always
   commands:
   - cargo check --target=$TARGET
-  - cargo check --target=$TARGET --example client --features opentelemetry_0_17
-  - cargo check --target=$TARGET --example server --features opentelemetry_0_17
+  - cargo check --target=$TARGET --example client --features opentelemetry_0_18
+  - cargo check --target=$TARGET --example server --features opentelemetry_0_18
 
 trigger:
   event:
@@ -164,8 +165,8 @@ steps:
   pull: always
   commands:
   - cargo check --target=$TARGET
-  - cargo check --target=$TARGET --example client --features opentelemetry_0_17
-  - cargo check --target=$TARGET --example server --features opentelemetry_0_17
+  - cargo check --target=$TARGET --example client --features opentelemetry_0_18
+  - cargo check --target=$TARGET --example server --features opentelemetry_0_18
 
 trigger:
   event:
@@ -197,8 +198,8 @@ steps:
   pull: always
   commands:
   - cargo build --target=$TARGET
-  - cargo build --target=$TARGET --example client --features opentelemetry_0_17
-  - cargo build --target=$TARGET --example server --features opentelemetry_0_17
+  - cargo build --target=$TARGET --example client --features opentelemetry_0_18
+  - cargo build --target=$TARGET --example server --features opentelemetry_0_18
 
 trigger:
   event:
@@ -230,8 +231,8 @@ steps:
   pull: always
   commands:
   - cargo build --target=$TARGET
-  - cargo build --target=$TARGET --example client --features opentelemetry_0_17
-  - cargo build --target=$TARGET --example server --features opentelemetry_0_17
+  - cargo build --target=$TARGET --example client --features opentelemetry_0_18
+  - cargo build --target=$TARGET --example server --features opentelemetry_0_18
 
 trigger:
   event:
@@ -263,8 +264,8 @@ steps:
   pull: always
   commands:
   - cargo build --target=$TARGET
-  - cargo build --target=$TARGET --example client --features opentelemetry_0_17
-  - cargo build --target=$TARGET --example server --features opentelemetry_0_17
+  - cargo build --target=$TARGET --example client --features opentelemetry_0_18
+  - cargo build --target=$TARGET --example server --features opentelemetry_0_18
 
 trigger:
   event:

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tracing-awc"
 description = "Tracing instrumentation for the awc http client"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["asonix <asonix@asonix.dog"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -10,11 +10,11 @@ readme = "README.md"
 
 [[example]]
 name = "client"
-required-features = ["opentelemetry_0_17"]
+required-features = ["opentelemetry_0_18"]
 
 [[example]]
 name = "server"
-required-features = ["opentelemetry_0_17"]
+required-features = ["opentelemetry_0_18"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
@@ -40,6 +40,10 @@ opentelemetry_0_17 = [
   "opentelemetry_0_17_pkg",
   "tracing-opentelemetry_0_17_pkg",
 ]
+opentelemetry_0_18 = [
+  "opentelemetry_0_18_pkg",
+  "tracing-opentelemetry_0_18_pkg",
+]
 
 [dependencies]
 actix-http = { version = "3.0.2", default-features = false }
@@ -52,6 +56,7 @@ opentelemetry_0_14_pkg = { package = "opentelemetry", version = "0.14", optional
 opentelemetry_0_15_pkg = { package = "opentelemetry", version = "0.15", optional = true }
 opentelemetry_0_16_pkg = { package = "opentelemetry", version = "0.16", optional = true }
 opentelemetry_0_17_pkg = { package = "opentelemetry", version = "0.17", optional = true }
+opentelemetry_0_18_pkg = { package = "opentelemetry", version = "0.18", optional = true }
 pin-project-lite = "0.2.7"
 tracing = "0.1"
 tracing-opentelemetry_0_12_pkg = { package = "tracing-opentelemetry", version = "0.12", optional = true }
@@ -59,15 +64,16 @@ tracing-opentelemetry_0_13_pkg = { package = "tracing-opentelemetry", version =
 tracing-opentelemetry_0_14_pkg = { package = "tracing-opentelemetry", version = "0.14", optional = true }
 tracing-opentelemetry_0_16_pkg = { package = "tracing-opentelemetry", version = "0.16", optional = true }
 tracing-opentelemetry_0_17_pkg = { package = "tracing-opentelemetry", version = "0.17", optional = true }
+tracing-opentelemetry_0_18_pkg = { package = "tracing-opentelemetry", version = "0.18", optional = true }
 
 [dev-dependencies]
 actix-rt = "2.6"
 actix-web = { version = "4.0.0", default-features = false }
-opentelemetry-otlp = "0.10"
-opentelemetry_0_17_pkg = { package = "opentelemetry", version = "0.17", features = [
+opentelemetry-otlp = "0.11"
+opentelemetry_0_18_pkg = { package = "opentelemetry", version = "0.18", features = [
   "rt-tokio",
 ] }
-tracing-actix-web = { version = "0.5.0", features = ["opentelemetry_0_17"] }
+tracing-actix-web = { version = "0.6.1", features = ["opentelemetry_0_18"] }
 tracing-subscriber = { version = "0.3", features = [
   "ansi",
   "env-filter",

examples/client.rs

@@ -5,8 +5,8 @@ use tracing::instrument::Instrument;
 use tracing_awc::{root_span, Tracing};
 use tracing_subscriber::{fmt::format::FmtSpan, layer::SubscriberExt, EnvFilter, Registry};
 
-use opentelemetry_0_17_pkg as opentelemetry;
-use tracing_opentelemetry_0_17_pkg as tracing_opentelemetry;
+use opentelemetry_0_18_pkg as opentelemetry;
+use tracing_opentelemetry_0_18_pkg as tracing_opentelemetry;
 
 use opentelemetry::{
     sdk::{propagation::TraceContextPropagator, Resource},

examples/server.rs

@@ -7,8 +7,8 @@ use std::error::Error;
 use tracing_actix_web::TracingLogger;
 use tracing_subscriber::{fmt::format::FmtSpan, layer::SubscriberExt, EnvFilter, Registry};
 
-use opentelemetry_0_17_pkg as opentelemetry;
-use tracing_opentelemetry_0_17_pkg as tracing_opentelemetry;
+use opentelemetry_0_18_pkg as opentelemetry;
+use tracing_opentelemetry_0_18_pkg as tracing_opentelemetry;
 
 use opentelemetry::{
     sdk::{propagation::TraceContextPropagator, Resource},

src/lib.rs

@@ -20,6 +20,8 @@ use opentelemetry_0_15_pkg as opentelemetry;
 use opentelemetry_0_16_pkg as opentelemetry;
 #[cfg(feature = "opentelemetry_0_17")]
 use opentelemetry_0_17_pkg as opentelemetry;
+#[cfg(feature = "opentelemetry_0_18")]
+use opentelemetry_0_18_pkg as opentelemetry;
 
 #[cfg(feature = "opentelemetry_0_13")]
 use tracing_opentelemetry_0_12_pkg as tracing_opentelemetry;
@@ -31,23 +33,26 @@ use tracing_opentelemetry_0_14_pkg as tracing_opentelemetry;
 use tracing_opentelemetry_0_16_pkg as tracing_opentelemetry;
 #[cfg(feature = "opentelemetry_0_17")]
 use tracing_opentelemetry_0_17_pkg as tracing_opentelemetry;
+#[cfg(feature = "opentelemetry_0_18")]
+use tracing_opentelemetry_0_18_pkg as tracing_opentelemetry;
 
 #[cfg(any(
     feature = "opentelemetry_0_13",
     feature = "opentelemetry_0_14",
     feature = "opentelemetry_0_15",
     feature = "opentelemetry_0_16",
-    feature = "opentelemetry_0_17"
+    feature = "opentelemetry_0_17",
+    feature = "opentelemetry_0_18"
 ))]
 pub fn root_span() -> Span {
     let span = tracing::info_span!("Root span", trace_id = tracing::field::Empty,);
     {
         use opentelemetry::trace::TraceContextExt;
         use tracing_opentelemetry::OpenTelemetrySpanExt;
-        #[cfg(not(feature = "opentelemetry_0_17"))]
+        #[cfg(not(any(feature = "opentelemetry_0_17", feature = "opentelemetry_0_18")))]
         let trace_id = span.context().span().span_context().trace_id().to_hex();
 
-        #[cfg(feature = "opentelemetry_0_17")]
+        #[cfg(any(feature = "opentelemetry_0_17", feature = "opentelemetry_0_18"))]
         let trace_id = {
             let id = span.context().span().span_context().trace_id();
             format!("{:032x}", id)
@@ -282,7 +287,8 @@ struct RequestHeaderCarrier<'a> {
     feature = "opentelemetry_0_14",
     feature = "opentelemetry_0_15",
     feature = "opentelemetry_0_16",
-    feature = "opentelemetry_0_17"
+    feature = "opentelemetry_0_17",
+    feature = "opentelemetry_0_18"
 ))]
 impl<'a> opentelemetry::propagation::Injector for RequestHeaderCarrier<'a> {
     fn set(&mut self, key: &str, value: String) {
@@ -315,7 +321,8 @@ fn record_otel(_headers: &mut HeaderMap, _span: &Span) {
         feature = "opentelemetry_0_14",
         feature = "opentelemetry_0_15",
         feature = "opentelemetry_0_16",
-        feature = "opentelemetry_0_17"
+        feature = "opentelemetry_0_17",
+        feature = "opentelemetry_0_18"
     ))]
     {
         let span = _span;