Extract common code from exporters

Signed-off-by: Kevin Earls <[email protected]>

Author: kevinearls

Sources/Exporters/OpenTelemetryProtocol/common/OtlpHttpExporterBase.swift

@@ -0,0 +1,40 @@
+//
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+// 
+
+import Foundation
+import SwiftProtobuf
+
+public class OtlpHttpExporterBase {
+    let endpoint: URL
+    let httpClient: HTTPClient
+    
+    public init(endpoint: URL, useSession: URLSession? = nil) {
+        self.endpoint = endpoint
+        if let providedSession = useSession {
+            self.httpClient = HTTPClient(session: providedSession)
+        } else {
+            self.httpClient = HTTPClient()
+        }
+    }
+    
+    public func createRequest(body: Message, endpoint: URL) -> URLRequest {
+        var request = URLRequest(url: endpoint)
+        
+        do {
+            request.httpMethod = "POST"
+            request.httpBody = try body.serializedData()
+            request.setValue("application/x-protobuf", forHTTPHeaderField: "Content-Type")
+        } catch {
+            print("Error serializing body: \(error)")
+        }
+        
+        return request
+    }
+    
+    
+    public func shutdown() {
+    }
+    
+}

Sources/Exporters/OpenTelemetryProtocol/logs/OtlpHttpLogExporter.swift

@@ -4,38 +4,25 @@
 // 
 
 import Foundation
-import Logging
-import NIO
-import NIOHPACK
-import OpenTelemetryApi
 import OpenTelemetrySdk
 
 public func defaultOltpHttpLoggingEndpoint() -> URL {
     URL(string: "http://localhost:4318/v1/logs")!
 }
 
-public class OtlpHttpLogExporter : LogRecordExporter {
-    let endpoint: URL
-    private let httpClient: HTTPClient
+public class OtlpHttpLogExporter : OtlpHttpExporterBase, LogRecordExporter {
     var pendingLogRecords: [ReadableLogRecord] = []
 
+    override
     public init(endpoint: URL = defaultOltpHttpLoggingEndpoint(), useSession: URLSession? = nil) {
-        self.endpoint = endpoint
-        if let providedSession = useSession {
-            self.httpClient = HTTPClient(session: providedSession)
-        } else {
-            self.httpClient = HTTPClient()
-        }
+        super.init(endpoint: endpoint, useSession: useSession)
     }
 
     public func export(logRecords: [OpenTelemetrySdk.ReadableLogRecord]) -> OpenTelemetrySdk.ExportResult {
         pendingLogRecords.append(contentsOf: logRecords)
         return self.flush()
     }
-    
-    public func shutdown() {
-    }
-    
+
     public func forceFlush() -> OpenTelemetrySdk.ExportResult {
         self.flush()
     }
@@ -48,12 +35,8 @@ public class OtlpHttpLogExporter : LogRecordExporter {
         let body = Opentelemetry_Proto_Collector_Logs_V1_ExportLogsServiceRequest.with { request in
             request.resourceLogs = LogRecordAdapter.toProtoResourceRecordLog(logRecordList: logRecords)
         }
-
-        var request = URLRequest(url: endpoint)
-        request.httpMethod = "POST"
-        request.httpBody = try? body.serializedData()
-        request.setValue("application/x-protobuf", forHTTPHeaderField: "Content-Type")
-            
+        
+        let request = createRequest(body: body, endpoint: endpoint)
         httpClient.send(request: request) { result in
             switch result {
             case .success(_):

Sources/Exporters/OpenTelemetryProtocol/metric/OltpHTTPMetricExporter.swift

@@ -10,18 +10,12 @@ public func defaultOltpHTTPMetricsEndpoint() -> URL {
     URL(string: "http://localhost:4318/v1/metrics")!
 }
 
-public class OtlpHttpMetricExporter: MetricExporter {
-    let endpoint: URL
-    private let httpClient: HTTPClient
+public class OtlpHttpMetricExporter: OtlpHttpExporterBase, MetricExporter {
     var pendingMetrics: [Metric] = []
 
+    override
     public init(endpoint: URL = defaultOltpHTTPMetricsEndpoint(), useSession: URLSession? = nil) {
-        self.endpoint = endpoint
-        if let providedSession = useSession {
-            self.httpClient = HTTPClient(session: providedSession)
-        } else {
-            self.httpClient = HTTPClient()
-        }
+        super.init(endpoint: endpoint, useSession: useSession)
     }
 
     public func export(metrics: [Metric], shouldCancel: (() -> Bool)?) -> MetricExporterResultCode {
@@ -39,11 +33,7 @@ public class OtlpHttpMetricExporter: MetricExporter {
                 $0.resourceMetrics = MetricsAdapter.toProtoResourceMetrics(metricDataList: metrics)
             }
 
-        var request = URLRequest(url: endpoint)
-        request.httpMethod = "POST"
-        request.httpBody = try? body.serializedData()
-        request.setValue("application/x-protobuf", forHTTPHeaderField: "Content-Type")
-        
+        let request = createRequest(body: body, endpoint: endpoint)
         httpClient.send(request: request) { result in
             switch result {
             case .success(_):
@@ -55,9 +45,4 @@ public class OtlpHttpMetricExporter: MetricExporter {
         }
         return exporterResult
     }
-    
-    
-    public func shutdown() {
-        
-    }
 }

Sources/Exporters/OpenTelemetryProtocol/trace/OtlpHTttpTraceExporter.swift

@@ -10,20 +10,14 @@ public func defaultOltpHttpTracesEndpoint() -> URL {
     URL(string: "http://localhost:4318/v1/traces")!
 }
 
-public class OtlpHttpTraceExporter: SpanExporter {
-    let endpoint: URL
-    private let httpClient: HTTPClient
+public class OtlpHttpTraceExporter: OtlpHttpExporterBase, SpanExporter {
     var pendingSpans: [SpanData] = []
-     
+    
+    override
     public init(endpoint: URL = defaultOltpHttpTracesEndpoint(), useSession: URLSession? = nil) {
-        self.endpoint = endpoint
-        if let providedSession = useSession {
-            self.httpClient = HTTPClient(session: providedSession)
-        } else {
-            self.httpClient = HTTPClient()
-        }
+        super.init(endpoint: endpoint, useSession: useSession)
     }
-    
+     
     public func export(spans: [SpanData]) -> SpanExporterResultCode {
         pendingSpans.append(contentsOf: spans)
         return self.flush()
@@ -37,11 +31,7 @@ public class OtlpHttpTraceExporter: SpanExporter {
             $0.resourceSpans = SpanAdapter.toProtoResourceSpans(spanDataList: spans)
         }
 
-        var request = URLRequest(url: endpoint)
-        request.httpMethod = "POST"
-        request.httpBody = try? body.serializedData()
-        request.setValue("application/x-protobuf", forHTTPHeaderField: "Content-Type")
-                
+        let request = createRequest(body: body, endpoint: endpoint)
         httpClient.send(request: request) { result in
             switch result {
             case .success(_):
@@ -53,7 +43,4 @@ public class OtlpHttpTraceExporter: SpanExporter {
         }
         return exporterResult
     }
-
-    public func shutdown() {
-    }
 }