Merge pull request #147 from slashmo/fix/http-headers-carrier-extract-no-value

Return nil when extracting empty header value

Author: slashmo

Sources/NIOInstrumentation/HTTPHeadersCarrier.swift

@@ -23,11 +23,11 @@ public struct HTTPHeadersExtractor: ExtractorProtocol {
     public init() {}
 
     public func extract(key: String, from headers: HTTPHeaders) -> String? {
-        return headers
+        let headers = headers
             .lazy
             .filter { $0.name == key }
             .map { $0.value }
-            .joined(separator: ",")
+        return headers.isEmpty ? nil : headers.joined(separator: ",")
     }
 }
 

Tests/NIOInstrumentationTests/HTTPHeadersCarrierTests+XCTest.swift

@@ -26,6 +26,7 @@ extension HTTPHeadersCarrierTests {
    static var allTests : [(String, (HTTPHeadersCarrierTests) -> () throws -> Void)] {
       return [
                 ("testExtractSingleHeader", testExtractSingleHeader),
+                ("testExtractNoHeader", testExtractNoHeader),
                 ("testExtractMultipleHeadersOfSameName", testExtractMultipleHeadersOfSameName),
            ]
    }

Tests/NIOInstrumentationTests/HTTPHeadersCarrierTests.swift

@@ -35,6 +35,18 @@ final class HTTPHeadersCarrierTests: XCTestCase {
         )
     }
 
+    func testExtractNoHeader() {
+        let extractor = HTTPHeadersExtractor()
+
+        XCTAssertNil(extractor.extract(key: "test", from: .init()))
+    }
+
+    func testExtractEmptyHeader() {
+        let extractor = HTTPHeadersExtractor()
+
+        XCTAssertEqual(extractor.extract(key: "test", from: ["test": ""]), "")
+    }
+
     func testExtractMultipleHeadersOfSameName() {
         let headers: HTTPHeaders = [
             "tracestate": "vendorname1=opaqueValue1",