Use TestTracer from TracingTestKit

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

Author: slashmo

Package.swift

@@ -26,7 +26,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/apple/swift-distributed-tracing.git", from: "1.0.0"),
+        .package(url: "https://github.com/slashmo/swift-distributed-tracing.git", branch: "feature/tracing-test-kit"),
         .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"),
@@ -94,6 +94,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"])),
             ],
             swiftSettings: defaultSwiftSettings
         ),

Tests/ValkeyTests/Utils/TestTracer.swift

@@ -21,7 +21,7 @@ import Testing
 @testable import Valkey
 
 #if DistributedTracingSupport
-@testable import Instrumentation
+import TracingTestKit
 #endif
 
 @Suite
@@ -497,7 +497,7 @@ struct ConnectionTests {
         try await channel.close()
     }
 
-    #if DistributedTracingSupport && compiler(>=6.2)  // Swift Testing exit tests only added in 6.2
+    #if DistributedTracingSupport
     @Suite
     struct DistributedTracingTests {
         @Test
@@ -520,11 +520,11 @@ struct ConnectionTests {
             try await channel.writeInbound(RESPToken(.bulkString("Bar")).base)
             #expect(try await fooResult == "Bar")
 
-            #expect(tracer.spans.count == 1)
-            let span = try #require(tracer.spans.first)
+            #expect(tracer.finishedSpans.count == 1)
+            let span = try #require(tracer.finishedSpans.first)
             #expect(span.operationName == "GET")
             #expect(span.kind == .client)
-            #expect(span.recordedErrors.isEmpty)
+            #expect(span.errors.isEmpty)
             #expect(
                 span.attributes == [
                     "db.system.name": "valkey",
@@ -534,7 +534,6 @@ struct ConnectionTests {
                     "network.peer.port": 6379,
                 ]
             )
-            #expect(span.recordedErrors.isEmpty)
             #expect(span.status == nil)
         }
 
@@ -562,13 +561,13 @@ struct ConnectionTests {
                 #expect(error.message == "ERR Error!")
             }
 
-            #expect(tracer.spans.count == 1)
-            let span = try #require(tracer.spans.first)
+            #expect(tracer.finishedSpans.count == 1)
+            let span = try #require(tracer.finishedSpans.first)
             #expect(span.operationName == "GET")
             #expect(span.kind == .client)
-            #expect(span.recordedErrors.count == 1)
-            let error = try #require(span.recordedErrors.first)
-            #expect(error.0 as? ValkeyClientError == ValkeyClientError(.commandError, message: "ERR Error!"))
+            #expect(span.errors.count == 1)
+            let error = try #require(span.errors.first)
+            #expect(error.error as? ValkeyClientError == ValkeyClientError(.commandError, message: "ERR Error!"))
             #expect(
                 span.attributes == [
                     "db.system.name": "valkey",
@@ -607,11 +606,11 @@ struct ConnectionTests {
 
             #expect(try await results.1.get().map { String(buffer: $0) } == "OK")
 
-            #expect(tracer.spans.count == 1)
-            let span = try #require(tracer.spans.first)
+            #expect(tracer.finishedSpans.count == 1)
+            let span = try #require(tracer.finishedSpans.first)
             #expect(span.operationName == "MULTI")
             #expect(span.kind == .client)
-            #expect(span.recordedErrors.isEmpty)
+            #expect(span.errors.isEmpty)
             #expect(
                 span.attributes == [
                     "db.system.name": "valkey",
@@ -622,7 +621,6 @@ struct ConnectionTests {
                     "network.peer.port": 6379,
                 ]
             )
-            #expect(span.recordedErrors.isEmpty)
             #expect(span.status == nil)
         }
 
@@ -651,11 +649,11 @@ struct ConnectionTests {
 
             #expect(try await results.1.get().map { String(buffer: $0) } == "bar")
 
-            #expect(tracer.spans.count == 1)
-            let span = try #require(tracer.spans.first)
+            #expect(tracer.finishedSpans.count == 1)
+            let span = try #require(tracer.finishedSpans.first)
             #expect(span.operationName == "MULTI")
             #expect(span.kind == .client)
-            #expect(span.recordedErrors.isEmpty)
+            #expect(span.errors.isEmpty)
             #expect(
                 span.attributes == [
                     "db.system.name": "valkey",
@@ -666,7 +664,6 @@ struct ConnectionTests {
                     "network.peer.port": 6379,
                 ]
             )
-            #expect(span.recordedErrors.isEmpty)
             #expect(span.status == nil)
         }
 
@@ -692,13 +689,13 @@ struct ConnectionTests {
             try await channel.writeInbound(RESPToken(.simpleError("WRONGTYPE Error!")).base)
             _ = await results
 
-            #expect(tracer.spans.count == 1)
-            let span = try #require(tracer.spans.first)
+            #expect(tracer.finishedSpans.count == 1)
+            let span = try #require(tracer.finishedSpans.first)
             #expect(span.operationName == "MULTI")
             #expect(span.kind == .client)
-            #expect(span.recordedErrors.count == 1)
-            let error = try #require(span.recordedErrors.first)
-            #expect(error.0 as? ValkeyClientError == ValkeyClientError(.commandError, message: "WRONGTYPE Error!"))
+            #expect(span.errors.count == 1)
+            let error = try #require(span.errors.first)
+            #expect(error.error as? ValkeyClientError == ValkeyClientError(.commandError, message: "WRONGTYPE Error!"))
             #expect(
                 span.attributes == [
                     "db.system.name": "valkey",