Cleanup some leftovers and address some review comments

Author: ktoso

Sources/AsyncHTTPClient/AsyncAwait/HTTPClient+execute.swift

@@ -40,27 +40,33 @@ extension HTTPClient {
         deadline: NIODeadline,
         logger: Logger? = nil
     ) async throws -> HTTPClientResponse {
-        func doExecute() async throws -> HTTPClientResponse {
+        try await withRequestSpan(request) {
             try await self.executeAndFollowRedirectsIfNeeded(
                 request,
                 deadline: deadline,
                 logger: logger ?? Self.loggingDisabled,
                 redirectState: RedirectState(self.configuration.redirectConfiguration.mode, initialURL: request.url)
             )
         }
+    }
 
+    @inlinable
+    func withRequestSpan<ReturnType>(
+        _ request: HTTPClientRequest,
+        _ body: () async throws -> ReturnType
+    ) async rethrows -> ReturnType {
         #if TracingSupport
         if let tracer = self.tracer {
-            return try await tracer.withSpan("\(request.method)") { span -> (HTTPClientResponse) in
+            return try await tracer.withSpan("\(request.method)") { span in
                 let attr = self.configuration.tracing.attributeKeys
                 span.attributes[attr.requestMethod] = request.method.rawValue
                 // Set more attributes on the span
-                return try await doExecute()
+                return try await body()
             }
         }
         #endif
 
-        return try await doExecute()
+        return try await body()
     }
 }
 

Sources/AsyncHTTPClient/AsyncAwait/Transaction.swift

@@ -74,8 +74,7 @@ final class Transaction:
     }
 
     func cancel() {
-        let error = CancellationError()
-        self.fail(error)
+        self.fail(CancellationError())
     }
 
     // MARK: Request body helpers

Sources/AsyncHTTPClient/HTTPClient.swift

@@ -66,24 +66,25 @@ public final class HTTPClient: Sendable {
     ///
     /// All HTTP transactions will occur on loops owned by this group.
     public let eventLoopGroup: EventLoopGroup
-    let configuration: Configuration
     let poolManager: HTTPConnectionPool.Manager
 
+    @usableFromInline
+    let configuration: Configuration
+
     /// Shared thread pool used for file IO. It is lazily created on first access of ``Task/fileIOThreadPool``.
     private let fileIOThreadPool: NIOLockedValueBox<NIOThreadPool?>
 
     private let state: NIOLockedValueBox<State>
     private let canBeShutDown: Bool
 
     #if TracingSupport
-    @_spi(Tracing)
     @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
     public var tracer: (any Tracer)? {
         configuration.tracing.tracer
     }
     #endif  // TracingSupport
 
-    public static let loggingDisabled = Logger(label: "AHC-do-not-log", factory: { _ in SwiftLogNoOpLogHandler() })
+    static let loggingDisabled = Logger(label: "AHC-do-not-log", factory: { _ in SwiftLogNoOpLogHandler() })
 
     /// Create an ``HTTPClient`` with specified `EventLoopGroup` provider and configuration.
     ///
@@ -718,21 +719,6 @@ public final class HTTPClient: Sendable {
             requestID: globalRequestID.wrappingIncrementThenLoad(ordering: .relaxed)
         )
 
-        // #if TracingSupport
-        // let span: (any Span)? // we may be still executing the same span, e.g. under redirection etc.
-        // if let activeSpan {
-        //     span = activeSpan
-        // } else if let tracer = self.tracer {
-        //     let s = tracer.startSpan(request.method.rawValue)
-        //     let attrs = self.configuration.tracing.attributeKeys
-        //     s.attributes[attrs.requestMethod] = request.method.rawValue
-        //     s.attributes["loc"] = "\(#fileID):\(#line)"
-        //     span = s
-        // } else {
-        //     span = nil
-        // }
-        // #endif
-
         let taskEL: EventLoop
         switch eventLoopPreference.preference {
         case .indifferent:

Sources/AsyncHTTPClient/NIOTransportServices/NWErrorHandler.swift

@@ -25,11 +25,7 @@ extension HTTPClient {
     /// A wrapper for `POSIX` errors thrown by `Network.framework`.
     public struct NWPOSIXError: Error, CustomStringConvertible {
         /// POSIX error code (enum)
-        #if compiler(>=6.1)
-        nonisolated(unsafe) public let errorCode: POSIXErrorCode
-        #else
         public let errorCode: POSIXErrorCode
-        #endif
 
         /// actual reason, in human readable form
         private let reason: String

Sources/AsyncHTTPClient/TracingSupport.swift

@@ -34,14 +34,6 @@ struct HTTPHeadersInjector: Injector, @unchecked Sendable {
 }
 #endif  // TracingSupport
 
-// #if TracingSupport
-// @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
-// typealias HTTPClientTracingSupportTracerType = any Tracer
-// #else
-// enum TracingSupportDisabledTracer {}
-// typealias HTTPClientTracingSupportTracerType = TracingSupportDisabledTracer
-// #endif
-
 protocol _TracingSupportOperations {
     // associatedtype TracerType
 
@@ -99,8 +91,7 @@ extension RequestBag.LoopBoundState {
 
     mutating func failRequestSpanAsCancelled() {
         if #available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) {
-            let error = CancellationError()
-            failRequestSpan(error: error)
+            failRequestSpan(error: CancellationError())
         } else {
             fatalError("Unexpected configuration; expected availability of CancellationError")
         }

Tests/AsyncHTTPClientTests/HTTPClientBase.swift

@@ -61,11 +61,10 @@ class XCTestCaseHTTPClientTestsBaseClass: XCTestCase {
             }
         )
         backgroundLogger.logLevel = .trace
-        let configuration = HTTPClient.Configuration().enableFastFailureModeForTesting()
 
         self.defaultClient = HTTPClient(
             eventLoopGroupProvider: .shared(self.clientGroup),
-            configuration: configuration,
+            configuration: HTTPClient.Configuration().enableFastFailureModeForTesting(),
             backgroundActivityLogger: backgroundLogger
         )
     }