diff --git a/reqwest-tracing/Cargo.toml b/reqwest-tracing/Cargo.toml index 9191d28..af5b9e3 100644 --- a/reqwest-tracing/Cargo.toml +++ b/reqwest-tracing/Cargo.toml @@ -14,6 +14,8 @@ opentelemetry_0_13 = ["opentelemetry_0_13_pkg", "tracing-opentelemetry_0_12_pkg" opentelemetry_0_14 = ["opentelemetry_0_14_pkg", "tracing-opentelemetry_0_13_pkg"] opentelemetry_0_15 = ["opentelemetry_0_15_pkg", "tracing-opentelemetry_0_14_pkg"] opentelemetry_0_16 = ["opentelemetry_0_16_pkg", "tracing-opentelemetry_0_16_pkg"] +opentelemetry_0_17 = ["opentelemetry_0_17_pkg", "tracing-opentelemetry_0_17_pkg"] + [dependencies] reqwest-middleware = { version = "^0.1.5-alpha.0", path = "../reqwest-middleware" } @@ -28,10 +30,13 @@ opentelemetry_0_13_pkg = { package = "opentelemetry", version = "0.13", optional opentelemetry_0_14_pkg = { package = "opentelemetry", version = "0.14", optional = true } 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 } tracing-opentelemetry_0_12_pkg = { package = "tracing-opentelemetry",version = "0.12", optional = true } tracing-opentelemetry_0_13_pkg = { package = "tracing-opentelemetry", version = "0.13", optional = true } 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 } + [dev-dependencies] wiremock = "0.5" diff --git a/reqwest-tracing/README.md b/reqwest-tracing/README.md index 2822e21..8789753 100644 --- a/reqwest-tracing/README.md +++ b/reqwest-tracing/README.md @@ -16,11 +16,11 @@ Attach `TracingMiddleware` to your client to automatically trace HTTP requests: # Cargo.toml # ... [dependencies] -opentelemetry = "0.16" +opentelemetry = "0.17" reqwest = "0.11" reqwest-middleware = "0.1.1" reqwest-retry = "0.1.1" -reqwest-tracing = { version = "0.1.2", features = ["opentelemetry_0_16"] } +reqwest-tracing = { version = "0.1.2", features = ["opentelemetry_0_17"] } tokio = { version = "1.12.0", features = ["macros", "rt-multi-thread"] } tracing = "0.1" tracing-opentelemetry = "0.15" @@ -69,10 +69,10 @@ an opentelemetry version feature: ```toml [dependencies] # ... -reqwest-tracing = { version = "0.1.0", features = ["opentelemetry_0_16"] } +reqwest-tracing = { version = "0.1.0", features = ["opentelemetry_0_17"] } ``` -Available opentelemetry features are `opentelemetry_0_16`, `opentelemetry_0_15`, `opentelemetry_0_14` and +Available opentelemetry features are `opentelemetry_0_17`, `opentelemetry_0_16`, `opentelemetry_0_15`, `opentelemetry_0_14` and `opentelemetry_0_13`. #### License diff --git a/reqwest-tracing/src/lib.rs b/reqwest-tracing/src/lib.rs index d7ebb45..e9367ed 100644 --- a/reqwest-tracing/src/lib.rs +++ b/reqwest-tracing/src/lib.rs @@ -8,6 +8,7 @@ mod middleware; feature = "opentelemetry_0_14", feature = "opentelemetry_0_15", feature = "opentelemetry_0_16", + feature = "opentelemetry_0_17", ))] mod otel; diff --git a/reqwest-tracing/src/middleware.rs b/reqwest-tracing/src/middleware.rs index 0520ad0..8b660af 100644 --- a/reqwest-tracing/src/middleware.rs +++ b/reqwest-tracing/src/middleware.rs @@ -45,6 +45,7 @@ impl Middleware for TracingMiddleware { feature = "opentelemetry_0_14", feature = "opentelemetry_0_15", feature = "opentelemetry_0_16", + feature = "opentelemetry_0_17", ))] let req = crate::otel::inject_opentracing_context_into_request(&request_span, req); diff --git a/reqwest-tracing/src/otel.rs b/reqwest-tracing/src/otel.rs index cf1afc3..5beb295 100644 --- a/reqwest-tracing/src/otel.rs +++ b/reqwest-tracing/src/otel.rs @@ -15,6 +15,9 @@ use opentelemetry_0_15_pkg as opentelemetry; #[cfg(feature = "opentelemetry_0_16")] use opentelemetry_0_16_pkg as opentelemetry; +#[cfg(feature = "opentelemetry_0_17")] +use opentelemetry_0_17_pkg as opentelemetry; + #[cfg(feature = "opentelemetry_0_13")] pub use tracing_opentelemetry_0_12_pkg as tracing_opentelemetry; @@ -27,6 +30,9 @@ pub use tracing_opentelemetry_0_14_pkg as tracing_opentelemetry; #[cfg(feature = "opentelemetry_0_16")] pub use tracing_opentelemetry_0_16_pkg as tracing_opentelemetry; +#[cfg(feature = "opentelemetry_0_17")] +pub use tracing_opentelemetry_0_17_pkg as tracing_opentelemetry; + use opentelemetry::global; use opentelemetry::propagation::Injector; use tracing_opentelemetry::OpenTelemetrySpanExt;