Skip to content

Fix .with_headers to support multiple k/v pairs #2699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 24, 2025
Merged

Fix .with_headers to support multiple k/v pairs #2699

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9e7a36e
Add extra header to with_headers test
joshwlewis Feb 21, 2025
72f3fda
Adjust name of test to match function
joshwlewis Feb 21, 2025
4b1b789
Adjust .with_headers to support multiple header pairs
joshwlewis Feb 21, 2025
d38fe41
Merge branch 'main' into jwl/fix-multiple-header
cijothomas Feb 21, 2025
c0fd292
Merge branch 'main' into jwl/fix-multiple-header
cijothomas Feb 24, 2025
2795f2f
Changelog entry for .with_headers
joshwlewis Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions opentelemetry-otlp/src/exporter/http/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,13 +449,13 @@ impl<B: HasHttpConfig> WithHttpConfig for B {

fn with_headers(mut self, headers: HashMap<String, String>) -> Self {
// headers will be wrapped, so we must do some logic to unwrap first.
self.http_client_config()
let http_client_headers = self
.http_client_config()
.headers
.iter_mut()
.zip(headers)
.for_each(|(http_client_headers, (key, value))| {
http_client_headers.insert(key, super::url_decode(&value).unwrap_or(value));
});
.get_or_insert(HashMap::new());
headers.into_iter().for_each(|(key, value)| {
http_client_headers.insert(key, super::url_decode(&value).unwrap_or(value));
});
self
}
}
Expand Down Expand Up @@ -671,11 +671,14 @@ mod tests {
}

#[test]
fn test_http_exporter_builder_with_header() {
fn test_http_exporter_builder_with_headers() {
use std::collections::HashMap;
// Arrange
let initial_headers = HashMap::from([("k1".to_string(), "v1".to_string())]);
let extra_headers = HashMap::from([("k2".to_string(), "v2".to_string())]);
let extra_headers = HashMap::from([
("k2".to_string(), "v2".to_string()),
("k3".to_string(), "v3".to_string()),
]);
let expected_headers = initial_headers.iter().chain(extra_headers.iter()).fold(
HashMap::new(),
|mut acc, (k, v)| {
Expand Down