Skip to content

fix: OtlpHttpTraceExporter request headers. #877

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 2 commits into from
Aug 4, 2025
Merged

fix: OtlpHttpTraceExporter request headers. #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e2754c
Update OtlpHttpTraceExporterTests.swift
Waheiba Jul 27, 2025
b442fbf
Merge branch 'main' into fix-OtlpHttpTraceExporter-request-headers
Waheiba Jul 31, 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
12 changes: 1 addition & 11 deletions Sources/Exporters/OpenTelemetryProtocolHttp/trace/OtlpHttpTraceExporter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,7 @@ public class OtlpHttpTraceExporter: OtlpHttpExporterBase, SpanExporter {
$0.resourceSpans = SpanAdapter.toProtoResourceSpans(
spanDataList: sendingSpans)
}
var request = createRequest(body: body, endpoint: endpoint)
if let headers = envVarHeaders {
headers.forEach { key, value in
request.addValue(value, forHTTPHeaderField: key)
}

} else if let headers = config.headers {
headers.forEach { key, value in
request.addValue(value, forHTTPHeaderField: key)
}
}
let request = createRequest(body: body, endpoint: endpoint)
exporterMetrics?.addSeen(value: sendingSpans.count)
httpClient.send(request: request) { [weak self] result in
switch result {
Expand Down
7 changes: 6 additions & 1 deletion Tests/ExportersTests/OpenTelemetryProtocol/OtlpHttpTraceExporterTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ class OtlpHttpTraceExporterTests: XCTestCase {
// description strings (which is why I made them unique) in the body returned by testServer.receiveBodyAndVerify().
// It should ideally turn that body into [SpanData] using protobuf and then confirm content
func testExport() {
let testHeader = ("testHeader", "testValue")
let endpoint = URL(string: "http://localhost:\(testServer.serverPort)/v1/traces")!
let exporter = OtlpHttpTraceExporter(endpoint: endpoint, config: .init(compression: .none))
let config = OtlpConfiguration(compression: .none, headers: [testHeader])
let exporter = OtlpHttpTraceExporter(endpoint: endpoint, config: config)

var spans: [SpanData] = []
let endpointName1 = "/api/foo" + String(Int.random(in: 1 ... 100))
Expand All @@ -48,6 +50,9 @@ class OtlpHttpTraceExporterTests: XCTestCase {
XCTAssertNoThrow(try testServer.receiveHeadAndVerify { head in
let otelVersion = Headers.getUserAgentHeader()
XCTAssertTrue(head.headers.contains(name: Constants.HTTP.userAgent))
XCTAssertTrue(head.headers.contains { header in
header.name.lowercased() == testHeader.0.lowercased() && header.value == testHeader.1
})
XCTAssertEqual(otelVersion, head.headers.first(name: Constants.HTTP.userAgent))
})
XCTAssertNoThrow(try testServer.receiveBodyAndVerify { body in
Expand Down
Loading