Update Tracing package 📦

Author: slashmo

Package.swift

@@ -34,7 +34,7 @@ let package = Package(
             name: "AsyncHTTPClient",
             dependencies: ["NIO", "NIOHTTP1", "NIOSSL", "NIOConcurrencyHelpers", "NIOHTTPCompression",
                            "NIOFoundationCompat", "NIOTransportServices", "Logging",
-                           .product(name: "TracingInstrumentation", package: "gsoc-swift-tracing"),
+                           .product(name: "Tracing", package: "gsoc-swift-tracing"),
                            .product(name: "OpenTelemetryInstrumentationSupport", package: "gsoc-swift-tracing"),
                            .product(name: "NIOInstrumentation", package: "gsoc-swift-tracing"),
                            .product(name: "BaggageLogging", package: "swift-baggage-context")]

Sources/AsyncHTTPClient/HTTPClient.swift

@@ -16,7 +16,7 @@ import Baggage
 import BaggageLogging
 import Foundation
 import Instrumentation
-import TracingInstrumentation
+import Tracing
 import Logging
 import NIO
 import NIOConcurrencyHelpers
@@ -390,7 +390,7 @@ public class HTTPClient {
                                                               eventLoop eventLoopPreference: EventLoopPreference,
                                                               context: LoggingBaggageContextCarrier,
                                                               deadline: NIODeadline? = nil) -> Task<Delegate.Response> {
-        var span = InstrumentationSystem.tracingInstrument.startSpan(named: request.method.rawValue, context: context, ofKind: .client)
+        let span = InstrumentationSystem.tracer.startSpan(named: request.method.rawValue, context: context, ofKind: .client)
         span.attributes.http.method = request.method.rawValue
         span.attributes.http.scheme = request.scheme
         span.attributes.http.target = request.uri

Sources/AsyncHTTPClient/Utils.swift

@@ -21,7 +21,7 @@ import NIOHTTP1
 import NIOHTTPCompression
 import NIOSSL
 import NIOTransportServices
-import TracingInstrumentation
+import Tracing
 
 internal extension String {
     var isIPAddress: Bool {

Tests/AsyncHTTPClientTests/HTTPClientTests.swift

@@ -18,7 +18,7 @@
 #endif
 import Baggage
 import Instrumentation
-import TracingInstrumentation
+import Tracing
 import Logging
 import NIO
 import NIOConcurrencyHelpers
@@ -501,7 +501,8 @@ class HTTPClientTests: XCTestCase {
 
                 let progress = try self.defaultClient.execute(
                     request: request,
-                    delegate: delegate
+                    delegate: delegate,
+                    context: testContext()
                 )
                 .wait()
 
@@ -526,7 +527,8 @@ class HTTPClientTests: XCTestCase {
 
                 let progress = try self.defaultClient.execute(
                     request: request,
-                    delegate: delegate
+                    delegate: delegate,
+                    context: testContext()
                 )
                 .wait()
 
@@ -2664,7 +2666,7 @@ class HTTPClientTests: XCTestCase {
     func testDoubleError() throws {
         // This is needed to that connection pool will not get into closed state when we release
         // second connection.
-        _ = self.defaultClient.get(url: "http://localhost:\(self.defaultHTTPBin.port)/events/10/1")
+        _ = self.defaultClient.get(url: "http://localhost:\(self.defaultHTTPBin.port)/events/10/1", context: testContext())
 
         var request = try HTTPClient.Request(url: "http://localhost:\(self.defaultHTTPBin.port)/wait", method: .POST)
         request.body = .stream { writer in
@@ -2683,7 +2685,7 @@ class HTTPClientTests: XCTestCase {
 
         // We specify a deadline of 2 ms co that request will be timed out before all chunks are writtent,
         // we need to verify that second error on write after timeout does not lead to double-release.
-        XCTAssertThrowsError(try self.defaultClient.execute(request: request, deadline: .now() + .milliseconds(2)).wait())
+        XCTAssertThrowsError(try self.defaultClient.execute(request: request, context: testContext(), deadline: .now() + .milliseconds(2)).wait())
     }
 
     // MARK: - Tracing -
@@ -2708,7 +2710,7 @@ class HTTPClientTests: XCTestCase {
     }
 }
 
-private final class TestTracer: TracingInstrument {
+private final class TestTracer: Tracer {
     private(set) var recordedSpans = [TestSpan]()
 
     func startSpan(