Merge branch 'main' into remove-external-dependencies

Author: Ignacio Bonafonte

Sources/Instrumentation/URLSession/URLSessionInstrumentation.swift

@@ -507,18 +507,21 @@ public class URLSessionInstrumentation {
     }
 
     private func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
-        let taskId = self.idKeyForTask(task)
+        queue.sync {
+            let taskId = self.idKeyForTask(task)
 
-        let requestState = self.requestMap[taskId]
+            let requestState = self.requestMap[taskId]
 
-        if let error = error {
-            let status = (task.response as? HTTPURLResponse)?.statusCode ?? 0
-            URLSessionLogger.logError(error, dataOrFile: requestState?.dataProcessed, statusCode: status, instrumentation: self, sessionTaskId: taskId)
-        } else if let response = task.response {
-            URLSessionLogger.logResponse(response, dataOrFile: requestState?.dataProcessed, instrumentation: self, sessionTaskId: taskId)
-        }
-        if requestState != nil {
-            requestMap[taskId] = nil
+            if let error = error {
+                let status = (task.response as? HTTPURLResponse)?.statusCode ?? 0
+                URLSessionLogger.logError(error, dataOrFile: requestState?.dataProcessed, statusCode: status, instrumentation: self, sessionTaskId: taskId)
+            } else if let response = task.response {
+                URLSessionLogger.logResponse(response, dataOrFile: requestState?.dataProcessed, instrumentation: self, sessionTaskId: taskId)
+            }
+
+            if requestState != nil {
+                self.requestMap[taskId] = nil
+            }
         }
     }
 
@@ -537,14 +540,16 @@ public class URLSessionInstrumentation {
     }
 
     private func urlSessionTaskWillResume(_ session: URLSessionTask) {
-        let taskId = self.idKeyForTask(session)
-        if let request = session.currentRequest {
-            var state = requestMap[taskId]
-            if state == nil {
-                state = NetworkRequestState()
-                requestMap[taskId] = state
+        queue.sync {
+            let taskId = self.idKeyForTask(session)
+            if let request = session.currentRequest {
+                var state = requestMap[taskId]
+                if state == nil {
+                    state = NetworkRequestState()
+                    requestMap[taskId] = state
+                }
+                requestMap[taskId]?.setRequest(request)
             }
-            requestMap[taskId]?.setRequest(request)
         }
     }
 

Sources/OpenTelemetryApi/Context/ActivityContextManager.swift

@@ -16,10 +16,10 @@ private let OS_ACTIVITY_CURRENT = unsafeBitCast(dlsym(UnsafeMutableRawPointer(bi
 
 class ActivityContextManager: ContextManager {
     static let instance = ActivityContextManager()
-    #if swift(>=5.5)
+#if canImport(_Concurrency)
     @available(macOS 12.0, iOS 15.0, tvOS 15.0, *)
     static let taskLocalContextManager = TaskLocalContextManager.instance
-    #endif
+#endif
 
     let rlock = NSRecursiveLock()
 
@@ -38,14 +38,14 @@ class ActivityContextManager: ContextManager {
     var contextMap = [os_activity_id_t: [String: AnyObject]]()
 
     func getCurrentContextValue(forKey key: OpenTelemetryContextKeys) -> AnyObject? {
-        #if swift(>=5.5)
+#if canImport(_Concurrency)
         if #available(macOS 12.0, iOS 15.0, tvOS 15.0, *) {
             // If running with task local, use first its stored value
             if let contextValue = ActivityContextManager.taskLocalContextManager.getCurrentContextValue(forKey: key) {
                 return contextValue
             }
         }
-        #endif
+#endif
         var parentIdent: os_activity_id_t = 0
         let activityIdent = os_activity_get_identifier(OS_ACTIVITY_CURRENT, &parentIdent)
         var contextValue: AnyObject?
@@ -70,12 +70,12 @@ class ActivityContextManager: ContextManager {
             objectScope.setObject(ScopeElement(scope: scope), forKey: value)
         }
         contextMap[activityIdent]?[key.rawValue] = value
-        #if swift(>=5.5)
+#if canImport(_Concurrency)
         if #available(macOS 12.0, iOS 15.0, tvOS 15.0, *) {
             // If running with task local, set the value after the activity, so activity is not empty
             ActivityContextManager.taskLocalContextManager.setCurrentContextValue(forKey: key, value: value)
         }
-        #endif
+#endif
         rlock.unlock()
     }
 
@@ -94,14 +94,14 @@ class ActivityContextManager: ContextManager {
             os_activity_scope_leave(&scope)
             objectScope.removeObject(forKey: value)
         }
-        #if swift(>=5.5)
+#if canImport(_Concurrency)
         if #available(macOS 12.0, iOS 15.0, tvOS 15.0, *) {
             // If there is a parent activity, set its content as the task local
             ActivityContextManager.taskLocalContextManager.removeContextValue(forKey: key, value: value)
             if let currentContext = self.getCurrentContextValue(forKey: key) {
                 ActivityContextManager.taskLocalContextManager.setCurrentContextValue(forKey: key, value: currentContext)
             }
         }
-        #endif
+#endif
     }
 }

Sources/OpenTelemetryApi/Context/TaskLocalContextManager.swift

@@ -5,7 +5,7 @@
 
 import Foundation
 
-#if swift(>=5.5)
+#if canImport(_Concurrency)
 @available(macOS 12.0, iOS 15.0, tvOS 15.0, *)
 enum ContextManagement {
     @TaskLocal