swift-format and remove hacky platform setting

Author: ktoso

Package.swift

@@ -35,9 +35,6 @@ let strictConcurrencySettings: [SwiftSetting] = {
 
 let package = Package(
     name: "async-http-client",
-    platforms: [ // FIXME: must remove this
-        .macOS("10.15")
-    ],
     products: [
         .library(name: "AsyncHTTPClient", targets: ["AsyncHTTPClient"])
     ],
@@ -82,7 +79,11 @@ let package = Package(
                 .product(name: "Atomics", package: "swift-atomics"),
                 .product(name: "Algorithms", package: "swift-algorithms"),
                 // Observability support
-                .product(name: "Tracing", package: "swift-distributed-tracing", condition: .when(traits: ["TracingSupport"])),
+                .product(
+                    name: "Tracing",
+                    package: "swift-distributed-tracing",
+                    condition: .when(traits: ["TracingSupport"])
+                ),
             ],
             swiftSettings: strictConcurrencySettings
         ),

[email protected]

@@ -35,9 +35,6 @@ let strictConcurrencySettings: [SwiftSetting] = {
 
 let package = Package(
     name: "async-http-client",
-    platforms: [ // FIXME: must remove this
-        .macOS("10.15")
-    ],
     products: [
         .library(name: "AsyncHTTPClient", targets: ["AsyncHTTPClient"])
     ],
@@ -82,8 +79,16 @@ let package = Package(
                 .product(name: "Atomics", package: "swift-atomics"),
                 .product(name: "Algorithms", package: "swift-algorithms"),
                 // Observability support
-                .product(name: "Tracing", package: "swift-distributed-tracing", condition: .when(traits: ["TracingSupport"])),
-                .product(name: "InMemoryTracing", package: "swift-distributed-tracing", condition: .when(traits: ["TracingSupport"])),
+                .product(
+                    name: "Tracing",
+                    package: "swift-distributed-tracing",
+                    condition: .when(traits: ["TracingSupport"])
+                ),
+                .product(
+                    name: "InMemoryTracing",
+                    package: "swift-distributed-tracing",
+                    condition: .when(traits: ["TracingSupport"])
+                ),
             ],
             swiftSettings: strictConcurrencySettings
         ),
@@ -104,8 +109,16 @@ let package = Package(
                 .product(name: "Atomics", package: "swift-atomics"),
                 .product(name: "Algorithms", package: "swift-algorithms"),
                 // Observability support
-                .product(name: "Tracing", package: "swift-distributed-tracing", condition: .when(traits: ["TracingSupport"])),
-                .product(name: "InMemoryTracing", package: "swift-distributed-tracing", condition: .when(traits: ["TracingSupport"])),
+                .product(
+                    name: "Tracing",
+                    package: "swift-distributed-tracing",
+                    condition: .when(traits: ["TracingSupport"])
+                ),
+                .product(
+                    name: "InMemoryTracing",
+                    package: "swift-distributed-tracing",
+                    condition: .when(traits: ["TracingSupport"])
+                ),
             ],
             resources: [
                 .copy("Resources/self_signed_cert.pem"),

Sources/AsyncHTTPClient/AsyncAwait/HTTPClient+execute.swift

@@ -15,12 +15,13 @@
 import Logging
 import NIOCore
 import NIOHTTP1
+
+import struct Foundation.URL
+
 #if TracingSupport
 import Tracing
 #endif
 
-import struct Foundation.URL
-
 @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 extension HTTPClient {
     /// Execute arbitrary HTTP requests.
@@ -58,7 +59,7 @@ extension HTTPClient {
             }
         }
         #endif
-        
+
         return try await doExecute()
     }
 }

Sources/AsyncHTTPClient/AsyncAwait/Transaction.swift

@@ -20,7 +20,7 @@ import NIOSSL
 
 #if TracingSupport
 import Tracing
-#endif // TracingSupport
+#endif  // TracingSupport
 
 @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 @usableFromInline
@@ -60,7 +60,7 @@ final class Transaction:
         self.span = span
         self.state = NIOLockedValueBox(StateMachine(responseContinuation))
     }
-    #endif // TracingSupport 
+    #endif  // TracingSupport
 
     init(
         request: HTTPClientRequest.Prepared,

Sources/AsyncHTTPClient/HTTPClient.swift

@@ -81,7 +81,7 @@ public final class HTTPClient: Sendable {
     public var tracer: (any Tracer)? {
         configuration.tracing.tracer
     }
-    #endif // TracingSupport
+    #endif  // TracingSupport
 
     public static let loggingDisabled = Logger(label: "AHC-do-not-log", factory: { _ in SwiftLogNoOpLogHandler() })
 
@@ -684,7 +684,7 @@ public final class HTTPClient: Sendable {
         deadline: NIODeadline? = nil,
         logger: Logger?
     ) -> Task<Delegate.Response> {
-        return self._execute(
+        self._execute(
             request: request,
             delegate: delegate,
             eventLoop: eventLoopPreference,
@@ -718,7 +718,7 @@ public final class HTTPClient: Sendable {
             requestID: globalRequestID.wrappingIncrementThenLoad(ordering: .relaxed)
         )
 
-        // #if TracingSupport 
+        // #if TracingSupport
         // let span: (any Span)? // we may be still executing the same span, e.g. under redirection etc.
         // if let activeSpan {
         //     span = activeSpan
@@ -732,7 +732,7 @@ public final class HTTPClient: Sendable {
         //     span = nil
         // }
         // #endif
-        
+
         let taskEL: EventLoop
         switch eventLoopPreference.preference {
         case .indifferent:
@@ -1086,19 +1086,19 @@ public final class HTTPClient: Sendable {
 
     #if TracingSupport
     public struct TracingConfiguration: Sendable {
-        
-        @usableFromInline 
-        var _tracer: Optional<any Sendable> // erasure trick so we don't have to make Configuration @available
 
-        /// Tracer that should be used by the HTTPClient. 
-        /// 
+        @usableFromInline
+        var _tracer: Optional<any Sendable>  // erasure trick so we don't have to make Configuration @available
+
+        /// Tracer that should be used by the HTTPClient.
+        ///
         /// This is selected at configuration creation time, and if no tracer is passed explicitly,
         /// (including `nil` in order to disable traces), the default global bootstrapped tracer will
         /// be stored in this property, and used for all subsequent requests made by this client.
         @inlinable
         @available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
-        public var tracer: (any Tracer)? { 
-            get { 
+        public var tracer: (any Tracer)? {
+            get {
                 guard let _tracer else {
                     return nil
                 }
@@ -1121,13 +1121,13 @@ public final class HTTPClient: Sendable {
 
         /// Span attribute keys that the HTTPClient should set automatically.
         /// This struct allows the configuration of the attribute names (keys) which will be used for the apropriate values.
-        public struct AttributeKeys: Sendable { 
+        public struct AttributeKeys: Sendable {
             public var requestMethod: String = "http.request.method"
             public var requestBodySize: String = "http.request.body.size"
 
             public var responseBodySize: String = "http.response.size"
             public var responseStatusCode: String = "http.status_code"
-            
+
             public var httpFlavor: String = "http.flavor"
 
             public init() {}

Sources/AsyncHTTPClient/HTTPHandler.swift

@@ -927,9 +927,9 @@ extension HTTPClient {
         public let eventLoop: EventLoop
         /// The `Logger` used by the `Task` for logging.
         public let logger: Logger  // We are okay to store the logger here because a Task is for only one request.
-        
+
         #if TracingSupport
-        public let tracer: (any Tracer)?  // We are okay to store the tracer here because a Task is for only one request.
+        public let tracer: (any Tracer)?  // Ok to store the tracer here because a Task is for only one request.
         #endif
 
         let promise: EventLoopPromise<Response>
@@ -986,7 +986,12 @@ extension HTTPClient {
         }
 
         #if TracingSupport
-        init(eventLoop: EventLoop, logger: Logger, tracer: (any Tracer)?, makeOrGetFileIOThreadPool: @escaping @Sendable () -> NIOThreadPool) {
+        init(
+            eventLoop: EventLoop,
+            logger: Logger,
+            tracer: (any Tracer)?,
+            makeOrGetFileIOThreadPool: @escaping @Sendable () -> NIOThreadPool
+        ) {
             self.eventLoop = eventLoop
             self.promise = eventLoop.makePromise()
             self.logger = logger

Sources/AsyncHTTPClient/RequestBag.swift

@@ -54,11 +54,11 @@ final class RequestBag<Delegate: HTTPClientResponseDelegate & Sendable>: Sendabl
         var consumeBodyPartStackDepth: Int
         // if a redirect occurs, we store the task for it so we can propagate cancellation
         var redirectTask: HTTPClient.Task<Delegate.Response>? = nil
-        
-        #if TracingSupport 
+
+        #if TracingSupport
         // The current span, representing the entire request/response made by an execute call.
         var activeSpan: (any Span)? = nil
-        #endif // TracingSupport
+        #endif  // TracingSupport
     }
 
     private let loopBoundState: NIOLoopBoundBox<LoopBoundState>

Sources/AsyncHTTPClient/TracingSupport.swift

@@ -25,14 +25,14 @@ import Tracing
 #if TracingSupport
 struct HTTPHeadersInjector: Injector, @unchecked Sendable {
     static let shared: HTTPHeadersInjector = HTTPHeadersInjector()
-    
+
     private init() {}
 
     func inject(_ value: String, forKey name: String, into headers: inout HTTPHeaders) {
         headers.add(name: name, value: value)
     }
 }
-#endif // TracingSupport
+#endif  // TracingSupport
 
 #if TracingSupport
 typealias HTTPClientTracingSupportTracerType = any Tracer
@@ -52,12 +52,12 @@ protocol _TracingSupportOperations {
     mutating func failRequestSpan(error: any Error)
 
     /// Ends the active overall span upon receipt of the response head.
-    /// 
+    ///
     /// If the status code is in error range, this will automatically fail the span.
     mutating func endRequestSpan(response: HTTPResponseHead)
 }
 
-extension RequestBag.LoopBoundState: _TracingSupportOperations { }
+extension RequestBag.LoopBoundState: _TracingSupportOperations {}
 
 #if !TracingSupport
 /// Operations used to start/end spans at apropriate times from the Request lifecycle.
@@ -66,15 +66,15 @@ extension RequestBag.LoopBoundState {
 
     @inlinable
     mutating func startRequestSpan(tracer: TracerType?) {}
-    
+
     @inlinable
     mutating func failRequestSpan(error: any Error) {}
 
     @inlinable
     mutating func endRequestSpan(response: HTTPResponseHead) {}
 }
 
-#else // TracingSupport
+#else  // TracingSupport
 
 extension RequestBag.LoopBoundState {
     typealias TracerType = Tracer
@@ -84,13 +84,16 @@ extension RequestBag.LoopBoundState {
             return
         }
 
-        assert(self.activeSpan == nil, "Unexpected active span when starting new request span! Was: \(String(describing: self.activeSpan))")
+        assert(
+            self.activeSpan == nil,
+            "Unexpected active span when starting new request span! Was: \(String(describing: self.activeSpan))"
+        )
         self.activeSpan = tracer.startSpan("\(request.method)")
         self.activeSpan?.attributes["loc"] = "\(#fileID):\(#line)"
     }
 
     // TODO: should be able to record the reason for the failure, e.g. timeout, cancellation etc.
-    mutating func failRequestSpan(error: any Error) { 
+    mutating func failRequestSpan(error: any Error) {
         guard let span = activeSpan else {
             return
         }
@@ -114,4 +117,4 @@ extension RequestBag.LoopBoundState {
     }
 }
 
-#endif // TracingSupport
+#endif  // TracingSupport

Tests/AsyncHTTPClientTests/HTTPClientBase.swift

@@ -62,7 +62,7 @@ class XCTestCaseHTTPClientTestsBaseClass: XCTestCase {
         )
         backgroundLogger.logLevel = .trace
         var configuration = HTTPClient.Configuration().enableFastFailureModeForTesting()
-        
+
         self.defaultClient = HTTPClient(
             eventLoopGroupProvider: .shared(self.clientGroup),
             configuration: configuration,

Tests/AsyncHTTPClientTests/HTTPClientTracingTests.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if TracingSupport 
+#if TracingSupport
 
 @_spi(Tracing) import AsyncHTTPClient  // NOT @testable - tests that need @testable go into HTTPClientInternalTests.swift
 import Atomics
@@ -36,7 +36,7 @@ import Network
 import Tracing
 import InMemoryTracing
 
-fileprivate func makeTracedHTTPClient(tracer: InMemoryTracer) -> HTTPClient {
+private func makeTracedHTTPClient(tracer: InMemoryTracer) -> HTTPClient {
     var config = HTTPClient.Configuration()
     config.httpVersion = .automatic
     config.tracing.tracer = tracer
@@ -80,7 +80,7 @@ final class HTTPClientTracingTests: XCTestCaseHTTPClientTestsBaseClass {
 
         XCTAssertEqual(span.operationName, "GET")
     }
-    
+
     func testTrace_post_sync() throws {
         let url = self.defaultHTTPBinURLPrefix + "echo-method"
         let _ = try client.post(url: url).wait()
@@ -107,4 +107,4 @@ final class HTTPClientTracingTests: XCTestCaseHTTPClientTestsBaseClass {
     }
 }
 
-#endif
+#endif