Renamed URLSessionConfiguration to URLSessionInstrumentationConfiguration, since URLSessionConfiguration is an already existing class in Foundation

Author: Ignacio Bonafonte

Examples/Network Sample/main.swift

@@ -68,7 +68,7 @@ func simpleNetworkCallWithDelegate() {
 let spanProcessor = SimpleSpanProcessor(spanExporter: StdoutExporter(isDebug: true))
 OpenTelemetrySDK.instance.tracerProvider.addSpanProcessor(spanProcessor)
 
-let networkInstrumentation = URLSessionInstrumentation(configuration: URLSessionConfiguration())
+let networkInstrumentation = URLSessionInstrumentation(configuration: URLSessionInstrumentationConfiguration())
 
 simpleNetworkCall()
 simpleNetworkCallWithDelegate()

Sources/Instrumentation/URLSession/URLSessionInstrumentation.swift

@@ -27,7 +27,7 @@ private var idKey: Void?
 public class URLSessionInstrumentation {
     private var requestMap = [String: NetworkRequestState]()
 
-    var configuration: URLSessionConfiguration
+    var configuration: URLSessionInstrumentationConfiguration
 
     private let queue = DispatchQueue(label: "com.datadoghq.ddnetworkinstrumentation")
 
@@ -43,7 +43,7 @@ public class URLSessionInstrumentation {
         return spans
     }
 
-    public init(configuration: URLSessionConfiguration) {
+    public init(configuration: URLSessionInstrumentationConfiguration) {
         self.configuration = configuration
         tracer = OpenTelemetrySDK.instance.tracerProvider.get(instrumentationName: "NSURLSession", instrumentationVersion: "0.0.1") as! TracerSdk
         self.injectInNSURLClasses()

Sources/Instrumentation/URLSession/URLSessionConfiguration.swift renamed to Sources/Instrumentation/URLSession/URLSessionInstrumentationConfiguration.swift

@@ -21,7 +21,7 @@ public typealias DataOrFile = Any
 public typealias SessionTaskId = String
 public typealias HTTPStatus = Int
 
-public struct URLSessionConfiguration {
+public struct URLSessionInstrumentationConfiguration {
     public init(shouldRecordPayload: ((URLSession) -> (Bool)?)? = nil,
                 shouldInstrument: ((URLRequest) -> (Bool)?)? = nil,
                 nameSpan: ((URLRequest) -> (String)?)? = nil,

Sources/OpenTelemetryApi/Trace/SpanBuilder.swift

@@ -15,7 +15,7 @@
 
 import Foundation
 
-public protocol SpanBuilder: class {
+public protocol SpanBuilder: AnyObject {
     /// Sets the parent Span to use. If not set, the value of OpenTelemetryContext.activeSpan
     /// at startSpan() time will be used as parent.
     ///

Tests/InstrumentationTests/URLSessionTests/URLSessionInstrumentationTests.swift

@@ -48,38 +48,38 @@ class URLSessionInstrumentationTests: XCTestCase {
     static var requestCopy: URLRequest!
     static var responseCopy: HTTPURLResponse!
 
-    static var config = URLSessionConfiguration(shouldRecordPayload: nil,
-                                                shouldInstrument: { req in
-                                                    checker.shouldInstrumentCalled = true
-                                                    if req.url?.host?.contains("dontinstrument") ?? false {
-                                                        return false
-                                                    }
-                                                    return true
-
-                                                },
-                                                nameSpan: { req in
-                                                    checker.nameSpanCalled = true
-                                                    if req.url?.host?.contains("defaultName") ?? false {
-                                                        return nil
-                                                    }
-                                                    return "new name"
-                                                },
-                                                shouldInjectTracingHeaders: { _ in
-                                                    checker.shouldInjectTracingHeadersCalled = true
-                                                    return true
-
-                                                },
-                                                createdRequest: { request, _ in
-                                                    requestCopy = request
-                                                    checker.createdRequestCalled = true
-                                                },
-                                                receivedResponse: { response, _, _ in
-                                                    responseCopy = response as? HTTPURLResponse
-                                                    checker.receivedResponseCalled = true
-                                                },
-                                                receivedError: { _, _, _, _ in
-                                                    URLSessionInstrumentationTests.checker.receivedErrorCalled = true
-                                                })
+    static var config = URLSessionInstrumentationConfiguration(shouldRecordPayload: nil,
+                                                               shouldInstrument: { req in
+                                                                   checker.shouldInstrumentCalled = true
+                                                                   if req.url?.host?.contains("dontinstrument") ?? false {
+                                                                       return false
+                                                                   }
+                                                                   return true
+
+                                                               },
+                                                               nameSpan: { req in
+                                                                   checker.nameSpanCalled = true
+                                                                   if req.url?.host?.contains("defaultName") ?? false {
+                                                                       return nil
+                                                                   }
+                                                                   return "new name"
+                                                               },
+                                                               shouldInjectTracingHeaders: { _ in
+                                                                   checker.shouldInjectTracingHeadersCalled = true
+                                                                   return true
+
+                                                               },
+                                                               createdRequest: { request, _ in
+                                                                   requestCopy = request
+                                                                   checker.createdRequestCalled = true
+                                                               },
+                                                               receivedResponse: { response, _, _ in
+                                                                   responseCopy = response as? HTTPURLResponse
+                                                                   checker.receivedResponseCalled = true
+                                                               },
+                                                               receivedError: { _, _, _, _ in
+                                                                   URLSessionInstrumentationTests.checker.receivedErrorCalled = true
+                                                               })
 
     static var checker = Check()
     static var semaphore: DispatchSemaphore!
@@ -355,5 +355,4 @@ class URLSessionInstrumentationTests: XCTestCase {
         XCTAssertTrue(URLSessionInstrumentationTests.checker.createdRequestCalled)
         XCTAssertNotNil(URLSessionInstrumentationTests.requestCopy?.allHTTPHeaderFields?[W3CTraceContextPropagator.traceparent])
     }
-
 }