awslabs · sebsto · May 14, 2026 · May 14, 2026 · May 14, 2026 · May 14, 2026
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -42,8 +42,8 @@ on:
       matrix_linux_swift_container_image:
         type: string
         # Note: we don't use Amazon Linux 2 here because zip is not installed by default.
-        description: "Container image for the matrix test jobs. Defaults to Swift 6.2"
-        default: "swift:6.2"
+        description: "Container image for the matrix test jobs. Defaults to Swift 6.3"
+        default: "swift:6.3"
 
 ## We are cancelling previously triggered workflow runs
 concurrency:

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -15,17 +15,17 @@ jobs:
       license_header_check_project_name: "SwiftAWSLambdaRuntime"
       shell_check_enabled: true
       python_lint_check_enabled: true
-      api_breakage_check_container_image: "swift:6.2-noble"
-      docs_check_container_image: "swift:6.2-noble"
-      format_check_container_image: "swift:6.2-noble"
+      api_breakage_check_container_image: "swift:6.3-noble"
+      docs_check_container_image: "swift:6.3-noble"
+      format_check_container_image: "swift:6.3-noble"
       yamllint_check_enabled: true
 
   unit-tests:
     name: Unit tests
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
     with:
       enable_windows_checks: false
-      linux_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}, {\"swift_version\": \"5.10\"}]"
+      linux_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}, {\"swift_version\": \"5.10\"}, {\"swift_version\": \"6.0\"}]"
       swift_flags: "--explicit-target-dependency-import-check error"
       swift_nightly_flags: "--explicit-target-dependency-import-check error"
       enable_linux_static_sdk_build: true

diff --git a/Examples/APIGatewayV1/Package.swift b/Examples/APIGatewayV1/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/APIGatewayV2+LambdaAuthorizer/Package.swift b/Examples/APIGatewayV2+LambdaAuthorizer/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/APIGatewayV2/Package.swift b/Examples/APIGatewayV2/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/BackgroundTasks/Package.swift b/Examples/BackgroundTasks/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/CDK/Package.swift b/Examples/CDK/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/HelloJSON/Package.swift b/Examples/HelloJSON/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/HelloWorld/Package.swift b/Examples/HelloWorld/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/HelloWorldNoTraits/Package.swift b/Examples/HelloWorldNoTraits/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/HummingbirdLambda/Package.swift b/Examples/HummingbirdLambda/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.2
+// swift-tools-version: 6.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

diff --git a/Examples/JSONLogging/Package.swift b/Examples/JSONLogging/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/ManagedInstances/Package.swift b/Examples/ManagedInstances/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/ManagedInstances/README.md b/Examples/ManagedInstances/README.md
@@ -12,7 +12,7 @@ This example demonstrates deploying Swift Lambda functions to Lambda Managed Ins
 
 - AWS CLI configured with appropriate permissions
 - SAM CLI installed
-- Swift 6.0+ installed
+- Swift 6.3+ installed
 - An existing [Lambda Managed Instances capacity provider](https://docs.aws.amazon.com/lambda/latest/dg/lambda-managed-instances-capacity-providers.html)
 
 ## Capacity Provider Configuration

diff --git a/Examples/MultiSourceAPI/Package.swift b/Examples/MultiSourceAPI/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/MultiTenant/Package.swift b/Examples/MultiTenant/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/MultiTenant/README.md b/Examples/MultiTenant/README.md
@@ -157,7 +157,7 @@ requestParameters:
 
 ### Prerequisites
 
-- Swift (>=6.2)
+- Swift (>=6.3)
 - Docker (for cross-compilation to Amazon Linux)
 - AWS SAM CLI (>=1.147.1)
 - AWS CLI configured with appropriate credentials

diff --git a/Examples/ResourcesPackaging/Package.swift b/Examples/ResourcesPackaging/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/S3EventNotifier/Package.swift b/Examples/S3EventNotifier/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.2
+// swift-tools-version: 6.3
 import PackageDescription
 
 let package = Package(

diff --git a/Examples/S3_AWSSDK/Package.swift b/Examples/S3_AWSSDK/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.2
+// swift-tools-version: 6.3
 
 import PackageDescription
 

diff --git a/Examples/S3_Soto/Package.swift b/Examples/S3_Soto/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.2
+// swift-tools-version: 6.3
 
 import PackageDescription
 

diff --git a/Examples/ServiceLifecycle+Postgres/Package.swift b/Examples/ServiceLifecycle+Postgres/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.2
+// swift-tools-version: 6.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

diff --git a/Examples/Streaming+APIGateway/Package.swift b/Examples/Streaming+APIGateway/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/Streaming+Codable/Package.swift b/Examples/Streaming+Codable/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.2
+// swift-tools-version: 6.3
 
 import PackageDescription
 

diff --git a/Examples/Streaming+FunctionUrl/Package.swift b/Examples/Streaming+FunctionUrl/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/Testing/Package.swift b/Examples/Testing/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Examples/Tutorial/Package.swift b/Examples/Tutorial/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.2
+// swift-tools-version: 6.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

diff --git a/Examples/_MyFirstFunction/create_and_deploy_function.sh b/Examples/_MyFirstFunction/create_and_deploy_function.sh
@@ -85,7 +85,7 @@ create_swift_project() {
     # swift package add-target-dependency AWSLambdaRuntime MyLambda --package swift-aws-lambda-runtime
     # swift package add-target-dependency AWSLambdaEvents MyLambda --package swift-aws-lambda-events
     cat <<EOF > Package.swift
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 
 import PackageDescription
 

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.1
 
 import PackageDescription
 

diff --git a/Package@swift-6.0.swift b/Package@swift-6.0.swift
diff --git a/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-01-package.swift b/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-01-package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

diff --git a/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-02-package.swift b/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-02-package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

diff --git a/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-03-package.swift b/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-03-package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

diff --git a/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-04-package.swift b/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-04-package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

diff --git a/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-05-package.swift b/Sources/AWSLambdaRuntime/Docs.docc/Resources/code/03-02-05-package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

diff --git a/Sources/AWSLambdaRuntime/Docs.docc/quick-setup.md b/Sources/AWSLambdaRuntime/Docs.docc/quick-setup.md
@@ -30,7 +30,7 @@ swift package init --type executable
 2. Add dependencies on `AWSLambdaRuntime` library 
 
 ```swift
-// swift-tools-version:6.2
+// swift-tools-version:6.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

diff --git a/Sources/AWSLambdaRuntime/Logging/JSONLogHandler.swift b/Sources/AWSLambdaRuntime/Logging/JSONLogHandler.swift
@@ -53,6 +53,7 @@ public struct JSONLogHandler: LogHandler {
         self.traceID = traceID
     }
 
+    @available(*, deprecated, message: "Use log(event:) instead")
     public func log(
         level: Logger.Level,
         message: Logger.Message,
@@ -62,22 +63,38 @@ public struct JSONLogHandler: LogHandler {
         function: String,
         line: UInt
     ) {
+        self.log(
+            event: LogEvent(
+                level: level,
+                message: message,
+                metadata: metadata,
+                source: source as String?,
+                file: file,
+                function: function,
+                line: line
+            )
+        )
+    }
+
+    public func log(event: LogEvent) {
         // Merge metadata
         var allMetadata = self.metadata
-        if let metadata = metadata {
+        if let metadata = event.metadata {
             allMetadata.merge(metadata) { _, new in new }
         }
 
         // Create log entry struct
         let logEntry = LogEntry(
             timestamp: Date(),
-            level: Self.mapLogLevel(level),
-            message: message.description,
+            level: Self.mapLogLevel(event.level),
+            message: event.message.description,
+            source: event.source,
+            error: event.error.map { String(describing: $0) },
             requestId: self.requestID,
             traceId: self.traceID,
-            file: file,
-            function: function,
-            line: line,
+            file: event.file,
+            function: event.function,
+            line: event.line,
             metadata: allMetadata.isEmpty ? nil : allMetadata.mapValues { $0.description }
         )
 
@@ -175,6 +192,8 @@ public struct JSONLogHandler: LogHandler {
         let timestamp: Date
         let level: String
         let message: String
+        let source: String
+        let error: String?
         let requestId: String
         let traceId: String
         let file: String