fix

Author: ktoso

Sources/Tracing/Tracer.swift

@@ -275,7 +275,7 @@ extension Tracer {
         )
         defer { span.end() }
         do {
-            return try await Baggage.withValue(span.baggage) {
+            return try await Baggage.$current.withValue(span.baggage) {
                 try await operation(span)
             }
         } catch {
@@ -312,7 +312,7 @@ extension Tracer {
         let span = self.startSpan(operationName, baggage: baggage, ofKind: kind, function: function, file: fileID, line: line)
         defer { span.end() }
         do {
-            return try await Baggage.withValue(span.baggage) {
+            return try await Baggage.$current.withValue(span.baggage) {
                 try await operation(span)
             }
         } catch {

Tests/TracingTests/DynamicTracepointTracerTests.swift

@@ -87,8 +87,10 @@ final class DynamicTracepointTracerTests: XCTestCase {
     }
 
     func logic(fakeLine: UInt) {
+        #if swift(>=5.5)
         InstrumentationSystem.tracer.withSpan("\(#function)-dont", line: fakeLine) { _ in
         }
+        #endif
     }
 
     func traceMeLogic(fakeLine: UInt) {
@@ -166,13 +168,14 @@ final class DynamicTracepointTestTracer: Tracer {
     }
 
     private func shouldRecord(tracepoint: TracepointID) -> Bool {
+        #if swift(>=5.5.0)
         if self.isActive(tracepoint: tracepoint) {
             // this tracepoint was specifically activated!
             return true
         }
 
         // else, perhaps there is already an active span, if so, attach to it
-        guard let baggage = Baggage.current else { // TODO: we could make this such that we only ever once pick-up 🧳
+        guard let baggage = Baggage.$current.withValue else { // TODO: we could make this such that we only ever once pick-up 🧳
             return false
         }
 
@@ -184,6 +187,9 @@ final class DynamicTracepointTestTracer: Tracer {
         // there is some active trace already, so we should record as well
         // TODO: this logic may need to become smarter
         return true
+        #else
+        return false
+        #endif
     }
 
     func isActive(tracepoint: TracepointID) -> Bool {