Skip to content

Add synchronous processing and HTTP status code validation to OtlpHttpTraceExporter #1005

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

Open
devjoonn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add synchronous processing and HTTP status code validation to OtlpHttpTraceExporter #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions Sources/Exporters/OpenTelemetryProtocolHttp/HTTPClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,14 @@ func httpClientResult(for taskResult: (Data?, URLResponse?, Error?)) -> Result<H
)
}

let statusCode = httpResponse.statusCode
guard (200..<300).contains(statusCode) else {
return .failure(
HTTPClientError(
description: "HTTP request failed with status code: \(statusCode)"
)
)
}

return .success(httpResponse)
}
18 changes: 16 additions & 2 deletions Sources/Exporters/OpenTelemetryProtocolHttp/trace/OtlpHttpTraceExporter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public class OtlpHttpTraceExporter: OtlpHttpExporterBase, SpanExporter {

public func export(spans: [SpanData], explicitTimeout: TimeInterval? = nil)
-> SpanExporterResultCode {
var resultValue: SpanExporterResultCode = .success
var sendingSpans: [SpanData] = []
exporterLock.withLockVoid {
pendingSpans.append(contentsOf: spans)
Expand All @@ -68,7 +69,17 @@ public class OtlpHttpTraceExporter: OtlpHttpExporterBase, SpanExporter {
$0.resourceSpans = SpanAdapter.toProtoResourceSpans(
spanDataList: sendingSpans)
}
let request = createRequest(body: body, endpoint: endpoint)
let semaphore = DispatchSemaphore(value: 0)
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)
}
}
exporterMetrics?.addSeen(value: sendingSpans.count)
httpClient.send(request: request) { [weak self] result in
switch result {
Expand All @@ -80,9 +91,12 @@ public class OtlpHttpTraceExporter: OtlpHttpExporterBase, SpanExporter {
self?.pendingSpans.append(contentsOf: sendingSpans)
}
print(error)
resultValue = .failure
}
semaphore.signal()
}
return .success
semaphore.wait()
return resultValue
}

public func flush(explicitTimeout: TimeInterval? = nil)
Expand Down
Loading