Support tracing-opentelemetry 0.32

Author: Jesse-Bakker

Cargo.lock

@@ -31,6 +31,10 @@ tracing-opentelemetry-0-31 = [
     "dep:tracing-opentelemetry-0-31",
     "dep:opentelemetry-0-30",
 ]
+tracing-opentelemetry-0-32 = [
+    "dep:tracing-opentelemetry-0-32",
+    "dep:opentelemetry-0-31",
+]
 
 # TODO Remove this for the next breaking release.
 # This is the price I have to pay to the gods of semantic versioning for failing to notice I created
@@ -67,6 +71,8 @@ tracing-opentelemetry-0-30 = { package = "tracing-opentelemetry", version = "0.3
 opentelemetry-0-29 = { package = "opentelemetry", version = "0.29.0", default-features = false, features = ["futures"], optional = true }
 tracing-opentelemetry-0-31 = { package = "tracing-opentelemetry", version = "0.31.0", default-features = false, optional = true }
 opentelemetry-0-30 = { package = "opentelemetry", version = "0.30.0", default-features = false, optional = true }
+tracing-opentelemetry-0-32 = { package = "tracing-opentelemetry", version = "0.32.0", default-features = false, optional = true }
+opentelemetry-0-31 = { package = "opentelemetry", version = "0.31.0", default-features = false, optional = true }
 
 # OpenTelemetry depends on this but with a version such that minimal versions are broken. We do not use this.
 async-trait = { version = "0.1.9", default-features = false, optional = true }

Cargo.toml

@@ -548,7 +548,8 @@ where
         feature = "tracing-opentelemetry-0-28",
         feature = "tracing-opentelemetry-0-29",
         feature = "tracing-opentelemetry-0-30",
-        feature = "tracing-opentelemetry-0-31"
+        feature = "tracing-opentelemetry-0-31",
+        feature = "tracing-opentelemetry-0-32",
     ))]
     #[cfg_attr(
         docsrs,
@@ -557,7 +558,8 @@ where
             feature = "tracing-opentelemetry-0-28",
             feature = "tracing-opentelemetry-0-29",
             feature = "tracing-opentelemetry-0-30",
-            feature = "tracing-opentelemetry-0-31"
+            feature = "tracing-opentelemetry-0-31",
+            feature = "tracing-opentelemetry-0-32",
         ))
     )]
     #[must_use]

src/fmt/layer.rs

@@ -983,7 +983,8 @@ where
         feature = "tracing-opentelemetry-0-28",
         feature = "tracing-opentelemetry-0-29",
         feature = "tracing-opentelemetry-0-30",
-        feature = "tracing-opentelemetry-0-31"
+        feature = "tracing-opentelemetry-0-31",
+        feature = "tracing-opentelemetry-0-32",
     ))]
     #[cfg_attr(
         docsrs,
@@ -992,7 +993,8 @@ where
             feature = "tracing-opentelemetry-0-28",
             feature = "tracing-opentelemetry-0-29",
             feature = "tracing-opentelemetry-0-30",
-            feature = "tracing-opentelemetry-0-31"
+            feature = "tracing-opentelemetry-0-31",
+            feature = "tracing-opentelemetry-0-32",
         ))
     )]
     pub fn with_opentelemetry_ids(&mut self, display_opentelemetry_ids: bool) -> &mut Self {
@@ -1034,6 +1036,21 @@ where
                         };
                     }
 
+                    #[cfg(feature = "tracing-opentelemetry-0-32")]
+                    {
+                        ids = ids.or_else(|| {
+                            span.extensions()
+                                .get::<tracing_opentelemetry_0_32::OtelData>()
+                                .and_then(|otel_data| {
+                                    let trace_id = otel_data.trace_id()?;
+                                    let span_id = otel_data.span_id()?;
+                                    Some(serde_json::json!({
+                                        "traceId": trace_id.to_string(),
+                                        "spanId": span_id.to_string(),
+                                    }))
+                                })
+                        })
+                    }
                     otel_extraction!(
                         "tracing-opentelemetry-0-31",
                         tracing_opentelemetry_0_31,