From de76674123bc1485cabe234321b39c517c920020 Mon Sep 17 00:00:00 2001
From: Sichan Yoo <chanyoo@amazon.com>
Date: Tue, 26 Nov 2024 08:49:22 -0800
Subject: [PATCH 1/3] Clean up logging

---
 .../FlexibleChecksumsResponseMiddleware.swift |  2 +-
 .../FlexibleChecksumsMiddlewareTests.swift    |  6 ++--
 .../Documentation.docc/logging.md             | 28 +++++++++++++++----
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/FlexibleChecksumsResponseMiddleware.swift b/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/FlexibleChecksumsResponseMiddleware.swift
index b4b4ba23c55..223171805f5 100644
--- a/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/FlexibleChecksumsResponseMiddleware.swift
+++ b/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/FlexibleChecksumsResponseMiddleware.swift
@@ -43,7 +43,7 @@ public struct FlexibleChecksumsResponseMiddleware<OperationStackInput, Operation
         guard let checksumHeader = checksumHeaderIsPresent else {
             let message =
                 "User requested checksum validation, but the response headers did not contain any valid checksums"
-            logger.warn(message)
+            logger.warning(message)
             return
         }
 
diff --git a/Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests/Middlewares/FlexibleChecksumsMiddlewareTests.swift b/Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests/Middlewares/FlexibleChecksumsMiddlewareTests.swift
index d4b8efc6381..06ad27a56b4 100644
--- a/Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests/Middlewares/FlexibleChecksumsMiddlewareTests.swift
+++ b/Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests/Middlewares/FlexibleChecksumsMiddlewareTests.swift
@@ -382,14 +382,14 @@ class FlexibleChecksumsMiddlewareTests: XCTestCase {
 }
 
 class TestLogger: LogAgent {
-    var name: String
+    var label: String
 
     var messages: [(level: LogAgentLevel, message: String)] = []
 
     var level: LogAgentLevel
 
-    init(name: String = "Test", messages: [(level: LogAgentLevel, message: String)] = [], level: LogAgentLevel = .info) {
-        self.name = name
+    init(label: String = "Test", messages: [(level: LogAgentLevel, message: String)] = [], level: LogAgentLevel = .info) {
+        self.label = label
         self.messages = messages
         self.level = level
     }
diff --git a/Sources/Core/AWSSDKForSwift/Documentation.docc/logging.md b/Sources/Core/AWSSDKForSwift/Documentation.docc/logging.md
index 71e6cf9a9f0..cfd87c385fb 100644
--- a/Sources/Core/AWSSDKForSwift/Documentation.docc/logging.md
+++ b/Sources/Core/AWSSDKForSwift/Documentation.docc/logging.md
@@ -3,15 +3,33 @@
 The AWS SDK for Swift uses SwiftLog for high performant logging.  Many of our calls are issued to the `debug` level of output, which are disabled in the console by default.  To see debug output to your console, you can add the following code to your application in a place where you know that the code will be called once and only once:
 ```swift
 import ClientRuntime
-SDKLoggingSystem().initialize(logLevel: .debug)
+await SDKLoggingSystem().initialize(logLevel: .debug)
 ```
 
 Alternatively, if you need finer grain control of instances of SwiftLog, you can call `SDKLoggingSystem::add` to control specific instances of the log handler.  For example:
 ```swift
 import ClientRuntime
 
-let system = SDKLoggingSystem()
-system.add(logHandlerFactory: S3ClientLogHandlerFactory(logLevel: .debug))
-system.add(logHandlerFactory: CRTClientEngineLogHandlerFactory(logLevel: .info))
-system.initialize()
+let loggingSystem = SDKLoggingSystem()
+
+// Adds custom log handler for S3Client so that only .debug or severe leveled messages get logged for S3Client.
+await loggingSystem.addLogHandlerFactory(logHandlerFactory: S3ClientLogHandlerFactory(logLevel: .debug))
+await loggingSystem.initialize()
+
+// Example implementation of a service-specific log handler factory.
+public struct S3ClientLogHandlerFactory: SDKLogHandlerFactory {
+    // This label value must be the name of the service client you want the log handler to apply to.
+    public var label = "S3Client"
+    let logLevel: Logger.Level
+
+    public func construct(label: String) -> LogHandler {
+        var handler = StreamLogHandler.standardOutput(label: label)
+        handler.logLevel = logLevel
+        return handler
+    }
+
+    public init(logLevel: Logger.Level) {
+        self.logLevel = logLevel
+    }
+}
 ```

From 504aa44fa10cb618f230eeac5310c991932ad8be Mon Sep 17 00:00:00 2001
From: Sichan Yoo <chanyoo@amazon.com>
Date: Tue, 26 Nov 2024 09:07:07 -0800
Subject: [PATCH 2/3] Update test

---
 .../Middlewares/FlexibleChecksumsMiddlewareTests.swift   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests/Middlewares/FlexibleChecksumsMiddlewareTests.swift b/Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests/Middlewares/FlexibleChecksumsMiddlewareTests.swift
index 06ad27a56b4..55f3e0a825b 100644
--- a/Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests/Middlewares/FlexibleChecksumsMiddlewareTests.swift
+++ b/Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests/Middlewares/FlexibleChecksumsMiddlewareTests.swift
@@ -16,6 +16,7 @@ import class SmithyStreams.BufferedStream
 import class SmithyChecksums.ChunkedStream
 import enum SmithyChecksums.ChecksumMismatchException
 import AWSClientRuntime
+import Logging
 
 class FlexibleChecksumsMiddlewareTests: XCTestCase {
     private var builtContext: Context!
@@ -384,17 +385,15 @@ class FlexibleChecksumsMiddlewareTests: XCTestCase {
 class TestLogger: LogAgent {
     var label: String
 
-    var messages: [(level: LogAgentLevel, message: String)] = []
+    var messages: [(level: Logger.Level, message: String)] = []
 
-    var level: LogAgentLevel
-
-    init(label: String = "Test", messages: [(level: LogAgentLevel, message: String)] = [], level: LogAgentLevel = .info) {
+    init(label: String = "Test", messages: [(level: Logger.Level, message: String)] = [], level: Logger.Level = .info) {
         self.label = label
         self.messages = messages
         self.level = level
     }
 
-    func log(level: LogAgentLevel = .info, message: @autoclosure () -> String, metadata: @autoclosure () -> [String : String]? = nil, source: @autoclosure () -> String = "ChecksumUnitTests", file: String = #file, function: String = #function, line: UInt = #line) {
+    func log(level: Logger.Level = .info, message: @autoclosure () -> String, metadata: @autoclosure () -> [String : String]? = nil, source: @autoclosure () -> String = "ChecksumUnitTests", file: String = #file, function: String = #function, line: UInt = #line) {
         messages.append((level: level, message: message()))
     }
 }

From 558872821f0c735cf3f2b7eb43836c8bb2657f03 Mon Sep 17 00:00:00 2001
From: Sichan Yoo <chanyoo@amazon.com>
Date: Tue, 26 Nov 2024 09:26:33 -0800
Subject: [PATCH 3/3] Update test

---
 .../Middlewares/FlexibleChecksumsMiddlewareTests.swift     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests/Middlewares/FlexibleChecksumsMiddlewareTests.swift b/Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests/Middlewares/FlexibleChecksumsMiddlewareTests.swift
index 55f3e0a825b..c3c31dc38c1 100644
--- a/Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests/Middlewares/FlexibleChecksumsMiddlewareTests.swift
+++ b/Sources/Core/AWSClientRuntime/Tests/AWSClientRuntimeTests/Middlewares/FlexibleChecksumsMiddlewareTests.swift
@@ -385,15 +385,14 @@ class FlexibleChecksumsMiddlewareTests: XCTestCase {
 class TestLogger: LogAgent {
     var label: String
 
-    var messages: [(level: Logger.Level, message: String)] = []
+    var messages: [(level: Logging.Logger.Level, message: String)] = []
 
-    init(label: String = "Test", messages: [(level: Logger.Level, message: String)] = [], level: Logger.Level = .info) {
+    init(label: String = "Test", messages: [(level: Logging.Logger.Level, message: String)] = [], level: Logging.Logger.Level = .info) {
         self.label = label
         self.messages = messages
-        self.level = level
     }
 
-    func log(level: Logger.Level = .info, message: @autoclosure () -> String, metadata: @autoclosure () -> [String : String]? = nil, source: @autoclosure () -> String = "ChecksumUnitTests", file: String = #file, function: String = #function, line: UInt = #line) {
+    func log(level: Logging.Logger.Level = .info, message: @autoclosure () -> String, metadata: @autoclosure () -> [String : String]? = nil, source: @autoclosure () -> String = "ChecksumUnitTests", file: String = #file, function: String = #function, line: UInt = #line) {
         messages.append((level: level, message: message()))
     }
 }