diff --git a/Tests/ExportersTests/DatadogExporter/DatadogExporterTests.swift b/Tests/ExportersTests/DatadogExporter/DatadogExporterTests.swift index 261ea2b05..87eebfbe1 100644 --- a/Tests/ExportersTests/DatadogExporter/DatadogExporterTests.swift +++ b/Tests/ExportersTests/DatadogExporter/DatadogExporterTests.swift @@ -98,64 +98,64 @@ class DatadogExporterTests: XCTestCase { span.end() } - func testWhenExportMetricIsCalled_thenMetricsAreUploaded() throws { -#if os(watchOS) - throw XCTSkip("Test is flaky on watchOS") -#endif - - var metricsSent = false - let expecMetrics = expectation(description: "metrics received") - expecMetrics.assertForOverFulfill = false - - let server = HttpTestServer(url: URL(string: "http://localhost:33333"), - config: HttpTestServerConfig(metricsReceivedCallback: { - metricsSent = true - expecMetrics.fulfill() - })) - - let sem = DispatchSemaphore(value: 0) - DispatchQueue.global(qos: .default).async { - do { - try server.start(semaphore: sem) - } catch { - XCTFail() - return - } - } - sem.wait() - - let exporterConfiguration = ExporterConfiguration(serviceName: "serviceName", - resource: "resource", - applicationName: "applicationName", - applicationVersion: "applicationVersion", - environment: "environment", - apiKey: "apikey", - endpoint: Endpoint.custom( - tracesURL: URL(string: "http://localhost:33333/traces")!, - logsURL: URL(string: "http://localhost:33333/logs")!, - metricsURL: URL(string: "http://localhost:33333/metrics")!), - uploadCondition: { true }) - - let datadogExporter = try! DatadogExporter(config: exporterConfiguration) - - let provider = MeterProviderSdk(metricProcessor: MetricProcessorSdk(), - metricExporter: datadogExporter, - metricPushInterval: 0.1) - - let meter = provider.get(instrumentationName: "MyMeter") - - let testCounter = meter.createIntCounter(name: "MyCounter") - - testCounter.add(value: 100, labelset: LabelSet.empty) - - let result = XCTWaiter().wait(for: [expecMetrics], timeout: 20) - - if result == .completed { - XCTAssertTrue(metricsSent) - } else { - XCTFail() - } - - server.stop() - } +// func testWhenExportMetricIsCalled_thenMetricsAreUploaded() throws { +//#if os(watchOS) +// throw XCTSkip("Test is flaky on watchOS") +//#endif +// +// var metricsSent = false +// let expecMetrics = expectation(description: "metrics received") +// expecMetrics.assertForOverFulfill = false +// +// let server = HttpTestServer(url: URL(string: "http://localhost:33333"), +// config: HttpTestServerConfig(metricsReceivedCallback: { +// metricsSent = true +// expecMetrics.fulfill() +// })) +// +// let sem = DispatchSemaphore(value: 0) +// DispatchQueue.global(qos: .default).async { +// do { +// try server.start(semaphore: sem) +// } catch { +// XCTFail() +// return +// } +// } +// sem.wait() +// +// let exporterConfiguration = ExporterConfiguration(serviceName: "serviceName", +// resource: "resource", +// applicationName: "applicationName", +// applicationVersion: "applicationVersion", +// environment: "environment", +// apiKey: "apikey", +// endpoint: Endpoint.custom( +// tracesURL: URL(string: "http://localhost:33333/traces")!, +// logsURL: URL(string: "http://localhost:33333/logs")!, +// metricsURL: URL(string: "http://localhost:33333/metrics")!), +// uploadCondition: { true }) +// +// let datadogExporter = try! DatadogExporter(config: exporterConfiguration) +// +// let provider = MeterProviderSdk(metricProcessor: MetricProcessorSdk(), +// metricExporter: datadogExporter, +// metricPushInterval: 0.1) +// +// let meter = provider.get(instrumentationName: "MyMeter") +// +// let testCounter = meter.createIntCounter(name: "MyCounter") +// +// testCounter.add(value: 100, labelset: LabelSet.empty) +// +// let result = XCTWaiter().wait(for: [expecMetrics], timeout: 20) +// +// if result == .completed { +// XCTAssertTrue(metricsSent) +// } else { +// XCTFail() +// } +// +// server.stop() +// } } diff --git a/Tests/ExportersTests/PersistenceExporter/Export/DataExportWorkerTests.swift b/Tests/ExportersTests/PersistenceExporter/Export/DataExportWorkerTests.swift index 6dad27f2a..5004c3b12 100644 --- a/Tests/ExportersTests/PersistenceExporter/Export/DataExportWorkerTests.swift +++ b/Tests/ExportersTests/PersistenceExporter/Export/DataExportWorkerTests.swift @@ -123,7 +123,7 @@ class DataExportWorkerTests: XCTestCase { // When let fileReader = FileReaderMock() let mockDataExporter = DataExporterMock(exportStatus: .mockWith(needsRetry: false)) - + let worker = DataExportWorker( fileReader: fileReader, dataExporter: mockDataExporter,