fixed tests

open-telemetry · Sep 18, 2023 · bf5f4ec · bf5f4ec
1 parent a1e64a1
commit bf5f4ec
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 23 deletions.
diff --git a/Tests/ExportersTests/OpenTelemetryProtocol/OtlpLogRecordExporterTests.swift b/Tests/ExportersTests/OpenTelemetryProtocol/OtlpLogRecordExporterTests.swift
@@ -86,16 +86,12 @@ class OtlpLogRecordExporterTests: XCTestCase {
 
     func testImplicitGrpcLoggingConfig() throws {
         let exporter = OtlpLogExporter(channel: channel)
-        guard let logger = exporter.callOptions?.logger else {
-            throw "Missing logger"
-        }
+        let logger = exporter.callOptions.logger
         XCTAssertEqual(logger.label, "io.grpc")
     }
     func testExplicitGrpcLoggingConfig() throws {
         let exporter = OtlpLogExporter(channel: channel, logger: Logger(label: "my.grpc.logger"))
-        guard let logger = exporter.callOptions?.logger else {
-            throw "Missing logger"
-        }
+        let logger = exporter.callOptions.logger  
         XCTAssertEqual(logger.label, "my.grpc.logger")
     }
 
@@ -110,13 +106,13 @@ class OtlpLogRecordExporterTests: XCTestCase {
         XCTAssertNotNil(exporter.config.headers)
         XCTAssertEqual(exporter.config.headers?[0].0, "FOO")
         XCTAssertEqual(exporter.config.headers?[0].1, "BAR")
-        XCTAssertEqual("BAR", exporter.callOptions?.customMetadata.first(name: "FOO"))
+        XCTAssertEqual("BAR", exporter.callOptions.customMetadata.first(name: "FOO"))
     }
 
     func testConfigHeadersAreSet_whenInitCalledWithExplicitHeaders() throws {
         let exporter = OtlpLogExporter(channel: channel, envVarHeaders: [("FOO", "BAR")])
         XCTAssertNil(exporter.config.headers)
-        XCTAssertEqual("BAR", exporter.callOptions?.customMetadata.first(name: "FOO"))
+        XCTAssertEqual("BAR", exporter.callOptions.customMetadata.first(name: "FOO"))
     }
 
     func testExportAfterShutdown() {

diff --git a/Tests/ExportersTests/OpenTelemetryProtocol/OtlpTraceExporterTests.swift b/Tests/ExportersTests/OpenTelemetryProtocol/OtlpTraceExporterTests.swift
@@ -50,28 +50,23 @@ class OtlpTraceExporterTests: XCTestCase {
 
     func testImplicitGrpcLoggingConfig() throws {
         let exporter = OtlpTraceExporter(channel: channel)
-        guard let logger = exporter.callOptions?.logger else {
-            throw "Missing logger"
-        }
-        XCTAssertEqual(logger.label, "io.grpc")
+        let logger = exporter.callOptions.logger
     }
 
     func testExplicitGrpcLoggingConfig() throws {
         let exporter = OtlpTraceExporter(channel: channel, logger: Logger(label: "my.grpc.logger"))
-        guard let logger = exporter.callOptions?.logger else {
-            throw "Missing logger"
-        }
+        let logger = exporter.callOptions.logger
         XCTAssertEqual(logger.label, "my.grpc.logger")
     }
 
     func verifyUserAgentIsSet(exporter: OtlpTraceExporter) {
-        if let callOptions = exporter.callOptions {
-            let customMetadata = callOptions.customMetadata
-            let userAgent = Headers.getUserAgentHeader()
-            if customMetadata.contains(name: Constants.HTTP.userAgent) && customMetadata.first(name: Constants.HTTP.userAgent) == userAgent {
-                return
-            }
+        let callOptions = exporter.callOptions
+        let customMetadata = callOptions.customMetadata
+        let userAgent = Headers.getUserAgentHeader()
+        if customMetadata.contains(name: Constants.HTTP.userAgent) && customMetadata.first(name: Constants.HTTP.userAgent) == userAgent {
+            return
         }
+
         XCTFail("User-Agent header was not set correctly")
     }
 
@@ -88,15 +83,15 @@ class OtlpTraceExporterTests: XCTestCase {
         XCTAssertNotNil(exporter.config.headers)
         XCTAssertEqual(exporter.config.headers?[0].0, "FOO")
         XCTAssertEqual(exporter.config.headers?[0].1, "BAR")
-        XCTAssertEqual("BAR", exporter.callOptions?.customMetadata.first(name: "FOO"))
+        XCTAssertEqual("BAR", exporter.callOptions.customMetadata.first(name: "FOO"))
 
         verifyUserAgentIsSet(exporter: exporter)
     }
 
     func testConfigHeadersAreSet_whenInitCalledWithExplicitHeaders() throws {
         let exporter = OtlpTraceExporter(channel: channel, envVarHeaders: [("FOO", "BAR")])
         XCTAssertNil(exporter.config.headers)
-        XCTAssertEqual("BAR", exporter.callOptions?.customMetadata.first(name: "FOO"))
+        XCTAssertEqual("BAR", exporter.callOptions.customMetadata.first(name: "FOO"))
 
         verifyUserAgentIsSet(exporter: exporter)
     }