more swift 5.6 adjustments for concurrency

Author: ktoso

Sources/Tracing/Tracer.swift

@@ -71,7 +71,7 @@ extension Tracer {
         #else
         InstrumentationSystem.legacyTracer.startAnySpan(
             operationName,
-            baggage: baggage,
+            baggage: baggage(),
             ofKind: kind,
             at: time,
             function: function,
@@ -159,6 +159,7 @@ extension Tracer {
     ///   - operation: The operation that this span should be measuring
     /// - Returns: the value returned by `operation`
     /// - Throws: the error the `operation` has thrown (if any)
+    #if swift(>=5.7.0)
     @_unsafeInheritExecutor
     @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
     public static func withSpan<T>(
@@ -171,7 +172,31 @@ extension Tracer {
         line: UInt = #line,
         _ operation: (any SpanProtocol) async throws -> T
     ) async rethrows -> T {
-        try await InstrumentationSystem.tracer.withAnySpan(
+        try await InstrumentationSystem.legacyTracer.withAnySpan(
+            operationName,
+            baggage: baggage(),
+            ofKind: kind,
+            at: time,
+            function: function,
+            file: fileID,
+            line: line
+        ) { anySpan in
+            try await operation(anySpan)
+        }
+    }
+    #else // TODO: remove this if/else when we require 5.7; it is only here to add @_unsafeInheritExecutor
+    @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+    public static func withSpan<T>(
+        _ operationName: String,
+        baggage: @autoclosure () -> Baggage = .current ?? .topLevel,
+        ofKind kind: SpanKind = .internal,
+        at time: DispatchWallTime = .now(),
+        function: String = #function,
+        file fileID: String = #fileID,
+        line: UInt = #line,
+        _ operation: (any SpanProtocol) async throws -> T
+    ) async rethrows -> T {
+        try await InstrumentationSystem.legacyTracer.withAnySpan(
             operationName,
             baggage: baggage(),
             ofKind: kind,
@@ -183,4 +208,5 @@ extension Tracer {
             try await operation(anySpan)
         }
     }
+    #endif
 }

Sources/Tracing/TracerProtocol+Legacy.swift

@@ -377,6 +377,7 @@ extension TracerProtocol {
     ///   - operation: The operation that this span should be measuring
     /// - Returns: the value returned by `operation`
     /// - Throws: the error the `operation` has thrown (if any)
+    #if swift(>=5.7.0)
     @_unsafeInheritExecutor
     public func withAnySpan<T>(
         _ operationName: String,
@@ -400,5 +401,30 @@ extension TracerProtocol {
             try await operation(span)
         }
     }
+    #else // TODO: remove this if/else when we require 5.7; it is only here to add @_unsafeInheritExecutor
+    @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+    public func withAnySpan<T>(
+        _ operationName: String,
+        baggage: @autoclosure () -> Baggage = .current ?? .topLevel,
+        ofKind kind: SpanKind = .internal,
+        at time: DispatchWallTime = .now(),
+        function: String = #function,
+        file fileID: String = #fileID,
+        line: UInt = #line,
+        _ operation: (any SpanProtocol) async throws -> T
+    ) async rethrows -> T {
+        try await self.withSpan(
+            operationName,
+            baggage: baggage(),
+            ofKind: kind,
+            at: time,
+            function: function,
+            file: fileID,
+            line: line
+        ) { span in
+            try await operation(span)
+        }
+    }
+    #endif
 }
 #endif