temporary multi-value support

iunanua · iunanua · commit bf4a23f1a3c1 · 2025-06-12T16:39:12.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,15 +30,15 @@ datadog-trace-utils = { git = "https://github.com/Datadog/libdatadog", rev = "54
 tinybytes = { git = "https://github.com/Datadog/libdatadog", rev = "540ea1e63ab403774325ffadb76f870747f11f6c" }
 
 futures = "0.3.31"
-opentelemetry_sdk = { version = "0.28.0", features = [
+opentelemetry_sdk = { git = "https://github.com/open-telemetry/opentelemetry-rust", features = [
     "trace",
 ], default-features = false }
-opentelemetry = { version = "0.28.0", features = [
+opentelemetry = { git = "https://github.com/open-telemetry/opentelemetry-rust", features = [
     "trace",
 ], default-features = false }
-opentelemetry-semantic-conventions = { version = "0.29.0", features = ["semconv_experimental"] }
+opentelemetry-semantic-conventions = { git = "https://github.com/open-telemetry/opentelemetry-rust", features = ["semconv_experimental"] }
 tokio = { version = "1.44.1" }
-rand = { version = "0.8" }
+rand = { version = "0.8", features = ["small_rng"] }
 
 [profile.dev]
 debug = 2 # full debug info
diff --git a/datadog-opentelemetry/examples/propagator/Cargo.toml b/datadog-opentelemetry/examples/propagator/Cargo.toml
@@ -20,12 +20,12 @@ hyper = { version = "1.3", default-features = false, features = ["full"] }
 hyper-util = { version = "0.1", features = ["full"] }
 tokio = { version = "1", default-features = false, features = ["full"] }
 tokio-stream = "0.1"
-opentelemetry = "0.28.0"
-opentelemetry_sdk = "0.28.0"
-opentelemetry-http = "0.28.0"
-opentelemetry-stdout = { version = "0.28.0", features = ["trace", "logs"] }
-opentelemetry-semantic-conventions = "0.28.0"
-opentelemetry-appender-tracing = "0.28.0"
+opentelemetry = { workspace = true }
+opentelemetry_sdk = { workspace = true }
+opentelemetry-semantic-conventions = { workspace = true }
+opentelemetry-http = { git = "https://github.com/open-telemetry/opentelemetry-rust" }
+opentelemetry-stdout = { git = "https://github.com/open-telemetry/opentelemetry-rust", features = ["trace", "logs"] }
+opentelemetry-appender-tracing = { git = "https://github.com/open-telemetry/opentelemetry-rust" }
 
 tracing = { version = ">=0.1.40", default-features = false, features = ["std"] }
 # `tracing-core >=0.1.33` is required for compatibility with `tracing >=0.1.40`.
diff --git a/datadog-opentelemetry/examples/propagator/src/server.rs b/datadog-opentelemetry/examples/propagator/src/server.rs
@@ -200,6 +200,10 @@ impl SpanProcessor for EnrichWithBaggageSpanProcessor {
         Ok(())
     }
 
+    fn shutdown_with_timeout(&self, _timeout: std::time::Duration) -> OTelSdkResult {
+        Ok(())
+    }
+
     fn on_start(&self, span: &mut opentelemetry_sdk::trace::Span, cx: &Context) {
         for (kk, vv) in cx.baggage().iter() {
             span.set_attribute(KeyValue::new(kk.clone(), vv.0.clone()));
diff --git a/datadog-opentelemetry/src/span_exporter.rs b/datadog-opentelemetry/src/span_exporter.rs
@@ -207,10 +207,14 @@ impl DatadogExporter {
     }
 
     pub fn shutdown(&self) -> OTelSdkResult {
+        self.shutdown_with_timeout(SPAN_EXPORTER_SHUTDOWN_TIMEOUT)
+    }
+
+    pub fn shutdown_with_timeout(&self, timeout: Duration) -> OTelSdkResult {
         match self
             .tx
             .trigger_shutdown()
-            .and_then(|()| self.tx.wait_shutdown_done(SPAN_EXPORTER_SHUTDOWN_TIMEOUT))
+            .and_then(|()| self.tx.wait_shutdown_done(timeout))
         {
             Ok(()) | Err(SenderError::BatchFull(_)) => {}
             Err(SenderError::AlreadyShutdown) => {
diff --git a/datadog-opentelemetry/src/span_processor.rs b/datadog-opentelemetry/src/span_processor.rs
@@ -461,4 +461,11 @@ impl opentelemetry_sdk::trace::SpanProcessor for DatadogSpanProcessor {
         // set the shared resource in the DatadogSpanProcessor
         *self.resource.write().unwrap() = resource.clone();
     }
+
+    fn shutdown_with_timeout(
+        &self,
+        timeout: std::time::Duration,
+    ) -> opentelemetry_sdk::error::OTelSdkResult {
+        self.span_exporter.shutdown_with_timeout(timeout)
+    }
 }
diff --git a/datadog-opentelemetry/tests/snapshots/test_injection_extraction.json b/datadog-opentelemetry/tests/snapshots/test_injection_extraction.json
@@ -17,7 +17,7 @@
       "span.kind": "server",
       "telemetry.sdk.language": "rust",
       "telemetry.sdk.name": "opentelemetry",
-      "telemetry.sdk.version": "0.28.0"
+      "telemetry.sdk.version": "0.30.0"
     },
     "metrics": {
       "_sampling_priority_v1": 2.0,
@@ -43,7 +43,7 @@
          "span.kind": "client",
          "telemetry.sdk.language": "rust",
          "telemetry.sdk.name": "opentelemetry",
-         "telemetry.sdk.version": "0.28.0"
+         "telemetry.sdk.version": "0.30.0"
        },
        "metrics": {
          "_dd.measured": 1.0,
diff --git a/datadog-opentelemetry/tests/snapshots/test_received_traces.json b/datadog-opentelemetry/tests/snapshots/test_received_traces.json
@@ -14,7 +14,7 @@
       "span.kind": "client",
       "telemetry.sdk.language": "rust",
       "telemetry.sdk.name": "opentelemetry",
-      "telemetry.sdk.version": "0.28.0"
+      "telemetry.sdk.version": "0.30.0"
     },
     "metrics": {
       "_dd.measured": 1.0,
diff --git a/datadog-opentelemetry/tests/snapshots/test_sampling_extraction.json b/datadog-opentelemetry/tests/snapshots/test_sampling_extraction.json
@@ -15,7 +15,7 @@
       "span.kind": "server",
       "telemetry.sdk.language": "rust",
       "telemetry.sdk.name": "opentelemetry",
-      "telemetry.sdk.version": "0.28.0"
+      "telemetry.sdk.version": "0.30.0"
     },
     "metrics": {
       "_dd.rule.psr": 1.0,
@@ -41,7 +41,7 @@
          "span.kind": "client",
          "telemetry.sdk.language": "rust",
          "telemetry.sdk.name": "opentelemetry",
-         "telemetry.sdk.version": "0.28.0"
+         "telemetry.sdk.version": "0.30.0"
        },
        "metrics": {
          "_dd.measured": 1.0,
diff --git a/dd-trace-propagation/Cargo.toml b/dd-trace-propagation/Cargo.toml
@@ -22,8 +22,9 @@ thiserror = { version = "1.0", default-features = false}
 opentelemetry = { workspace = true, optional = true }
 
 [dev-dependencies]
-pretty_assertions = "1.4.1"
 assert_unordered = "0.3"
+multimap = "0.10.1"
+pretty_assertions = "1.4.1"
 
 [features]
 default = ["opentelemetry"]
diff --git a/dd-trace-propagation/src/carrier.rs b/dd-trace-propagation/src/carrier.rs
@@ -5,6 +5,8 @@
 /// <https://github.com/open-telemetry/opentelemetry-rust/blob/main/opentelemetry/src/propagation/mod.rs>
 use std::collections::HashMap;
 
+use crate::error::Error;
+
 /// Injector provides an interface for a carrier to be used
 /// with a Propagator to inject a Context into the carrier.
 pub trait Injector {
@@ -16,10 +18,45 @@ pub trait Extractor {
     /// Get a value from the carrier.
     fn get(&self, key: &str) -> Option<&str>;
 
+    /// Get all values for a key from the carrier
+    fn get_all(&self, key: &str) -> Option<Vec<&str>>;
+
     /// Get all keys from the carrier.
     fn keys(&self) -> Vec<&str>;
 }
 
+pub fn get_single_value_from_extractor<'a>(
+    extractor: &'a dyn Extractor,
+    key: &'a str,
+) -> Result<Option<&'a str>, Error> {
+    let all = extractor.get_all(key);
+    if let Some(all) = all {
+        if all.iter().len() > 1 {
+            return Err(Error::extract(
+                "Multiple values while getting a single value",
+                "generic",
+            ));
+        } else {
+            return Ok(all.first().map(|v| &**v));
+        }
+    }
+
+    Ok(None)
+}
+
+pub fn get_comma_separated_value_from_extractor<'a>(
+    extractor: &'a dyn Extractor,
+    key: &'a str,
+) -> Option<String> {
+    extractor.get_all(key).map(|all| {
+        all.iter()
+            .filter(|part| !part.is_empty())
+            .map(|part| *part)
+            .collect::<Vec<_>>()
+            .join(",")
+    })
+}
+
 impl<S: std::hash::BuildHasher> Injector for HashMap<String, String, S> {
     /// Set a key and value in the `HashMap`.
     fn set(&mut self, key: &str, value: String) {
@@ -33,6 +70,11 @@ impl<S: std::hash::BuildHasher> Extractor for HashMap<String, String, S> {
         self.get(&key.to_lowercase()).map(String::as_str)
     }
 
+    /// Get all values for a key from the `HashMap`.
+    fn get_all(&self, key: &str) -> Option<Vec<&str>> {
+        Extractor::get(self, key).map(|value| vec![value])
+    }
+
     /// Collect all the keys from the `HashMap`.
     fn keys(&self) -> Vec<&str> {
         self.keys().map(String::as_str).collect::<Vec<_>>()
@@ -45,6 +87,10 @@ impl Extractor for &dyn opentelemetry::propagation::Extractor {
         opentelemetry::propagation::Extractor::get(*self, key)
     }
 
+    fn get_all(&self, key: &str) -> Option<Vec<&str>> {
+        opentelemetry::propagation::Extractor::get_all(*self, key)
+    }
+
     fn keys(&self) -> Vec<&str> {
         opentelemetry::propagation::Extractor::keys(*self)
     }
diff --git a/dd-trace-propagation/src/context.rs b/dd-trace-propagation/src/context.rs
@@ -147,7 +147,7 @@ impl FromStr for Tracestate {
     fn from_str(tracestate: &str) -> Result<Self, Self::Err> {
         let ts_v = tracestate.split(',');
 
-        let mut dd: Option<HashMap<String, String>> = None;
+        let mut dd: HashMap<String, String> = HashMap::new();
         let mut additional_values = vec![];
 
         for v in ts_v {
@@ -160,21 +160,20 @@ impl FromStr for Tracestate {
                 return Err(String::from("Invalid tracestate"));
             }
 
+            // datadog tracestate part is as 'dd=key1:value1;key2:value2'
             if key == "dd" {
-                dd = Some(
-                    value
-                        .trim()
-                        .split(';')
-                        .filter_map(|item| {
-                            if INVALID_ASCII_CHARACTERS_REGEX.is_match(item) {
-                                None
-                            } else {
-                                let mut parts = item.splitn(2, ':');
-                                Some((parts.next()?.to_string(), decode_tag_value(parts.next()?)))
+                value
+                    .trim()
+                    .split(';')
+                    .filter(|item| !INVALID_ASCII_CHARACTERS_REGEX.is_match(item))
+                    .for_each(|item| {
+                        let mut parts = item.splitn(2, ':');
+                        if let Some(key) = parts.next() {
+                            if let Some(value) = parts.next() {
+                                dd.insert(key.to_string(), decode_tag_value(value));
                             }
-                        })
-                        .collect(),
-                );
+                        }
+                    });
             } else {
                 additional_values.push((key.to_string(), value.to_string()));
             }
@@ -193,7 +192,7 @@ impl FromStr for Tracestate {
             tracestate.additional_values = Some(additional_values);
         }
 
-        let propagation_tags = if let Some(dd) = dd {
+        let propagation_tags = if !dd.is_empty() {
             let mut tags = HashMap::new();
             let mut priority = None;
             let mut mechanism = None;
diff --git a/dd-trace-propagation/src/tracecontext.rs b/dd-trace-propagation/src/tracecontext.rs

Original file line number	Diff line number	Diff line change
`@@ -461,4 +461,11 @@ impl opentelemetry_sdk::trace::SpanProcessor for DatadogSpanProcessor {`
`461`	`461`	`// set the shared resource in the DatadogSpanProcessor`
`462`	`462`	`*self.resource.write().unwrap() = resource.clone();`
`463`	`463`	`}`
	`464`	`+`
	`465`	`+ fn shutdown_with_timeout(`
	`466`	`+ &self,`
	`467`	`+ timeout: std::time::Duration,`
	`468`	`+ ) -> opentelemetry_sdk::error::OTelSdkResult {`
	`469`	`+ self.span_exporter.shutdown_with_timeout(timeout)`
	`470`	`+ }`
`464`	`471`	`}`