refactor more and more

Author: dayaffe

Sources/ClientRuntime/Config/DefaultSDKRuntimeConfiguration.swift

@@ -16,7 +16,6 @@ import struct SmithyRetries.ExponentialBackoffStrategy
 import protocol SmithyRetriesAPI.RetryErrorInfoProvider
 import protocol SmithyRetriesAPI.RetryStrategy
 import struct SmithyRetriesAPI.RetryStrategyOptions
-import class SmithySwiftNIO.SwiftNIOHTTPClient
 
 public struct DefaultSDKRuntimeConfiguration<DefaultSDKRuntimeRetryStrategy: RetryStrategy,
     DefaultSDKRuntimeRetryErrorInfoProvider: RetryErrorInfoProvider> {
@@ -92,21 +91,20 @@ public extension DefaultSDKRuntimeConfiguration {
     static func makeClient(
         httpClientConfiguration: HttpClientConfiguration = defaultHttpClientConfiguration
     ) -> HTTPClient {
-        return SwiftNIOHTTPClient(httpClientConfiguration: httpClientConfiguration)
-        // #if os(iOS) || os(tvOS) || os(watchOS) || os(visionOS) || os(macOS)
-        // return URLSessionHTTPClient(httpClientConfiguration: httpClientConfiguration)
-        // #else
-        // let connectTimeoutMs = httpClientConfiguration.connectTimeout.map { UInt32($0 * 1000) }
-        // let socketTimeout = UInt32(httpClientConfiguration.socketTimeout)
-        // let config = CRTClientEngineConfig(
-        //     maxConnectionsPerEndpoint: httpClientConfiguration.maxConnections,
-        //     telemetry: httpClientConfiguration.telemetry ?? CRTClientEngine.noOpCrtClientEngineTelemetry,
-        //     connectTimeoutMs: connectTimeoutMs,
-        //     crtTlsOptions: httpClientConfiguration.tlsConfiguration as? CRTClientTLSOptions,
-        //     socketTimeout: socketTimeout
-        // )
-        // return CRTClientEngine(config: config)
-        // #endif
+        #if os(iOS) || os(tvOS) || os(watchOS) || os(visionOS) || os(macOS)
+        return URLSessionHTTPClient(httpClientConfiguration: httpClientConfiguration)
+        #else
+        let connectTimeoutMs = httpClientConfiguration.connectTimeout.map { UInt32($0 * 1000) }
+        let socketTimeout = UInt32(httpClientConfiguration.socketTimeout)
+        let config = CRTClientEngineConfig(
+            maxConnectionsPerEndpoint: httpClientConfiguration.maxConnections,
+            telemetry: httpClientConfiguration.telemetry ?? CRTClientEngine.noOpCrtClientEngineTelemetry,
+            connectTimeoutMs: connectTimeoutMs,
+            crtTlsOptions: httpClientConfiguration.tlsConfiguration as? CRTClientTLSOptions,
+            socketTimeout: socketTimeout
+        )
+        return CRTClientEngine(config: config)
+        #endif
     }
 
     /// The default HTTP client configuration to use.

Sources/ClientRuntime/Networking/Http/CRT/CRTClientEngine.swift

@@ -19,6 +19,8 @@ import protocol SmithyHTTPAPI.HTTPClient
 import class SmithyHTTPAPI.HTTPRequest
 import class SmithyHTTPAPI.HTTPResponse
 import enum SmithyHTTPAPI.HTTPStatusCode
+import class SmithyHTTPClientAPI.HttpTelemetry
+import enum SmithyHTTPClientAPI.HttpMetricsAttributesKeys
 import class SmithyStreams.BufferedStream
 #if os(Linux)
 import Glibc

Sources/ClientRuntime/Networking/Http/CRT/CRTClientEngineConfig.swift

@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
+import class SmithyHTTPClientAPI.HttpTelemetry
+
 struct CRTClientEngineConfig: Sendable {
 
     /// Max connections the manager can contain per endpoint

Sources/ClientRuntime/Networking/Http/CRT/HTTP2Stream+ByteStream.swift

@@ -8,6 +8,8 @@
 import AwsCommonRuntimeKit
 import struct Smithy.Attributes
 import enum Smithy.ByteStream
+import class SmithyHTTPClientAPI.HttpTelemetry
+import enum SmithyHTTPClientAPI.HttpMetricsAttributesKeys
 
 extension HTTP2Stream {
     /// Returns the recommended size, in bytes, for the data to write

Sources/ClientRuntime/Networking/Http/URLSession/FoundationStreamBridge.swift

@@ -13,6 +13,8 @@ import class Foundation.DispatchQueue
 import class Foundation.InputStream
 import class Foundation.NSObject
 import class Foundation.OutputStream
+import class SmithyHTTPClientAPI.HttpTelemetry
+import enum SmithyHTTPClientAPI.HttpMetricsAttributesKeys
 import class Foundation.RunLoop
 import class Foundation.Stream
 import protocol Foundation.StreamDelegate

Sources/ClientRuntime/Networking/Http/URLSession/URLSessionHTTPClient.swift

@@ -18,6 +18,8 @@ import class Foundation.NSRecursiveLock
 import var Foundation.NSURLAuthenticationMethodClientCertificate
 import var Foundation.NSURLAuthenticationMethodServerTrust
 import struct Foundation.TimeInterval
+import class SmithyHTTPClientAPI.HttpTelemetry
+import enum SmithyHTTPClientAPI.HttpMetricsAttributesKeys
 import class Foundation.URLAuthenticationChallenge
 import struct Foundation.URLComponents
 import class Foundation.URLCredential

…time/Networking/Http/HttpTelemetry.swift …/SmithyHTTPClientAPI/HttpTelemetry.swiftSources/ClientRuntime/Networking/Http/HttpTelemetry.swift renamed to Sources/SmithyHTTPClientAPI/HttpTelemetry.swift Sources/ClientRuntime/Networking/Http/HttpTelemetry.swift renamed to Sources/SmithyHTTPClientAPI/HttpTelemetry.swift

@@ -87,7 +87,7 @@ public class HttpTelemetry: @unchecked Sendable {
 
     public init(
         httpScope: String,
-        telemetryProvider: any TelemetryProvider = DefaultTelemetry.provider,
+        telemetryProvider: any TelemetryProvider,
         meterScope: String? = nil,
         meterAttributes: Attributes? = nil,
         tracerScope: String? = nil,
@@ -189,9 +189,9 @@ private enum RequestState {
     fileprivate static let queued = "queued"
 }
 
-internal enum HttpMetricsAttributesKeys {
+public enum HttpMetricsAttributesKeys {
     fileprivate static let state = AttributeKey<String>(name: "state")
-    internal static let serverAddress = AttributeKey<String>(name: "server.address")
+    public static let serverAddress = AttributeKey<String>(name: "server.address")
 }
 
 public struct HttpMetricsUsage {

Sources/SmithySwiftNIO/SwiftNIOHTTPClient.swift

@@ -23,7 +23,7 @@ import struct Foundation.URLQueryItem
 /// This implementation is thread-safe and supports concurrent request execution.
 public final class SwiftNIOHTTPClient: SmithyHTTPAPI.HTTPClient {
     public static let noOpSwiftNIOHTTPClientTelemetry =
-        ClientRuntime.HttpTelemetry(
+        SmithyHTTPClientAPI.HttpTelemetry(
         httpScope: "SwiftNIOHTTPClient",
         telemetryProvider: ClientRuntime.DefaultTelemetry.provider
     )
@@ -34,7 +34,7 @@ public final class SwiftNIOHTTPClient: SmithyHTTPAPI.HTTPClient {
     private let allocator: ByteBufferAllocator
 
     /// HTTP Client Telemetry
-    private let telemetry: ClientRuntime.HttpTelemetry
+    private let telemetry: SmithyHTTPClientAPI.HttpTelemetry
 
     /// Logger for HTTP-related events.
     private var logger: LogAgent