Switch to swift-distributed-tracing upstream

Signed-off-by: Moritz Lang <[email protected]>

Author: slashmo

Package.swift

@@ -25,7 +25,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-atomics.git", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.4"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.6.3"),
-        .package(url: "https://github.com/slashmo/swift-distributed-tracing.git", branch: "feature/tracing-test-kit"),
+        .package(url: "https://github.com/apple/swift-distributed-tracing.git", from: "1.3.0"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.81.0"),
         .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.29.0"),
         .package(url: "https://github.com/apple/swift-nio-transport-services.git", from: "1.23.0"),
@@ -93,7 +93,7 @@ let package = Package(
                 .product(name: "NIOTestUtils", package: "swift-nio"),
                 .product(name: "Logging", package: "swift-log"),
                 .product(name: "NIOEmbedded", package: "swift-nio"),
-                .product(name: "TracingTestKit", package: "swift-distributed-tracing", condition: .when(traits: ["DistributedTracingSupport"])),
+                .product(name: "InMemoryTracing", package: "swift-distributed-tracing", condition: .when(traits: ["DistributedTracingSupport"])),
             ],
             swiftSettings: defaultSwiftSettings
         ),

Tests/ValkeyTests/ValkeyConnectionTests.swift

@@ -15,7 +15,7 @@ import Testing
 @testable import Valkey
 
 #if DistributedTracingSupport
-import TracingTestKit
+import InMemoryTracing
 #endif
 
 @Suite
@@ -497,7 +497,7 @@ struct ConnectionTests {
         @Test
         @available(valkeySwift 1.0, *)
         func testSingleCommandSpan() async throws {
-            let tracer = TestTracer()
+            let tracer = InMemoryTracer()
             var config = ValkeyConnectionConfiguration()
             config.tracing.tracer = tracer
 
@@ -534,7 +534,7 @@ struct ConnectionTests {
         @Test
         @available(valkeySwift 1.0, *)
         func testSingleCommandFailureSpan() async throws {
-            let tracer = TestTracer()
+            let tracer = InMemoryTracer()
             var config = ValkeyConnectionConfiguration()
             config.tracing.tracer = tracer
 
@@ -578,7 +578,7 @@ struct ConnectionTests {
         @Test(.disabled("Pipeline support not implemented yet"))
         @available(valkeySwift 1.0, *)
         func testPipelinedSameCommandsSpan() async throws {
-            let tracer = TestTracer()
+            let tracer = InMemoryTracer()
             var config = ValkeyConnectionConfiguration()
             config.tracing.tracer = tracer
 
@@ -621,7 +621,7 @@ struct ConnectionTests {
         @Test(.disabled("Pipeline support not implemented yet"))
         @available(valkeySwift 1.0, *)
         func testPipelinedDifferentCommandsSpan() async throws {
-            let tracer = TestTracer()
+            let tracer = InMemoryTracer()
             var config = ValkeyConnectionConfiguration()
             config.tracing.tracer = tracer
 
@@ -664,7 +664,7 @@ struct ConnectionTests {
         @Test(.disabled("Pipeline support not implemented yet"))
         @available(valkeySwift 1.0, *)
         func testPipelinedCommandFailureSpan() async throws {
-            let tracer = TestTracer()
+            let tracer = InMemoryTracer()
             var config = ValkeyConnectionConfiguration()
             config.tracing.tracer = tracer