From 4325fc52b63453a4e1d46258ec6ad227caed8085 Mon Sep 17 00:00:00 2001 From: Mason Gup Date: Mon, 12 Jan 2026 16:09:41 -0500 Subject: [PATCH 1/3] Support OpenTelemetry 0.31 --- reqwest-tracing/CHANGELOG.md | 4 ++++ reqwest-tracing/Cargo.toml | 5 +++++ reqwest-tracing/src/lib.rs | 1 + reqwest-tracing/src/middleware.rs | 1 + reqwest-tracing/src/otel.rs | 30 ++++++++++++++++++++++++++++++ 5 files changed, 41 insertions(+) diff --git a/reqwest-tracing/CHANGELOG.md b/reqwest-tracing/CHANGELOG.md index 6f05ec4..01ae5b4 100644 --- a/reqwest-tracing/CHANGELOG.md +++ b/reqwest-tracing/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] + +### Added +- Added support for OpenTelemetry `0.31` ## [0.6.0] - 2026-01-07 diff --git a/reqwest-tracing/Cargo.toml b/reqwest-tracing/Cargo.toml index 548bd57..fece5dc 100644 --- a/reqwest-tracing/Cargo.toml +++ b/reqwest-tracing/Cargo.toml @@ -21,6 +21,7 @@ opentelemetry_0_27 = ["opentelemetry_0_27_pkg", "tracing-opentelemetry_0_28_pkg" opentelemetry_0_28 = ["opentelemetry_0_28_pkg", "tracing-opentelemetry_0_29_pkg"] opentelemetry_0_29 = ["opentelemetry_0_29_pkg", "tracing-opentelemetry_0_30_pkg"] opentelemetry_0_30 = ["opentelemetry_0_30_pkg", "tracing-opentelemetry_0_31_pkg"] +opentelemetry_0_31 = ["opentelemetry_0_31_pkg", "tracing-opentelemetry_0_32_pkg"] # This feature ensures that both the old (deprecated) and new attributes are published simultaneously. # By doing so, we maintain backward compatibility, allowing existing code that relies on the old attributes # to continue functioning while encouraging the transition to the new attributes. @@ -47,6 +48,7 @@ opentelemetry_0_27_pkg = { package = "opentelemetry", version = "0.27.0", option opentelemetry_0_28_pkg = { package = "opentelemetry", version = "0.28.0", optional = true } opentelemetry_0_29_pkg = { package = "opentelemetry", version = "0.29.0", optional = true } opentelemetry_0_30_pkg = { package = "opentelemetry", version = "0.30.0", optional = true } +opentelemetry_0_31_pkg = { package = "opentelemetry", version = "0.31.0", optional = true } tracing-opentelemetry_0_21_pkg = { package = "tracing-opentelemetry", version = "0.21.0", optional = true } tracing-opentelemetry_0_22_pkg = { package = "tracing-opentelemetry", version = "0.22.0", optional = true } tracing-opentelemetry_0_23_pkg = { package = "tracing-opentelemetry", version = "0.23.0", optional = true } @@ -58,6 +60,7 @@ tracing-opentelemetry_0_28_pkg = { package = "tracing-opentelemetry", version = tracing-opentelemetry_0_29_pkg = { package = "tracing-opentelemetry", version = "0.29.0", optional = true } tracing-opentelemetry_0_30_pkg = { package = "tracing-opentelemetry", version = "0.30.0", optional = true } tracing-opentelemetry_0_31_pkg = { package = "tracing-opentelemetry", version = "0.31.0", optional = true } +tracing-opentelemetry_0_32_pkg = { package = "tracing-opentelemetry", version = "0.32.1", optional = true } [target.'cfg(target_arch = "wasm32")'.dependencies] getrandom = { version = "0.2.0", features = ["js"] } @@ -78,8 +81,10 @@ opentelemetry_sdk_0_27 = { package = "opentelemetry_sdk", version = "0.27.0", fe opentelemetry_sdk_0_28 = { package = "opentelemetry_sdk", version = "0.28.0", features = ["trace"] } opentelemetry_sdk_0_29 = { package = "opentelemetry_sdk", version = "0.29.0", features = ["trace"] } opentelemetry_sdk_0_30 = { package = "opentelemetry_sdk", version = "0.30.0", features = ["trace"] } +opentelemetry_sdk_0_31 = { package = "opentelemetry_sdk", version = "0.31.0", features = ["trace"] } opentelemetry_stdout_0_1 = { package = "opentelemetry-stdout", version = "0.1.0", features = ["trace"] } opentelemetry_stdout_0_2 = { package = "opentelemetry-stdout", version = "0.2.0", features = ["trace"] } opentelemetry_stdout_0_3 = { package = "opentelemetry-stdout", version = "0.3.0", features = ["trace"] } opentelemetry_stdout_0_4 = { package = "opentelemetry-stdout", version = "0.4.0", features = ["trace"] } opentelemetry_stdout_0_5 = { package = "opentelemetry-stdout", version = "0.5.0", features = ["trace"] } +opentelemetry_stdout_0_31 = { package = "opentelemetry-stdout", version = "0.31.0", features = ["trace"] } diff --git a/reqwest-tracing/src/lib.rs b/reqwest-tracing/src/lib.rs index b6b3f30..d7d3901 100644 --- a/reqwest-tracing/src/lib.rs +++ b/reqwest-tracing/src/lib.rs @@ -95,6 +95,7 @@ mod middleware; feature = "opentelemetry_0_28", feature = "opentelemetry_0_29", feature = "opentelemetry_0_30", + feature = "opentelemetry_0_31", ))] mod otel; mod reqwest_otel_span_builder; diff --git a/reqwest-tracing/src/middleware.rs b/reqwest-tracing/src/middleware.rs index c4f1d19..b5f9046 100644 --- a/reqwest-tracing/src/middleware.rs +++ b/reqwest-tracing/src/middleware.rs @@ -57,6 +57,7 @@ where feature = "opentelemetry_0_28", feature = "opentelemetry_0_29", feature = "opentelemetry_0_30", + feature = "opentelemetry_0_31", ))] let req = if extensions.get::().is_none() { // Adds tracing headers to the given request to propagate the OpenTelemetry context to downstream revivers of the request. diff --git a/reqwest-tracing/src/otel.rs b/reqwest-tracing/src/otel.rs index 5a9d6ff..8182808 100644 --- a/reqwest-tracing/src/otel.rs +++ b/reqwest-tracing/src/otel.rs @@ -82,6 +82,13 @@ pub fn inject_opentelemetry_context_into_request(mut request: Request) -> Reques injector.inject_context(&context, &mut RequestCarrier::new(&mut request)) }); + #[cfg(feature = "opentelemetry_0_31")] + opentelemetry_0_31_pkg::global::get_text_map_propagator(|injector| { + use tracing_opentelemetry_0_32_pkg::OpenTelemetrySpanExt; + let context = Span::current().context(); + injector.inject_context(&context, &mut RequestCarrier::new(&mut request)) + }); + request } @@ -186,6 +193,13 @@ impl opentelemetry_0_30_pkg::propagation::Injector for RequestCarrier<'_> { } } +#[cfg(feature = "opentelemetry_0_31")] +impl opentelemetry_0_31_pkg::propagation::Injector for RequestCarrier<'_> { + fn set(&mut self, key: &str, value: String) { + self.set_inner(key, value) + } +} + #[cfg(test)] mod test { use std::sync::OnceLock; @@ -417,6 +431,22 @@ mod test { subscriber.with(telemetry) }; + #[cfg(feature = "opentelemetry_0_31")] + let subscriber = { + use opentelemetry_0_31_pkg::trace::TracerProvider; + + let provider = opentelemetry_sdk_0_31::trace::SdkTracerProvider::builder().build(); + + let tracer = provider.tracer("reqwest"); + let _ = opentelemetry_0_31_pkg::global::set_tracer_provider(provider); + opentelemetry_0_31_pkg::global::set_text_map_propagator( + opentelemetry_sdk_0_31::propagation::TraceContextPropagator::new(), + ); + + let telemetry = tracing_opentelemetry_0_32_pkg::layer().with_tracer(tracer); + subscriber.with(telemetry) + }; + tracing::subscriber::set_global_default(subscriber).unwrap(); }); From 757b7e92301388b481109b5770ec062a187ca94e Mon Sep 17 00:00:00 2001 From: Mason Gup Date: Mon, 12 Jan 2026 16:36:24 -0500 Subject: [PATCH 2/3] Fix clippy issue --- reqwest-tracing/src/otel.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reqwest-tracing/src/otel.rs b/reqwest-tracing/src/otel.rs index 8182808..571adc7 100644 --- a/reqwest-tracing/src/otel.rs +++ b/reqwest-tracing/src/otel.rs @@ -438,7 +438,7 @@ mod test { let provider = opentelemetry_sdk_0_31::trace::SdkTracerProvider::builder().build(); let tracer = provider.tracer("reqwest"); - let _ = opentelemetry_0_31_pkg::global::set_tracer_provider(provider); + opentelemetry_0_31_pkg::global::set_tracer_provider(provider); opentelemetry_0_31_pkg::global::set_text_map_propagator( opentelemetry_sdk_0_31::propagation::TraceContextPropagator::new(), ); From 8631df0728c4e22fa05e77cc1b1b811a0918e8f8 Mon Sep 17 00:00:00 2001 From: Mason Gup Date: Mon, 12 Jan 2026 16:49:53 -0500 Subject: [PATCH 3/3] Try bumping versions in CI test exclude and group to fix CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2de71ce..441d1fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,7 @@ jobs: uses: taiki-e/install-action@cargo-hack # Old opentelemetry features group to improve performance - name: test - run: cargo hack test --feature-powerset -p reqwest-tracing --exclude-features opentelemetry_0_20 --group-features opentelemetry_0_21,opentelemetry_0_22,opentelemetry_0_23,opentelemetry_0_24,opentelemetry_0_25,opentelemetry_0_26,opentelemetry_0_27 + run: cargo hack test --feature-powerset -p reqwest-tracing --exclude-features opentelemetry_0_20,opentelemetry_0_21 --group-features opentelemetry_0_22,opentelemetry_0_23,opentelemetry_0_24,opentelemetry_0_25,opentelemetry_0_26,opentelemetry_0_27,opentelemetry_0_28 rustfmt: name: Rustfmt