Merge pull request #197 from nachoBonafonte/DatadogExporter-Add-us3-endpoint

DatadogExporter: Add us3 endpoint

Author: Ignacio Bonafonte

Examples/Datadog Sample/main.swift

@@ -8,7 +8,7 @@ import Foundation
 import OpenTelemetryApi
 import OpenTelemetrySdk
 
-let clientKey = ""
+let clientToken = ""
 let apikey = ""
 
 let sampleKey = "sampleKey"
@@ -27,7 +27,7 @@ let exporterConfiguration = ExporterConfiguration(
     applicationName: "SwiftDatadogSample",
     applicationVersion: "1.0.0",
     environment: "test",
-    clientToken: clientKey,
+    clientToken: clientToken,
     apiKey: apikey,
     endpoint: Endpoint.us,
     uploadCondition: { true },

Sources/Exporters/DatadogExporter/Upload/DatadogEndpoints.swift

@@ -9,6 +9,9 @@ public enum Endpoint {
     /// US based servers.
     /// Sends logs to [app.datadoghq.com](https://app.datadoghq.com/).
     case us
+    /// US3 based servers.
+    /// Sends logs to [us3.datadoghq.com](https://us3.datadoghq.com/).
+    case us3
     /// Europe based servers.
     /// Sends logs to [app.datadoghq.eu](https://app.datadoghq.eu/).
     case eu
@@ -21,6 +24,7 @@ public enum Endpoint {
     internal var logsURL: URL {
         switch self {
             case .us: return URL(string: "https://mobile-http-intake.logs.datadoghq.com/v1/input/")!
+            case .us3: return URL(string: "https://logs.browser-intake-us3-datadoghq.com/v1/input/")!
             case .eu: return URL(string: "https://mobile-http-intake.logs.datadoghq.eu/v1/input/")!
             case .gov: return URL(string: "https://logs.browser-intake-ddog-gov.com/v1/input/")!
             case let .custom(_, logsURL: logsUrl, _): return logsUrl
@@ -30,6 +34,7 @@ public enum Endpoint {
     internal var tracesURL: URL {
         switch self {
             case .us: return URL(string: "https://public-trace-http-intake.logs.datadoghq.com/v1/input/")!
+            case .us3: return URL(string: "https://trace.browser-intake-us3-datadoghq.com/v1/input/")!
             case .eu: return URL(string: "https://public-trace-http-intake.logs.datadoghq.eu/v1/input/")!
             case .gov: return URL(string: "https://trace.browser-intake-ddog-gov.com/v1/input/")!
             case let .custom(tracesURL: tracesUrl, _, _): return tracesUrl
@@ -39,6 +44,7 @@ public enum Endpoint {
     internal var metricsURL: URL {
         switch self {
             case .us: return URL(string: "https://api.datadoghq.com/api/v1/series/")!
+            case .us3: return URL(string: "https://api.us3.datadoghq.com/api/v1/series/")!
             case .eu: return URL(string: "https://api.datadoghq.eu/api/v1/series/")!
             case .gov: return URL(string: "https://api.ddog-gov.com/api/v1/series/")!
             case let .custom(_, _, metricsURL: metricsURL): return metricsURL

Tests/ExportersTests/DatadogExporter/Upload/DatadogEndpointsTests.swift

@@ -25,6 +25,17 @@ class DatadogEndpointsTests: XCTestCase {
         XCTAssertEqual(logsURL.absoluteString, "https://mobile-http-intake.logs.datadoghq.com/v1/input/abcdef123456789")
     }
 
+    func testWhenAsksUS3LogEndpointsWithClientToken_returnsCorrectly() throws {
+        let endpoint = Endpoint.us3
+        let clientToken = "abcdef123456789"
+
+        let logsURL = try endpoint.logsUrlWithClientToken(clientToken: clientToken)
+
+        XCTAssertEqual(logsURL, endpoint.logsURL.appendingPathComponent(clientToken))
+        XCTAssertEqual(logsURL.absoluteString, "https://logs.browser-intake-us3-datadoghq.com/v1/input/abcdef123456789")
+    }
+
+
     func testWhenAsksEULogEndpointsWithClientToken_returnsCorrectly() throws {
         let endpoint = Endpoint.eu
         let clientToken = "abcdef123456789"
@@ -62,6 +73,16 @@ class DatadogEndpointsTests: XCTestCase {
         XCTAssertEqual(logsURL.absoluteString, "https://public-trace-http-intake.logs.datadoghq.com/v1/input/abcdef123456789")
     }
 
+    func testWhenAsksUS3TracesEndpointsWithClientToken_returnsCorrectly() throws {
+        let endpoint = Endpoint.us3
+        let clientToken = "abcdef123456789"
+
+        let logsURL = try endpoint.tracesUrlWithClientToken(clientToken: clientToken)
+
+        XCTAssertEqual(logsURL, endpoint.tracesURL.appendingPathComponent(clientToken))
+        XCTAssertEqual(logsURL.absoluteString, "https://trace.browser-intake-us3-datadoghq.com/v1/input/abcdef123456789")
+    }
+
     func testWhenAsksEUTracesEndpointsWithClientToken_returnsCorrectly() throws {
         let endpoint = Endpoint.eu
         let clientToken = "abcdef123456789"