Merge branch 'main' into fixes-sysctl-issue-on-mac

BennettSmith · BennettSmith · commit 18df4ec8d028 · 2022-06-16T15:37:06.000-07:00
diff --git a/Sources/Exporters/DatadogExporter/Upload/DatadogEndpoints.swift b/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
         }
diff --git a/Tests/ExportersTests/DatadogExporter/DatadogExporterTests.swift b/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",
diff --git a/Tests/ExportersTests/DatadogExporter/Files/FileTests.swift b/Tests/ExportersTests/DatadogExporter/Files/FileTests.swift
@@ -8,6 +8,7 @@ import XCTest
 
 class FileTests: XCTestCase {
     private let fileManager = FileManager.default
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
 
     override func setUp() {
         super.setUp()
diff --git a/Tests/ExportersTests/DatadogExporter/Helpers/HttpTestServer.swift b/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
diff --git a/Tests/ExportersTests/DatadogExporter/Helpers/TestsDirectory.swift b/Tests/ExportersTests/DatadogExporter/Helpers/TestsDirectory.swift
@@ -18,7 +18,7 @@ func obtainUniqueTemporaryDirectory() -> Directory {
 
 /// `Directory` pointing to subfolder in `/var/folders/`.
 /// The subfolder does not exist and can be created and deleted by calling `.create()` and `.delete()`.
-let temporaryDirectory = obtainUniqueTemporaryDirectory()
+//let temporaryDirectory = obtainUniqueTemporaryDirectory()
 
 /// Extends `Directory` with set of utilities for convenient work with files in tests.
 /// Provides handy methods to create / delete files and directires.
diff --git a/Tests/ExportersTests/DatadogExporter/Logs/LogsExporterTests.swift b/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 {
diff --git a/Tests/ExportersTests/DatadogExporter/Persistence/FileReaderTests.swift b/Tests/ExportersTests/DatadogExporter/Persistence/FileReaderTests.swift
@@ -7,6 +7,8 @@
 import XCTest
 
 class FileReaderTests: XCTestCase {
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
+
     override func setUp() {
         super.setUp()
         temporaryDirectory.create()
diff --git a/Tests/ExportersTests/DatadogExporter/Persistence/FileWriterTests.swift b/Tests/ExportersTests/DatadogExporter/Persistence/FileWriterTests.swift
@@ -7,6 +7,8 @@
 import XCTest
 
 class FileWriterTests: XCTestCase {
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
+
     override func setUp() {
         super.setUp()
         temporaryDirectory.create()
diff --git a/Tests/ExportersTests/DatadogExporter/Persistence/FilesOrchestratorTests.swift b/Tests/ExportersTests/DatadogExporter/Persistence/FilesOrchestratorTests.swift
@@ -8,6 +8,7 @@ import XCTest
 
 class FilesOrchestratorTests: XCTestCase {
     private let performance: PerformancePreset = .default
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
 
     override func setUp() {
         super.setUp()
diff --git a/Tests/ExportersTests/DatadogExporter/Spans/SpansExporterTests.swift b/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 {
diff --git a/Tests/ExportersTests/DatadogExporter/Upload/DataUploadWorkerTests.swift b/Tests/ExportersTests/DatadogExporter/Upload/DataUploadWorkerTests.swift
@@ -7,6 +7,8 @@
 import XCTest
 
 class DataUploadWorkerTests: XCTestCase {
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
+
     lazy var dateProvider = RelativeDateProvider(advancingBySeconds: 1)
     lazy var orchestrator = FilesOrchestrator(
         directory: temporaryDirectory,
@@ -260,6 +262,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()
diff --git a/Tests/ExportersTests/PersistenceExporter/Export/DataExportWorkerTests.swift b/Tests/ExportersTests/PersistenceExporter/Export/DataExportWorkerTests.swift
@@ -146,10 +146,16 @@ class DataExportWorkerTests: XCTestCase {
             }
         }
         
-        let exportExpectation = self.expectation(description: "value exported")
-        
+        let exportExpectation = expectation(description: "value exported")
+
+        // The onExport closure is called more than once as part of test execution
+        // It does not seem to be called the same number of times on each test run.
+        // Setting `assertForOverFulfill` to `false` works around the XCTestExpectation
+        // error that fails the test.
+        // "API violation - multiple calls made to -[XCTestExpectation fulfill] for value exported."
+        exportExpectation.assertForOverFulfill = false
+
         var mockDataExporter = DataExporterMock(exportStatus: .mockWith(needsRetry: true))
-        
         mockDataExporter.onExport = { data in exportExpectation.fulfill() }
 
         // When
diff --git a/Tests/ExportersTests/PersistenceExporter/Helpers/TestsDirectory.swift b/Tests/ExportersTests/PersistenceExporter/Helpers/TestsDirectory.swift
@@ -18,7 +18,7 @@ func obtainUniqueTemporaryDirectory() -> Directory {
 
 /// `Directory` pointing to subfolder in `/var/folders/`.
 /// The subfolder does not exist and can be created and deleted by calling `.create()` and `.delete()`.
-let temporaryDirectory = obtainUniqueTemporaryDirectory()
+//let temporaryDirectory = obtainUniqueTemporaryDirectory()
 
 /// Extends `Directory` with set of utilities for convenient work with files in tests.
 /// Provides handy methods to create / delete files and directires.
diff --git a/Tests/ExportersTests/PersistenceExporter/PersistenceMetricExporterDecoratorTests.swift b/Tests/ExportersTests/PersistenceExporter/PersistenceMetricExporterDecoratorTests.swift
@@ -9,7 +9,8 @@ import OpenTelemetrySdk
 import XCTest
 
 class PersistenceMetricExporterDecoratorTests: XCTestCase {
-    
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
+
     class MetricExporterMock: MetricExporter {
         
         let onExport: ([Metric]) -> MetricExporterResultCode
diff --git a/Tests/ExportersTests/PersistenceExporter/PersistenceSpanExporterDecoratorTests.swift b/Tests/ExportersTests/PersistenceExporter/PersistenceSpanExporterDecoratorTests.swift
@@ -9,7 +9,8 @@ import OpenTelemetrySdk
 import XCTest
 
 class PersistenceSpanExporterDecoratorTests: XCTestCase {
-    
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
+
     class SpanExporterMock: SpanExporter {
         
         let onExport: ([SpanData]) -> SpanExporterResultCode
diff --git a/Tests/ExportersTests/PersistenceExporter/Storage/FileTests.swift b/Tests/ExportersTests/PersistenceExporter/Storage/FileTests.swift
@@ -8,6 +8,7 @@ import XCTest
 
 class FileTests: XCTestCase {
     private let fileManager = FileManager.default
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
 
     override func setUp() {
         super.setUp()
diff --git a/Tests/ExportersTests/PersistenceExporter/Storage/FilesOrchestratorTests.swift b/Tests/ExportersTests/PersistenceExporter/Storage/FilesOrchestratorTests.swift
@@ -8,6 +8,7 @@ import XCTest
 
 class FilesOrchestratorTests: XCTestCase {
     private let performance: PersistencePerformancePreset = .default
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
 
     override func setUp() {
         super.setUp()
diff --git a/Tests/ExportersTests/PersistenceExporter/Storage/OrchestratedFileReaderTests.swift b/Tests/ExportersTests/PersistenceExporter/Storage/OrchestratedFileReaderTests.swift
@@ -7,6 +7,8 @@
 import XCTest
 
 class OrchestratedFileReaderTests: XCTestCase {
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
+
     override func setUp() {
         super.setUp()
         temporaryDirectory.create()
diff --git a/Tests/ExportersTests/PersistenceExporter/Storage/OrchestratedFileWriterTests.swift b/Tests/ExportersTests/PersistenceExporter/Storage/OrchestratedFileWriterTests.swift
@@ -7,6 +7,8 @@
 import XCTest
 
 class OrchestratedFileWriterTests: XCTestCase {
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
+
     override func setUp() {
         super.setUp()
         temporaryDirectory.create()
diff --git a/Tests/InstrumentationTests/URLSessionTests/URLSessionInstrumentationTests.swift b/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)
     }
 
diff --git a/Tests/InstrumentationTests/URLSessionTests/Utils/HttpTestServer.swift b/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

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public enum Endpoint {`
`49`	`49`	`case .us1: return URL(string: "https://trace.browser-intake-datadoghq.com/" + endpoint)!`
`50`	`50`	`case .us3: return URL(string: "https://trace.browser-intake-us3-datadoghq.com/" + endpoint)!`
`51`	`51`	`case .us5: return URL(string: "https://trace.browser-intake-us5-datadoghq.com/" + endpoint)!`
`52`		`- case .eu1: return URL(string: "https:/public-trace-http-intake.logs.datadoghq.eu/" + endpoint)!`
	`52`	`+ case .eu1: return URL(string: "https://public-trace-http-intake.logs.datadoghq.eu/" + endpoint)!`
`53`	`53`	`case .us1_fed: return URL(string: "https://trace.browser-intake-ddog-gov.com/" + endpoint)!`
`54`	`54`	`case let .custom(tracesURL: tracesUrl, _, _): return tracesUrl`
`55`	`55`	`}`