compat with 5.6

Author: ktoso

Sources/Tracing/Tracer.swift

@@ -120,7 +120,6 @@ extension Tracer {
     }
     #endif
 
-
     // ==== withSpan + sync ---------------------------------------------------
 
     /// Start a new ``Span`` and automatically end when the `operation` completes,
@@ -314,5 +313,4 @@ extension Tracer {
         }
     }
     #endif
-
 }

Tests/TracingTests/DynamicTracepointTracerTests.swift

@@ -281,13 +281,13 @@ extension DynamicTracepointTestTracer {
             return span
         }
 
-        init(operationName: String,
-             startTime: some TracerInstantProtocol,
-             baggage: Baggage,
-             kind: SpanKind,
-             file fileID: String,
-             line: UInt,
-             onEnd: @escaping (TracepointSpan) -> Void)
+        init<Instant: TracerInstantProtocol>(operationName: String,
+                                             startTime: Instant,
+                                             baggage: Baggage,
+                                             kind: SpanKind,
+                                             file fileID: String,
+                                             line: UInt,
+                                             onEnd: @escaping (TracepointSpan) -> Void)
         {
             self.operationName = operationName
             self.startTime = startTime.millisSinceEpoch

Tests/TracingTests/TestTracer.swift

@@ -150,9 +150,9 @@ final class TestSpan: Span {
 
     let onEnd: (TestSpan) -> Void
 
-    init(
+    init<Instant: TracerInstantProtocol>(
         operationName: String,
-        startTime: some TracerInstantProtocol,
+        startTime: Instant,
         baggage: Baggage,
         kind: SpanKind,
         onEnd: @escaping (TestSpan) -> Void
@@ -181,7 +181,7 @@ final class TestSpan: Span {
         self.recordedErrors.append((error, attributes))
     }
 
-    func end<Clock: TracerClock>(clock: Clock = DefaultTracerClock()) {
+    func end<Clock: TracerClock>(clock: Clock) {
         self.endTime = clock.now.millisSinceEpoch
         self.onEnd(self)
     }

Tests/TracingTests/TracedLockTests.swift

@@ -64,7 +64,7 @@ private final class TracedLockPrintlnTracer: LegacyTracerProtocol {
         _ operationName: String,
         baggage: @autoclosure () -> Baggage,
         ofKind kind: SpanKind,
-        clock: Clock = DefaultTracerClock(),
+        clock: Clock,
         function: String,
         file fileID: String,
         line: UInt
@@ -124,9 +124,9 @@ private final class TracedLockPrintlnTracer: LegacyTracerProtocol {
 
         private(set) var isRecording = false
 
-        init(
+        init<Instant: TracerInstantProtocol>(
             operationName: String,
-            startTime: some TracerInstantProtocol,
+            startTime: Instant,
             kind: SpanKind,
             baggage: Baggage
         ) {

Tests/TracingTests/TracerTimeTests.swift

@@ -42,8 +42,13 @@ final class TracerTimeTests: XCTestCase {
 
         let mockClock = MockClock()
         mockClock.setTime(13)
+        #if swift(>=5.7.0)
         let span: TestSpan = tracer.startSpan("start", clock: mockClock)
         XCTAssertEqual(span.startTime, 13)
+        #else
+        let span: TestSpan = tracer.startAnySpan("start", clock: mockClock) as! TestSpan
+        XCTAssertEqual(span.startTime, 13)
+        #endif
     }
 }