Skip to content

Commit 9cde968

Browse files
authored
chore: Prepare for release otel-http v0.30.1, Revert part of multi-value key propagation (open-telemetry#3177)
1 parent 5250df2 commit 9cde968

File tree

2 files changed

+1
-39
lines changed

2 files changed

+1
-39
lines changed

opentelemetry-http/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ http = { workspace = true }
2626
http-body-util = { workspace = true, optional = true }
2727
hyper = { workspace = true, optional = true }
2828
hyper-util = { workspace = true, features = ["client-legacy", "http1", "http2"], optional = true }
29-
opentelemetry = { workspace = true, features = ["trace"] }
29+
opentelemetry = { path = "../opentelemetry", version = "0.30.0", features = ["trace"] }
3030
reqwest = { workspace = true, optional = true }
3131
tokio = { workspace = true, features = ["time"], optional = true }
3232

opentelemetry-http/src/lib.rs

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,6 @@ impl Extractor for HeaderExtractor<'_> {
4343
.map(|value| value.as_str())
4444
.collect::<Vec<_>>()
4545
}
46-
47-
/// Get all the values for a key from the HeaderMap
48-
fn get_all(&self, key: &str) -> Option<Vec<&str>> {
49-
let all_iter = self.0.get_all(key).iter();
50-
if let (0, Some(0)) = all_iter.size_hint() {
51-
return None;
52-
}
53-
54-
Some(all_iter.filter_map(|value| value.to_str().ok()).collect())
55-
}
5646
}
5747

5848
pub type HttpError = Box<dyn std::error::Error + Send + Sync + 'static>;
@@ -251,8 +241,6 @@ impl<T> ResponseExt for Response<T> {
251241

252242
#[cfg(test)]
253243
mod tests {
254-
use http::HeaderValue;
255-
256244
use super::*;
257245

258246
#[test]
@@ -267,32 +255,6 @@ mod tests {
267255
)
268256
}
269257

270-
#[test]
271-
fn http_headers_get_all() {
272-
let mut carrier = http::HeaderMap::new();
273-
carrier.append("headerName", HeaderValue::from_static("value"));
274-
carrier.append("headerName", HeaderValue::from_static("value2"));
275-
carrier.append("headerName", HeaderValue::from_static("value3"));
276-
277-
assert_eq!(
278-
HeaderExtractor(&carrier).get_all("HEADERNAME"),
279-
Some(vec!["value", "value2", "value3"]),
280-
"all values from a key extraction"
281-
)
282-
}
283-
284-
#[test]
285-
fn http_headers_get_all_missing_key() {
286-
let mut carrier = http::HeaderMap::new();
287-
carrier.append("headerName", HeaderValue::from_static("value"));
288-
289-
assert_eq!(
290-
HeaderExtractor(&carrier).get_all("not_existing"),
291-
None,
292-
"all values from a missing key extraction"
293-
)
294-
}
295-
296258
#[test]
297259
fn http_headers_keys() {
298260
let mut carrier = http::HeaderMap::new();

0 commit comments

Comments
 (0)