Merge pull request #304 from nachoBonafonte/fix-flaky-tests

Try to fix some flaky tests

Author: Ignacio Bonafonte

Sources/Exporters/DatadogExporter/Upload/DatadogEndpoints.swift

@@ -49,7 +49,7 @@ public enum Endpoint {
             case .us1: return URL(string: "https://trace.browser-intake-datadoghq.com/" + endpoint)!
             case .us3: return URL(string: "https://trace.browser-intake-us3-datadoghq.com/" + endpoint)!
             case .us5: return URL(string: "https://trace.browser-intake-us5-datadoghq.com/" + endpoint)!
-            case .eu1: return URL(string: "https:/public-trace-http-intake.logs.datadoghq.eu/" + endpoint)!
+            case .eu1: return URL(string: "https://public-trace-http-intake.logs.datadoghq.eu/" + endpoint)!
             case .us1_fed: return URL(string: "https://trace.browser-intake-ddog-gov.com/" + endpoint)!
             case let .custom(tracesURL: tracesUrl, _, _): return tracesUrl
         }

Tests/ExportersTests/DatadogExporter/DatadogExporterTests.swift

@@ -34,14 +34,18 @@ class DatadogExporterTests: XCTestCase {
                                         logsSent = true
                                         expecLog.fulfill()
         }))
+
+        let sem = DispatchSemaphore(value: 0)
         DispatchQueue.global(qos: .default).async {
             do {
-                try server.start()
+                try server.start(semaphore: sem)
             } catch {
                 XCTFail()
                 return
             }
         }
+        sem.wait()
+        
         let instrumentationLibraryName = "SimpleExporter"
         let instrumentationLibraryVersion = "semver:0.1.0"
 
@@ -95,14 +99,17 @@ class DatadogExporterTests: XCTestCase {
                                         metricsSent = true
                                         expecMetrics.fulfill()
         }))
+
+        let sem = DispatchSemaphore(value: 0)
         DispatchQueue.global(qos: .default).async {
             do {
-                try server.start()
+                try server.start(semaphore: sem)
             } catch {
                 XCTFail()
                 return
             }
         }
+        sem.wait()
 
         let exporterConfiguration = ExporterConfiguration(serviceName: "serviceName",
                                                           resource: "resource",

Tests/ExportersTests/DatadogExporter/Helpers/HttpTestServer.swift

@@ -28,10 +28,11 @@ internal class HttpTestServer {
         self.config = config
     }
 
-    public func start() throws {
+    public func start(semaphore: DispatchSemaphore) throws {
         do {
             let channel = try serverBootstrap.bind(host: host, port: port).wait()
             print("Listening on \(String(describing: channel.localAddress))...")
+            semaphore.signal()
             try channel.closeFuture.wait()
         } catch {
             throw error

Tests/ExportersTests/DatadogExporter/Logs/LogsExporterTests.swift

@@ -27,14 +27,16 @@ class LogsExporterTests: XCTestCase {
                                                                      expec.fulfill()
         }))
 
+        let sem = DispatchSemaphore(value: 0)
         DispatchQueue.global(qos: .default).async {
             do {
-                try server.start()
+                try server.start(semaphore: sem)
             } catch {
                 XCTFail()
                 return
             }
         }
+        sem.wait()
 
         let configuration = ExporterConfiguration(serviceName: "serviceName",
                                                   resource: "resource",
@@ -52,6 +54,7 @@ class LogsExporterTests: XCTestCase {
 
         let spanData = createBasicSpanWithEvent()
         logsExporter.exportLogs(fromSpan: spanData)
+        logsExporter.logsStorage.writer.queue.sync {}
 
         waitForExpectations(timeout: 30) { error in
             if let error = error {

Tests/ExportersTests/DatadogExporter/Spans/SpansExporterTests.swift

@@ -26,15 +26,16 @@ class SpansExporterTests: XCTestCase {
                                         expec.fulfill()
                                     },
                                                                  logsReceivedCallback: nil))
-
+        let sem = DispatchSemaphore(value: 0)
         DispatchQueue.global(qos: .default).async {
             do {
-                try server.start()
+                try server.start(semaphore: sem)
             } catch {
                 XCTFail()
                 return
             }
         }
+        sem.wait()
 
         let configuration = ExporterConfiguration(serviceName: "serviceName",
                                                   resource: "resource",
@@ -52,6 +53,7 @@ class SpansExporterTests: XCTestCase {
 
         let spanData = createBasicSpan()
         spansExporter.exportSpan(span: spanData)
+        spansExporter.tracesStorage.writer.queue.sync {}
 
         waitForExpectations(timeout: 30) { error in
             if let error = error {

Tests/ExportersTests/DatadogExporter/Upload/DataUploadWorkerTests.swift

@@ -260,6 +260,7 @@ class DataUploadWorkerTests: XCTestCase {
         writer.write(value: ["k1": "v1"])
         writer.write(value: ["k2": "v2"])
         writer.write(value: ["k3": "v3"])
+        writer.queue.sync {}
 
         // When
         _ = worker.flush()

Tests/InstrumentationTests/URLSessionTests/URLSessionInstrumentationTests.swift

@@ -79,14 +79,16 @@ class URLSessionInstrumentationTests: XCTestCase {
     static let server = HttpTestServer(url: URL(string: "http://localhost:33333"), config: nil)
 
     override class func setUp() {
+        let sem = DispatchSemaphore(value: 0)
         DispatchQueue.global(qos: .default).async {
             do {
-                try server.start()
+                try server.start(semaphore: sem)
             } catch {
                 XCTFail()
                 return
             }
         }
+        sem.wait()
         instrumentation = URLSessionInstrumentation(configuration: config)
     }
 

Tests/InstrumentationTests/URLSessionTests/Utils/HttpTestServer.swift

@@ -27,10 +27,11 @@ internal class HttpTestServer {
         self.config = config
     }
 
-    public func start() throws {
+    public func start(semaphore: DispatchSemaphore) throws {
         do {
             let channel = try serverBootstrap.bind(host: host, port: port).wait()
             print("Listening on \(String(describing: channel.localAddress))...")
+            semaphore.signal()
             try channel.closeFuture.wait()
         } catch {
             throw error