Merge branch 'main' into konsti/report-retry-counts

Author: konstin

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --workspace --all-targets --all-features
+          args: --workspace --all-targets
 
   test-features-reqwest-middleware:
     name: Run test suite for `reqwest-middleware` with every feature combination
@@ -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 --group-features opentelemetry_0_20,opentelemetry_0_21,opentelemetry_0_22,opentelemetry_0_23,opentelemetry_0_24,opentelemetry_0_25
+        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
 
   rustfmt:
     name: Rustfmt

.github/workflows/permaref.yaml

@@ -0,0 +1,42 @@
+# Automatically creates a tag for each commit to `main` so when we rebase
+# changes on top of the upstream, we retain permanent references to each
+# previous commit so they are not orphaned and eventually deleted.
+name: Create permanent reference
+
+on:
+  push:
+    branches:
+      - "main"
+
+jobs:
+  create-permaref:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: "write"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Get the permanent ref number
+        id: get_version
+        run: |
+          # Enable pipefail so git command failures do not result in null versions downstream
+          set -x
+
+          echo "LAST_PERMA_NUMBER=$(\
+            git ls-remote --tags --refs --sort="v:refname" \
+            https://github.com/astral-sh/pubgrub.git | grep "tags/perma-" | tail -n1 | sed 's/.*\/perma-//' \
+          )" >> $GITHUB_OUTPUT
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "[email protected]"
+
+      - name: Create and push the new tag
+        run: |
+          TAG="perma-$((LAST_PERMA_NUMBER + 1))"
+          git tag -a "$TAG" -m 'Automatically created on push to `main`'
+          git push origin "$TAG"
+        env:
+          LAST_PERMA_NUMBER: ${{ steps.get_version.outputs.LAST_PERMA_NUMBER }}

reqwest-tracing/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.8] - 2025-06-16
+
+### Added
+- Added support for OpenTelemetry `0.30` ([#236](https://github.com/TrueLayer/reqwest-middleware/pull/236))
+
 ## [0.5.7] - 2025-04-08
 
 ### Added

reqwest-tracing/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reqwest-tracing"
-version = "0.5.7"
+version = "0.5.8"
 authors = ["Rodrigo Gryzinski <[email protected]>"]
 edition = "2018"
 description = "Opentracing middleware for reqwest."
@@ -20,6 +20,7 @@ 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"]
 opentelemetry_0_29 = ["opentelemetry_0_29_pkg", "tracing-opentelemetry_0_30_pkg"]
+opentelemetry_0_30 = ["opentelemetry_0_30_pkg", "tracing-opentelemetry_0_31_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.
@@ -45,6 +46,7 @@ opentelemetry_0_26_pkg = { package = "opentelemetry", version = "0.26.0", option
 opentelemetry_0_27_pkg = { package = "opentelemetry", version = "0.27.0", optional = true }
 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 }
 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 }
@@ -55,6 +57,7 @@ tracing-opentelemetry_0_27_pkg = { package = "tracing-opentelemetry", version =
 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 }
 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 }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 getrandom = { version = "0.2.0", features = ["js"] }
@@ -74,6 +77,7 @@ opentelemetry_sdk_0_26 = { package = "opentelemetry_sdk", version = "0.26.0", fe
 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_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_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

@@ -94,6 +94,7 @@ mod middleware;
     feature = "opentelemetry_0_27",
     feature = "opentelemetry_0_28",
     feature = "opentelemetry_0_29",
+    feature = "opentelemetry_0_30",
 ))]
 mod otel;
 mod reqwest_otel_span_builder;

reqwest-tracing/src/middleware.rs

@@ -56,6 +56,7 @@ where
                 feature = "opentelemetry_0_27",
                 feature = "opentelemetry_0_28",
                 feature = "opentelemetry_0_29",
+                feature = "opentelemetry_0_30",
             ))]
             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

@@ -75,6 +75,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_30")]
+    opentelemetry_0_30_pkg::global::get_text_map_propagator(|injector| {
+        use tracing_opentelemetry_0_31_pkg::OpenTelemetrySpanExt;
+        let context = Span::current().context();
+        injector.inject_context(&context, &mut RequestCarrier::new(&mut request))
+    });
+
     request
 }
 
@@ -172,6 +179,13 @@ impl opentelemetry_0_29_pkg::propagation::Injector for RequestCarrier<'_> {
     }
 }
 
+#[cfg(feature = "opentelemetry_0_30")]
+impl opentelemetry_0_30_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;
@@ -387,6 +401,22 @@ mod test {
                 subscriber.with(telemetry)
             };
 
+            #[cfg(feature = "opentelemetry_0_30")]
+            let subscriber = {
+                use opentelemetry_0_30_pkg::trace::TracerProvider;
+
+                let provider = opentelemetry_sdk_0_30::trace::SdkTracerProvider::builder().build();
+
+                let tracer = provider.tracer("reqwest");
+                let _ = opentelemetry_0_30_pkg::global::set_tracer_provider(provider);
+                opentelemetry_0_30_pkg::global::set_text_map_propagator(
+                    opentelemetry_sdk_0_30::propagation::TraceContextPropagator::new(),
+                );
+
+                let telemetry = tracing_opentelemetry_0_31_pkg::layer().with_tracer(tracer);
+                subscriber.with(telemetry)
+            };
+
             tracing::subscriber::set_global_default(subscriber).unwrap();
         });