Merge branch 'main' into ban/add-size-hint-to-injector

Author: cijothomas

opentelemetry-http/Cargo.toml

@@ -26,7 +26,7 @@ http = { workspace = true }
 http-body-util = { workspace = true, optional = true }
 hyper = { workspace = true, optional = true }
 hyper-util = { workspace = true, features = ["client-legacy", "http1", "http2"], optional = true }
-opentelemetry = { workspace = true, features = ["trace"] }
+opentelemetry = { path = "../opentelemetry", version = "0.30.0", features = ["trace"] }
 reqwest = { workspace = true, optional = true }
 tokio = { workspace = true, features = ["time"], optional = true }
 

opentelemetry-http/src/lib.rs

@@ -48,16 +48,6 @@ impl Extractor for HeaderExtractor<'_> {
             .map(|value| value.as_str())
             .collect::<Vec<_>>()
     }
-
-    /// Get all the values for a key from the HeaderMap
-    fn get_all(&self, key: &str) -> Option<Vec<&str>> {
-        let all_iter = self.0.get_all(key).iter();
-        if let (0, Some(0)) = all_iter.size_hint() {
-            return None;
-        }
-
-        Some(all_iter.filter_map(|value| value.to_str().ok()).collect())
-    }
 }
 
 pub type HttpError = Box<dyn std::error::Error + Send + Sync + 'static>;
@@ -256,8 +246,6 @@ impl<T> ResponseExt for Response<T> {
 
 #[cfg(test)]
 mod tests {
-    use http::HeaderValue;
-
     use super::*;
 
     #[test]
@@ -272,32 +260,6 @@ mod tests {
         )
     }
 
-    #[test]
-    fn http_headers_get_all() {
-        let mut carrier = http::HeaderMap::new();
-        carrier.append("headerName", HeaderValue::from_static("value"));
-        carrier.append("headerName", HeaderValue::from_static("value2"));
-        carrier.append("headerName", HeaderValue::from_static("value3"));
-
-        assert_eq!(
-            HeaderExtractor(&carrier).get_all("HEADERNAME"),
-            Some(vec!["value", "value2", "value3"]),
-            "all values from a key extraction"
-        )
-    }
-
-    #[test]
-    fn http_headers_get_all_missing_key() {
-        let mut carrier = http::HeaderMap::new();
-        carrier.append("headerName", HeaderValue::from_static("value"));
-
-        assert_eq!(
-            HeaderExtractor(&carrier).get_all("not_existing"),
-            None,
-            "all values from a missing key extraction"
-        )
-    }
-
     #[test]
     fn http_headers_keys() {
         let mut carrier = http::HeaderMap::new();