Add changes from code review

Author: Ignacio Bonafonte

Examples/Network Sample/main.swift

@@ -26,8 +26,8 @@ func simpleNetworkCall() {
 
     let task = URLSession.shared.dataTask(with: request) { data, _, _ in
         if let data = data {
-            let string = String(data: data, encoding: .utf8)
-            print(string ?? "")
+            let string = String(decoding: data, as: UTF8.self)
+            print(string)
         }
         semaphore.signal()
     }
@@ -40,11 +40,6 @@ func simpleNetworkCall() {
 class SessionDelegate: NSObject, URLSessionDataDelegate, URLSessionTaskDelegate {
     let semaphore = DispatchSemaphore(value: 0)
 
-//    func urlSession(_ session: URLSession, task: URLSessionTask, didFinishCollecting metrics: URLSessionTaskMetrics) {
-//
-//        let a = 0
-//    }
-
     func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
         semaphore.signal()
     }

Sources/Instrumentation/URLSession/URLSessionInstrumentation.swift

@@ -29,9 +29,9 @@ public class URLSessionInstrumentation {
 
     var configuration: URLSessionInstrumentationConfiguration
 
-    private let queue = DispatchQueue(label: "com.datadoghq.ddnetworkinstrumentation")
+    private let queue = DispatchQueue(label: "io.opentelemetry.ddnetworkinstrumentation")
 
-    static var instrumentedKey = "com.datadoghq.instrumentedCall"
+    static var instrumentedKey = "io.opentelemetry.instrumentedCall"
 
     public private(set) var tracer: TracerSdk
 

Sources/Instrumentation/URLSession/URLSessionLogger.swift

@@ -19,7 +19,7 @@ import OpenTelemetrySdk
 
 class URLSessionLogger {
     static var runningSpans = [String: Span]()
-    static var runningSpansQueue = DispatchQueue(label: "org.opentelemetry.URLSessionLogger")
+    static var runningSpansQueue = DispatchQueue(label: "io.opentelemetry.URLSessionLogger")
 
     /// This methods creates a Span for a request, and optionally injects tracing headers, returns a  new request if it was needed to create a new one to add the tracing headers
     @discardableResult static func processAndLogRequest(_ request: URLRequest, sessionTaskId: String, instrumentation: URLSessionInstrumentation, shouldInjectHeaders: Bool) -> URLRequest? {

Tests/ExportersTests/DatadogExporter/Helpers/SwiftExtensions.swift

@@ -66,7 +66,7 @@ extension String {
 }
 
 extension Data {
-    var utf8String: String { String(data: self, encoding: .utf8)! }
+    var utf8String: String { String(decoding: self, as: UTF8.self) }
 }
 
 extension InputStream {

Tests/ExportersTests/Prometheus/PrometheusExporterTests.swift

@@ -45,9 +45,9 @@ class PrometheusExporterTests: XCTestCase {
         let task = URLSession.shared.dataTask(with: url) { data, response, error in
             if error == nil, let data = data, let response = response as? HTTPURLResponse {
                 XCTAssert(response.statusCode == 200)
-                let responseText = String(data: data, encoding: .utf8)
-                print("Response from metric API is: \n\(responseText!)")
-                self.validateResponse(responseText: responseText!);
+                let responseText = String(decoding: data, as: UTF8.self)
+                print("Response from metric API is: \n\(responseText)")
+                self.validateResponse(responseText: responseText);
                 // This is your file-variable:
                 // data
                 expec.fulfill()

Tests/InstrumentationTests/URLSessionTests/URLSessionInstrumentationTests.swift

@@ -151,8 +151,8 @@ class URLSessionInstrumentationTests: XCTestCase {
 
         let task = URLSession.shared.dataTask(with: request) { data, _, _ in
             if let data = data {
-                let string = String(data: data, encoding: .utf8)
-                print(string ?? "")
+                let string = String(decoding: data, as: UTF8.self)
+                print(string)
             }
             URLSessionInstrumentationTests.semaphore.signal()
         }
@@ -171,7 +171,7 @@ class URLSessionInstrumentationTests: XCTestCase {
         let request = URLRequest(url: URL(string: "http://localhost:33333/forbidden")!)
         let task = URLSession.shared.dataTask(with: request) { data, _, _ in
             if let data = data {
-                let string = String(data: data, encoding: .utf8)
+                let string = String(decoding: data, as: UTF8.self)
                 print(string ?? "")
             }
             URLSessionInstrumentationTests.semaphore.signal()