compat fixes

Author: ktoso

Package.swift

@@ -8,7 +8,7 @@ let package = Package(
         .library(name: "Tracing", targets: ["Tracing"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-distributed-tracing-baggage.git", .upToNextMinor(from: "0.3.0")),
+        .package(url: "https://github.com/apple/swift-distributed-tracing-baggage.git", .upToNextMinor(from: "0.4.1")),
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
     ],
     targets: [

Sources/Tracing/Tracer.swift

@@ -202,7 +202,7 @@ extension Tracer {
         )
         defer { span.end() }
         do {
-            return try await Baggage.$current.withValue(span.baggage) {
+            return try await Baggage.withValue(span.baggage) {
                 try await operation(span)
             }
         } catch {
@@ -239,7 +239,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.$current.withValue(span.baggage) {
+            return try await Baggage.withValue(span.baggage) {
                 try await operation(span)
             }
         } catch {

Tests/TracingTests/DynamicTracepointTracerTests.swift

@@ -24,6 +24,7 @@ final class DynamicTracepointTracerTests: XCTestCase {
     }
 
     func test_adhoc_enableBySourceLoc() {
+        #if swift(>=5.5)
         let tracer = DynamicTracepointTestTracer()
 
         InstrumentationSystem.bootstrapInternal(tracer)
@@ -55,9 +56,11 @@ final class DynamicTracepointTracerTests: XCTestCase {
         }
         XCTAssertEqual(tracer.spans[0].baggage.spanID, "span-id-fake-\(fileID)-\(fakeLine)")
         XCTAssertEqual(tracer.spans[1].baggage.spanID, "span-id-fake-\(fileID)-\(fakeNextLine)")
+        #endif
     }
 
     func test_adhoc_enableByFunction() {
+        #if swift(>=5.5)
         let tracer = DynamicTracepointTestTracer()
 
         InstrumentationSystem.bootstrapInternal(tracer)
@@ -80,6 +83,7 @@ final class DynamicTracepointTracerTests: XCTestCase {
         }
         XCTAssertEqual(tracer.spans[0].baggage.spanID, "span-id-fake-\(fileID)-\(fakeLine)")
         XCTAssertEqual(tracer.spans[1].baggage.spanID, "span-id-fake-\(fileID)-\(fakeNextLine)")
+        #endif
     }
 
     func logic(fakeLine: UInt) {
@@ -88,11 +92,13 @@ final class DynamicTracepointTracerTests: XCTestCase {
     }
 
     func traceMeLogic(fakeLine: UInt) {
+        #if swift(>=5.5)
         InstrumentationSystem.tracer.withSpan("\(#function)-yes", line: fakeLine) { _ in
             InstrumentationSystem.tracer.withSpan("\(#function)-yes-inside", line: fakeLine + 11) { _ in
                 // inside
             }
         }
+        #endif
     }
 }