Merge pull request #234 from open-telemetry/fix-compiling-Xcode-13-RC

Author: Ignacio Bonafonte

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