Merge pull request #215 from SimenB/otel-0-28

feat: support OTel 0.28

Author: SimenB

reqwest-tracing/CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- Added support for OpenTelemetry `0.28` ([#215](https://github.com/TrueLayer/reqwest-middleware/pull/215))
+
 ## [0.5.5] - 2024-12-02
 
 ### Added

reqwest-tracing/Cargo.toml

@@ -18,6 +18,7 @@ opentelemetry_0_24 = ["opentelemetry_0_24_pkg", "tracing-opentelemetry_0_25_pkg"
 opentelemetry_0_25 = ["opentelemetry_0_25_pkg", "tracing-opentelemetry_0_26_pkg"]
 opentelemetry_0_26 = ["opentelemetry_0_26_pkg", "tracing-opentelemetry_0_27_pkg"]
 opentelemetry_0_27 = ["opentelemetry_0_27_pkg", "tracing-opentelemetry_0_28_pkg"]
+opentelemetry_0_28 = ["opentelemetry_0_28_pkg", "tracing-opentelemetry_0_29_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.
@@ -41,6 +42,7 @@ opentelemetry_0_24_pkg = { package = "opentelemetry", version = "0.24.0", option
 opentelemetry_0_25_pkg = { package = "opentelemetry", version = "0.25.0", optional = true }
 opentelemetry_0_26_pkg = { package = "opentelemetry", version = "0.26.0", optional = true }
 opentelemetry_0_27_pkg = { package = "opentelemetry", version = "0.27.0", optional = true }
+opentelemetry_0_28_pkg = { package = "opentelemetry", version = "0.28.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 }
@@ -49,6 +51,7 @@ tracing-opentelemetry_0_25_pkg = { package = "tracing-opentelemetry", version =
 tracing-opentelemetry_0_26_pkg = { package = "tracing-opentelemetry", version = "0.26.0", optional = true }
 tracing-opentelemetry_0_27_pkg = { package = "tracing-opentelemetry", version = "0.27.0", optional = true }
 tracing-opentelemetry_0_28_pkg = { package = "tracing-opentelemetry", version = "0.28.0", optional = true }
+tracing-opentelemetry_0_29_pkg = { package = "tracing-opentelemetry", version = "0.29.0", optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 getrandom = { version = "0.2.0", features = ["js"] }
@@ -66,6 +69,7 @@ opentelemetry_sdk_0_24 = { package = "opentelemetry_sdk", version = "0.24.1", fe
 opentelemetry_sdk_0_25 = { package = "opentelemetry_sdk", version = "0.25.0", features = ["trace"] }
 opentelemetry_sdk_0_26 = { package = "opentelemetry_sdk", version = "0.26.0", features = ["trace"] }
 opentelemetry_sdk_0_27 = { package = "opentelemetry_sdk", version = "0.27.0", features = ["trace"] }
+opentelemetry_sdk_0_28 = { package = "opentelemetry_sdk", version = "0.28.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"] }

reqwest-tracing/src/lib.rs

@@ -92,6 +92,7 @@ mod middleware;
     feature = "opentelemetry_0_25",
     feature = "opentelemetry_0_26",
     feature = "opentelemetry_0_27",
+    feature = "opentelemetry_0_28",
 ))]
 mod otel;
 mod reqwest_otel_span_builder;

reqwest-tracing/src/middleware.rs

@@ -54,6 +54,7 @@ where
                 feature = "opentelemetry_0_25",
                 feature = "opentelemetry_0_26",
                 feature = "opentelemetry_0_27",
+                feature = "opentelemetry_0_28",
             ))]
             let req = if extensions.get::<crate::DisableOtelPropagation>().is_none() {
                 // Adds tracing headers to the given request to propagate the OpenTelemetry context to downstream revivers of the request.

reqwest-tracing/src/otel.rs

@@ -61,6 +61,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_28")]
+    opentelemetry_0_28_pkg::global::get_text_map_propagator(|injector| {
+        use tracing_opentelemetry_0_29_pkg::OpenTelemetrySpanExt;
+        let context = Span::current().context();
+        injector.inject_context(&context, &mut RequestCarrier::new(&mut request))
+    });
+
     request
 }
 
@@ -144,6 +151,13 @@ impl opentelemetry_0_27_pkg::propagation::Injector for RequestCarrier<'_> {
     }
 }
 
+#[cfg(feature = "opentelemetry_0_28")]
+impl opentelemetry_0_28_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;
@@ -327,6 +341,22 @@ mod test {
                 subscriber.with(telemetry)
             };
 
+            #[cfg(feature = "opentelemetry_0_28")]
+            let subscriber = {
+                use opentelemetry_0_28_pkg::trace::TracerProvider;
+
+                let provider = opentelemetry_sdk_0_28::trace::SdkTracerProvider::builder().build();
+
+                let tracer = provider.tracer("reqwest");
+                let _ = opentelemetry_0_28_pkg::global::set_tracer_provider(provider);
+                opentelemetry_0_28_pkg::global::set_text_map_propagator(
+                    opentelemetry_sdk_0_28::propagation::TraceContextPropagator::new(),
+                );
+
+                let telemetry = tracing_opentelemetry_0_29_pkg::layer().with_tracer(tracer);
+                subscriber.with(telemetry)
+            };
+
             tracing::subscriber::set_global_default(subscriber).unwrap();
         });