From a4734c7551694dd90a71aa5d1e4818ec9ae7b47f Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Mon, 16 Dec 2024 11:30:46 -0500
Subject: [PATCH 001/183] fix: create JMESPATH flattenIfPossible functions for
 Lists (#1169)

---
 .../smithy/kotlin/runtime/util/JMESPath.kt    | 10 ++++
 .../kotlin/runtime/util/JmesPathTest.kt       | 49 +++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/util/JmesPathTest.kt

diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/JMESPath.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/JMESPath.kt
index 2a7cdd9791..9b691a79a2 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/JMESPath.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/JMESPath.kt
@@ -66,6 +66,7 @@ public fun Any?.type(): String = when (this) {
     else -> throw Exception("Undetected type for: $this")
 }
 
+// Collection `flattenIfPossible` functions
 @InternalApi
 @JvmName("noOpUnnestedCollection")
 public inline fun <reified T> Collection<T>.flattenIfPossible(): Collection<T> = this
@@ -73,3 +74,12 @@ public inline fun <reified T> Collection<T>.flattenIfPossible(): Collection<T> =
 @InternalApi
 @JvmName("flattenNestedCollection")
 public inline fun <reified T> Collection<Collection<T>>.flattenIfPossible(): Collection<T> = flatten()
+
+// List `flattenIfPossible` functions
+@InternalApi
+@JvmName("noOpUnnestedCollection")
+public inline fun <reified T> List<T>.flattenIfPossible(): List<T> = this
+
+@InternalApi
+@JvmName("flattenNestedCollection")
+public inline fun <reified T> List<List<T>>.flattenIfPossible(): List<T> = flatten()
diff --git a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/util/JmesPathTest.kt b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/util/JmesPathTest.kt
new file mode 100644
index 0000000000..e867f1e8a1
--- /dev/null
+++ b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/util/JmesPathTest.kt
@@ -0,0 +1,49 @@
+package aws.smithy.kotlin.runtime.util
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class JmesPathTest {
+    @Test
+    fun flattenNestedLists() {
+        val nestedList = listOf(
+            listOf(1, 2, 3),
+            listOf(4, 5),
+            listOf(6),
+        )
+        val flattenedList = nestedList.flattenIfPossible()
+        assertEquals(listOf(1, 2, 3, 4, 5, 6), flattenedList)
+    }
+
+    @Test
+    fun flattenEmptyNestedLists() {
+        val nestedList = listOf(
+            listOf<Int>(),
+            listOf(),
+            listOf(),
+        )
+        val flattenedList = nestedList.flattenIfPossible()
+        assertTrue(flattenedList.isEmpty())
+    }
+
+    @Test
+    fun flattenNestedEmptyAndNonEmptyNestedLists() {
+        val nestedList = listOf(
+            listOf(1, 2),
+            listOf(),
+            listOf(3, 4, 5),
+        )
+        val flattenedList = nestedList.flattenIfPossible()
+        assertEquals(listOf(1, 2, 3, 4, 5), flattenedList)
+    }
+
+    @Test
+    fun flattenList() {
+        val nestedList = listOf(
+            listOf(1, 2, 3),
+        )
+        val flattenedList = nestedList.flattenIfPossible()
+        assertEquals(listOf(1, 2, 3), flattenedList)
+    }
+}

From 7911a94dd5f6ee27f2652aeb7c8031e2dce79215 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Mon, 16 Dec 2024 16:51:49 +0000
Subject: [PATCH 002/183] chore: release 1.3.30

---
 CHANGELOG.md      | 2 ++
 gradle.properties | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 892e2b1248..5633a30d73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.3.30] - 12/16/2024
+
 ## [1.3.29] - 12/12/2024
 
 ## [1.3.28] - 12/03/2024
diff --git a/gradle.properties b/gradle.properties
index f35cfc1d5a..377ff6666b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.3.30-SNAPSHOT
+sdkVersion=1.3.30
 
 # codegen
-codegenVersion=0.33.30-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.33.30
\ No newline at end of file

From 7085c8ab0d4b34d3ddb77bbb31a2fd41c47c288c Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Mon, 16 Dec 2024 16:51:50 +0000
Subject: [PATCH 003/183] chore: bump snapshot version to 1.3.31-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 377ff6666b..3628520e5a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.3.30
+sdkVersion=1.3.31-SNAPSHOT
 
 # codegen
-codegenVersion=0.33.30
\ No newline at end of file
+codegenVersion=0.33.31-SNAPSHOT
\ No newline at end of file

From 45750232626bbe4e279142e486be8bbbfccab33f Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Wed, 18 Dec 2024 14:20:08 -0500
Subject: [PATCH 004/183] misc: enhance support for replayable instances of
 `InputStream` (#1197)

---
 .../2de8162f-e5a0-4618-b00d-8da3cfdbc6a2.json |  8 ++++++
 .../kotlin/runtime/content/ByteStreamJVM.kt   | 23 +++++++++++++--
 .../runtime/content/ByteStreamJVMTest.kt      | 28 +++++++++++++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 .changes/2de8162f-e5a0-4618-b00d-8da3cfdbc6a2.json

diff --git a/.changes/2de8162f-e5a0-4618-b00d-8da3cfdbc6a2.json b/.changes/2de8162f-e5a0-4618-b00d-8da3cfdbc6a2.json
new file mode 100644
index 0000000000..fb16fa5843
--- /dev/null
+++ b/.changes/2de8162f-e5a0-4618-b00d-8da3cfdbc6a2.json
@@ -0,0 +1,8 @@
+{
+    "id": "2de8162f-e5a0-4618-b00d-8da3cfdbc6a2",
+    "type": "feature",
+    "description": "Enhance support for replayable instances of `InputStream`",
+    "issues": [
+        "https://github.com/awslabs/aws-sdk-kotlin/issues/1473"
+    ]
+}
\ No newline at end of file
diff --git a/runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/content/ByteStreamJVM.kt b/runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/content/ByteStreamJVM.kt
index 1d6124357a..5647ac15af 100644
--- a/runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/content/ByteStreamJVM.kt
+++ b/runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/content/ByteStreamJVM.kt
@@ -114,11 +114,30 @@ public fun ByteStream.Companion.fromInputStream(
  * @param contentLength If specified, indicates how many bytes remain in this stream. Defaults to `null`.
  */
 public fun InputStream.asByteStream(contentLength: Long? = null): ByteStream.SourceStream {
-    val source = source()
+    if (markSupported() && contentLength != null) {
+        mark(contentLength.toInt())
+    }
+
     return object : ByteStream.SourceStream() {
         override val contentLength: Long? = contentLength
         override val isOneShot: Boolean = !markSupported()
-        override fun readFrom(): SdkSource = source
+        override fun readFrom(): SdkSource {
+            if (markSupported() && contentLength != null) {
+                reset()
+                mark(contentLength.toInt())
+                return object : SdkSource by source() {
+                    /*
+                     * This is a no-op close to prevent body hashing from closing the underlying InputStream, which causes
+                     * `IOException: Stream closed` on subsequent reads. Consider making [ByteStream.ChannelStream]/[ByteStream.SourceStream]
+                     * (or possibly even [ByteStream] itself) implement [Closeable] to better handle closing streams.
+                     * This should allow us to clean up our usage of [ByteStream.cancel()].
+                     */
+                    override fun close() { }
+                }
+            }
+
+            return source()
+        }
     }
 }
 
diff --git a/runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/content/ByteStreamJVMTest.kt b/runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/content/ByteStreamJVMTest.kt
index 054387b2e5..e8324fb11f 100644
--- a/runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/content/ByteStreamJVMTest.kt
+++ b/runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/content/ByteStreamJVMTest.kt
@@ -5,8 +5,11 @@
 
 package aws.smithy.kotlin.runtime.content
 
+import aws.smithy.kotlin.runtime.io.readToByteArray
 import aws.smithy.kotlin.runtime.testing.RandomTempFile
 import kotlinx.coroutines.test.runTest
+import java.io.BufferedInputStream
+import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
 import java.io.OutputStream
@@ -228,6 +231,31 @@ class ByteStreamJVMTest {
         assertFalse(sos.closed)
     }
 
+    // https://github.com/awslabs/aws-sdk-kotlin/issues/1473
+    @Test
+    fun testReplayableInputStreamAsByteStream() = runTest {
+        val content = "Hello, Bytes!".encodeToByteArray()
+        val byteArrayIns = ByteArrayInputStream(content)
+        val nonReplayableIns = NonReplayableInputStream(byteArrayIns)
+
+        // buffer the non-replayable stream, making it replayable...
+        val bufferedIns = BufferedInputStream(nonReplayableIns)
+
+        val byteStream = bufferedIns.asByteStream(content.size.toLong())
+
+        // Test that it can be read at least twice (e.g. once for hashing the body, once for transmitting the body)
+        assertContentEquals(content, byteStream.readFrom().use { it.readToByteArray() })
+        assertContentEquals(content, byteStream.readFrom().use { it.readToByteArray() })
+    }
+
+    private class NonReplayableInputStream(val inputStream: InputStream) : InputStream() {
+        override fun markSupported(): Boolean = false // not replayable
+
+        override fun read(): Int = inputStream.read()
+        override fun mark(readlimit: Int) = inputStream.mark(readlimit)
+        override fun reset() = inputStream.reset()
+    }
+
     private class StatusTrackingOutputStream(val os: OutputStream) : OutputStream() {
         var closed: Boolean = false
 

From b0a4bacc3626bf2c9e8cfe9607ef8d5ece03ee4e Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Wed, 18 Dec 2024 19:23:06 +0000
Subject: [PATCH 005/183] chore: release 1.3.31

---
 .changes/2de8162f-e5a0-4618-b00d-8da3cfdbc6a2.json | 8 --------
 CHANGELOG.md                                       | 5 +++++
 gradle.properties                                  | 4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 .changes/2de8162f-e5a0-4618-b00d-8da3cfdbc6a2.json

diff --git a/.changes/2de8162f-e5a0-4618-b00d-8da3cfdbc6a2.json b/.changes/2de8162f-e5a0-4618-b00d-8da3cfdbc6a2.json
deleted file mode 100644
index fb16fa5843..0000000000
--- a/.changes/2de8162f-e5a0-4618-b00d-8da3cfdbc6a2.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "id": "2de8162f-e5a0-4618-b00d-8da3cfdbc6a2",
-    "type": "feature",
-    "description": "Enhance support for replayable instances of `InputStream`",
-    "issues": [
-        "https://github.com/awslabs/aws-sdk-kotlin/issues/1473"
-    ]
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5633a30d73..5473a56d69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.3.31] - 12/18/2024
+
+### Features
+* [#1473](https://github.com/awslabs/aws-sdk-kotlin/issues/1473) Enhance support for replayable instances of `InputStream`
+
 ## [1.3.30] - 12/16/2024
 
 ## [1.3.29] - 12/12/2024
diff --git a/gradle.properties b/gradle.properties
index 3628520e5a..cf967edd0b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.3.31-SNAPSHOT
+sdkVersion=1.3.31
 
 # codegen
-codegenVersion=0.33.31-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.33.31
\ No newline at end of file

From 80f453814d8b0c4e20ef7e729d47a364ca8b5753 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Wed, 18 Dec 2024 19:23:08 +0000
Subject: [PATCH 006/183] chore: bump snapshot version to 1.3.32-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index cf967edd0b..f902a36719 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.3.31
+sdkVersion=1.3.32-SNAPSHOT
 
 # codegen
-codegenVersion=0.33.31
\ No newline at end of file
+codegenVersion=0.33.32-SNAPSHOT
\ No newline at end of file

From e9d16a98b8030468e35a05f63c79cae2444e6759 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Wed, 18 Dec 2024 16:28:30 -0500
Subject: [PATCH 007/183] fix: CBOR protocol test assertions / blob
 serialization (#1198)

---
 .changes/1021e75a-45f3-4f3a-820c-700d9ec6e782.json           | 5 +++++
 .../protocol/HttpProtocolUnitTestRequestGenerator.kt         | 4 ++--
 .../codegen/rendering/serde/SerializeStructGenerator.kt      | 1 -
 .../codegen/rendering/serde/SerializeStructGeneratorTest.kt  | 2 +-
 .../src/aws/smithy/kotlin/runtime/serde/xml/XmlSerializer.kt | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 .changes/1021e75a-45f3-4f3a-820c-700d9ec6e782.json

diff --git a/.changes/1021e75a-45f3-4f3a-820c-700d9ec6e782.json b/.changes/1021e75a-45f3-4f3a-820c-700d9ec6e782.json
new file mode 100644
index 0000000000..0fad5e0349
--- /dev/null
+++ b/.changes/1021e75a-45f3-4f3a-820c-700d9ec6e782.json
@@ -0,0 +1,5 @@
+{
+    "id": "1021e75a-45f3-4f3a-820c-700d9ec6e782",
+    "type": "bugfix",
+    "description": "Fix serialization of CBOR blobs"
+}
\ No newline at end of file
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolUnitTestRequestGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolUnitTestRequestGenerator.kt
index 74bd7db782..6fcc47c3e5 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolUnitTestRequestGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolUnitTestRequestGenerator.kt
@@ -117,11 +117,11 @@ open class HttpProtocolUnitTestRequestGenerator protected constructor(builder: B
                         write("return")
                     }
                     write("requireNotNull(expectedBytes) { #S }", "expected application/cbor body cannot be null")
-                    write("requireNotNull(expectedBytes) { #S }", "actual application/cbor body cannot be null")
+                    write("requireNotNull(actualBytes) { #S }", "actual application/cbor body cannot be null")
 
                     write("")
                     write("val expectedRequest = #L(#T(expectedBytes))", inputDeserializer.name, RuntimeTypes.Serde.SerdeCbor.CborDeserializer)
-                    write("val actualRequest = #L(#T(expectedBytes))", inputDeserializer.name, RuntimeTypes.Serde.SerdeCbor.CborDeserializer)
+                    write("val actualRequest = #L(#T(actualBytes))", inputDeserializer.name, RuntimeTypes.Serde.SerdeCbor.CborDeserializer)
                     write("assertEquals(expectedRequest, actualRequest)")
                 }
                 writer.write("")
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGenerator.kt
index e7f2e261ef..d8810044a5 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGenerator.kt
@@ -647,7 +647,6 @@ open class SerializeStructGenerator(
         val target = member.targetOrSelf(ctx.model)
 
         val encoded = when {
-            target.type == ShapeType.BLOB -> writer.format("#L.#T()", identifier, RuntimeTypes.Core.Text.Encoding.encodeBase64String)
             target.type == ShapeType.TIMESTAMP -> {
                 writer.addImport(RuntimeTypes.Core.TimestampFormat)
                 val tsFormat = member
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGeneratorTest.kt
index 40d9c9db7d..347da007cb 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGeneratorTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGeneratorTest.kt
@@ -1822,7 +1822,7 @@ class SerializeStructGeneratorTest {
 
         val expected = """
             serializer.serializeStruct(OBJ_DESCRIPTOR) {
-                input.fooBlob?.let { field(FOOBLOB_DESCRIPTOR, it.encodeBase64String()) }
+                input.fooBlob?.let { field(FOOBLOB_DESCRIPTOR, it) }
             }
         """.trimIndent()
 
diff --git a/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlSerializer.kt b/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlSerializer.kt
index 35618cb49e..d1356f848c 100644
--- a/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlSerializer.kt
+++ b/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlSerializer.kt
@@ -134,7 +134,7 @@ public class XmlSerializer(private val xmlWriter: XmlStreamWriter = xmlStreamWri
         field(descriptor, value.format(format))
 
     override fun field(descriptor: SdkFieldDescriptor, value: ByteArray): Unit =
-        field(descriptor, value)
+        field(descriptor, value.encodeBase64String())
 
     override fun field(descriptor: SdkFieldDescriptor, value: Document?): Unit = throw SerializationException(
         "cannot serialize field ${descriptor.serialName}; Document type is not supported by xml encoding",

From 48849a1208fe0bb2c42c06c49b54b9c419104378 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Mon, 6 Jan 2025 16:34:11 -0500
Subject: [PATCH 008/183] fix: correctly serialize subset of shape's members
 when configured (#1199)

---
 .../core/QueryHttpBindingProtocolGenerator.kt   |  2 +-
 .../codegen/aws/protocols/RpcV2CborTest.kt      | 17 +++++++++++++++++
 .../rendering/serde/CborSerializerGenerator.kt  |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/QueryHttpBindingProtocolGenerator.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/QueryHttpBindingProtocolGenerator.kt
index 62f8f7ebe1..db97349f84 100644
--- a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/QueryHttpBindingProtocolGenerator.kt
+++ b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/QueryHttpBindingProtocolGenerator.kt
@@ -145,7 +145,7 @@ abstract class AbstractQueryFormUrlSerializerGenerator(
         return shape.documentSerializer(ctx.settings, symbol, members) { writer ->
             writer.openBlock("internal fun #identifier.name:L(serializer: #T, input: #T) {", RuntimeTypes.Serde.Serializer, symbol)
                 .call {
-                    renderSerializerBody(ctx, shape, shape.members().toList(), writer)
+                    renderSerializerBody(ctx, shape, members.toList(), writer)
                 }
                 .closeBlock("}")
         }
diff --git a/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RpcV2CborTest.kt b/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RpcV2CborTest.kt
index 17a7c0f3d1..0114185004 100644
--- a/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RpcV2CborTest.kt
+++ b/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RpcV2CborTest.kt
@@ -4,6 +4,7 @@
  */
 package software.amazon.smithy.kotlin.codegen.aws.protocols
 
+import io.kotest.matchers.string.shouldNotContain
 import software.amazon.smithy.kotlin.codegen.test.*
 import kotlin.test.Test
 
@@ -145,4 +146,20 @@ class RpcV2CborTest {
         val serializeBody = serializer.lines("    override suspend fun serialize(context: ExecutionContext, input: PutFooStreamingRequest): HttpRequestBuilder {", "}")
         serializeBody.shouldContainOnlyOnceWithDiff("""builder.headers.setMissing("Content-Type", "application/vnd.amazon.eventstream")""")
     }
+
+    @Test
+    fun testEventStreamInitialRequestDoesNotSerializeStreamMember() {
+        val ctx = model.newTestContext("CborExample")
+
+        val generator = RpcV2Cbor()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val documentSerializer = ctx.manifest.expectFileString("/src/main/kotlin/com/test/serde/PutFooStreamingRequestDocumentSerializer.kt")
+
+        val serializeBody = documentSerializer.lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "}")
+        serializeBody.shouldNotContain("input.messages") // `messages` is the stream member and should not be serialized in the initial request
+    }
 }
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/CborSerializerGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/CborSerializerGenerator.kt
index 1fdb7850a7..545a484a90 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/CborSerializerGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/CborSerializerGenerator.kt
@@ -108,7 +108,7 @@ class CborSerializerGenerator(
         val symbol = ctx.symbolProvider.toSymbol(shape)
         return shape.documentSerializer(ctx.settings, symbol, members) { writer ->
             writer.withBlock("internal fun #identifier.name:L(serializer: #T, input: #T) {", "}", RuntimeTypes.Serde.Serializer, symbol) {
-                call { renderSerializerBody(ctx, shape, shape.members().toList(), writer) }
+                call { renderSerializerBody(ctx, shape, members.toList(), writer) }
             }
         }
     }

From ded3a4bb03060f28f3ce085fed3a9627f7297ae5 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Mon, 6 Jan 2025 21:45:24 +0000
Subject: [PATCH 009/183] chore: release 1.3.32

---
 .changes/1021e75a-45f3-4f3a-820c-700d9ec6e782.json | 5 -----
 CHANGELOG.md                                       | 5 +++++
 gradle.properties                                  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 .changes/1021e75a-45f3-4f3a-820c-700d9ec6e782.json

diff --git a/.changes/1021e75a-45f3-4f3a-820c-700d9ec6e782.json b/.changes/1021e75a-45f3-4f3a-820c-700d9ec6e782.json
deleted file mode 100644
index 0fad5e0349..0000000000
--- a/.changes/1021e75a-45f3-4f3a-820c-700d9ec6e782.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "1021e75a-45f3-4f3a-820c-700d9ec6e782",
-    "type": "bugfix",
-    "description": "Fix serialization of CBOR blobs"
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5473a56d69..a52fe756c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.3.32] - 01/06/2025
+
+### Fixes
+* Fix serialization of CBOR blobs
+
 ## [1.3.31] - 12/18/2024
 
 ### Features
diff --git a/gradle.properties b/gradle.properties
index f902a36719..eda623b285 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.3.32-SNAPSHOT
+sdkVersion=1.3.32
 
 # codegen
-codegenVersion=0.33.32-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.33.32
\ No newline at end of file

From d97e8ba056d5f0c9869226854638dd486e06f1fa Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Mon, 6 Jan 2025 21:45:25 +0000
Subject: [PATCH 010/183] chore: bump snapshot version to 1.3.33-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index eda623b285..b49ffff27f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.3.32
+sdkVersion=1.3.33-SNAPSHOT
 
 # codegen
-codegenVersion=0.33.32
\ No newline at end of file
+codegenVersion=0.33.33-SNAPSHOT
\ No newline at end of file

From 78f17f3dcb809e297669c9733e2f440da33985f2 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Wed, 8 Jan 2025 09:23:33 -0800
Subject: [PATCH 011/183] chore: add *-main to branch workflows (#1209)

---
 .github/workflows/api-compat-verification.yml | 4 +++-
 .github/workflows/artifact-size-metrics.yml   | 4 +++-
 .github/workflows/changelog-verification.yml  | 4 +++-
 .github/workflows/continuous-integration.yml  | 4 +++-
 .github/workflows/dependabot.yml              | 4 +++-
 .github/workflows/kat-transform.yml           | 4 +++-
 .github/workflows/lint.yml                    | 5 ++++-
 7 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/api-compat-verification.yml b/.github/workflows/api-compat-verification.yml
index 26c7ef3901..2d4a22452a 100644
--- a/.github/workflows/api-compat-verification.yml
+++ b/.github/workflows/api-compat-verification.yml
@@ -3,7 +3,9 @@ name: API compatibility verification
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 jobs:
   api-compat-verification:
diff --git a/.github/workflows/artifact-size-metrics.yml b/.github/workflows/artifact-size-metrics.yml
index bd1c521e16..0591b2b6aa 100644
--- a/.github/workflows/artifact-size-metrics.yml
+++ b/.github/workflows/artifact-size-metrics.yml
@@ -2,7 +2,9 @@ name: Artifact Size Metrics
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
   release:
     types: [published]
 
diff --git a/.github/workflows/changelog-verification.yml b/.github/workflows/changelog-verification.yml
index 547b155abf..ed6efef911 100644
--- a/.github/workflows/changelog-verification.yml
+++ b/.github/workflows/changelog-verification.yml
@@ -3,7 +3,9 @@ name: Changelog verification
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 jobs:
   changelog-verification:
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 9b0dc1c880..599293cc06 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -2,7 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
   pull_request:
   workflow_dispatch:
 
diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
index 69fb0c9885..6588de3857 100644
--- a/.github/workflows/dependabot.yml
+++ b/.github/workflows/dependabot.yml
@@ -2,7 +2,9 @@ name: Dependabot Dependency Submission
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 permissions:
   contents: write
diff --git a/.github/workflows/kat-transform.yml b/.github/workflows/kat-transform.yml
index 859a904bc3..938e936ef9 100644
--- a/.github/workflows/kat-transform.yml
+++ b/.github/workflows/kat-transform.yml
@@ -3,7 +3,9 @@ name: Kat Transform
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 # Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed
 concurrency:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 6693ed2aae..e95b98aded 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,8 +5,11 @@ on:
     branches:
       - '**'
       - '!main'
+      - '!*-main'
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
   workflow_dispatch:
 
 env:

From d06ee0a604dd0750421c6d7dfe7c47dfbcd062bf Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Wed, 8 Jan 2025 09:23:43 -0800
Subject: [PATCH 012/183] chore: add .kotlin/ to .gitignore (#1208)

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 225fe6070b..99ff20f122 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ out/
 # Compiled class file
 *.class
 *.klib
+.kotlin/
 
 # Log file
 *.log

From d2e7c918e7fc9ee9892fd6cd7d852db4d5b2f2db Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Fri, 10 Jan 2025 09:16:58 -0500
Subject: [PATCH 013/183] chore: smithy version bump (#1213)

---
 .../model/error-correction-tests.smithy             | 13 ++++++++++---
 .../core/AwsHttpBindingProtocolGenerator.kt         | 10 +++++++++-
 gradle/libs.versions.toml                           |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/codegen/protocol-tests/model/error-correction-tests.smithy b/codegen/protocol-tests/model/error-correction-tests.smithy
index 74e614bdc5..201ffc877f 100644
--- a/codegen/protocol-tests/model/error-correction-tests.smithy
+++ b/codegen/protocol-tests/model/error-correction-tests.smithy
@@ -37,7 +37,12 @@ operation SayHello { output: TestOutputDocument, errors: [Error] }
 @http(method: "POST", uri: "/")
 operation SayHelloXml { output: TestOutput, errors: [Error] }
 
-structure TestOutputDocument with [TestStruct] { innerField: Nested, @required document: Document }
+structure TestOutputDocument with [TestStruct] {
+    innerField: Nested,
+    // FIXME: This trait fails smithy validator
+    // @required
+    document: Document
+}
 structure TestOutput with [TestStruct] { innerField: Nested }
 
 @mixin
@@ -60,7 +65,8 @@ structure TestStruct {
     @required
     nestedListValue: NestedList
 
-    @required
+    // FIXME: This trait fails smithy validator
+    // @required
     nested: Nested
 
     @required
@@ -91,7 +97,8 @@ union MyUnion {
 }
 
 structure Nested {
-    @required
+    // FIXME: This trait fails smithy validator
+    // @required
     a: String
 }
 
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGenerator.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGenerator.kt
index 864c2a6c3c..6e5834f7d1 100644
--- a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGenerator.kt
+++ b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGenerator.kt
@@ -39,7 +39,15 @@ abstract class AwsHttpBindingProtocolGenerator : HttpBindingProtocolGenerator()
         // The following can be used to generate only a specific test by name.
         // val targetedTest = TestMemberDelta(setOf("RestJsonComplexErrorWithNoMessage"), TestContainmentMode.RUN_TESTS)
 
-        val ignoredTests = TestMemberDelta(setOf())
+        val ignoredTests = TestMemberDelta(
+            setOf(
+                "AwsJson10ClientErrorCorrectsWithDefaultValuesWhenServerFailsToSerializeRequiredValues",
+                "RestJsonNullAndEmptyHeaders",
+                "NullAndEmptyHeaders",
+                "RpcV2CborClientPopulatesDefaultsValuesWhenMissingInResponse",
+                "RpcV2CborClientPopulatesDefaultValuesInInput",
+            ),
+        )
 
         val requestTestBuilder = HttpProtocolUnitTestRequestGenerator.Builder()
         val responseTestBuilder = HttpProtocolUnitTestResponseGenerator.Builder()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0683bfc2e1..14232f4241 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ crt-kotlin-version = "0.8.10"
 micrometer-version = "1.13.6"
 
 # codegen
-smithy-version = "1.51.0"
+smithy-version = "1.53.0"
 smithy-gradle-version = "0.9.0"
 
 # testing

From 5a2df8f171250e150c685c9389f80e2a6b0778eb Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 10 Jan 2025 14:36:46 +0000
Subject: [PATCH 014/183] chore: release 1.3.33

---
 CHANGELOG.md      | 2 ++
 gradle.properties | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a52fe756c1..2c327d4f40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.3.33] - 01/10/2025
+
 ## [1.3.32] - 01/06/2025
 
 ### Fixes
diff --git a/gradle.properties b/gradle.properties
index b49ffff27f..b6869a974b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.3.33-SNAPSHOT
+sdkVersion=1.3.33
 
 # codegen
-codegenVersion=0.33.33-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.33.33
\ No newline at end of file

From 003633bad25b5b3e75112da2d1de5f2eeffd1471 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 10 Jan 2025 14:36:47 +0000
Subject: [PATCH 015/183] chore: bump snapshot version to 1.3.34-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index b6869a974b..6c237cf8df 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.3.33
+sdkVersion=1.3.34-SNAPSHOT
 
 # codegen
-codegenVersion=0.33.33
\ No newline at end of file
+codegenVersion=0.33.34-SNAPSHOT
\ No newline at end of file

From 5f5ec8f16b4db571bb9c83f520e26f9927d8ecf2 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Fri, 10 Jan 2025 11:13:29 -0500
Subject: [PATCH 016/183] feat: add `AuthTokenGenerator` (#1212)

---
 .../api/aws-signing-common.api                | 10 +++
 .../auth/awssigning/AuthTokenGenerator.kt     | 44 ++++++++++++
 .../auth/awssigning/AuthTokenGeneratorTest.kt | 71 +++++++++++++++++++
 3 files changed, 125 insertions(+)
 create mode 100644 runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGenerator.kt
 create mode 100644 runtime/auth/aws-signing-common/common/test/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGeneratorTest.kt

diff --git a/runtime/auth/aws-signing-common/api/aws-signing-common.api b/runtime/auth/aws-signing-common/api/aws-signing-common.api
index 0c96486679..d128b0bd6f 100644
--- a/runtime/auth/aws-signing-common/api/aws-signing-common.api
+++ b/runtime/auth/aws-signing-common/api/aws-signing-common.api
@@ -1,3 +1,13 @@
+public final class aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGenerator {
+	public fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProvider;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;Laws/smithy/kotlin/runtime/time/Clock;)V
+	public synthetic fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProvider;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;Laws/smithy/kotlin/runtime/time/Clock;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun generateAuthToken-exY8QGI (Laws/smithy/kotlin/runtime/net/url/Url;Ljava/lang/String;JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun getClock ()Laws/smithy/kotlin/runtime/time/Clock;
+	public final fun getCredentialsProvider ()Laws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProvider;
+	public final fun getService ()Ljava/lang/String;
+	public final fun getSigner ()Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;
+}
+
 public final class aws/smithy/kotlin/runtime/auth/awssigning/AwsChunkedByteReadChannel : aws/smithy/kotlin/runtime/io/SdkByteReadChannel {
 	public fun <init> (Laws/smithy/kotlin/runtime/io/SdkByteReadChannel;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig;[BLaws/smithy/kotlin/runtime/http/DeferredHeaders;)V
 	public synthetic fun <init> (Laws/smithy/kotlin/runtime/io/SdkByteReadChannel;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig;[BLaws/smithy/kotlin/runtime/http/DeferredHeaders;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
diff --git a/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGenerator.kt b/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGenerator.kt
new file mode 100644
index 0000000000..e92ac1f72c
--- /dev/null
+++ b/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGenerator.kt
@@ -0,0 +1,44 @@
+/*
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
+package aws.smithy.kotlin.runtime.auth.awssigning
+
+import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
+import aws.smithy.kotlin.runtime.auth.awssigning.AwsSigningConfig.Companion.invoke
+import aws.smithy.kotlin.runtime.http.HttpMethod
+import aws.smithy.kotlin.runtime.http.request.HttpRequest
+import aws.smithy.kotlin.runtime.net.url.Url
+import aws.smithy.kotlin.runtime.time.Clock
+import kotlin.time.Duration
+
+/**
+ * Generates an authentication token, which is a SigV4-signed URL with the HTTP scheme removed.
+ * @param service The name of the service the token is being generated for
+ * @param credentialsProvider The [CredentialsProvider] which will provide credentials to use when generating the auth token
+ * @param signer The [AwsSigner] implementation to use when creating the authentication token
+ * @param clock The [Clock] implementation to use
+ */
+public class AuthTokenGenerator(
+    public val service: String,
+    public val credentialsProvider: CredentialsProvider,
+    public val signer: AwsSigner,
+    public val clock: Clock = Clock.System,
+) {
+    private fun Url.trimScheme(): String = toString().removePrefix(scheme.protocolName).removePrefix("://")
+
+    public suspend fun generateAuthToken(endpoint: Url, region: String, expiration: Duration): String {
+        val req = HttpRequest(HttpMethod.GET, endpoint)
+
+        val config = AwsSigningConfig {
+            credentials = credentialsProvider.resolve()
+            this.region = region
+            service = this@AuthTokenGenerator.service
+            signingDate = clock.now()
+            expiresAfter = expiration
+            signatureType = AwsSignatureType.HTTP_REQUEST_VIA_QUERY_PARAMS
+        }
+
+        return signer.sign(req, config).output.url.trimScheme()
+    }
+}
diff --git a/runtime/auth/aws-signing-common/common/test/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGeneratorTest.kt b/runtime/auth/aws-signing-common/common/test/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGeneratorTest.kt
new file mode 100644
index 0000000000..87fec1a74e
--- /dev/null
+++ b/runtime/auth/aws-signing-common/common/test/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGeneratorTest.kt
@@ -0,0 +1,71 @@
+/*
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
+package aws.smithy.kotlin.runtime.auth.awssigning
+
+import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
+import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
+import aws.smithy.kotlin.runtime.collections.Attributes
+import aws.smithy.kotlin.runtime.http.Headers
+import aws.smithy.kotlin.runtime.http.request.HttpRequest
+import aws.smithy.kotlin.runtime.http.request.toBuilder
+import aws.smithy.kotlin.runtime.net.Host
+import aws.smithy.kotlin.runtime.net.url.Url
+import aws.smithy.kotlin.runtime.time.Instant
+import aws.smithy.kotlin.runtime.time.ManualClock
+import kotlinx.coroutines.test.runTest
+import kotlin.test.Test
+import kotlin.test.assertContains
+import kotlin.test.assertTrue
+import kotlin.time.Duration.Companion.seconds
+import kotlin.time.DurationUnit
+
+class AuthTokenGeneratorTest {
+    @Test
+    fun testGenerateAuthToken() = runTest {
+        val credentials = Credentials("akid", "secret")
+
+        val credentialsProvider = object : CredentialsProvider {
+            var credentialsResolved = false
+            override suspend fun resolve(attributes: Attributes): Credentials {
+                credentialsResolved = true
+                return credentials
+            }
+        }
+
+        val clock = ManualClock(Instant.fromEpochSeconds(0))
+
+        val generator = AuthTokenGenerator("foo", credentialsProvider, TEST_SIGNER, clock = clock)
+
+        val endpoint = Url { host = Host.parse("foo.bar.us-east-1.baz") }
+        val token = generator.generateAuthToken(endpoint, "us-east-1", 333.seconds)
+
+        assertContains(token, "foo.bar.us-east-1.baz")
+        assertContains(token, "X-Amz-Credential=signature") // test custom signer was invoked
+        assertContains(token, "X-Amz-Expires=333") // expiration
+        assertContains(token, "X-Amz-SigningDate=0") // clock
+
+        assertTrue(credentialsProvider.credentialsResolved)
+    }
+}
+
+private val TEST_SIGNER = object : AwsSigner {
+    override suspend fun sign(
+        request: HttpRequest,
+        config: AwsSigningConfig,
+    ): AwsSigningResult<HttpRequest> {
+        val builder = request.toBuilder()
+        builder.url.parameters.decodedParameters.apply {
+            put("X-Amz-Credential", "signature")
+            put("X-Amz-Expires", (config.expiresAfter?.toLong(DurationUnit.SECONDS) ?: 900).toString())
+            put("X-Amz-SigningDate", config.signingDate.epochSeconds.toString())
+        }
+
+        return AwsSigningResult<HttpRequest>(builder.build(), "signature".encodeToByteArray())
+    }
+
+    override suspend fun signChunk(chunkBody: ByteArray, prevSignature: ByteArray, config: AwsSigningConfig): AwsSigningResult<Unit> = throw IllegalStateException("signChunk unexpectedly invoked")
+
+    override suspend fun signChunkTrailer(trailingHeaders: Headers, prevSignature: ByteArray, config: AwsSigningConfig): AwsSigningResult<Unit> = throw IllegalStateException("signChunkTrailer unexpectedly invoked")
+}

From 3fe1b5e7763bd4ed386f30d3f4bfcbb0ad4aa352 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 10 Jan 2025 16:45:39 +0000
Subject: [PATCH 017/183] chore: release 1.3.34

---
 CHANGELOG.md      | 2 ++
 gradle.properties | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c327d4f40..c1758b4332 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.3.34] - 01/10/2025
+
 ## [1.3.33] - 01/10/2025
 
 ## [1.3.32] - 01/06/2025
diff --git a/gradle.properties b/gradle.properties
index 6c237cf8df..193406ed69 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.3.34-SNAPSHOT
+sdkVersion=1.3.34
 
 # codegen
-codegenVersion=0.33.34-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.33.34
\ No newline at end of file

From 0bba3084ebb3160abe2a21fc86f4223c7bf37c23 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 10 Jan 2025 16:45:40 +0000
Subject: [PATCH 018/183] chore: bump snapshot version to 1.3.35-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 193406ed69..d76819491b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.3.34
+sdkVersion=1.3.35-SNAPSHOT
 
 # codegen
-codegenVersion=0.33.34
\ No newline at end of file
+codegenVersion=0.33.35-SNAPSHOT
\ No newline at end of file

From 52e4439088b388c5f4d8c9b1e6fec6588d37a1a4 Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Wed, 15 Jan 2025 12:33:57 -0500
Subject: [PATCH 019/183] misc: merge v1.4 into main (#1218)

---
 .brazil.json                                  |  2 +-
 .../0857b6f0-0444-479f-be6b-06ef71d482a0.json |  9 ++++
 .../1a68d0b7-00e7-45c0-88f6-95e5c39c9c61.json |  6 +++
 .../3456d00f-1b29-4d88-ab02-045db1b1ebce.json |  8 +++
 .../kotlin/codegen/core/KotlinDependency.kt   |  2 +-
 .../rendering/waiters/WaiterGenerator.kt      | 15 +++---
 .../waiters/ServiceWaitersGeneratorTest.kt    |  6 +--
 .../rendering/waiters/WaiterGeneratorTest.kt  |  4 +-
 gradle/libs.versions.toml                     | 17 ++++---
 .../tests/SigningSuiteTestBaseJVM.kt          |  3 +-
 runtime/runtime-core/api/runtime-core.api     | 15 +++++-
 .../aws/smithy/kotlin/runtime/Exceptions.kt   | 49 +++++++++++++++++-
 .../kotlin/runtime/collections/Attributes.kt  | 11 ++++
 .../kotlin/runtime/retries/Exceptions.kt      | 23 ++++++++-
 .../runtime/retries/StandardRetryStrategy.kt  | 30 +++++++++--
 .../retries/delay/StandardRetryTokenBucket.kt |  2 +-
 .../smithy/kotlin/runtime/ExceptionsTest.kt   | 34 +++++++++++++
 .../impl/StandardRetryIntegrationTest.kt      | 50 +++++++++++++++----
 .../smithy/kotlin/codegen/util/TestUtils.kt   |  7 +--
 19 files changed, 250 insertions(+), 43 deletions(-)
 create mode 100644 .changes/0857b6f0-0444-479f-be6b-06ef71d482a0.json
 create mode 100644 .changes/1a68d0b7-00e7-45c0-88f6-95e5c39c9c61.json
 create mode 100644 .changes/3456d00f-1b29-4d88-ab02-045db1b1ebce.json

diff --git a/.brazil.json b/.brazil.json
index cb2e43713a..5a1d830abd 100644
--- a/.brazil.json
+++ b/.brazil.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "org.jetbrains.kotlin:kotlin-stdlib:2.0.*": "KotlinStdlib-2.x",
+    "org.jetbrains.kotlin:kotlin-stdlib:2.*": "KotlinStdlib-2.x",
     "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": "KotlinxCoroutinesCoreJvm-1.x",
 
     "com.squareup.okhttp3:okhttp-coroutines:5.*": "OkHttp3Coroutines-5.x",
diff --git a/.changes/0857b6f0-0444-479f-be6b-06ef71d482a0.json b/.changes/0857b6f0-0444-479f-be6b-06ef71d482a0.json
new file mode 100644
index 0000000000..d89da89103
--- /dev/null
+++ b/.changes/0857b6f0-0444-479f-be6b-06ef71d482a0.json
@@ -0,0 +1,9 @@
+{
+    "id": "0857b6f0-0444-479f-be6b-06ef71d482a0",
+    "type": "feature",
+    "description": "⚠️ **IMPORTANT**: Add `retryStrategy` configuration option for waiters",
+    "issues": [
+        "https://github.com/awslabs/aws-sdk-kotlin/issues/1431"
+    ],
+    "requiresMinorVersionBump": true
+}
\ No newline at end of file
diff --git a/.changes/1a68d0b7-00e7-45c0-88f6-95e5c39c9c61.json b/.changes/1a68d0b7-00e7-45c0-88f6-95e5c39c9c61.json
new file mode 100644
index 0000000000..10ef502204
--- /dev/null
+++ b/.changes/1a68d0b7-00e7-45c0-88f6-95e5c39c9c61.json
@@ -0,0 +1,6 @@
+{
+    "id": "1a68d0b7-00e7-45c0-88f6-95e5c39c9c61",
+    "type": "misc",
+    "description": "⚠️ **IMPORTANT**: Upgrade to Kotlin 2.1.0",
+    "requiresMinorVersionBump": true
+}
\ No newline at end of file
diff --git a/.changes/3456d00f-1b29-4d88-ab02-045db1b1ebce.json b/.changes/3456d00f-1b29-4d88-ab02-045db1b1ebce.json
new file mode 100644
index 0000000000..767e48a02e
--- /dev/null
+++ b/.changes/3456d00f-1b29-4d88-ab02-045db1b1ebce.json
@@ -0,0 +1,8 @@
+{
+    "id": "3456d00f-1b29-4d88-ab02-045db1b1ebce",
+    "type": "bugfix",
+    "description": "Include more information when retry strategy halts early due to token bucket capacity errors",
+    "issues": [
+        "awslabs/aws-sdk-kotlin#1321"
+    ]
+}
\ No newline at end of file
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt
index 17faf0ad48..b575efae60 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt
@@ -37,7 +37,7 @@ private fun getDefaultRuntimeVersion(): String {
 // publishing info
 const val RUNTIME_GROUP: String = "aws.smithy.kotlin"
 val RUNTIME_VERSION: String = System.getProperty("smithy.kotlin.codegen.clientRuntimeVersion", getDefaultRuntimeVersion())
-val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "2.0.10")
+val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "2.1.0")
 
 enum class SourceSet {
     CommonMain,
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/WaiterGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/WaiterGenerator.kt
index 552a352a1a..f150cbc3d2 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/WaiterGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/WaiterGenerator.kt
@@ -17,7 +17,7 @@ import java.text.DecimalFormatSymbols
  * Renders the top-level retry strategy for a waiter.
  */
 private fun KotlinWriter.renderRetryStrategy(wi: WaiterInfo, asValName: String) {
-    withBlock("val #L = #T {", "}", asValName, RuntimeTypes.Core.Retries.StandardRetryStrategy) {
+    withBlock("val #L = retryStrategy ?: #T {", "}", asValName, RuntimeTypes.Core.Retries.StandardRetryStrategy) {
         write("maxAttempts = 20")
         write("tokenBucket = #T", RuntimeTypes.Core.Retries.Delay.InfiniteTokenBucket)
         withBlock("delayProvider {", "}") {
@@ -35,18 +35,21 @@ private fun KotlinWriter.renderRetryStrategy(wi: WaiterInfo, asValName: String)
 internal fun KotlinWriter.renderWaiter(wi: WaiterInfo) {
     write("")
     wi.waiter.documentation.ifPresent(::dokka)
-    val inputParameter = if (wi.input.hasAllOptionalMembers) {
-        format("request: #1T = #1T { }", wi.inputSymbol)
+
+    val requestType = if (wi.input.hasAllOptionalMembers) {
+        format("#1T = #1T { }", wi.inputSymbol)
     } else {
-        format("request: #T", wi.inputSymbol)
+        format("#T", wi.inputSymbol)
     }
+
     withBlock(
-        "#L suspend fun #T.#L(#L): #T<#T> {",
+        "#L suspend fun #T.#L(request: #L, retryStrategy: #T? = null): #T<#T> {",
         "}",
         wi.ctx.settings.api.visibility,
         wi.serviceSymbol,
         wi.methodName,
-        inputParameter,
+        requestType,
+        RuntimeTypes.Core.Retries.RetryStrategy,
         RuntimeTypes.Core.Retries.Outcome,
         wi.outputSymbol,
     ) {
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/ServiceWaitersGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/ServiceWaitersGeneratorTest.kt
index c83c29661d..49ee90f484 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/ServiceWaitersGeneratorTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/ServiceWaitersGeneratorTest.kt
@@ -43,7 +43,7 @@ class ServiceWaitersGeneratorTest {
             /**
              * Wait until a foo exists with optional input
              */
-            public suspend fun TestClient.waitUntilFooOptionalExists(request: DescribeFooOptionalRequest = DescribeFooOptionalRequest { }): Outcome<DescribeFooOptionalResponse> {
+            public suspend fun TestClient.waitUntilFooOptionalExists(request: DescribeFooOptionalRequest = DescribeFooOptionalRequest { }, retryStrategy: RetryStrategy? = null): Outcome<DescribeFooOptionalResponse> {
         """.trimIndent()
         val methodFooter = """
                 val policy = AcceptorRetryPolicy(request, acceptors)
@@ -59,7 +59,7 @@ class ServiceWaitersGeneratorTest {
             /**
              * Wait until a foo exists with required input
              */
-            public suspend fun TestClient.waitUntilFooRequiredExists(request: DescribeFooRequiredRequest): Outcome<DescribeFooRequiredResponse> {
+            public suspend fun TestClient.waitUntilFooRequiredExists(request: DescribeFooRequiredRequest, retryStrategy: RetryStrategy? = null): Outcome<DescribeFooRequiredResponse> {
         """.trimIndent()
         listOf(
             generateService("simple-service-with-operation-waiter.smithy"),
@@ -105,7 +105,7 @@ class ServiceWaitersGeneratorTest {
     @Test
     fun testRetryStrategy() {
         val expected = """
-            val strategy = StandardRetryStrategy {
+            val strategy = retryStrategy ?: StandardRetryStrategy {
                 maxAttempts = 20
                 tokenBucket = InfiniteTokenBucket
                 delayProvider {
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/WaiterGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/WaiterGeneratorTest.kt
index c8f6ae3cfc..705b3b8b16 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/WaiterGeneratorTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/WaiterGeneratorTest.kt
@@ -28,7 +28,7 @@ class WaiterGeneratorTest {
     @Test
     fun testDefaultDelays() {
         val expected = """
-            val strategy = StandardRetryStrategy {
+            val strategy = retryStrategy ?: StandardRetryStrategy {
                 maxAttempts = 20
                 tokenBucket = InfiniteTokenBucket
                 delayProvider {
@@ -45,7 +45,7 @@ class WaiterGeneratorTest {
     @Test
     fun testCustomDelays() {
         val expected = """
-            val strategy = StandardRetryStrategy {
+            val strategy = retryStrategy ?: StandardRetryStrategy {
                 maxAttempts = 20
                 tokenBucket = InfiniteTokenBucket
                 delayProvider {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 14232f4241..6ef5b35d57 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
-kotlin-version = "2.0.21"
+kotlin-version = "2.1.0"
 dokka-version = "1.9.10"
 
-aws-kotlin-repo-tools-version = "0.4.16"
+aws-kotlin-repo-tools-version = "0.4.17"
 
 # libs
 coroutines-version = "1.9.0"
@@ -10,11 +10,12 @@ atomicfu-version = "0.25.0"
 okhttp-version = "5.0.0-alpha.14"
 okhttp4-version = "4.12.0"
 okio-version = "3.9.1"
-otel-version = "1.43.0"
+otel-version = "1.45.0"
 slf4j-version = "2.0.16"
 slf4j-v1x-version = "1.7.36"
-crt-kotlin-version = "0.8.10"
-micrometer-version = "1.13.6"
+crt-kotlin-version = "0.9.0"
+micrometer-version = "1.14.2"
+binary-compatibility-validator-version = "0.16.3"
 
 # codegen
 smithy-version = "1.53.0"
@@ -23,7 +24,7 @@ smithy-gradle-version = "0.9.0"
 # testing
 junit-version = "5.10.5"
 kotest-version = "5.9.1"
-kotlin-compile-testing-version = "1.6.0"
+kotlin-compile-testing-version = "0.7.0"
 kotlinx-benchmark-version = "0.4.12"
 kotlinx-serialization-version = "1.7.3"
 docker-java-version = "3.4.0"
@@ -80,7 +81,7 @@ smithy-smoke-test-traits = { module = "software.amazon.smithy:smithy-smoke-test-
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-version" }
 junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-version" }
 
-kotlin-compile-testing = {module = "com.github.tschuchortdev:kotlin-compile-testing", version.ref = "kotlin-compile-testing-version" }
+kotlin-compile-testing = {module = "dev.zacsweers.kctfork:core", version.ref = "kotlin-compile-testing-version" }
 kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest-version" }
 kotest-assertions-core-jvm = { module = "io.kotest:kotest-assertions-core-jvm", version.ref = "kotest-version" }
 kotlinx-benchmark-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "kotlinx-benchmark-version" }
@@ -104,7 +105,7 @@ dokka = { id = "org.jetbrains.dokka", version.ref = "dokka-version"}
 kotlin-jvm = {id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" }
 kotlin-multiplatform = {id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-version" }
 kotlinx-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlinx-benchmark-version" }
-kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.2" }
+kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator-version" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version"}
 aws-kotlin-repo-tools-kmp = { id = "aws.sdk.kotlin.gradle.kmp", version.ref = "aws-kotlin-repo-tools-version" }
 aws-kotlin-repo-tools-smithybuild = { id = "aws.sdk.kotlin.gradle.smithybuild", version.ref = "aws-kotlin-repo-tools-version" }
diff --git a/runtime/auth/aws-signing-tests/jvm/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/SigningSuiteTestBaseJVM.kt b/runtime/auth/aws-signing-tests/jvm/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/SigningSuiteTestBaseJVM.kt
index 904aef564b..b3c4202d26 100644
--- a/runtime/auth/aws-signing-tests/jvm/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/SigningSuiteTestBaseJVM.kt
+++ b/runtime/auth/aws-signing-tests/jvm/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/SigningSuiteTestBaseJVM.kt
@@ -28,6 +28,7 @@ import io.ktor.util.*
 import io.ktor.utils.io.*
 import io.ktor.utils.io.core.*
 import kotlinx.coroutines.runBlocking
+import kotlinx.io.readByteArray
 import kotlinx.serialization.json.*
 import org.junit.jupiter.api.Assumptions.assumeTrue
 import org.junit.jupiter.api.Test
@@ -383,7 +384,7 @@ public actual abstract class SigningSuiteTestBase : HasSigner {
         }
 
         if (hasBody) {
-            val bytes = runBlocking { chan.readRemaining().readBytes() }
+            val bytes = runBlocking { chan.readRemaining().readByteArray() }
             builder.body = HttpBody.fromBytes(bytes)
         }
 
diff --git a/runtime/runtime-core/api/runtime-core.api b/runtime/runtime-core/api/runtime-core.api
index 942f99e348..8c42034110 100644
--- a/runtime/runtime-core/api/runtime-core.api
+++ b/runtime/runtime-core/api/runtime-core.api
@@ -1,3 +1,13 @@
+public final class aws/smithy/kotlin/runtime/ClientErrorContext {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getFormatted ()Ljava/lang/String;
+	public final fun getKey ()Ljava/lang/String;
+	public final fun getValue ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public class aws/smithy/kotlin/runtime/ClientException : aws/smithy/kotlin/runtime/SdkBaseException {
 	public fun <init> ()V
 	public fun <init> (Ljava/lang/String;)V
@@ -9,11 +19,13 @@ public class aws/smithy/kotlin/runtime/ErrorMetadata {
 	public static final field Companion Laws/smithy/kotlin/runtime/ErrorMetadata$Companion;
 	public fun <init> ()V
 	public final fun getAttributes ()Laws/smithy/kotlin/runtime/collections/MutableAttributes;
+	public final fun getClientContext ()Ljava/util/List;
 	public final fun isRetryable ()Z
 	public final fun isThrottling ()Z
 }
 
 public final class aws/smithy/kotlin/runtime/ErrorMetadata$Companion {
+	public final fun getClientContext ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 	public final fun getRetryable ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 	public final fun getThrottlingError ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 }
@@ -62,7 +74,6 @@ public class aws/smithy/kotlin/runtime/ServiceException : aws/smithy/kotlin/runt
 	public fun <init> (Ljava/lang/String;)V
 	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
 	public fun <init> (Ljava/lang/Throwable;)V
-	protected fun getDisplayMetadata ()Ljava/util/List;
 	public fun getMessage ()Ljava/lang/String;
 	public synthetic fun getSdkErrorMetadata ()Laws/smithy/kotlin/runtime/ErrorMetadata;
 	public fun getSdkErrorMetadata ()Laws/smithy/kotlin/runtime/ServiceErrorMetadata;
@@ -134,6 +145,7 @@ public final class aws/smithy/kotlin/runtime/collections/AttributesBuilder {
 }
 
 public final class aws/smithy/kotlin/runtime/collections/AttributesKt {
+	public static final fun appendValue (Laws/smithy/kotlin/runtime/collections/MutableAttributes;Laws/smithy/kotlin/runtime/collections/AttributeKey;Ljava/lang/Object;)V
 	public static final fun attributesOf (Lkotlin/jvm/functions/Function1;)Laws/smithy/kotlin/runtime/collections/Attributes;
 	public static final fun emptyAttributes ()Laws/smithy/kotlin/runtime/collections/Attributes;
 	public static final fun get (Laws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/collections/AttributeKey;)Ljava/lang/Object;
@@ -1685,6 +1697,7 @@ public abstract class aws/smithy/kotlin/runtime/retries/RetryException : aws/smi
 	public final fun getAttempts ()I
 	public final fun getLastException ()Ljava/lang/Throwable;
 	public final fun getLastResponse ()Ljava/lang/Object;
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class aws/smithy/kotlin/runtime/retries/RetryFailureException : aws/smithy/kotlin/runtime/retries/RetryException {
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/Exceptions.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/Exceptions.kt
index 87697ec7d7..661d855a5b 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/Exceptions.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/Exceptions.kt
@@ -8,6 +8,41 @@ import aws.smithy.kotlin.runtime.collections.AttributeKey
 import aws.smithy.kotlin.runtime.collections.MutableAttributes
 import aws.smithy.kotlin.runtime.collections.mutableAttributes
 
+/**
+ * Describes additional context about an error which may be useful in client-side debugging. This information will be
+ * included in exception messages. This contrasts with [ErrorMetadata] which is not _necessarily_ included in messages
+ * and not _necessarily_ client-related.
+ * @param key A header or key for the information
+ * @param value A value for the information
+ */
+public class ClientErrorContext(public val key: String, public val value: String) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other == null || this::class != other::class) return false
+
+        other as ClientErrorContext
+
+        if (key != other.key) return false
+        if (value != other.value) return false
+
+        return true
+    }
+
+    /**
+     * Gets a formatted representation of this error context suitable for inclusion in a message. This format is
+     * generally `"$key: $value"`.
+     */
+    public val formatted: String = "$key: $value"
+
+    override fun hashCode(): Int {
+        var result = key.hashCode()
+        result = 31 * result + value.hashCode()
+        return result
+    }
+
+    override fun toString(): String = "ClientErrorContext(key='$key', value='$value')"
+}
+
 /**
  * Additional metadata about an error
  */
@@ -16,6 +51,12 @@ public open class ErrorMetadata {
     public val attributes: MutableAttributes = mutableAttributes()
 
     public companion object {
+        /**
+         * Set if there are additional context elements about the error
+         */
+        public val ClientContext: AttributeKey<List<ClientErrorContext>> =
+            AttributeKey("aws.smithy.kotlin#ClientContext")
+
         /**
          * Set if an error is retryable
          */
@@ -32,6 +73,9 @@ public open class ErrorMetadata {
 
     public val isThrottling: Boolean
         get() = attributes.getOrNull(ThrottlingError) ?: false
+
+    public val clientContext: List<ClientErrorContext>
+        get() = attributes.getOrNull(ClientContext).orEmpty()
 }
 
 /**
@@ -156,7 +200,7 @@ public open class ServiceException : SdkBaseException {
 
     public constructor(cause: Throwable?) : super(cause)
 
-    protected open val displayMetadata: List<String>
+    private val displayMetadata: List<String>
         get() = buildList {
             val serviceProvidedMessage = super.message ?: sdkErrorMetadata.errorMessage
             if (serviceProvidedMessage == null) {
@@ -166,7 +210,10 @@ public open class ServiceException : SdkBaseException {
             } else {
                 add(serviceProvidedMessage)
             }
+
             sdkErrorMetadata.requestId?.let { add("Request ID: $it") }
+
+            sdkErrorMetadata.clientContext.mapTo(this@buildList) { it.formatted }
         }
 
     override val message: String
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/Attributes.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/Attributes.kt
index 1fffcc82a2..77c2507394 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/Attributes.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/Attributes.kt
@@ -115,6 +115,17 @@ public fun MutableAttributes.merge(other: Attributes) {
     }
 }
 
+/**
+ * Appends a value to a list-typed attribute. If the attribute does not exist, it will be created.
+ * @param key The key for the attribute
+ * @param element The element to append to the existing (or new) list value of the attribute
+ */
+public fun <E> MutableAttributes.appendValue(key: AttributeKey<List<E>>, element: E) {
+    val existingList = getOrNull(key).orEmpty()
+    val newList = existingList + element
+    set(key, newList)
+}
+
 private class AttributesImpl constructor(seed: Attributes) : MutableAttributes {
     private val map: MutableMap<AttributeKey<*>, Any> = mutableMapOf()
     constructor() : this(emptyAttributes())
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/retries/Exceptions.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/retries/Exceptions.kt
index dbc2de0ffa..a81c830da2 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/retries/Exceptions.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/retries/Exceptions.kt
@@ -22,7 +22,28 @@ public sealed class RetryException(
     public val attempts: Int,
     public val lastResponse: Any?,
     public val lastException: Throwable?,
-) : ClientException(message, cause)
+) : ClientException(message, cause) {
+    override fun toString(): String = buildString {
+        append(this@RetryException::class.simpleName)
+        append("(")
+
+        append("message=")
+        append(message)
+
+        append(",attempts=")
+        append(attempts)
+
+        if (lastException != null) {
+            append(",lastException=")
+            append(lastException)
+        } else if (lastResponse != null) {
+            append(",lastResponse=")
+            append(lastResponse)
+        }
+
+        append(")")
+    }
+}
 
 /**
  * Indicates that retrying has failed because too many attempts have completed unsuccessfully.
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/retries/StandardRetryStrategy.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/retries/StandardRetryStrategy.kt
index 95fd16faee..fb223aec68 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/retries/StandardRetryStrategy.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/retries/StandardRetryStrategy.kt
@@ -5,6 +5,10 @@
 
 package aws.smithy.kotlin.runtime.retries
 
+import aws.smithy.kotlin.runtime.ClientErrorContext
+import aws.smithy.kotlin.runtime.ErrorMetadata
+import aws.smithy.kotlin.runtime.ServiceException
+import aws.smithy.kotlin.runtime.collections.appendValue
 import aws.smithy.kotlin.runtime.retries.delay.*
 import aws.smithy.kotlin.runtime.retries.policy.RetryDirective
 import aws.smithy.kotlin.runtime.retries.policy.RetryPolicy
@@ -129,17 +133,35 @@ public open class StandardRetryStrategy(override val config: Config = Config.def
         }
     }
 
-    private fun <R> throwCapacityExceeded(cause: Throwable, attempt: Int, result: Result<R>?): Nothing =
-        when (val ex = result?.exceptionOrNull()) {
+    private fun <R> throwCapacityExceeded(
+        cause: RetryCapacityExceededException,
+        attempt: Int,
+        result: Result<R>?,
+    ): Nothing {
+        val capacityMessage = buildString {
+            append("Insufficient client capacity to attempt retry, halting on attempt ")
+            append(attempt)
+            append(" of ")
+            append(config.maxAttempts)
+        }
+
+        throw when (val retryableException = result?.exceptionOrNull()) {
             null -> throw TooManyAttemptsException(
-                cause.message!!,
+                capacityMessage,
                 cause,
                 attempt,
                 result?.getOrNull(),
                 result?.exceptionOrNull(),
             )
-            else -> throw ex
+
+            is ServiceException -> retryableException.apply {
+                val addCtx = ClientErrorContext("Early retry termination", capacityMessage)
+                sdkErrorMetadata.attributes.appendValue(ErrorMetadata.ClientContext, addCtx)
+            }
+
+            else -> retryableException
         }
+    }
 
     /**
      * Handles the termination of the retry loop because of a non-retryable failure by throwing a
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/retries/delay/StandardRetryTokenBucket.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/retries/delay/StandardRetryTokenBucket.kt
index 4bd2c23766..b2c4c70588 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/retries/delay/StandardRetryTokenBucket.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/retries/delay/StandardRetryTokenBucket.kt
@@ -60,7 +60,7 @@ public class StandardRetryTokenBucket internal constructor(
             capacity -= size
         } else {
             if (config.useCircuitBreakerMode) {
-                throw RetryCapacityExceededException("Insufficient capacity to attempt another retry")
+                throw RetryCapacityExceededException("Insufficient capacity to attempt retry")
             }
 
             val extraRequiredCapacity = size - capacity
diff --git a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/ExceptionsTest.kt b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/ExceptionsTest.kt
index 551718c36e..0ba2d1639f 100644
--- a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/ExceptionsTest.kt
+++ b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/ExceptionsTest.kt
@@ -5,9 +5,14 @@
 package aws.smithy.kotlin.runtime
 
 import aws.smithy.kotlin.runtime.collections.MutableAttributes
+import aws.smithy.kotlin.runtime.collections.appendValue
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
+private const val CTX_KEY_1 = "Color"
+private const val CTX_VALUE_1 = "blue"
+private const val CTX_KEY_2 = "Shape"
+private const val CTX_VALUE_2 = "square"
 private const val ERROR_CODE = "ErrorWithNoMessage"
 private const val METADATA_MESSAGE = "This is a message included in metadata but not the regular response"
 private const val PROTOCOL_RESPONSE_SUMMARY = "HTTP 418 I'm a teapot"
@@ -104,6 +109,35 @@ class ExceptionsTest {
             e.message,
         )
     }
+
+    @Test
+    fun testNoMessageWithClientContext() {
+        val e = FooServiceException {
+            appendValue(ErrorMetadata.ClientContext, ClientErrorContext(CTX_KEY_1, CTX_VALUE_1))
+            appendValue(ErrorMetadata.ClientContext, ClientErrorContext(CTX_KEY_2, CTX_VALUE_2))
+        }
+        assertEquals(
+            buildList {
+                add("Error type: Unknown")
+                add("Protocol response: (empty response)")
+                add("$CTX_KEY_1: $CTX_VALUE_1")
+                add("$CTX_KEY_2: $CTX_VALUE_2")
+            }.joinToString(),
+            e.message,
+        )
+    }
+
+    @Test
+    fun testMessageWithClientContext() {
+        val e = FooServiceException(SERVICE_MESSAGE) {
+            appendValue(ErrorMetadata.ClientContext, ClientErrorContext(CTX_KEY_1, CTX_VALUE_1))
+            appendValue(ErrorMetadata.ClientContext, ClientErrorContext(CTX_KEY_2, CTX_VALUE_2))
+        }
+        assertEquals(
+            "$SERVICE_MESSAGE, $CTX_KEY_1: $CTX_VALUE_1, $CTX_KEY_2: $CTX_VALUE_2",
+            e.message,
+        )
+    }
 }
 
 private class FooServiceException(
diff --git a/runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/retries/impl/StandardRetryIntegrationTest.kt b/runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/retries/impl/StandardRetryIntegrationTest.kt
index f2c08e47eb..2bd3bc7e6a 100644
--- a/runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/retries/impl/StandardRetryIntegrationTest.kt
+++ b/runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/retries/impl/StandardRetryIntegrationTest.kt
@@ -5,8 +5,8 @@
 
 package aws.smithy.kotlin.runtime.retries.impl
 
+import aws.smithy.kotlin.runtime.ServiceException
 import aws.smithy.kotlin.runtime.retries.StandardRetryStrategy
-import aws.smithy.kotlin.runtime.retries.TooManyAttemptsException
 import aws.smithy.kotlin.runtime.retries.delay.StandardRetryTokenBucket
 import aws.smithy.kotlin.runtime.retries.getOrThrow
 import aws.smithy.kotlin.runtime.retries.policy.RetryDirective
@@ -15,6 +15,7 @@ import aws.smithy.kotlin.runtime.retries.policy.RetryPolicy
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.currentTime
 import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.assertThrows
 import kotlin.test.*
 import kotlin.time.Duration.Companion.milliseconds
 
@@ -38,7 +39,7 @@ class StandardRetryIntegrationTest {
 
             val block = object {
                 var index = 0
-                suspend fun doIt() = tc.responses[index++].response.statusCode
+                suspend fun doIt() = tc.responses[index++].response.getOrThrow()
             }::doIt
 
             val startTimeMs = currentTime
@@ -47,9 +48,29 @@ class StandardRetryIntegrationTest {
 
             val finalState = tc.responses.last().expected
             when (finalState.outcome) {
-                TestOutcome.Success -> assertEquals(200, result.getOrNull()?.getOrThrow(), "Unexpected outcome for $name")
-                TestOutcome.MaxAttemptsExceeded -> assertIs<TooManyAttemptsException>(result.exceptionOrNull())
-                TestOutcome.RetryQuotaExceeded -> assertIs<TooManyAttemptsException>(result.exceptionOrNull())
+                TestOutcome.Success ->
+                    assertEquals(Ok, result.getOrThrow().getOrThrow(), "Unexpected outcome for $name")
+
+                TestOutcome.MaxAttemptsExceeded -> {
+                    val e = assertThrows<HttpCodeException>("Expected exception for $name") {
+                        result.getOrThrow()
+                    }
+
+                    assertEquals(tc.responses.last().response.statusCode, e.code, "Unexpected error code for $name")
+                }
+
+                TestOutcome.RetryQuotaExceeded -> {
+                    val e = assertThrows<HttpCodeException>("Expected exception for $name") {
+                        result.getOrThrow()
+                    }
+
+                    assertEquals(tc.responses.last().response.statusCode, e.code, "Unexpected error code for $name")
+
+                    assertTrue("Expected retry capacity message in exception for $name") {
+                        "Insufficient client capacity to attempt retry" in e.message
+                    }
+                }
+
                 else -> fail("Unexpected outcome for $name: ${finalState.outcome}")
             }
 
@@ -72,10 +93,19 @@ class StandardRetryIntegrationTest {
     }
 }
 
-object IntegrationTestPolicy : RetryPolicy<Int> {
-    override fun evaluate(result: Result<Int>): RetryDirective = when (val code = result.getOrNull()!!) {
-        200 -> RetryDirective.TerminateAndSucceed
-        500, 502 -> RetryDirective.RetryError(RetryErrorType.ServerSide)
-        else -> fail("Unexpected status code: $code")
+object IntegrationTestPolicy : RetryPolicy<Ok> {
+    override fun evaluate(result: Result<Ok>): RetryDirective = when {
+        result.isSuccess -> RetryDirective.TerminateAndSucceed
+        result.isFailure -> RetryDirective.RetryError(RetryErrorType.ServerSide)
+        else -> fail("Unexpected result condition")
     }
 }
+
+data object Ok
+
+class HttpCodeException(val code: Int) : ServiceException()
+
+fun Response.getOrThrow() = when (statusCode) {
+    200 -> Ok
+    else -> throw HttpCodeException(statusCode)
+}
diff --git a/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/util/TestUtils.kt b/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/util/TestUtils.kt
index 02bf209f3c..2e64c9d4fe 100644
--- a/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/util/TestUtils.kt
+++ b/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/util/TestUtils.kt
@@ -6,6 +6,7 @@
 
 package software.amazon.smithy.kotlin.codegen.util
 
+import com.tschuchort.compiletesting.JvmCompilationResult
 import com.tschuchort.compiletesting.KotlinCompilation
 import com.tschuchort.compiletesting.SourceFile
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
@@ -36,8 +37,8 @@ private fun String.slashEscape(char: Char) = this.replace(char.toString(), """\$
  * Captures the result of a model transformation test
  */
 data class ModelChangeTestResult(
-    val originalModelCompilationResult: KotlinCompilation.Result,
-    val updatedModelCompilationResult: KotlinCompilation.Result,
+    val originalModelCompilationResult: JvmCompilationResult,
+    val updatedModelCompilationResult: JvmCompilationResult,
     val compileSuccess: Boolean,
     val compileOutput: String,
 )
@@ -88,7 +89,7 @@ fun compileSdkAndTest(
     testSource: String? = null,
     outputSink: OutputStream = System.out,
     emitSourcesToTmp: Boolean = false,
-): KotlinCompilation.Result {
+): JvmCompilationResult {
     val sdkFileManifest = generateSdk(model)
 
     if (emitSourcesToTmp) {

From e0c25d654adde3124f50733e0bc66fde2ee8d058 Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Wed, 15 Jan 2025 12:35:50 -0500
Subject: [PATCH 020/183] feat: support default checksums (#1191)

---
 .../kotlin/codegen/core/RuntimeTypes.kt       |   7 +-
 .../HttpChecksumRequiredIntegration.kt        |  66 +++++
 .../protocol/HttpProtocolClientGenerator.kt   |  25 --
 ...tlin.codegen.integration.KotlinIntegration |   1 +
 .../protocol/http-client/api/http-client.api  |  20 +-
 ...eptor.kt => CachingChecksumInterceptor.kt} |  14 +-
 .../interceptors/ChecksumInterceptorUtils.kt  |  44 +++
 .../FlexibleChecksumsRequestInterceptor.kt    | 277 ++++++++----------
 .../FlexibleChecksumsResponseInterceptor.kt   |  94 +++---
 .../HttpChecksumRequiredInterceptor.kt        |  98 +++++++
 .../interceptors/Md5ChecksumInterceptor.kt    |  54 ----
 .../http/operation/HttpOperationContext.kt    |   4 +-
 ...t.kt => CachingChecksumInterceptorTest.kt} |  12 +-
 ...FlexibleChecksumsRequestInterceptorTest.kt | 115 +++++---
 ...lexibleChecksumsResponseInterceptorTest.kt |  84 +++++-
 ...=> HttpChecksumRequiredInterceptorTest.kt} |  46 ++-
 runtime/protocol/http/api/http.api            |  18 ++
 .../smithy/kotlin/runtime/http/HttpBody.kt    |  52 ++++
 runtime/runtime-core/api/runtime-core.api     |  15 +
 .../businessmetrics/BusinessMetricsUtils.kt   |   8 +
 .../kotlin/runtime/hashing/HashFunction.kt    |  55 ++++
 .../kotlin/runtime/io/SdkByteReadChannel.kt   |  16 +
 runtime/smithy-client/api/smithy-client.api   |  28 ++
 .../client/config/HttpChecksumConfig.kt       |  63 ++++
 24 files changed, 865 insertions(+), 351 deletions(-)
 create mode 100644 codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/checksums/HttpChecksumRequiredIntegration.kt
 rename runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/{AbstractChecksumInterceptor.kt => CachingChecksumInterceptor.kt} (67%)
 create mode 100644 runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/ChecksumInterceptorUtils.kt
 create mode 100644 runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/HttpChecksumRequiredInterceptor.kt
 delete mode 100644 runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/Md5ChecksumInterceptor.kt
 rename runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/{AbstractChecksumInterceptorTest.kt => CachingChecksumInterceptorTest.kt} (88%)
 rename runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/{Md5ChecksumInterceptorTest.kt => HttpChecksumRequiredInterceptorTest.kt} (62%)
 create mode 100644 runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/config/HttpChecksumConfig.kt

diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
index e42612b0b5..b6341e0443 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
@@ -81,7 +81,7 @@ object RuntimeTypes {
         object Interceptors : RuntimeTypePackage(KotlinDependency.HTTP, "interceptors") {
             val ContinueInterceptor = symbol("ContinueInterceptor")
             val HttpInterceptor = symbol("HttpInterceptor")
-            val Md5ChecksumInterceptor = symbol("Md5ChecksumInterceptor")
+            val HttpChecksumRequiredInterceptor = symbol("HttpChecksumRequiredInterceptor")
             val FlexibleChecksumsRequestInterceptor = symbol("FlexibleChecksumsRequestInterceptor")
             val FlexibleChecksumsResponseInterceptor = symbol("FlexibleChecksumsResponseInterceptor")
             val ResponseLengthValidationInterceptor = symbol("ResponseLengthValidationInterceptor")
@@ -231,6 +231,9 @@ object RuntimeTypes {
         object Config : RuntimeTypePackage(KotlinDependency.SMITHY_CLIENT, "config") {
             val RequestCompressionConfig = symbol("RequestCompressionConfig")
             val CompressionClientConfig = symbol("CompressionClientConfig")
+            val HttpChecksumConfig = symbol("HttpChecksumConfig")
+            val RequestHttpChecksumConfig = symbol("RequestHttpChecksumConfig")
+            val ResponseHttpChecksumConfig = symbol("ResponseHttpChecksumConfig")
         }
 
         object Endpoints : RuntimeTypePackage(KotlinDependency.SMITHY_CLIENT, "endpoints") {
@@ -395,6 +398,7 @@ object RuntimeTypes {
             val TelemetryContextElement = symbol("TelemetryContextElement", "context")
             val TraceSpan = symbol("TraceSpan", "trace")
             val withSpan = symbol("withSpan", "trace")
+            val warn = symbol("warn", "logging")
         }
         object TelemetryDefaults : RuntimeTypePackage(KotlinDependency.TELEMETRY_DEFAULTS) {
             val Global = symbol("Global")
@@ -409,6 +413,7 @@ object RuntimeTypes {
 
         val CompletableDeferred = "kotlinx.coroutines.CompletableDeferred".toSymbol()
         val job = "kotlinx.coroutines.job".toSymbol()
+        val runBlocking = "kotlinx.coroutines.runBlocking".toSymbol()
 
         object Flow {
             // NOTE: smithy-kotlin core has an API dependency on this already
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/checksums/HttpChecksumRequiredIntegration.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/checksums/HttpChecksumRequiredIntegration.kt
new file mode 100644
index 0000000000..61432a7b12
--- /dev/null
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/checksums/HttpChecksumRequiredIntegration.kt
@@ -0,0 +1,66 @@
+package software.amazon.smithy.kotlin.codegen.rendering.checksums
+
+import software.amazon.smithy.aws.traits.HttpChecksumTrait
+import software.amazon.smithy.kotlin.codegen.KotlinSettings
+import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
+import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
+import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
+import software.amazon.smithy.kotlin.codegen.model.hasTrait
+import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
+import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolMiddleware
+import software.amazon.smithy.model.Model
+import software.amazon.smithy.model.shapes.OperationShape
+import software.amazon.smithy.model.traits.HttpChecksumRequiredTrait
+
+/**
+ * Handles the `httpChecksumRequired` trait.
+ * See: https://smithy.io/2.0/spec/http-bindings.html#httpchecksumrequired-trait
+ */
+class HttpChecksumRequiredIntegration : KotlinIntegration {
+    override fun enabledForService(model: Model, settings: KotlinSettings): Boolean =
+        model.isTraitApplied(HttpChecksumRequiredTrait::class.java)
+
+    override fun customizeMiddleware(
+        ctx: ProtocolGenerator.GenerationContext,
+        resolved: List<ProtocolMiddleware>,
+    ): List<ProtocolMiddleware> = resolved + httpChecksumRequiredDefaultAlgorithmMiddleware + httpChecksumRequiredMiddleware
+}
+
+/**
+ * Adds default checksum algorithm to the execution context
+ */
+private val httpChecksumRequiredDefaultAlgorithmMiddleware = object : ProtocolMiddleware {
+    override val name: String = "httpChecksumRequiredDefaultAlgorithmMiddleware"
+    override val order: Byte = -2 // Before S3 Express (possibly) changes the default (-1) and before calculating checksum (0)
+
+    override fun isEnabledFor(ctx: ProtocolGenerator.GenerationContext, op: OperationShape): Boolean =
+        op.hasTrait<HttpChecksumRequiredTrait>() && !op.hasTrait<HttpChecksumTrait>()
+
+    override fun render(ctx: ProtocolGenerator.GenerationContext, op: OperationShape, writer: KotlinWriter) {
+        writer.write(
+            "op.context[#T.DefaultChecksumAlgorithm] = #S",
+            RuntimeTypes.HttpClient.Operation.HttpOperationContext,
+            "MD5",
+        )
+    }
+}
+
+/**
+ * Adds interceptor to calculate request checksums.
+ * The `httpChecksum` trait supersedes the `httpChecksumRequired` trait. If both are applied to an operation use `httpChecksum`.
+ *
+ * See: https://smithy.io/2.0/aws/aws-core.html#behavior-with-httpchecksumrequired
+ */
+private val httpChecksumRequiredMiddleware = object : ProtocolMiddleware {
+    override val name: String = "httpChecksumRequiredMiddleware"
+
+    override fun isEnabledFor(ctx: ProtocolGenerator.GenerationContext, op: OperationShape): Boolean =
+        op.hasTrait<HttpChecksumRequiredTrait>() && !op.hasTrait<HttpChecksumTrait>()
+
+    override fun render(ctx: ProtocolGenerator.GenerationContext, op: OperationShape, writer: KotlinWriter) {
+        writer.write(
+            "op.interceptors.add(#T())",
+            RuntimeTypes.HttpClient.Interceptors.HttpChecksumRequiredInterceptor,
+        )
+    }
+}
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolClientGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolClientGenerator.kt
index 519957cbed..f12ab07a26 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolClientGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolClientGenerator.kt
@@ -4,7 +4,6 @@
  */
 package software.amazon.smithy.kotlin.codegen.rendering.protocol
 
-import software.amazon.smithy.aws.traits.HttpChecksumTrait
 import software.amazon.smithy.codegen.core.Symbol
 import software.amazon.smithy.kotlin.codegen.core.*
 import software.amazon.smithy.kotlin.codegen.integration.SectionId
@@ -22,7 +21,6 @@ import software.amazon.smithy.model.knowledge.OperationIndex
 import software.amazon.smithy.model.knowledge.TopDownIndex
 import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.model.traits.EndpointTrait
-import software.amazon.smithy.model.traits.HttpChecksumRequiredTrait
 
 /**
  * Renders an implementation of a service interface for HTTP protocol
@@ -318,8 +316,6 @@ open class HttpProtocolClientGenerator(
             .forEach { middleware ->
                 middleware.render(ctx, op, writer)
             }
-
-        op.renderIsMd5ChecksumRequired(writer)
     }
 
     /**
@@ -336,27 +332,6 @@ open class HttpProtocolClientGenerator(
      */
     protected open fun renderAdditionalMethods(writer: KotlinWriter) { }
 
-    /**
-     * Render optionally installing Md5ChecksumMiddleware.
-     * The Md5 middleware will only be installed if the operation requires a checksum and the user has not opted-in to flexible checksums.
-     */
-    private fun OperationShape.renderIsMd5ChecksumRequired(writer: KotlinWriter) {
-        val httpChecksumTrait = getTrait<HttpChecksumTrait>()
-
-        // the checksum requirement can be modeled in either HttpChecksumTrait's `requestChecksumRequired` or the HttpChecksumRequired trait
-        if (!hasTrait<HttpChecksumRequiredTrait>() && httpChecksumTrait == null) {
-            return
-        }
-
-        if (hasTrait<HttpChecksumRequiredTrait>() || httpChecksumTrait?.isRequestChecksumRequired == true) {
-            val interceptorSymbol = RuntimeTypes.HttpClient.Interceptors.Md5ChecksumInterceptor
-            val inputSymbol = ctx.symbolProvider.toSymbol(ctx.model.expectShape(inputShape))
-            writer.withBlock("op.interceptors.add(#T<#T> {", "})", interceptorSymbol, inputSymbol) {
-                writer.write("op.context.getOrNull(#T.ChecksumAlgorithm) == null", RuntimeTypes.HttpClient.Operation.HttpOperationContext)
-            }
-        }
-    }
-
     /**
      * render a utility function to populate an operation's ExecutionContext with defaults from service config, environment, etc
      */
diff --git a/codegen/smithy-kotlin-codegen/src/main/resources/META-INF/services/software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration b/codegen/smithy-kotlin-codegen/src/main/resources/META-INF/services/software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
index 0d02b51187..2ab7fe506a 100644
--- a/codegen/smithy-kotlin-codegen/src/main/resources/META-INF/services/software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
+++ b/codegen/smithy-kotlin-codegen/src/main/resources/META-INF/services/software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
@@ -13,3 +13,4 @@ software.amazon.smithy.kotlin.codegen.rendering.endpoints.SdkEndpointBuiltinInte
 software.amazon.smithy.kotlin.codegen.rendering.compression.RequestCompressionIntegration
 software.amazon.smithy.kotlin.codegen.rendering.auth.SigV4AsymmetricAuthSchemeIntegration
 software.amazon.smithy.kotlin.codegen.rendering.smoketests.SmokeTestsIntegration
+software.amazon.smithy.kotlin.codegen.rendering.checksums.HttpChecksumRequiredIntegration
\ No newline at end of file
diff --git a/runtime/protocol/http-client/api/http-client.api b/runtime/protocol/http-client/api/http-client.api
index 6e91f528f2..e8527c2c2b 100644
--- a/runtime/protocol/http-client/api/http-client.api
+++ b/runtime/protocol/http-client/api/http-client.api
@@ -255,7 +255,7 @@ public final class aws/smithy/kotlin/runtime/http/engine/internal/ManagedHttpCli
 	public static final fun manage (Laws/smithy/kotlin/runtime/http/engine/HttpClientEngine;)Laws/smithy/kotlin/runtime/http/engine/HttpClientEngine;
 }
 
-public abstract class aws/smithy/kotlin/runtime/http/interceptors/AbstractChecksumInterceptor : aws/smithy/kotlin/runtime/client/Interceptor {
+public abstract class aws/smithy/kotlin/runtime/http/interceptors/CachingChecksumInterceptor : aws/smithy/kotlin/runtime/client/Interceptor {
 	public fun <init> ()V
 	public abstract fun applyChecksum (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Ljava/lang/String;)Laws/smithy/kotlin/runtime/http/request/HttpRequest;
 	public abstract fun calculateChecksum (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -331,19 +331,17 @@ public final class aws/smithy/kotlin/runtime/http/interceptors/DiscoveredEndpoin
 	public fun readBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
 }
 
-public final class aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsRequestInterceptor : aws/smithy/kotlin/runtime/http/interceptors/AbstractChecksumInterceptor {
-	public fun <init> ()V
-	public fun <init> (Lkotlin/jvm/functions/Function1;)V
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+public final class aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsRequestInterceptor : aws/smithy/kotlin/runtime/http/interceptors/CachingChecksumInterceptor {
+	public fun <init> (ZLaws/smithy/kotlin/runtime/client/config/RequestHttpChecksumConfig;Ljava/lang/String;)V
 	public fun applyChecksum (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Ljava/lang/String;)Laws/smithy/kotlin/runtime/http/request/HttpRequest;
 	public fun calculateChecksum (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun modifyBeforeSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun readAfterSerialization (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
 }
 
-public final class aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptor : aws/smithy/kotlin/runtime/client/Interceptor {
+public class aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptor : aws/smithy/kotlin/runtime/client/Interceptor {
 	public static final field Companion Laws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptor$Companion;
-	public fun <init> (Lkotlin/jvm/functions/Function1;)V
+	public fun <init> (ZLaws/smithy/kotlin/runtime/client/config/ResponseHttpChecksumConfig;)V
+	public fun ignoreChecksum (Ljava/lang/String;Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;)Z
 	public fun modifyBeforeAttemptCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun modifyBeforeCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun modifyBeforeDeserialization (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -369,10 +367,8 @@ public final class aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksums
 	public final fun getChecksumHeaderValidated ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 }
 
-public final class aws/smithy/kotlin/runtime/http/interceptors/Md5ChecksumInterceptor : aws/smithy/kotlin/runtime/http/interceptors/AbstractChecksumInterceptor {
+public final class aws/smithy/kotlin/runtime/http/interceptors/HttpChecksumRequiredInterceptor : aws/smithy/kotlin/runtime/http/interceptors/CachingChecksumInterceptor {
 	public fun <init> ()V
-	public fun <init> (Lkotlin/jvm/functions/Function1;)V
-	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun applyChecksum (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Ljava/lang/String;)Laws/smithy/kotlin/runtime/http/request/HttpRequest;
 	public fun calculateChecksum (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun modifyBeforeSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -516,9 +512,9 @@ public abstract interface class aws/smithy/kotlin/runtime/http/operation/HttpDes
 
 public final class aws/smithy/kotlin/runtime/http/operation/HttpOperationContext {
 	public static final field INSTANCE Laws/smithy/kotlin/runtime/http/operation/HttpOperationContext;
-	public final fun getChecksumAlgorithm ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 	public final fun getClockSkew ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 	public final fun getClockSkewApproximateSigningTime ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
+	public final fun getDefaultChecksumAlgorithm ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 	public final fun getHostPrefix ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 	public final fun getHttpCallList ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 	public final fun getOperationAttributes ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/AbstractChecksumInterceptor.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/CachingChecksumInterceptor.kt
similarity index 67%
rename from runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/AbstractChecksumInterceptor.kt
rename to runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/CachingChecksumInterceptor.kt
index 3fa8406bf5..adad89f259 100644
--- a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/AbstractChecksumInterceptor.kt
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/CachingChecksumInterceptor.kt
@@ -9,13 +9,21 @@ import aws.smithy.kotlin.runtime.InternalApi
 import aws.smithy.kotlin.runtime.client.ProtocolRequestInterceptorContext
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
 
+/**
+ * Enables inheriting [HttpInterceptor]s to use checksums caching
+ */
 @InternalApi
-public abstract class AbstractChecksumInterceptor : HttpInterceptor {
+public abstract class CachingChecksumInterceptor : HttpInterceptor {
     private var cachedChecksum: String? = null
 
     override suspend fun modifyBeforeSigning(context: ProtocolRequestInterceptorContext<Any, HttpRequest>): HttpRequest {
-        cachedChecksum ?: calculateChecksum(context).also { cachedChecksum = it }
-        return cachedChecksum?.let { applyChecksum(context, it) } ?: context.protocolRequest
+        cachedChecksum = cachedChecksum ?: calculateChecksum(context)
+
+        return if (cachedChecksum != null) {
+            applyChecksum(context, cachedChecksum!!)
+        } else {
+            context.protocolRequest
+        }
     }
 
     public abstract suspend fun calculateChecksum(context: ProtocolRequestInterceptorContext<Any, HttpRequest>): String?
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/ChecksumInterceptorUtils.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/ChecksumInterceptorUtils.kt
new file mode 100644
index 0000000000..b510ab14e5
--- /dev/null
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/ChecksumInterceptorUtils.kt
@@ -0,0 +1,44 @@
+package aws.smithy.kotlin.runtime.http.interceptors
+
+import aws.smithy.kotlin.runtime.businessmetrics.emitBusinessMetric
+import aws.smithy.kotlin.runtime.client.ProtocolRequestInterceptorContext
+import aws.smithy.kotlin.runtime.hashing.HashFunction
+import aws.smithy.kotlin.runtime.hashing.resolveChecksumAlgorithmHeaderName
+import aws.smithy.kotlin.runtime.hashing.toBusinessMetric
+import aws.smithy.kotlin.runtime.http.operation.HttpOperationContext
+import aws.smithy.kotlin.runtime.http.request.HttpRequest
+import aws.smithy.kotlin.runtime.http.request.toBuilder
+import aws.smithy.kotlin.runtime.http.toCompletingBody
+import aws.smithy.kotlin.runtime.http.toHashingBody
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.job
+
+/**
+ * Configures [HttpRequest] with AWS chunked streaming to calculate checksum during transmission
+ * @return [HttpRequest]
+ */
+internal fun calculateAwsChunkedStreamingChecksum(
+    context: ProtocolRequestInterceptorContext<Any, HttpRequest>,
+    checksumAlgorithm: HashFunction,
+): HttpRequest {
+    val request = context.protocolRequest.toBuilder()
+    val deferredChecksum = CompletableDeferred<String>(context.executionContext.coroutineContext.job)
+    val checksumHeader = checksumAlgorithm.resolveChecksumAlgorithmHeaderName()
+
+    request.body = request.body
+        .toHashingBody(checksumAlgorithm, request.body.contentLength)
+        .toCompletingBody(deferredChecksum)
+
+    request.headers.append("x-amz-trailer", checksumHeader)
+    request.trailingHeaders.append(checksumHeader, deferredChecksum)
+
+    context.executionContext.emitBusinessMetric(checksumAlgorithm.toBusinessMetric())
+
+    return request.build()
+}
+
+/**
+ * @return The default checksum algorithm name in the execution context, null if default checksums are disabled.
+ */
+internal val ProtocolRequestInterceptorContext<Any, HttpRequest>.defaultChecksumAlgorithmName: String?
+    get() = executionContext.getOrNull(HttpOperationContext.DefaultChecksumAlgorithm)
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsRequestInterceptor.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsRequestInterceptor.kt
index b29ede017f..936dead520 100644
--- a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsRequestInterceptor.kt
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsRequestInterceptor.kt
@@ -5,104 +5,117 @@
 
 package aws.smithy.kotlin.runtime.http.interceptors
 
-import aws.smithy.kotlin.runtime.ClientException
 import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.businessmetrics.emitBusinessMetric
 import aws.smithy.kotlin.runtime.client.ProtocolRequestInterceptorContext
+import aws.smithy.kotlin.runtime.client.config.RequestHttpChecksumConfig
 import aws.smithy.kotlin.runtime.hashing.*
 import aws.smithy.kotlin.runtime.http.*
-import aws.smithy.kotlin.runtime.http.operation.HttpOperationContext
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
-import aws.smithy.kotlin.runtime.http.request.header
 import aws.smithy.kotlin.runtime.http.request.toBuilder
 import aws.smithy.kotlin.runtime.io.*
+import aws.smithy.kotlin.runtime.telemetry.logging.Logger
 import aws.smithy.kotlin.runtime.telemetry.logging.logger
 import aws.smithy.kotlin.runtime.text.encoding.encodeBase64String
-import aws.smithy.kotlin.runtime.util.LazyAsyncValue
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.job
 import kotlin.coroutines.coroutineContext
 
 /**
- * Mutate a request to enable flexible checksums.
+ * Handles request checksums for operations with the [HttpChecksumTrait] applied.
  *
- * If the checksum will be sent as a header, calculate the checksum.
+ * If a user supplies a checksum via an HTTP header no calculation will be done. The exception is MD5, if a user
+ * supplies an MD5 checksum header it will be ignored.
  *
- * Otherwise, if it will be sent as a trailing header, calculate the checksum as asynchronously as the body is streamed.
- * In this case, a [LazyAsyncValue] will be added to the execution context which allows the trailing checksum to be sent
- * after the entire body has been streamed.
+ * If the request configuration and model requires checksum calculation:
+ * - Check if the user configured a checksum algorithm for the request and attempt to use that.
+ * - If no checksum is configured for the request then use the default checksum algorithm to calculate a checksum.
  *
- * @param checksumAlgorithmNameInitializer an optional function which parses the input [I] to return the checksum algorithm name.
- * if not set, then the [HttpOperationContext.ChecksumAlgorithm] execution context attribute will be used.
+ * If the request will be streamed:
+ * - The checksum calculation is done during transmission using a hashing & completing body.
+ * - The checksum will be sent in a trailing header, once the request is consumed.
+ *
+ * If the request will not be streamed:
+ * - The checksum calculation is done before transmission
+ * - The checksum will be sent in a header
+ *
+ * Business metrics MUST be emitted for the checksum algorithm used.
+ *
+ * @param requestChecksumRequired Model sourced flag indicating if checksum calculation is mandatory.
+ * @param requestChecksumCalculation Configuration option that determines when checksum calculation should be done.
+ * @param requestChecksumAlgorithm The checksum algorithm that the user selected for the request, may be null.
  */
 @InternalApi
-public class FlexibleChecksumsRequestInterceptor<I>(
-    private val checksumAlgorithmNameInitializer: ((I) -> String?)? = null,
-) : AbstractChecksumInterceptor() {
-    private var checksumAlgorithmName: String? = null
-
-    @Deprecated("readAfterSerialization is no longer used")
-    override fun readAfterSerialization(context: ProtocolRequestInterceptorContext<Any, HttpRequest>) { }
-
+public class FlexibleChecksumsRequestInterceptor(
+    private val requestChecksumRequired: Boolean,
+    private val requestChecksumCalculation: RequestHttpChecksumConfig?,
+    private val requestChecksumAlgorithm: String?,
+) : CachingChecksumInterceptor() {
     override suspend fun modifyBeforeSigning(context: ProtocolRequestInterceptorContext<Any, HttpRequest>): HttpRequest {
-        val logger = coroutineContext.logger<FlexibleChecksumsRequestInterceptor<I>>()
+        val logger = coroutineContext.logger<FlexibleChecksumsRequestInterceptor>()
 
-        @Suppress("UNCHECKED_CAST")
-        val input = context.request as I
-        checksumAlgorithmName = checksumAlgorithmNameInitializer?.invoke(input) ?: context.executionContext.getOrNull(HttpOperationContext.ChecksumAlgorithm)
+        context.protocolRequest.userProvidedChecksumHeader(logger)?.let {
+            logger.debug { "Checksum was supplied via header: skipping checksum calculation" }
 
-        checksumAlgorithmName ?: run {
-            logger.debug { "no checksum algorithm specified, skipping flexible checksums processing" }
+            val request = context.protocolRequest.toBuilder()
+            request.headers.removeAllChecksumHeadersExcept(it)
             return context.protocolRequest
         }
 
-        val req = context.protocolRequest.toBuilder()
-
-        check(context.protocolRequest.body !is HttpBody.Empty) {
-            "Can't calculate the checksum of an empty body"
-        }
-
-        val headerName = "x-amz-checksum-$checksumAlgorithmName".lowercase()
-        logger.debug { "Resolved checksum header name: $headerName" }
-
-        // remove all checksum headers except for $headerName
-        // this handles the case where a user inputs a precalculated checksum, but it doesn't match the input checksum algorithm
-        req.headers.removeAllChecksumHeadersExcept(headerName)
-
-        val checksumAlgorithm = checksumAlgorithmName?.toHashFunction() ?: throw ClientException("Could not parse checksum algorithm $checksumAlgorithmName")
-
-        if (!checksumAlgorithm.isSupported) {
-            throw ClientException("Checksum algorithm $checksumAlgorithmName is not supported for flexible checksums")
-        }
-
-        if (req.body.isEligibleForAwsChunkedStreaming) {
-            req.header("x-amz-trailer", headerName)
-
-            val deferredChecksum = CompletableDeferred<String>(context.executionContext.coroutineContext.job)
-
-            if (req.headers[headerName] != null) {
-                logger.debug { "User supplied a checksum, skipping asynchronous calculation" }
-
-                val checksum = req.headers[headerName]!!
-                req.headers.remove(headerName) // remove the checksum header because it will be sent as a trailing header
-
-                deferredChecksum.complete(checksum)
+        resolveChecksumAlgorithm(
+            requestChecksumRequired,
+            requestChecksumCalculation,
+            requestChecksumAlgorithm,
+            context,
+        )?.let { checksumAlgorithm ->
+            return if (context.protocolRequest.body.isEligibleForAwsChunkedStreaming) {
+                logger.debug { "Calculating checksum during transmission using: ${checksumAlgorithm::class.simpleName}" }
+                calculateAwsChunkedStreamingChecksum(context, checksumAlgorithm)
             } else {
-                logger.debug { "Calculating checksum asynchronously" }
-                req.body = req.body
-                    .toHashingBody(checksumAlgorithm, req.body.contentLength)
-                    .toCompletingBody(deferredChecksum)
+                if (context.protocolRequest.body is HttpBody.Bytes) {
+                    // Cache checksum
+                    super.modifyBeforeSigning(context)
+                } else {
+                    val checksum = calculateFlexibleChecksumsChecksum(context)
+                    applyFlexibleChecksumsChecksum(context, checksum)
+                }
             }
-
-            req.trailingHeaders.append(headerName, deferredChecksum)
-            return req.build()
-        } else {
-            return super.modifyBeforeSigning(context)
         }
+
+        logger.debug { "Checksum wasn't provided, selected, or isn't required: skipping checksum calculation" }
+        return context.protocolRequest
     }
 
-    override suspend fun calculateChecksum(context: ProtocolRequestInterceptorContext<Any, HttpRequest>): String? {
+    /**
+     * Determines what checksum algorithm to use, null if none is required
+     */
+    private fun resolveChecksumAlgorithm(
+        requestChecksumRequired: Boolean,
+        requestChecksumCalculation: RequestHttpChecksumConfig?,
+        requestChecksumAlgorithm: String?,
+        context: ProtocolRequestInterceptorContext<Any, HttpRequest>,
+    ): HashFunction? =
+        requestChecksumAlgorithm
+            ?.toHashFunctionOrThrow()
+            ?.takeIf { it.isSupportedForFlexibleChecksums }
+            ?: context.defaultChecksumAlgorithmName
+                ?.toHashFunctionOrThrow()
+                ?.takeIf {
+                    (requestChecksumRequired || requestChecksumCalculation == RequestHttpChecksumConfig.WHEN_SUPPORTED) &&
+                        it.isSupportedForFlexibleChecksums
+                }
+
+    /**
+     * Calculates a checksum based on the requirements and limitations of [FlexibleChecksumsRequestInterceptor]
+     */
+    private suspend fun calculateFlexibleChecksumsChecksum(
+        context: ProtocolRequestInterceptorContext<Any, HttpRequest>,
+    ): String {
         val req = context.protocolRequest.toBuilder()
-        val checksumAlgorithm = checksumAlgorithmName?.toHashFunction() ?: return null
+        val checksumAlgorithm = resolveChecksumAlgorithm(
+            requestChecksumRequired,
+            requestChecksumCalculation,
+            requestChecksumAlgorithm,
+            context,
+        )!!
 
         return when {
             req.body.contentLength == null && !req.body.isOneShot -> {
@@ -110,104 +123,66 @@ public class FlexibleChecksumsRequestInterceptor<I>(
                 channel.rollingHash(checksumAlgorithm).encodeBase64String()
             }
             else -> {
-                val bodyBytes = req.body.readAll()!!
-                req.body = bodyBytes.toHttpBody()
+                val bodyBytes = req.body.readAll() ?: byteArrayOf()
+                if (req.body.isOneShot) req.body = bodyBytes.toHttpBody()
                 bodyBytes.hash(checksumAlgorithm).encodeBase64String()
             }
         }
     }
 
-    override fun applyChecksum(
+    override suspend fun calculateChecksum(context: ProtocolRequestInterceptorContext<Any, HttpRequest>): String? =
+        calculateFlexibleChecksumsChecksum(context)
+
+    /**
+     * Applies a checksum based on the requirements and limitations of [FlexibleChecksumsRequestInterceptor]
+     */
+    private fun applyFlexibleChecksumsChecksum(
         context: ProtocolRequestInterceptorContext<Any, HttpRequest>,
         checksum: String,
     ): HttpRequest {
-        val headerName = "x-amz-checksum-$checksumAlgorithmName".lowercase()
-
-        val req = context.protocolRequest.toBuilder()
-
-        if (!req.headers.contains(headerName)) {
-            req.header(headerName, checksum)
-        }
-
-        return req.build()
+        val request = context.protocolRequest.toBuilder()
+        val checksumAlgorithm = resolveChecksumAlgorithm(
+            requestChecksumRequired,
+            requestChecksumCalculation,
+            requestChecksumAlgorithm,
+            context,
+        )!!
+        val checksumHeader = checksumAlgorithm.resolveChecksumAlgorithmHeaderName()
+
+        request.headers[checksumHeader] = checksum
+        request.headers.removeAllChecksumHeadersExcept(checksumHeader)
+        context.executionContext.emitBusinessMetric(checksumAlgorithm.toBusinessMetric())
+
+        return request.build()
     }
 
-    // FIXME this duplicates the logic from aws-signing-common, but can't import from there due to circular import.
-    private val HttpBody.isEligibleForAwsChunkedStreaming: Boolean
-        get() = (this is HttpBody.SourceContent || this is HttpBody.ChannelContent) &&
-            contentLength != null &&
-            (isOneShot || contentLength!! > 65536 * 16)
+    override fun applyChecksum(
+        context: ProtocolRequestInterceptorContext<Any, HttpRequest>,
+        checksum: String,
+    ): HttpRequest = applyFlexibleChecksumsChecksum(context, checksum)
 
     /**
-     * @return if the [HashFunction] is supported by flexible checksums
+     * Checks if a user provided a checksum for a request via an HTTP header.
+     * The header must start with "x-amz-checksum-" followed by the checksum algorithm's name.
+     * MD5 is not considered a supported checksum algorithm.
      */
-    private val HashFunction.isSupported: Boolean get() = when (this) {
-        is Crc32, is Crc32c, is Sha256, is Sha1 -> true
-        else -> false
-    }
+    private fun HttpRequest.userProvidedChecksumHeader(logger: Logger) = headers
+        .names()
+        .firstOrNull {
+            it.startsWith("x-amz-checksum-", ignoreCase = true) &&
+                !it.equals("x-amz-checksum-md5", ignoreCase = true).also { isMd5 ->
+                    if (isMd5) {
+                        logger.debug { "MD5 checksum was supplied via header, MD5 is not a supported algorithm, ignoring header" }
+                    }
+                }
+        }
 
     /**
      * Removes all checksum headers except [headerName]
      * @param headerName the checksum header name to keep
      */
-    private fun HeadersBuilder.removeAllChecksumHeadersExcept(headerName: String) {
-        names().forEach { name ->
-            if (name.startsWith("x-amz-checksum-") && name != headerName) {
-                remove(name)
-            }
-        }
-    }
-
-    /**
-     * Convert an [HttpBody] with an underlying [HashingSource] or [HashingByteReadChannel]
-     * to a [CompletingSource] or [CompletingByteReadChannel], respectively.
-     */
-    private fun HttpBody.toCompletingBody(deferred: CompletableDeferred<String>) = when (this) {
-        is HttpBody.SourceContent -> CompletingSource(deferred, (readFrom() as HashingSource)).toHttpBody(contentLength)
-        is HttpBody.ChannelContent -> CompletingByteReadChannel(deferred, (readFrom() as HashingByteReadChannel)).toHttpBody(contentLength)
-        else -> throw ClientException("HttpBody type is not supported")
-    }
-
-    /**
-     * An [SdkSource] which uses the underlying [hashingSource]'s checksum to complete a [CompletableDeferred] value.
-     */
-    internal class CompletingSource(
-        private val deferred: CompletableDeferred<String>,
-        private val hashingSource: HashingSource,
-    ) : SdkSource by hashingSource {
-        override fun read(sink: SdkBuffer, limit: Long): Long = hashingSource.read(sink, limit)
-            .also {
-                if (it == -1L) {
-                    deferred.complete(hashingSource.digest().encodeBase64String())
-                }
-            }
-    }
-
-    /**
-     * An [SdkByteReadChannel] which uses the underlying [hashingChannel]'s checksum to complete a [CompletableDeferred] value.
-     */
-    internal class CompletingByteReadChannel(
-        private val deferred: CompletableDeferred<String>,
-        private val hashingChannel: HashingByteReadChannel,
-    ) : SdkByteReadChannel by hashingChannel {
-        override suspend fun read(sink: SdkBuffer, limit: Long): Long = hashingChannel.read(sink, limit)
-            .also {
-                if (it == -1L) {
-                    deferred.complete(hashingChannel.digest().encodeBase64String())
-                }
-            }
-    }
-
-    /**
-     * Compute the rolling hash of an [SdkByteReadChannel] using [hashFunction], reading up-to [bufferSize] bytes into memory
-     * @return a ByteArray of the hash function's digest
-     */
-    private suspend fun SdkByteReadChannel.rollingHash(hashFunction: HashFunction, bufferSize: Long = 8192): ByteArray {
-        val buffer = SdkBuffer()
-        while (!isClosedForRead) {
-            read(buffer, bufferSize)
-            hashFunction.update(buffer.readToByteArray())
-        }
-        return hashFunction.digest()
-    }
+    private fun HeadersBuilder.removeAllChecksumHeadersExcept(headerName: String) =
+        names()
+            .filter { it.startsWith("x-amz-checksum-", ignoreCase = true) && !it.equals(headerName, ignoreCase = true) }
+            .forEach { remove(it) }
 }
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptor.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptor.kt
index 2e43fe1469..eceb19e739 100644
--- a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptor.kt
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptor.kt
@@ -8,10 +8,11 @@ package aws.smithy.kotlin.runtime.http.interceptors
 import aws.smithy.kotlin.runtime.ClientException
 import aws.smithy.kotlin.runtime.InternalApi
 import aws.smithy.kotlin.runtime.client.ProtocolResponseInterceptorContext
-import aws.smithy.kotlin.runtime.client.RequestInterceptorContext
+import aws.smithy.kotlin.runtime.client.config.ResponseHttpChecksumConfig
 import aws.smithy.kotlin.runtime.collections.AttributeKey
-import aws.smithy.kotlin.runtime.hashing.toHashFunction
+import aws.smithy.kotlin.runtime.hashing.toHashFunctionOrThrow
 import aws.smithy.kotlin.runtime.http.HttpBody
+import aws.smithy.kotlin.runtime.http.readAll
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
 import aws.smithy.kotlin.runtime.http.response.HttpResponse
 import aws.smithy.kotlin.runtime.http.response.copy
@@ -31,60 +32,87 @@ internal val CHECKSUM_HEADER_VALIDATION_PRIORITY_LIST: List<String> = listOf(
 )
 
 /**
- * Validate a response's checksum.
+ * Handles response checksums.
+ *
+ * If it's a streaming response, it wraps the response in a hashing body, calculating the checksum as the response is
+ * streamed to the user. The checksum is validated after the user has consumed the entire body using a checksum validating body.
+ * Otherwise, the checksum if calculated all at once.
  *
- * Wraps the response in a hashing body, calculating the checksum as the response is streamed to the user.
- * The checksum is validated after the user has consumed the entire body using a checksum validating body.
  * Users can check which checksum was validated by referencing the `ResponseChecksumValidated` execution context variable.
  *
- * @param shouldValidateResponseChecksumInitializer A function which uses the input [I] to return whether response checksum validation should occur
+ * @param responseValidationRequired Model sourced flag indicating if the checksum validation is mandatory.
+ * @param responseChecksumValidation Configuration option that determines when checksum validation should be done.
  */
-
 @InternalApi
-public class FlexibleChecksumsResponseInterceptor<I>(
-    private val shouldValidateResponseChecksumInitializer: (input: I) -> Boolean,
+public open class FlexibleChecksumsResponseInterceptor(
+    private val responseValidationRequired: Boolean,
+    private val responseChecksumValidation: ResponseHttpChecksumConfig?,
 ) : HttpInterceptor {
-
-    private var shouldValidateResponseChecksum: Boolean = false
-
     @InternalApi
     public companion object {
         // The name of the checksum header which was validated. If `null`, validation was not performed.
         public val ChecksumHeaderValidated: AttributeKey<String> = AttributeKey("ChecksumHeaderValidated")
     }
 
-    override fun readBeforeSerialization(context: RequestInterceptorContext<Any>) {
-        @Suppress("UNCHECKED_CAST")
-        val input = context.request as I
-        shouldValidateResponseChecksum = shouldValidateResponseChecksumInitializer(input)
-    }
-
     override suspend fun modifyBeforeDeserialization(context: ProtocolResponseInterceptorContext<Any, HttpRequest, HttpResponse>): HttpResponse {
-        if (!shouldValidateResponseChecksum) {
-            return context.protocolResponse
-        }
+        val configuredToVerifyChecksum = responseValidationRequired || responseChecksumValidation == ResponseHttpChecksumConfig.WHEN_SUPPORTED
+        if (!configuredToVerifyChecksum) return context.protocolResponse
 
-        val logger = coroutineContext.logger<FlexibleChecksumsResponseInterceptor<I>>()
+        val logger = coroutineContext.logger<FlexibleChecksumsResponseInterceptor>()
 
         val checksumHeader = CHECKSUM_HEADER_VALIDATION_PRIORITY_LIST
             .firstOrNull { context.protocolResponse.headers.contains(it) } ?: run {
-            logger.warn { "User requested checksum validation, but the response headers did not contain any valid checksums" }
+            logger.warn { "Checksum validation was requested but the response headers didn't contain a valid checksum." }
             return context.protocolResponse
         }
 
-        // let the user know which checksum will be validated
-        logger.debug { "Validating checksum from $checksumHeader" }
-        context.executionContext[ChecksumHeaderValidated] = checksumHeader
+        val serviceChecksumValue = context.protocolResponse.headers[checksumHeader]!!
+        if (ignoreChecksum(serviceChecksumValue, context)) {
+            return context.protocolResponse
+        }
 
-        val checksumAlgorithm = checksumHeader.removePrefix("x-amz-checksum-").toHashFunction() ?: throw ClientException("could not parse checksum algorithm from header $checksumHeader")
+        context.executionContext[ChecksumHeaderValidated] = checksumHeader
 
-        // Wrap the response body in a hashing body
-        return context.protocolResponse.copy(
-            body = context.protocolResponse.body
-                .toHashingBody(checksumAlgorithm, context.protocolResponse.body.contentLength)
-                .toChecksumValidatingBody(context.protocolResponse.headers[checksumHeader]!!),
-        )
+        val checksumAlgorithm = checksumHeader
+            .removePrefix("x-amz-checksum-")
+            .toHashFunctionOrThrow()
+
+        when (val bodyType = context.protocolResponse.body) {
+            is HttpBody.Bytes -> {
+                logger.debug { "Validating checksum before deserialization from $checksumHeader" }
+
+                checksumAlgorithm.update(
+                    context.protocolResponse.body.readAll() ?: byteArrayOf(),
+                )
+                val sdkChecksumValue = checksumAlgorithm.digest().encodeBase64String()
+
+                validateAndThrow(
+                    serviceChecksumValue,
+                    sdkChecksumValue,
+                )
+
+                return context.protocolResponse
+            }
+            is HttpBody.SourceContent, is HttpBody.ChannelContent -> {
+                logger.debug { "Validating checksum after deserialization from $checksumHeader" }
+
+                return context.protocolResponse.copy(
+                    body = context.protocolResponse.body
+                        .toHashingBody(checksumAlgorithm, context.protocolResponse.body.contentLength)
+                        .toChecksumValidatingBody(serviceChecksumValue),
+                )
+            }
+            else -> throw IllegalStateException("HTTP body type '$bodyType' is not supported for flexible checksums.")
+        }
     }
+
+    /**
+     * Additional check on the checksum itself to see if it should be validated
+     */
+    public open fun ignoreChecksum(
+        checksum: String,
+        context: ProtocolResponseInterceptorContext<Any, HttpRequest, HttpResponse>,
+    ): Boolean = false
 }
 
 public class ChecksumMismatchException(message: String?) : ClientException(message)
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/HttpChecksumRequiredInterceptor.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/HttpChecksumRequiredInterceptor.kt
new file mode 100644
index 0000000000..f422de7fa7
--- /dev/null
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/HttpChecksumRequiredInterceptor.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.http.interceptors
+
+import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.client.ProtocolRequestInterceptorContext
+import aws.smithy.kotlin.runtime.hashing.*
+import aws.smithy.kotlin.runtime.http.*
+import aws.smithy.kotlin.runtime.http.request.HttpRequest
+import aws.smithy.kotlin.runtime.http.request.header
+import aws.smithy.kotlin.runtime.http.request.toBuilder
+import aws.smithy.kotlin.runtime.io.rollingHash
+import aws.smithy.kotlin.runtime.telemetry.logging.logger
+import aws.smithy.kotlin.runtime.text.encoding.encodeBase64String
+import kotlin.coroutines.coroutineContext
+
+/**
+ * Handles checksum request calculation from the `httpChecksumRequired` trait.
+ */
+@InternalApi
+public class HttpChecksumRequiredInterceptor : CachingChecksumInterceptor() {
+    override suspend fun modifyBeforeSigning(context: ProtocolRequestInterceptorContext<Any, HttpRequest>): HttpRequest {
+        if (context.defaultChecksumAlgorithmName == null) {
+            // Don't calculate checksum
+            return context.protocolRequest
+        }
+
+        val checksumAlgorithmName = context.defaultChecksumAlgorithmName!!
+        val checksumAlgorithm = checksumAlgorithmName.toHashFunctionOrThrow()
+
+        return if (context.protocolRequest.body.isEligibleForAwsChunkedStreaming) {
+            coroutineContext.logger<HttpChecksumRequiredInterceptor>().debug {
+                "Calculating checksum during transmission using: ${checksumAlgorithm::class.simpleName}"
+            }
+            calculateAwsChunkedStreamingChecksum(context, checksumAlgorithm)
+        } else {
+            if (context.protocolRequest.body is HttpBody.Bytes) {
+                // Cache checksum
+                super.modifyBeforeSigning(context)
+            } else {
+                val checksum = calculateHttpChecksumRequiredChecksum(context)
+                applyHttpChecksumRequiredChecksum(context, checksum)
+            }
+        }
+    }
+
+    /**
+     * Calculates a checksum based on the requirements and limitations of [HttpChecksumRequiredInterceptor]
+     */
+    private suspend fun calculateHttpChecksumRequiredChecksum(
+        context: ProtocolRequestInterceptorContext<Any, HttpRequest>,
+    ): String {
+        val req = context.protocolRequest.toBuilder()
+        val checksumAlgorithmName = context.defaultChecksumAlgorithmName!!
+        val checksumAlgorithm = checksumAlgorithmName.toHashFunctionOrThrow()
+
+        return when {
+            req.body.contentLength == null && !req.body.isOneShot -> {
+                val channel = req.body.toSdkByteReadChannel()!!
+                channel.rollingHash(checksumAlgorithm).encodeBase64String()
+            }
+            else -> {
+                val bodyBytes = req.body.readAll() ?: byteArrayOf()
+                if (req.body.isOneShot) req.body = bodyBytes.toHttpBody()
+                bodyBytes.hash(checksumAlgorithm).encodeBase64String()
+            }
+        }
+    }
+
+    public override suspend fun calculateChecksum(
+        context: ProtocolRequestInterceptorContext<Any, HttpRequest>,
+    ): String? =
+        calculateHttpChecksumRequiredChecksum(context)
+
+    /**
+     * Applies a checksum based on the requirements and limitations of [HttpChecksumRequiredInterceptor]
+     */
+    private fun applyHttpChecksumRequiredChecksum(
+        context: ProtocolRequestInterceptorContext<Any, HttpRequest>,
+        checksum: String,
+    ): HttpRequest {
+        val checksumAlgorithmName = context.defaultChecksumAlgorithmName!!
+        val checksumHeader = checksumAlgorithmName.resolveChecksumAlgorithmHeaderName()
+        val request = context.protocolRequest.toBuilder()
+
+        request.header(checksumHeader, checksum)
+        return request.build()
+    }
+
+    public override fun applyChecksum(
+        context: ProtocolRequestInterceptorContext<Any, HttpRequest>,
+        checksum: String,
+    ): HttpRequest =
+        applyHttpChecksumRequiredChecksum(context, checksum)
+}
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/Md5ChecksumInterceptor.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/Md5ChecksumInterceptor.kt
deleted file mode 100644
index cbe6bcabe2..0000000000
--- a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/Md5ChecksumInterceptor.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package aws.smithy.kotlin.runtime.http.interceptors
-
-import aws.smithy.kotlin.runtime.InternalApi
-import aws.smithy.kotlin.runtime.client.ProtocolRequestInterceptorContext
-import aws.smithy.kotlin.runtime.hashing.md5
-import aws.smithy.kotlin.runtime.http.HttpBody
-import aws.smithy.kotlin.runtime.http.request.HttpRequest
-import aws.smithy.kotlin.runtime.http.request.header
-import aws.smithy.kotlin.runtime.http.request.toBuilder
-import aws.smithy.kotlin.runtime.text.encoding.encodeBase64String
-
-/**
- * Set the `Content-MD5` header based on the current payload
- * See:
- *   - https://awslabs.github.io/smithy/1.0/spec/core/behavior-traits.html#httpchecksumrequired-trait
- *   - https://datatracker.ietf.org/doc/html/rfc1864.html
- * @param block An optional function which parses the input [I] to determine if the `Content-MD5` header should be set.
- * If not provided, the default behavior will set the header.
- */
-@InternalApi
-public class Md5ChecksumInterceptor<I>(
-    private val block: ((input: I) -> Boolean)? = null,
-) : AbstractChecksumInterceptor() {
-    override suspend fun modifyBeforeSigning(context: ProtocolRequestInterceptorContext<Any, HttpRequest>): HttpRequest {
-        @Suppress("UNCHECKED_CAST")
-        val input = context.request as I
-
-        val injectMd5Header = block?.invoke(input) ?: true
-        if (!injectMd5Header) {
-            return context.protocolRequest
-        }
-
-        return super.modifyBeforeSigning(context)
-    }
-
-    public override suspend fun calculateChecksum(context: ProtocolRequestInterceptorContext<Any, HttpRequest>): String? =
-        when (val body = context.protocolRequest.body) {
-            is HttpBody.Bytes -> body.bytes().md5().encodeBase64String()
-            else -> null
-        }
-
-    public override fun applyChecksum(context: ProtocolRequestInterceptorContext<Any, HttpRequest>, checksum: String): HttpRequest {
-        val req = context.protocolRequest.toBuilder()
-        if (!req.headers.contains("Content-MD5")) {
-            req.header("Content-MD5", checksum)
-        }
-        return req.build()
-    }
-}
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/HttpOperationContext.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/HttpOperationContext.kt
index 524614a667..56444dca98 100644
--- a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/HttpOperationContext.kt
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/HttpOperationContext.kt
@@ -66,9 +66,9 @@ public object HttpOperationContext {
     public val ClockSkewApproximateSigningTime: AttributeKey<Instant> = AttributeKey("aws.smithy.kotlin#ClockSkewApproximateSigningTime")
 
     /**
-     * The name of the algorithm to be used for computing a checksum of the request.
+     * The name of the default algorithm to be used for computing a checksum of the request.
      */
-    public val ChecksumAlgorithm: AttributeKey<String> = AttributeKey("aws.smithy.kotlin#ChecksumAlgorithm")
+    public val DefaultChecksumAlgorithm: AttributeKey<String> = AttributeKey("aws.smithy.kotlin#DefaultChecksumAlgorithm")
 }
 
 internal val ExecutionContext.operationMetrics: OperationMetrics
diff --git a/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/AbstractChecksumInterceptorTest.kt b/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/CachingChecksumInterceptorTest.kt
similarity index 88%
rename from runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/AbstractChecksumInterceptorTest.kt
rename to runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/CachingChecksumInterceptorTest.kt
index 3de8e557c2..cee1db7766 100644
--- a/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/AbstractChecksumInterceptorTest.kt
+++ b/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/CachingChecksumInterceptorTest.kt
@@ -6,7 +6,7 @@ import aws.smithy.kotlin.runtime.client.ProtocolRequestInterceptorContext
 import aws.smithy.kotlin.runtime.collections.get
 import aws.smithy.kotlin.runtime.http.HttpBody
 import aws.smithy.kotlin.runtime.http.SdkHttpClient
-import aws.smithy.kotlin.runtime.http.interceptors.AbstractChecksumInterceptor
+import aws.smithy.kotlin.runtime.http.interceptors.CachingChecksumInterceptor
 import aws.smithy.kotlin.runtime.http.operation.HttpOperationContext
 import aws.smithy.kotlin.runtime.http.operation.newTestOperation
 import aws.smithy.kotlin.runtime.http.operation.roundTrip
@@ -21,7 +21,7 @@ import kotlin.test.assertEquals
 
 private val CHECKSUM_TEST_HEADER = "x-amz-kotlin-sdk-test-checksum-header"
 
-class AbstractChecksumInterceptorTest {
+class CachingChecksumInterceptorTest {
     private val client = SdkHttpClient(TestEngine())
 
     @Test
@@ -33,7 +33,7 @@ class AbstractChecksumInterceptorTest {
 
         val op = newTestOperation<Unit, Unit>(req, Unit)
 
-        op.interceptors.add(TestAbstractChecksumInterceptor(expectedChecksumValue))
+        op.interceptors.add(TestCachingChecksumInterceptor(expectedChecksumValue))
 
         op.roundTrip(client, Unit)
         val call = op.context.attributes[HttpOperationContext.HttpCallList].first()
@@ -49,16 +49,16 @@ class AbstractChecksumInterceptorTest {
 
         val op = newTestOperation<Unit, Unit>(req, Unit)
 
-        op.interceptors.add(TestAbstractChecksumInterceptor(expectedChecksumValue))
+        op.interceptors.add(TestCachingChecksumInterceptor(expectedChecksumValue))
 
         // the TestAbstractChecksumInterceptor will throw an exception if calculateChecksum is called more than once.
         op.roundTrip(client, Unit)
         op.roundTrip(client, Unit)
     }
 
-    inner class TestAbstractChecksumInterceptor(
+    inner class TestCachingChecksumInterceptor(
         private val expectedChecksum: String?,
-    ) : AbstractChecksumInterceptor() {
+    ) : CachingChecksumInterceptor() {
         private var alreadyCalculatedChecksum = false
 
         override suspend fun calculateChecksum(context: ProtocolRequestInterceptorContext<Any, HttpRequest>): String? {
diff --git a/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsRequestInterceptorTest.kt b/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsRequestInterceptorTest.kt
index c4c85de66b..37e5054865 100644
--- a/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsRequestInterceptorTest.kt
+++ b/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsRequestInterceptorTest.kt
@@ -6,6 +6,7 @@
 package aws.smithy.kotlin.runtime.http.interceptors
 
 import aws.smithy.kotlin.runtime.ClientException
+import aws.smithy.kotlin.runtime.client.config.RequestHttpChecksumConfig
 import aws.smithy.kotlin.runtime.collections.get
 import aws.smithy.kotlin.runtime.hashing.toHashFunction
 import aws.smithy.kotlin.runtime.http.*
@@ -41,9 +42,11 @@ class FlexibleChecksumsRequestInterceptorTest {
             val op = newTestOperation<Unit, Unit>(req, Unit)
 
             op.interceptors.add(
-                FlexibleChecksumsRequestInterceptor<Unit> {
-                    checksumAlgorithmName
-                },
+                FlexibleChecksumsRequestInterceptor(
+                    requestChecksumAlgorithm = checksumAlgorithmName,
+                    requestChecksumRequired = true,
+                    requestChecksumCalculation = RequestHttpChecksumConfig.WHEN_SUPPORTED,
+                ),
             )
 
             op.roundTrip(client, Unit)
@@ -65,10 +68,13 @@ class FlexibleChecksumsRequestInterceptorTest {
 
         val op = newTestOperation<Unit, Unit>(req, Unit)
 
+        op.context.attributes[HttpOperationContext.DefaultChecksumAlgorithm] = "CRC32"
         op.interceptors.add(
-            FlexibleChecksumsRequestInterceptor<Unit> {
-                checksumAlgorithmName
-            },
+            FlexibleChecksumsRequestInterceptor(
+                requestChecksumAlgorithm = checksumAlgorithmName,
+                requestChecksumRequired = true,
+                requestChecksumCalculation = RequestHttpChecksumConfig.WHEN_SUPPORTED,
+            ),
         )
 
         op.roundTrip(client, Unit)
@@ -87,13 +93,14 @@ class FlexibleChecksumsRequestInterceptorTest {
 
         val op = newTestOperation<Unit, Unit>(req, Unit)
 
-        op.interceptors.add(
-            FlexibleChecksumsRequestInterceptor<Unit> {
-                unsupportedChecksumAlgorithmName
-            },
-        )
-
         assertFailsWith<ClientException> {
+            op.interceptors.add(
+                FlexibleChecksumsRequestInterceptor(
+                    requestChecksumAlgorithm = unsupportedChecksumAlgorithmName,
+                    requestChecksumRequired = true,
+                    requestChecksumCalculation = RequestHttpChecksumConfig.WHEN_SUPPORTED,
+                ),
+            )
             op.roundTrip(client, Unit)
         }
     }
@@ -115,9 +122,11 @@ class FlexibleChecksumsRequestInterceptorTest {
         val op = newTestOperation<Unit, Unit>(req, Unit)
 
         op.interceptors.add(
-            FlexibleChecksumsRequestInterceptor<Unit> {
-                checksumAlgorithmName
-            },
+            FlexibleChecksumsRequestInterceptor(
+                requestChecksumAlgorithm = checksumAlgorithmName,
+                requestChecksumRequired = true,
+                requestChecksumCalculation = RequestHttpChecksumConfig.WHEN_SUPPORTED,
+            ),
         )
 
         op.roundTrip(client, Unit)
@@ -126,23 +135,6 @@ class FlexibleChecksumsRequestInterceptorTest {
         assertEquals(0, call.request.headers.getNumChecksumHeaders())
     }
 
-    @Test
-    fun itSetsChecksumHeaderViaExecutionContext() = runTest {
-        checksums.forEach { (checksumAlgorithmName, expectedChecksumValue) ->
-            val req = HttpRequestBuilder().apply {
-                body = HttpBody.fromBytes("<Foo>bar</Foo>".encodeToByteArray())
-            }
-
-            val op = newTestOperation<Unit, Unit>(req, Unit)
-            op.context[HttpOperationContext.ChecksumAlgorithm] = checksumAlgorithmName
-            op.interceptors.add(FlexibleChecksumsRequestInterceptor<Unit>())
-
-            op.roundTrip(client, Unit)
-            val call = op.context.attributes[HttpOperationContext.HttpCallList].first()
-            assertEquals(expectedChecksumValue, call.request.headers["x-amz-checksum-$checksumAlgorithmName"])
-        }
-    }
-
     @Test
     fun testCompletingSource() = runTest {
         val hashFunctionName = "crc32"
@@ -151,7 +143,7 @@ class FlexibleChecksumsRequestInterceptorTest {
         val source = byteArray.source()
         val completableDeferred = CompletableDeferred<String>()
         val hashingSource = HashingSource(hashFunctionName.toHashFunction()!!, source)
-        val completingSource = FlexibleChecksumsRequestInterceptor.CompletingSource(completableDeferred, hashingSource)
+        val completingSource = CompletingSource(completableDeferred, hashingSource)
 
         completingSource.read(SdkBuffer(), 1L)
         assertFalse(completableDeferred.isCompleted) // deferred value should not be completed because the source is not exhausted
@@ -172,7 +164,8 @@ class FlexibleChecksumsRequestInterceptorTest {
         val channel = SdkByteReadChannel(byteArray)
         val completableDeferred = CompletableDeferred<String>()
         val hashingChannel = HashingByteReadChannel(hashFunctionName.toHashFunction()!!, channel)
-        val completingChannel = FlexibleChecksumsRequestInterceptor.CompletingByteReadChannel(completableDeferred, hashingChannel)
+        val completingChannel =
+            CompletingByteReadChannel(completableDeferred, hashingChannel)
 
         completingChannel.read(SdkBuffer(), 1L)
         assertFalse(completableDeferred.isCompleted)
@@ -198,9 +191,11 @@ class FlexibleChecksumsRequestInterceptorTest {
         val op = newTestOperation<Unit, Unit>(req, Unit)
 
         op.interceptors.add(
-            FlexibleChecksumsRequestInterceptor<Unit> {
-                checksumAlgorithmName
-            },
+            FlexibleChecksumsRequestInterceptor(
+                requestChecksumAlgorithm = checksumAlgorithmName,
+                requestChecksumRequired = true,
+                requestChecksumCalculation = RequestHttpChecksumConfig.WHEN_SUPPORTED,
+            ),
         )
 
         op.roundTrip(client, Unit)
@@ -210,5 +205,51 @@ class FlexibleChecksumsRequestInterceptorTest {
         assertEquals(precalculatedChecksumValue, call.request.headers["x-amz-checksum-sha256"])
     }
 
+    @Test
+    fun testDefaultChecksumConfiguration() = runTest {
+        setOf(
+            DefaultChecksumTest(true, RequestHttpChecksumConfig.WHEN_SUPPORTED, true),
+            DefaultChecksumTest(true, RequestHttpChecksumConfig.WHEN_REQUIRED, true),
+            DefaultChecksumTest(false, RequestHttpChecksumConfig.WHEN_SUPPORTED, true),
+            DefaultChecksumTest(false, RequestHttpChecksumConfig.WHEN_REQUIRED, false),
+        ).forEach { runDefaultChecksumTest(it) }
+    }
+
     private fun Headers.getNumChecksumHeaders(): Int = entries().count { (name, _) -> name.startsWith("x-amz-checksum-") }
+
+    private data class DefaultChecksumTest(
+        val requestChecksumRequired: Boolean,
+        val requestChecksumCalculation: RequestHttpChecksumConfig,
+        val defaultChecksumExpected: Boolean,
+    )
+
+    private fun runDefaultChecksumTest(
+        testCase: DefaultChecksumTest,
+    ) = runTest {
+        val defaultChecksumAlgorithmName = "crc32"
+        val expectedChecksumValue = "WdqXHQ=="
+
+        val req = HttpRequestBuilder().apply {
+            body = HttpBody.fromBytes("<Foo>bar</Foo>".encodeToByteArray())
+        }
+
+        val op = newTestOperation<Unit, Unit>(req, Unit)
+
+        op.context.attributes[HttpOperationContext.DefaultChecksumAlgorithm] = "CRC32"
+        op.interceptors.add(
+            FlexibleChecksumsRequestInterceptor(
+                requestChecksumAlgorithm = null, // See if default checksum is applied
+                requestChecksumRequired = testCase.requestChecksumRequired,
+                requestChecksumCalculation = testCase.requestChecksumCalculation,
+            ),
+        )
+
+        op.roundTrip(client, Unit)
+        val call = op.context.attributes[HttpOperationContext.HttpCallList].first()
+
+        when (testCase.defaultChecksumExpected) {
+            true -> assertEquals(expectedChecksumValue, call.request.headers["x-amz-checksum-$defaultChecksumAlgorithmName"])
+            false -> assertFalse { call.request.headers.contains("x-amz-checksum-$defaultChecksumAlgorithmName") }
+        }
+    }
 }
diff --git a/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptorTest.kt b/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptorTest.kt
index 2c04ee680d..e465499ad1 100644
--- a/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptorTest.kt
+++ b/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptorTest.kt
@@ -5,6 +5,7 @@
 
 package aws.smithy.kotlin.runtime.http.interceptors
 
+import aws.smithy.kotlin.runtime.client.config.ResponseHttpChecksumConfig
 import aws.smithy.kotlin.runtime.collections.get
 import aws.smithy.kotlin.runtime.http.*
 import aws.smithy.kotlin.runtime.http.HttpCall
@@ -73,9 +74,10 @@ class FlexibleChecksumsResponseInterceptorTest {
             val op = newTestOperation<TestInput>(req)
 
             op.interceptors.add(
-                FlexibleChecksumsResponseInterceptor<TestInput> {
-                    true
-                },
+                FlexibleChecksumsResponseInterceptor(
+                    responseValidationRequired = true,
+                    responseChecksumValidation = ResponseHttpChecksumConfig.WHEN_SUPPORTED,
+                ),
             )
 
             val responseChecksumHeaderName = "x-amz-checksum-$checksumAlgorithmName"
@@ -99,9 +101,10 @@ class FlexibleChecksumsResponseInterceptorTest {
             val op = newTestOperation<TestInput>(req)
 
             op.interceptors.add(
-                FlexibleChecksumsResponseInterceptor<TestInput> {
-                    true
-                },
+                FlexibleChecksumsResponseInterceptor(
+                    responseValidationRequired = true,
+                    responseChecksumValidation = ResponseHttpChecksumConfig.WHEN_SUPPORTED,
+                ),
             )
 
             val responseChecksumHeaderName = "x-amz-checksum-$checksumAlgorithmName"
@@ -126,9 +129,10 @@ class FlexibleChecksumsResponseInterceptorTest {
         val op = newTestOperation<TestInput>(req)
 
         op.interceptors.add(
-            FlexibleChecksumsResponseInterceptor<TestInput> {
-                true
-            },
+            FlexibleChecksumsResponseInterceptor(
+                responseValidationRequired = true,
+                responseChecksumValidation = ResponseHttpChecksumConfig.WHEN_SUPPORTED,
+            ),
         )
 
         val responseHeaders = Headers {
@@ -150,9 +154,10 @@ class FlexibleChecksumsResponseInterceptorTest {
         val op = newTestOperation<TestInput>(req)
 
         op.interceptors.add(
-            FlexibleChecksumsResponseInterceptor<TestInput> {
-                true
-            },
+            FlexibleChecksumsResponseInterceptor(
+                responseValidationRequired = true,
+                responseChecksumValidation = ResponseHttpChecksumConfig.WHEN_SUPPORTED,
+            ),
         )
 
         val responseHeaders = Headers {
@@ -170,9 +175,10 @@ class FlexibleChecksumsResponseInterceptorTest {
         val op = newTestOperation<TestInput>(req)
 
         op.interceptors.add(
-            FlexibleChecksumsResponseInterceptor<TestInput> {
-                false
-            },
+            FlexibleChecksumsResponseInterceptor(
+                responseValidationRequired = false,
+                responseChecksumValidation = ResponseHttpChecksumConfig.WHEN_REQUIRED,
+            ),
         )
 
         val responseChecksumHeaderName = "x-amz-checksum-crc32"
@@ -188,4 +194,52 @@ class FlexibleChecksumsResponseInterceptorTest {
 
         assertNull(op.context.getOrNull(ChecksumHeaderValidated))
     }
+
+    @Test
+    fun testResponseValidationConfiguration() = runTest {
+        setOf(
+            ResponseChecksumValidationTest(true, ResponseHttpChecksumConfig.WHEN_SUPPORTED, true),
+            ResponseChecksumValidationTest(true, ResponseHttpChecksumConfig.WHEN_REQUIRED, true),
+            ResponseChecksumValidationTest(false, ResponseHttpChecksumConfig.WHEN_SUPPORTED, true),
+            ResponseChecksumValidationTest(false, ResponseHttpChecksumConfig.WHEN_REQUIRED, false),
+        ).forEach { runResponseChecksumValidationTest(it) }
+    }
+
+    private data class ResponseChecksumValidationTest(
+        val responseValidationRequired: Boolean,
+        val responseChecksumValidation: ResponseHttpChecksumConfig,
+        val checksumValidationExpected: Boolean,
+    )
+
+    private fun runResponseChecksumValidationTest(
+        testCase: ResponseChecksumValidationTest,
+    ) = runTest {
+        checksums.forEach { (checksumAlgorithmName, expectedChecksum) ->
+            val req = HttpRequestBuilder()
+            val op = newTestOperation<TestInput>(req)
+
+            op.interceptors.add(
+                FlexibleChecksumsResponseInterceptor(
+                    responseValidationRequired = testCase.responseValidationRequired,
+                    responseChecksumValidation = testCase.responseChecksumValidation,
+                ),
+            )
+
+            val responseChecksumHeaderName = "x-amz-checksum-$checksumAlgorithmName"
+
+            val responseHeaders = Headers {
+                append(responseChecksumHeaderName, expectedChecksum)
+            }
+
+            val client = getMockClient(response, responseHeaders)
+
+            val output = op.roundTrip(client, TestInput("input"))
+            output.body.readAll()
+
+            when (testCase.checksumValidationExpected) {
+                true -> assertEquals(responseChecksumHeaderName, op.context[ChecksumHeaderValidated])
+                false -> assertNull(op.context.getOrNull(ChecksumHeaderValidated))
+            }
+        }
+    }
 }
diff --git a/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/Md5ChecksumInterceptorTest.kt b/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/HttpChecksumRequiredInterceptorTest.kt
similarity index 62%
rename from runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/Md5ChecksumInterceptorTest.kt
rename to runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/HttpChecksumRequiredInterceptorTest.kt
index 109d2e3e8d..df2cf49f0e 100644
--- a/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/Md5ChecksumInterceptorTest.kt
+++ b/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/interceptors/HttpChecksumRequiredInterceptorTest.kt
@@ -6,6 +6,7 @@
 package aws.smithy.kotlin.runtime.http.interceptors
 
 import aws.smithy.kotlin.runtime.collections.get
+import aws.smithy.kotlin.runtime.hashing.Crc32
 import aws.smithy.kotlin.runtime.http.HttpBody
 import aws.smithy.kotlin.runtime.http.SdkHttpClient
 import aws.smithy.kotlin.runtime.http.operation.HttpOperationContext
@@ -14,12 +15,13 @@ import aws.smithy.kotlin.runtime.http.operation.roundTrip
 import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.httptest.TestEngine
 import aws.smithy.kotlin.runtime.io.SdkByteReadChannel
+import aws.smithy.kotlin.runtime.text.encoding.encodeBase64String
 import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
 
-class Md5ChecksumInterceptorTest {
+class HttpChecksumRequiredInterceptorTest {
     private val client = SdkHttpClient(TestEngine())
 
     @Test
@@ -29,10 +31,9 @@ class Md5ChecksumInterceptorTest {
         }
         val op = newTestOperation<Unit, Unit>(req, Unit)
 
+        op.context.attributes[HttpOperationContext.DefaultChecksumAlgorithm] = "MD5"
         op.interceptors.add(
-            Md5ChecksumInterceptor<Unit> {
-                true
-            },
+            HttpChecksumRequiredInterceptor(),
         )
 
         val expected = "RG22oBSZFmabBbkzVGRi4w=="
@@ -42,7 +43,30 @@ class Md5ChecksumInterceptorTest {
     }
 
     @Test
-    fun itOnlySetsHeaderForBytesContent() = runTest {
+    fun itSetsContentCrc32Header() = runTest {
+        val testBody = "<Foo>bar</Foo>".encodeToByteArray()
+
+        val req = HttpRequestBuilder().apply {
+            body = HttpBody.fromBytes(testBody)
+        }
+        val op = newTestOperation<Unit, Unit>(req, Unit)
+
+        op.context.attributes[HttpOperationContext.DefaultChecksumAlgorithm] = "CRC32"
+        op.interceptors.add(
+            HttpChecksumRequiredInterceptor(),
+        )
+
+        val crc32 = Crc32()
+        crc32.update(testBody)
+        val expected = crc32.digest().encodeBase64String()
+
+        op.roundTrip(client, Unit)
+        val call = op.context.attributes[HttpOperationContext.HttpCallList].first()
+        assertEquals(expected, call.request.headers["x-amz-checksum-crc32"])
+    }
+
+    @Test
+    fun itSetsHeaderForNonBytesContent() = runTest {
         val req = HttpRequestBuilder().apply {
             body = object : HttpBody.ChannelContent() {
                 override fun readFrom(): SdkByteReadChannel = SdkByteReadChannel("fooey".encodeToByteArray())
@@ -50,15 +74,15 @@ class Md5ChecksumInterceptorTest {
         }
         val op = newTestOperation<Unit, Unit>(req, Unit)
 
+        op.context.attributes[HttpOperationContext.DefaultChecksumAlgorithm] = "MD5"
         op.interceptors.add(
-            Md5ChecksumInterceptor<Unit> {
-                true
-            },
+            HttpChecksumRequiredInterceptor(),
         )
 
+        val expected = "vJLiaOiNxaxdWfYAYzdzFQ=="
         op.roundTrip(client, Unit)
         val call = op.context.attributes[HttpOperationContext.HttpCallList].first()
-        assertNull(call.request.headers["Content-MD5"])
+        assertEquals(expected, call.request.headers["Content-MD5"])
     }
 
     @Test
@@ -69,9 +93,7 @@ class Md5ChecksumInterceptorTest {
         val op = newTestOperation<Unit, Unit>(req, Unit)
 
         op.interceptors.add(
-            Md5ChecksumInterceptor<Unit> {
-                false // interceptor disabled
-            },
+            HttpChecksumRequiredInterceptor(),
         )
 
         op.roundTrip(client, Unit)
diff --git a/runtime/protocol/http/api/http.api b/runtime/protocol/http/api/http.api
index 3f4c29414f..fb338e64d9 100644
--- a/runtime/protocol/http/api/http.api
+++ b/runtime/protocol/http/api/http.api
@@ -1,3 +1,19 @@
+public final class aws/smithy/kotlin/runtime/http/CompletingByteReadChannel : aws/smithy/kotlin/runtime/io/SdkByteReadChannel {
+	public fun <init> (Lkotlinx/coroutines/CompletableDeferred;Laws/smithy/kotlin/runtime/io/HashingByteReadChannel;)V
+	public fun cancel (Ljava/lang/Throwable;)Z
+	public fun getAvailableForRead ()I
+	public fun getClosedCause ()Ljava/lang/Throwable;
+	public fun isClosedForRead ()Z
+	public fun isClosedForWrite ()Z
+	public fun read (Laws/smithy/kotlin/runtime/io/SdkBuffer;JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class aws/smithy/kotlin/runtime/http/CompletingSource : aws/smithy/kotlin/runtime/io/SdkSource {
+	public fun <init> (Lkotlinx/coroutines/CompletableDeferred;Laws/smithy/kotlin/runtime/io/HashingSource;)V
+	public fun close ()V
+	public fun read (Laws/smithy/kotlin/runtime/io/SdkBuffer;J)J
+}
+
 public abstract interface class aws/smithy/kotlin/runtime/http/DeferredHeaders : aws/smithy/kotlin/runtime/collections/ValuesMap {
 	public static final field Companion Laws/smithy/kotlin/runtime/http/DeferredHeaders$Companion;
 }
@@ -86,8 +102,10 @@ public abstract class aws/smithy/kotlin/runtime/http/HttpBody$SourceContent : aw
 }
 
 public final class aws/smithy/kotlin/runtime/http/HttpBodyKt {
+	public static final fun isEligibleForAwsChunkedStreaming (Laws/smithy/kotlin/runtime/http/HttpBody;)Z
 	public static final fun readAll (Laws/smithy/kotlin/runtime/http/HttpBody;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun toByteStream (Laws/smithy/kotlin/runtime/http/HttpBody;)Laws/smithy/kotlin/runtime/content/ByteStream;
+	public static final fun toCompletingBody (Laws/smithy/kotlin/runtime/http/HttpBody;Lkotlinx/coroutines/CompletableDeferred;)Laws/smithy/kotlin/runtime/http/HttpBody;
 	public static final fun toHashingBody (Laws/smithy/kotlin/runtime/http/HttpBody;Laws/smithy/kotlin/runtime/hashing/HashFunction;Ljava/lang/Long;)Laws/smithy/kotlin/runtime/http/HttpBody;
 	public static final fun toHttpBody (Laws/smithy/kotlin/runtime/content/ByteStream;)Laws/smithy/kotlin/runtime/http/HttpBody;
 	public static final fun toHttpBody (Laws/smithy/kotlin/runtime/io/SdkByteReadChannel;Ljava/lang/Long;)Laws/smithy/kotlin/runtime/http/HttpBody;
diff --git a/runtime/protocol/http/common/src/aws/smithy/kotlin/runtime/http/HttpBody.kt b/runtime/protocol/http/common/src/aws/smithy/kotlin/runtime/http/HttpBody.kt
index b86c5c2199..a12626a656 100644
--- a/runtime/protocol/http/common/src/aws/smithy/kotlin/runtime/http/HttpBody.kt
+++ b/runtime/protocol/http/common/src/aws/smithy/kotlin/runtime/http/HttpBody.kt
@@ -10,6 +10,8 @@ import aws.smithy.kotlin.runtime.content.ByteStream
 import aws.smithy.kotlin.runtime.hashing.HashFunction
 import aws.smithy.kotlin.runtime.http.content.ByteArrayContent
 import aws.smithy.kotlin.runtime.io.*
+import aws.smithy.kotlin.runtime.text.encoding.encodeBase64String
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 
 /**
@@ -191,6 +193,49 @@ public fun HttpBody.toHashingBody(
     else -> throw ClientException("HttpBody type is not supported")
 }
 
+/**
+ * Convert an [HttpBody] with an underlying [HashingSource] or [HashingByteReadChannel]
+ * to a [CompletingSource] or [CompletingByteReadChannel], respectively.
+ */
+@InternalApi
+public fun HttpBody.toCompletingBody(deferred: CompletableDeferred<String>): HttpBody = when (this) {
+    is HttpBody.SourceContent -> CompletingSource(deferred, (readFrom() as HashingSource)).toHttpBody(contentLength)
+    is HttpBody.ChannelContent -> CompletingByteReadChannel(deferred, (readFrom() as HashingByteReadChannel)).toHttpBody(contentLength)
+    else -> throw ClientException("HttpBody type is not supported")
+}
+
+/**
+ * An [SdkSource] which uses the underlying [hashingSource]'s checksum to complete a [CompletableDeferred] value.
+ */
+@InternalApi
+public class CompletingSource(
+    private val deferred: CompletableDeferred<String>,
+    private val hashingSource: HashingSource,
+) : SdkSource by hashingSource {
+    override fun read(sink: SdkBuffer, limit: Long): Long = hashingSource.read(sink, limit)
+        .also {
+            if (it == -1L) {
+                deferred.complete(hashingSource.digest().encodeBase64String())
+            }
+        }
+}
+
+/**
+ * An [SdkByteReadChannel] which uses the underlying [hashingChannel]'s checksum to complete a [CompletableDeferred] value.
+ */
+@InternalApi
+public class CompletingByteReadChannel(
+    private val deferred: CompletableDeferred<String>,
+    private val hashingChannel: HashingByteReadChannel,
+) : SdkByteReadChannel by hashingChannel {
+    override suspend fun read(sink: SdkBuffer, limit: Long): Long = hashingChannel.read(sink, limit)
+        .also {
+            if (it == -1L) {
+                deferred.complete(hashingChannel.digest().encodeBase64String())
+            }
+        }
+}
+
 // FIXME - replace/move to reading to SdkBuffer instead
 /**
  * Consume the [HttpBody] and pull the entire contents into memory as a [ByteArray].
@@ -244,3 +289,10 @@ public fun HttpBody.toSdkByteReadChannel(scope: CoroutineScope? = null): SdkByte
     is HttpBody.ChannelContent -> body.readFrom()
     is HttpBody.SourceContent -> body.readFrom().toSdkByteReadChannel(scope)
 }
+
+// FIXME this duplicates the logic from aws-signing-common
+@InternalApi
+public val HttpBody.isEligibleForAwsChunkedStreaming: Boolean
+    get() = (this is HttpBody.SourceContent || this is HttpBody.ChannelContent) &&
+        contentLength != null &&
+        (isOneShot || contentLength!! > 65536 * 16)
diff --git a/runtime/runtime-core/api/runtime-core.api b/runtime/runtime-core/api/runtime-core.api
index 8c42034110..6d39c3b417 100644
--- a/runtime/runtime-core/api/runtime-core.api
+++ b/runtime/runtime-core/api/runtime-core.api
@@ -104,6 +104,14 @@ public final class aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtil
 
 public final class aws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric : java/lang/Enum, aws/smithy/kotlin/runtime/businessmetrics/BusinessMetric {
 	public static final field ACCOUNT_ID_BASED_ENDPOINT Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
+	public static final field FLEXIBLE_CHECKSUMS_REQ_CRC32 Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
+	public static final field FLEXIBLE_CHECKSUMS_REQ_CRC32C Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
+	public static final field FLEXIBLE_CHECKSUMS_REQ_SHA1 Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
+	public static final field FLEXIBLE_CHECKSUMS_REQ_SHA256 Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
+	public static final field FLEXIBLE_CHECKSUMS_REQ_WHEN_REQUIRED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
+	public static final field FLEXIBLE_CHECKSUMS_REQ_WHEN_SUPPORTED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
+	public static final field FLEXIBLE_CHECKSUMS_RES_WHEN_REQUIRED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
+	public static final field FLEXIBLE_CHECKSUMS_RES_WHEN_SUPPORTED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field GZIP_REQUEST_COMPRESSION Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field PAGINATOR Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field PROTOCOL_RPC_V2_CBOR Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
@@ -699,7 +707,12 @@ public final class aws/smithy/kotlin/runtime/hashing/HashFunction$DefaultImpls {
 public final class aws/smithy/kotlin/runtime/hashing/HashFunctionKt {
 	public static final fun hash ([BLaws/smithy/kotlin/runtime/hashing/HashFunction;)[B
 	public static final fun hash ([BLkotlin/jvm/functions/Function0;)[B
+	public static final fun isSupportedForFlexibleChecksums (Laws/smithy/kotlin/runtime/hashing/HashFunction;)Z
+	public static final fun resolveChecksumAlgorithmHeaderName (Laws/smithy/kotlin/runtime/hashing/HashFunction;)Ljava/lang/String;
+	public static final fun resolveChecksumAlgorithmHeaderName (Ljava/lang/String;)Ljava/lang/String;
+	public static final fun toBusinessMetric (Laws/smithy/kotlin/runtime/hashing/HashFunction;)Laws/smithy/kotlin/runtime/businessmetrics/BusinessMetric;
 	public static final fun toHashFunction (Ljava/lang/String;)Laws/smithy/kotlin/runtime/hashing/HashFunction;
+	public static final fun toHashFunctionOrThrow (Ljava/lang/String;)Laws/smithy/kotlin/runtime/hashing/HashFunction;
 }
 
 public final class aws/smithy/kotlin/runtime/hashing/HmacKt {
@@ -958,6 +971,8 @@ public final class aws/smithy/kotlin/runtime/io/SdkByteReadChannelKt {
 	public static final fun readFully (Laws/smithy/kotlin/runtime/io/SdkByteReadChannel;Laws/smithy/kotlin/runtime/io/SdkBuffer;JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun readRemaining (Laws/smithy/kotlin/runtime/io/SdkByteReadChannel;Laws/smithy/kotlin/runtime/io/SdkBuffer;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun readToBuffer (Laws/smithy/kotlin/runtime/io/SdkByteReadChannel;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun rollingHash (Laws/smithy/kotlin/runtime/io/SdkByteReadChannel;Laws/smithy/kotlin/runtime/hashing/HashFunction;JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun rollingHash$default (Laws/smithy/kotlin/runtime/io/SdkByteReadChannel;Laws/smithy/kotlin/runtime/hashing/HashFunction;JLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 	public static final fun writeAll (Laws/smithy/kotlin/runtime/io/SdkByteWriteChannel;Laws/smithy/kotlin/runtime/io/SdkSource;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt
index fa9c41652a..0600752a6e 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt
@@ -90,6 +90,14 @@ public enum class SmithyBusinessMetric(public override val identifier: String) :
     SERVICE_ENDPOINT_OVERRIDE("N"),
     ACCOUNT_ID_BASED_ENDPOINT("O"),
     SIGV4A_SIGNING("S"),
+    FLEXIBLE_CHECKSUMS_REQ_CRC32("U"),
+    FLEXIBLE_CHECKSUMS_REQ_CRC32C("V"),
+    FLEXIBLE_CHECKSUMS_REQ_SHA1("X"),
+    FLEXIBLE_CHECKSUMS_REQ_SHA256("Y"),
+    FLEXIBLE_CHECKSUMS_REQ_WHEN_SUPPORTED("Z"),
+    FLEXIBLE_CHECKSUMS_REQ_WHEN_REQUIRED("a"),
+    FLEXIBLE_CHECKSUMS_RES_WHEN_SUPPORTED("b"),
+    FLEXIBLE_CHECKSUMS_RES_WHEN_REQUIRED("c"),
     ;
 
     override fun toString(): String = identifier
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/hashing/HashFunction.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/hashing/HashFunction.kt
index 50684d61d8..2ad5b6785f 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/hashing/HashFunction.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/hashing/HashFunction.kt
@@ -4,7 +4,10 @@
  */
 package aws.smithy.kotlin.runtime.hashing
 
+import aws.smithy.kotlin.runtime.ClientException
 import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.businessmetrics.BusinessMetric
+import aws.smithy.kotlin.runtime.businessmetrics.SmithyBusinessMetric
 
 /**
  * A cryptographic hash function (algorithm)
@@ -70,3 +73,55 @@ public fun String.toHashFunction(): HashFunction? = when (this.lowercase()) {
     "md5" -> Md5()
     else -> null
 }
+
+/**
+ * @return The [HashFunction] which is represented by this string, or an exception if none match.
+ */
+@InternalApi
+public fun String.toHashFunctionOrThrow(): HashFunction =
+    toHashFunction() ?: throw ClientException("Checksum algorithm is not supported: $this")
+
+/**
+ * @return If the [HashFunction] is supported by flexible checksums
+ */
+@InternalApi
+public val HashFunction.isSupportedForFlexibleChecksums: Boolean
+    get() = when (this) {
+        is Crc32, is Crc32c, is Sha1, is Sha256 -> true
+        else -> false
+    }
+
+/**
+ * @return The checksum algorithm header used depending on the checksum algorithm name
+ */
+@InternalApi
+public fun String.resolveChecksumAlgorithmHeaderName(): String =
+    this.toHashFunctionOrThrow().resolveChecksumAlgorithmHeaderName()
+
+/**
+ * @return The checksum algorithm header used depending on the checksum algorithm
+ */
+@InternalApi
+public fun HashFunction.resolveChecksumAlgorithmHeaderName(): String {
+    val prefix = "x-amz-checksum-"
+    return when (this) {
+        is Crc32 -> prefix + "crc32"
+        is Crc32c -> prefix + "crc32c"
+        is Sha1 -> prefix + "sha1"
+        is Sha256 -> prefix + "sha256"
+        is Md5 -> "Content-MD5"
+        else -> throw ClientException("Checksum algorithm is not supported: ${this::class.simpleName}")
+    }
+}
+
+/**
+ * Maps supported hash functions to business metrics.
+ */
+@InternalApi
+public fun HashFunction.toBusinessMetric(): BusinessMetric = when (this) {
+    is Crc32 -> SmithyBusinessMetric.FLEXIBLE_CHECKSUMS_REQ_CRC32
+    is Crc32c -> SmithyBusinessMetric.FLEXIBLE_CHECKSUMS_REQ_CRC32C
+    is Sha1 -> SmithyBusinessMetric.FLEXIBLE_CHECKSUMS_REQ_SHA1
+    is Sha256 -> SmithyBusinessMetric.FLEXIBLE_CHECKSUMS_REQ_SHA256
+    else -> throw IllegalStateException("Checksum was calculated using an unsupported hash function: ${this::class.simpleName}")
+}
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/io/SdkByteReadChannel.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/io/SdkByteReadChannel.kt
index 87d5a531da..a50259e240 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/io/SdkByteReadChannel.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/io/SdkByteReadChannel.kt
@@ -4,6 +4,8 @@
  */
 package aws.smithy.kotlin.runtime.io
 
+import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.hashing.HashFunction
 import aws.smithy.kotlin.runtime.io.internal.SdkDispatchers
 import kotlinx.coroutines.withContext
 
@@ -131,3 +133,17 @@ public suspend fun SdkByteWriteChannel.writeAll(source: SdkSource): Long = withC
     }
     totalRead
 }
+
+/**
+ * Compute the rolling hash of an [SdkByteReadChannel] using [hashFunction], reading up-to [bufferSize] bytes into memory
+ * @return a ByteArray of the hash function's digest
+ */
+@InternalApi
+public suspend fun SdkByteReadChannel.rollingHash(hashFunction: HashFunction, bufferSize: Long = 8192): ByteArray {
+    val buffer = SdkBuffer()
+    while (!isClosedForRead) {
+        read(buffer, bufferSize)
+        hashFunction.update(buffer.readToByteArray())
+    }
+    return hashFunction.digest()
+}
diff --git a/runtime/smithy-client/api/smithy-client.api b/runtime/smithy-client/api/smithy-client.api
index c2a9190009..b6132b26b8 100644
--- a/runtime/smithy-client/api/smithy-client.api
+++ b/runtime/smithy-client/api/smithy-client.api
@@ -235,6 +235,18 @@ public final class aws/smithy/kotlin/runtime/client/config/CompressionClientConf
 public abstract interface annotation class aws/smithy/kotlin/runtime/client/config/CompressionClientConfigDsl : java/lang/annotation/Annotation {
 }
 
+public abstract interface class aws/smithy/kotlin/runtime/client/config/HttpChecksumConfig {
+	public abstract fun getRequestChecksumCalculation ()Laws/smithy/kotlin/runtime/client/config/RequestHttpChecksumConfig;
+	public abstract fun getResponseChecksumValidation ()Laws/smithy/kotlin/runtime/client/config/ResponseHttpChecksumConfig;
+}
+
+public abstract interface class aws/smithy/kotlin/runtime/client/config/HttpChecksumConfig$Builder {
+	public abstract fun getRequestChecksumCalculation ()Laws/smithy/kotlin/runtime/client/config/RequestHttpChecksumConfig;
+	public abstract fun getResponseChecksumValidation ()Laws/smithy/kotlin/runtime/client/config/ResponseHttpChecksumConfig;
+	public abstract fun setRequestChecksumCalculation (Laws/smithy/kotlin/runtime/client/config/RequestHttpChecksumConfig;)V
+	public abstract fun setResponseChecksumValidation (Laws/smithy/kotlin/runtime/client/config/ResponseHttpChecksumConfig;)V
+}
+
 public final class aws/smithy/kotlin/runtime/client/config/RequestCompressionConfig {
 	public static final field Companion Laws/smithy/kotlin/runtime/client/config/RequestCompressionConfig$Companion;
 	public fun <init> (Laws/smithy/kotlin/runtime/client/config/RequestCompressionConfig$Builder;)V
@@ -258,6 +270,22 @@ public final class aws/smithy/kotlin/runtime/client/config/RequestCompressionCon
 	public final fun invoke (Lkotlin/jvm/functions/Function1;)Laws/smithy/kotlin/runtime/client/config/RequestCompressionConfig;
 }
 
+public final class aws/smithy/kotlin/runtime/client/config/RequestHttpChecksumConfig : java/lang/Enum {
+	public static final field WHEN_REQUIRED Laws/smithy/kotlin/runtime/client/config/RequestHttpChecksumConfig;
+	public static final field WHEN_SUPPORTED Laws/smithy/kotlin/runtime/client/config/RequestHttpChecksumConfig;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/client/config/RequestHttpChecksumConfig;
+	public static fun values ()[Laws/smithy/kotlin/runtime/client/config/RequestHttpChecksumConfig;
+}
+
+public final class aws/smithy/kotlin/runtime/client/config/ResponseHttpChecksumConfig : java/lang/Enum {
+	public static final field WHEN_REQUIRED Laws/smithy/kotlin/runtime/client/config/ResponseHttpChecksumConfig;
+	public static final field WHEN_SUPPORTED Laws/smithy/kotlin/runtime/client/config/ResponseHttpChecksumConfig;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/client/config/ResponseHttpChecksumConfig;
+	public static fun values ()[Laws/smithy/kotlin/runtime/client/config/ResponseHttpChecksumConfig;
+}
+
 public final class aws/smithy/kotlin/runtime/client/config/RetryMode : java/lang/Enum {
 	public static final field ADAPTIVE Laws/smithy/kotlin/runtime/client/config/RetryMode;
 	public static final field LEGACY Laws/smithy/kotlin/runtime/client/config/RetryMode;
diff --git a/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/config/HttpChecksumConfig.kt b/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/config/HttpChecksumConfig.kt
new file mode 100644
index 0000000000..fbe73b860e
--- /dev/null
+++ b/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/config/HttpChecksumConfig.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.client.config
+
+/**
+ * Client config for HTTP checksums
+ */
+public interface HttpChecksumConfig {
+    /**
+     * Configures request checksum calculation
+     */
+    public val requestChecksumCalculation: RequestHttpChecksumConfig?
+
+    /**
+     * Configures response checksum validation
+     */
+    public val responseChecksumValidation: ResponseHttpChecksumConfig?
+
+    public interface Builder {
+        /**
+         * Configures request checksum calculation
+         */
+        public var requestChecksumCalculation: RequestHttpChecksumConfig?
+
+        /**
+         * Configures response checksum validation
+         */
+        public var responseChecksumValidation: ResponseHttpChecksumConfig?
+    }
+}
+
+/**
+ * Configuration options for enabling and managing HTTP request checksums
+ */
+public enum class RequestHttpChecksumConfig {
+    /**
+     * SDK will calculate checksums if the service marks them as required or if the service offers optional checksums.
+     */
+    WHEN_SUPPORTED,
+
+    /**
+     * SDK will only calculate checksums if the service marks them as required.
+     */
+    WHEN_REQUIRED,
+}
+
+/**
+ * Configuration options for enabling and managing HTTP response checksums
+ */
+public enum class ResponseHttpChecksumConfig {
+    /**
+     * SDK will validate checksums if the service marks them as required or if the service offers optional checksums.
+     */
+    WHEN_SUPPORTED,
+
+    /**
+     * SDK will only validate checksums if the service marks them as required.
+     */
+    WHEN_REQUIRED,
+}

From 14e0958a95a86016d1845c89019a06bc9a0f879c Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Wed, 15 Jan 2025 17:58:12 +0000
Subject: [PATCH 021/183] chore: release 1.4.0

---
 .changes/0857b6f0-0444-479f-be6b-06ef71d482a0.json |  9 ---------
 .changes/1a68d0b7-00e7-45c0-88f6-95e5c39c9c61.json |  6 ------
 .changes/3456d00f-1b29-4d88-ab02-045db1b1ebce.json |  8 --------
 CHANGELOG.md                                       | 11 +++++++++++
 gradle.properties                                  |  4 ++--
 5 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 .changes/0857b6f0-0444-479f-be6b-06ef71d482a0.json
 delete mode 100644 .changes/1a68d0b7-00e7-45c0-88f6-95e5c39c9c61.json
 delete mode 100644 .changes/3456d00f-1b29-4d88-ab02-045db1b1ebce.json

diff --git a/.changes/0857b6f0-0444-479f-be6b-06ef71d482a0.json b/.changes/0857b6f0-0444-479f-be6b-06ef71d482a0.json
deleted file mode 100644
index d89da89103..0000000000
--- a/.changes/0857b6f0-0444-479f-be6b-06ef71d482a0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "id": "0857b6f0-0444-479f-be6b-06ef71d482a0",
-    "type": "feature",
-    "description": "⚠️ **IMPORTANT**: Add `retryStrategy` configuration option for waiters",
-    "issues": [
-        "https://github.com/awslabs/aws-sdk-kotlin/issues/1431"
-    ],
-    "requiresMinorVersionBump": true
-}
\ No newline at end of file
diff --git a/.changes/1a68d0b7-00e7-45c0-88f6-95e5c39c9c61.json b/.changes/1a68d0b7-00e7-45c0-88f6-95e5c39c9c61.json
deleted file mode 100644
index 10ef502204..0000000000
--- a/.changes/1a68d0b7-00e7-45c0-88f6-95e5c39c9c61.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "id": "1a68d0b7-00e7-45c0-88f6-95e5c39c9c61",
-    "type": "misc",
-    "description": "⚠️ **IMPORTANT**: Upgrade to Kotlin 2.1.0",
-    "requiresMinorVersionBump": true
-}
\ No newline at end of file
diff --git a/.changes/3456d00f-1b29-4d88-ab02-045db1b1ebce.json b/.changes/3456d00f-1b29-4d88-ab02-045db1b1ebce.json
deleted file mode 100644
index 767e48a02e..0000000000
--- a/.changes/3456d00f-1b29-4d88-ab02-045db1b1ebce.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "id": "3456d00f-1b29-4d88-ab02-045db1b1ebce",
-    "type": "bugfix",
-    "description": "Include more information when retry strategy halts early due to token bucket capacity errors",
-    "issues": [
-        "awslabs/aws-sdk-kotlin#1321"
-    ]
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1758b4332..c324c5e681 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [1.4.0] - 01/15/2025
+
+### Features
+* [#1431](https://github.com/awslabs/aws-sdk-kotlin/issues/1431) ⚠️ **IMPORTANT**: Add `retryStrategy` configuration option for waiters
+
+### Fixes
+* [#1321](https://github.com/awslabs/aws-sdk-kotlin/issues/1321) Include more information when retry strategy halts early due to token bucket capacity errors
+
+### Miscellaneous
+* ⚠️ **IMPORTANT**: Upgrade to Kotlin 2.1.0
+
 ## [1.3.34] - 01/10/2025
 
 ## [1.3.33] - 01/10/2025
diff --git a/gradle.properties b/gradle.properties
index d76819491b..d0e2da8b41 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.3.35-SNAPSHOT
+sdkVersion=1.4.0
 
 # codegen
-codegenVersion=0.33.35-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.0
\ No newline at end of file

From ed95d7b5014ba9311d4a3fff16671971fc026e36 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Wed, 15 Jan 2025 17:58:13 +0000
Subject: [PATCH 022/183] chore: bump snapshot version to 1.4.1-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index d0e2da8b41..dbe31b2197 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.0
+sdkVersion=1.4.1-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.0
\ No newline at end of file
+codegenVersion=0.34.1-SNAPSHOT
\ No newline at end of file

From a4ace353ca9dc1517c00de345a833691c444841d Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Thu, 16 Jan 2025 11:50:34 -0500
Subject: [PATCH 023/183] fix: add 0.9.x aws-crt-kotlin transform (#1220)

---
 .brazil.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.brazil.json b/.brazil.json
index 5a1d830abd..dbb2135d1b 100644
--- a/.brazil.json
+++ b/.brazil.json
@@ -8,6 +8,7 @@
     "com.squareup.okio:okio-jvm:3.*": "OkioJvm-3.x",
     "io.opentelemetry:opentelemetry-api:1.*": "Maven-io-opentelemetry_opentelemetry-api-1.x",
     "org.slf4j:slf4j-api:2.*": "Maven-org-slf4j_slf4j-api-2.x",
+    "aws.sdk.kotlin.crt:aws-crt-kotlin:0.9.*": "AwsCrtKotlin-0.9.x",
     "aws.sdk.kotlin.crt:aws-crt-kotlin:0.8.*": "AwsCrtKotlin-0.8.x",
     "com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x"
   },

From 15e5f0ce2c713f3e81f75a28e90b4175891e0575 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Thu, 16 Jan 2025 14:57:24 -0500
Subject: [PATCH 024/183] fix: Ensure `Host` header is included when signing
 auth tokens (#1222)

---
 .github/workflows/continuous-integration.yml             | 2 +-
 gradle/libs.versions.toml                                | 2 +-
 .../kotlin/runtime/auth/awssigning/AuthTokenGenerator.kt | 9 ++++++++-
 .../runtime/auth/awssigning/AuthTokenGeneratorTest.kt    | 2 ++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 599293cc06..ef2cc9db42 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -68,7 +68,7 @@ jobs:
           ./gradlew test jvmTest
       - name: Save Test Reports
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-reports-${{ matrix.os }}
           path: '**/build/reports'
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6ef5b35d57..6d8724016e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin-version = "2.1.0"
 dokka-version = "1.9.10"
 
-aws-kotlin-repo-tools-version = "0.4.17"
+aws-kotlin-repo-tools-version = "0.4.18"
 
 # libs
 coroutines-version = "1.9.0"
diff --git a/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGenerator.kt b/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGenerator.kt
index e92ac1f72c..f80ee4fe7e 100644
--- a/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGenerator.kt
+++ b/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGenerator.kt
@@ -6,6 +6,7 @@ package aws.smithy.kotlin.runtime.auth.awssigning
 
 import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
 import aws.smithy.kotlin.runtime.auth.awssigning.AwsSigningConfig.Companion.invoke
+import aws.smithy.kotlin.runtime.http.Headers
 import aws.smithy.kotlin.runtime.http.HttpMethod
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
 import aws.smithy.kotlin.runtime.net.url.Url
@@ -28,7 +29,13 @@ public class AuthTokenGenerator(
     private fun Url.trimScheme(): String = toString().removePrefix(scheme.protocolName).removePrefix("://")
 
     public suspend fun generateAuthToken(endpoint: Url, region: String, expiration: Duration): String {
-        val req = HttpRequest(HttpMethod.GET, endpoint)
+        val req = HttpRequest(
+            HttpMethod.GET,
+            endpoint,
+            headers = Headers {
+                append("Host", endpoint.hostAndPort)
+            },
+        )
 
         val config = AwsSigningConfig {
             credentials = credentialsProvider.resolve()
diff --git a/runtime/auth/aws-signing-common/common/test/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGeneratorTest.kt b/runtime/auth/aws-signing-common/common/test/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGeneratorTest.kt
index 87fec1a74e..75b17fbab9 100644
--- a/runtime/auth/aws-signing-common/common/test/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGeneratorTest.kt
+++ b/runtime/auth/aws-signing-common/common/test/aws/smithy/kotlin/runtime/auth/awssigning/AuthTokenGeneratorTest.kt
@@ -45,6 +45,7 @@ class AuthTokenGeneratorTest {
         assertContains(token, "X-Amz-Credential=signature") // test custom signer was invoked
         assertContains(token, "X-Amz-Expires=333") // expiration
         assertContains(token, "X-Amz-SigningDate=0") // clock
+        assertContains(token, "X-Amz-SignedHeaders=host")
 
         assertTrue(credentialsProvider.credentialsResolved)
     }
@@ -60,6 +61,7 @@ private val TEST_SIGNER = object : AwsSigner {
             put("X-Amz-Credential", "signature")
             put("X-Amz-Expires", (config.expiresAfter?.toLong(DurationUnit.SECONDS) ?: 900).toString())
             put("X-Amz-SigningDate", config.signingDate.epochSeconds.toString())
+            put("X-Amz-SignedHeaders", request.headers.names().map { it.lowercase() }.joinToString())
         }
 
         return AwsSigningResult<HttpRequest>(builder.build(), "signature".encodeToByteArray())

From 447ac10880ebe778471d9ad4bce97a424139550d Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 16 Jan 2025 19:59:39 +0000
Subject: [PATCH 025/183] chore: release 1.4.1

---
 CHANGELOG.md      | 2 ++
 gradle.properties | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c324c5e681..a4c4a65548 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.4.1] - 01/16/2025
+
 ## [1.4.0] - 01/15/2025
 
 ### Features
diff --git a/gradle.properties b/gradle.properties
index dbe31b2197..e005c08ee2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.1-SNAPSHOT
+sdkVersion=1.4.1
 
 # codegen
-codegenVersion=0.34.1-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.1
\ No newline at end of file

From 0f8db4452966822949bbe6616e3642b2063cfb63 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 16 Jan 2025 19:59:40 +0000
Subject: [PATCH 026/183] chore: bump snapshot version to 1.4.2-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index e005c08ee2..df0e651ce1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.1
+sdkVersion=1.4.2-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.1
\ No newline at end of file
+codegenVersion=0.34.2-SNAPSHOT
\ No newline at end of file

From 8b336937bb028bc3d0fcb1beafeabcf4c25fc51e Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Thu, 23 Jan 2025 14:03:54 -0500
Subject: [PATCH 027/183] fix: address various failing protocol tests (#1223)

---
 .../model/error-correction-tests.smithy       | 12 ++++----
 .../core/AwsHttpBindingProtocolGenerator.kt   |  8 +----
 .../codegen/core/KotlinSymbolProvider.kt      | 30 ++++++++++++-------
 .../codegen/rendering/StructureGenerator.kt   |  1 +
 .../protocol/HttpStringValuesMapSerializer.kt | 19 ++----------
 .../kotlin/codegen/core/SymbolProviderTest.kt |  2 +-
 .../HttpBindingProtocolGeneratorTest.kt       |  8 ++---
 .../HttpStringValuesMapSerializerTest.kt      | 16 +++++-----
 gradle/libs.versions.toml                     |  2 +-
 .../kotlin/runtime/text/encoding/Base64.kt    | 11 +++++--
 .../runtime/text/encoding/Base64Test.kt       | 28 ++++++++++++-----
 11 files changed, 74 insertions(+), 63 deletions(-)

diff --git a/codegen/protocol-tests/model/error-correction-tests.smithy b/codegen/protocol-tests/model/error-correction-tests.smithy
index 201ffc877f..4f246e1b99 100644
--- a/codegen/protocol-tests/model/error-correction-tests.smithy
+++ b/codegen/protocol-tests/model/error-correction-tests.smithy
@@ -39,8 +39,9 @@ operation SayHelloXml { output: TestOutput, errors: [Error] }
 
 structure TestOutputDocument with [TestStruct] {
     innerField: Nested,
-    // FIXME: This trait fails smithy validator
-    // @required
+
+    // Note: This shape _should_ be @required, but causes Smithy httpResponseTests validation to fail.
+    // We expect `document` to be deserialized as `null` and enforce @required using a runtime check, but Smithy validator doesn't recognize / allow this.
     document: Document
 }
 structure TestOutput with [TestStruct] { innerField: Nested }
@@ -65,8 +66,8 @@ structure TestStruct {
     @required
     nestedListValue: NestedList
 
-    // FIXME: This trait fails smithy validator
-    // @required
+    // Note: This shape _should_ be @required, but causes Smithy httpResponseTests validation to fail.
+    // We expect `nested` to be deserialized as `null` and enforce @required using a runtime check, but Smithy validator doesn't recognize / allow this.
     nested: Nested
 
     @required
@@ -97,8 +98,7 @@ union MyUnion {
 }
 
 structure Nested {
-    // FIXME: This trait fails smithy validator
-    // @required
+    @required
     a: String
 }
 
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGenerator.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGenerator.kt
index 6e5834f7d1..bd41afcade 100644
--- a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGenerator.kt
+++ b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGenerator.kt
@@ -40,13 +40,7 @@ abstract class AwsHttpBindingProtocolGenerator : HttpBindingProtocolGenerator()
         // val targetedTest = TestMemberDelta(setOf("RestJsonComplexErrorWithNoMessage"), TestContainmentMode.RUN_TESTS)
 
         val ignoredTests = TestMemberDelta(
-            setOf(
-                "AwsJson10ClientErrorCorrectsWithDefaultValuesWhenServerFailsToSerializeRequiredValues",
-                "RestJsonNullAndEmptyHeaders",
-                "NullAndEmptyHeaders",
-                "RpcV2CborClientPopulatesDefaultsValuesWhenMissingInResponse",
-                "RpcV2CborClientPopulatesDefaultValuesInInput",
-            ),
+            setOf(),
         )
 
         val requestTestBuilder = HttpProtocolUnitTestRequestGenerator.Builder()
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinSymbolProvider.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinSymbolProvider.kt
index e6dbd0dca1..f35570dfeb 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinSymbolProvider.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinSymbolProvider.kt
@@ -193,7 +193,7 @@ class KotlinSymbolProvider(private val model: Model, private val settings: Kotli
                 } else {
                     // only use @default if type is `T`
                     shape.getTrait<DefaultTrait>()?.let {
-                        defaultValue(it.getDefaultValue(targetShape))
+                        setDefaultValue(it, targetShape)
                     }
                 }
             }
@@ -219,9 +219,10 @@ class KotlinSymbolProvider(private val model: Model, private val settings: Kotli
         }
     }
 
-    private fun DefaultTrait.getDefaultValue(targetShape: Shape): String? {
-        val node = toNode()
-        return when {
+    private fun Symbol.Builder.setDefaultValue(defaultTrait: DefaultTrait, targetShape: Shape) {
+        val node = defaultTrait.toNode()
+
+        val defaultValue = when {
             node.toString() == "null" -> null
 
             // Check if target is an enum before treating the default like a regular number/string
@@ -235,13 +236,20 @@ class KotlinSymbolProvider(private val model: Model, private val settings: Kotli
                 "${enumSymbol.fullName}.fromValue($arg)"
             }
 
-            targetShape.isBlobShape && targetShape.isStreaming ->
-                node
-                    .toString()
-                    .takeUnless { it.isEmpty() }
-                    ?.let { "ByteStream.fromString(${it.dq()})" }
+            targetShape.isBlobShape -> {
+                addReferences(RuntimeTypes.Core.Text.Encoding.decodeBase64)
 
-            targetShape.isBlobShape -> "${node.toString().dq()}.encodeToByteArray()"
+                if (targetShape.isStreaming) {
+                    node.toString()
+                        .takeUnless { it.isEmpty() }
+                        ?.let {
+                            addReferences(RuntimeTypes.Core.Content.ByteStream)
+                            "ByteStream.fromString(${it.dq()}.decodeBase64())"
+                        }
+                } else {
+                    "${node.toString().dq()}.decodeBase64().encodeToByteArray()"
+                }
+            }
 
             targetShape.isDocumentShape -> getDefaultValueForDocument(node)
             targetShape.isTimestampShape -> getDefaultValueForTimestamp(node.asNumberNode().get())
@@ -252,6 +260,8 @@ class KotlinSymbolProvider(private val model: Model, private val settings: Kotli
             node.isStringNode -> node.toString().dq()
             else -> node.toString()
         }
+
+        defaultValue(defaultValue)
     }
 
     private fun getDefaultValueForTimestamp(node: NumberNode): String {
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/StructureGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/StructureGenerator.kt
index c34eb5ab9d..5d90f376d2 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/StructureGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/StructureGenerator.kt
@@ -248,6 +248,7 @@ class StructureGenerator(
                     } else {
                         memberSymbol
                     }
+
                     write("public var #L: #E", memberName, builderMemberSymbol)
                 }
                 write("")
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpStringValuesMapSerializer.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpStringValuesMapSerializer.kt
index 932b2a796a..5dfc519962 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpStringValuesMapSerializer.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpStringValuesMapSerializer.kt
@@ -157,9 +157,8 @@ class HttpStringValuesMapSerializer(
         val paramName = binding.locationName
         // addAll collection parameter 2
         val param2 = if (mapFnContents.isEmpty()) "input.$memberName" else "input.$memberName.map { $mapFnContents }"
-        val nullCheck = if (memberSymbol.isNullable) "?" else ""
         writer.write(
-            "if (input.#L$nullCheck.isNotEmpty() == true) #L(#S, #L)",
+            "if (input.#L != null) #L(#S, #L)",
             memberName,
             binding.location.addAllFnName,
             paramName,
@@ -174,8 +173,7 @@ class HttpStringValuesMapSerializer(
         val paramName = binding.locationName
         val memberSymbol = symbolProvider.toSymbol(binding.member)
 
-        // NOTE: query parameters are allowed to be empty, whereas headers should omit empty string
-        // values from serde
+        // NOTE: query parameters are allowed to be empty
         if ((location == HttpBinding.Location.QUERY || location == HttpBinding.Location.HEADER) && binding.member.hasTrait<IdempotencyTokenTrait>()) {
             // Call the idempotency token function if no supplied value.
             writer.addImport(RuntimeTypes.SmithyClient.IdempotencyTokenProviderExt)
@@ -185,18 +183,7 @@ class HttpStringValuesMapSerializer(
                 paramName,
             )
         } else {
-            val nullCheck =
-                if (location == HttpBinding.Location.QUERY ||
-                    memberTarget.hasTrait<
-                        @Suppress("DEPRECATION")
-                        software.amazon.smithy.model.traits.EnumTrait,
-                        >()
-                ) {
-                    if (memberSymbol.isNullable) "input.$memberName != null" else ""
-                } else {
-                    val nullCheck = if (memberSymbol.isNullable) "?" else ""
-                    "input.$memberName$nullCheck.isNotEmpty() == true"
-                }
+            val nullCheck = if (memberSymbol.isNullable) "input.$memberName != null" else ""
 
             val cond = defaultCheck(binding.member) ?: nullCheck
 
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/SymbolProviderTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/SymbolProviderTest.kt
index 0cc4d2cb14..bb90fbc0fb 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/SymbolProviderTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/SymbolProviderTest.kt
@@ -182,7 +182,7 @@ class SymbolProviderTest {
         "double,2.71828,2.71828",
         "byte,10,10.toByte()",
         "string,\"hello\",\"hello\"",
-        "blob,\"abcdefg\",\"abcdefg\".encodeToByteArray()",
+        "blob,\"abcdefg\",\"abcdefg\".decodeBase64().encodeToByteArray()",
         "boolean,true,true",
         "bigInteger,5,5",
         "bigDecimal,9.0123456789,9.0123456789",
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpBindingProtocolGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpBindingProtocolGeneratorTest.kt
index 3c15579dab..6f8040e7dc 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpBindingProtocolGeneratorTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpBindingProtocolGeneratorTest.kt
@@ -57,8 +57,8 @@ internal class SmokeTestOperationSerializer: HttpSerializer.NonStreaming<SmokeTe
         }
 
         builder.headers {
-            if (input.header1?.isNotEmpty() == true) append("X-Header1", input.header1)
-            if (input.header2?.isNotEmpty() == true) append("X-Header2", input.header2)
+            if (input.header1 != null) append("X-Header1", input.header1)
+            if (input.header2 != null) append("X-Header2", input.header2)
         }
 
         val payload = serializeSmokeTestOperationBody(context, input)
@@ -264,7 +264,7 @@ internal class TimestampInputOperationSerializer: HttpSerializer.NonStreaming<Ti
             }
             parameters.decodedParameters(PercentEncoding.SmithyLabel) {
                 if (input.queryTimestamp != null) add("qtime", input.queryTimestamp.format(TimestampFormat.ISO_8601))
-                if (input.queryTimestampList?.isNotEmpty() == true) addAll("qtimeList", input.queryTimestampList.map { it.format(TimestampFormat.ISO_8601) })
+                if (input.queryTimestampList != null) addAll("qtimeList", input.queryTimestampList.map { it.format(TimestampFormat.ISO_8601) })
             }
         }
 
@@ -304,7 +304,7 @@ internal class BlobInputOperationSerializer: HttpSerializer.NonStreaming<BlobInp
         }
 
         builder.headers {
-            if (input.headerMediaType?.isNotEmpty() == true) append("X-Blob", input.headerMediaType.encodeBase64())
+            if (input.headerMediaType != null) append("X-Blob", input.headerMediaType.encodeBase64())
         }
 
         val payload = serializeBlobInputOperationBody(context, input)
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpStringValuesMapSerializerTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpStringValuesMapSerializerTest.kt
index 6ce806bb04..95138ad529 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpStringValuesMapSerializerTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpStringValuesMapSerializerTest.kt
@@ -145,8 +145,8 @@ class HttpStringValuesMapSerializerTest {
         contents.assertBalancedBracesAndParens()
 
         val expectedContents = """
-            if (input.header1?.isNotEmpty() == true) append("X-Header1", input.header1)
-            if (input.header2?.isNotEmpty() == true) append("X-Header2", input.header2)
+            if (input.header1 != null) append("X-Header1", input.header1)
+            if (input.header2 != null) append("X-Header2", input.header2)
         """.trimIndent()
         contents.shouldContainOnlyOnceWithDiff(expectedContents)
     }
@@ -157,7 +157,7 @@ class HttpStringValuesMapSerializerTest {
         contents.assertBalancedBracesAndParens()
 
         val expectedContents = """
-            if (input.headerMediaType?.isNotEmpty() == true) append("X-Blob", input.headerMediaType.encodeBase64())
+            if (input.headerMediaType != null) append("X-Blob", input.headerMediaType.encodeBase64())
         """.trimIndent()
         contents.shouldContainOnlyOnceWithDiff(expectedContents)
     }
@@ -168,10 +168,10 @@ class HttpStringValuesMapSerializerTest {
         contents.assertBalancedBracesAndParens()
 
         val expectedContents = """
-            if (input.enumList?.isNotEmpty() == true) appendAll("x-enumList", input.enumList.map { quoteHeaderValue(it.value) })
-            if (input.intList?.isNotEmpty() == true) appendAll("x-intList", input.intList.map { it.toString() })
-            if (input.strList?.isNotEmpty() == true) appendAll("x-strList", input.strList.map { quoteHeaderValue(it) })
-            if (input.tsList?.isNotEmpty() == true) appendAll("x-tsList", input.tsList.map { it.format(TimestampFormat.RFC_5322) })
+            if (input.enumList != null) appendAll("x-enumList", input.enumList.map { quoteHeaderValue(it.value) })
+            if (input.intList != null) appendAll("x-intList", input.intList.map { it.toString() })
+            if (input.strList != null) appendAll("x-strList", input.strList.map { quoteHeaderValue(it) })
+            if (input.tsList != null) appendAll("x-tsList", input.tsList.map { it.format(TimestampFormat.RFC_5322) })
         """.trimIndent()
         contents.shouldContainOnlyOnceWithDiff(expectedContents)
     }
@@ -190,7 +190,7 @@ class HttpStringValuesMapSerializerTest {
         val queryContents = getTestContents(defaultModel, "com.test#TimestampInput", HttpBinding.Location.QUERY)
         val expectedQueryContents = """
             if (input.queryTimestamp != null) add("qtime", input.queryTimestamp.format(TimestampFormat.ISO_8601))
-            if (input.queryTimestampList?.isNotEmpty() == true) addAll("qtimeList", input.queryTimestampList.map { it.format(TimestampFormat.ISO_8601) })
+            if (input.queryTimestampList != null) addAll("qtimeList", input.queryTimestampList.map { it.format(TimestampFormat.ISO_8601) })
         """.trimIndent()
         queryContents.shouldContainOnlyOnceWithDiff(expectedQueryContents)
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6d8724016e..31f5d17afa 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ micrometer-version = "1.14.2"
 binary-compatibility-validator-version = "0.16.3"
 
 # codegen
-smithy-version = "1.53.0"
+smithy-version = "1.54.0"
 smithy-gradle-version = "0.9.0"
 
 # testing
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/text/encoding/Base64.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/text/encoding/Base64.kt
index 7a3a569899..9af6977d29 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/text/encoding/Base64.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/text/encoding/Base64.kt
@@ -99,10 +99,17 @@ public fun String.decodeBase64Bytes(): ByteArray = encodeToByteArray().decodeBas
  * Decode [ByteArray] from base64 format
  */
 public fun ByteArray.decodeBase64(): ByteArray {
-    val encoded = this
+    // Calculate the padding needed to make the length a multiple of 4
+    val remainder = size % 4
+    val encoded: ByteArray = if (remainder == 0) {
+        this
+    } else {
+        this + ByteArray(4 - remainder) { BASE64_PAD.code.toByte() }
+    }
+
     val decodedLen = base64DecodedLen(encoded)
     val decoded = ByteArray(decodedLen)
-    val blockCnt = size / 4
+    val blockCnt = encoded.size / 4
     var readIdx = 0
     var writeIdx = 0
 
diff --git a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/text/encoding/Base64Test.kt b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/text/encoding/Base64Test.kt
index 4c2ada2010..956fabee2e 100644
--- a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/text/encoding/Base64Test.kt
+++ b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/text/encoding/Base64Test.kt
@@ -76,14 +76,6 @@ class Base64Test {
         ex.message!!.shouldContain("decode base64: invalid input byte: 45")
     }
 
-    @Test
-    fun decodeNonMultipleOf4() {
-        val ex = assertFails {
-            "Zm9vY=".decodeBase64()
-        }
-        ex.message!!.shouldContain("invalid base64 string of length 6; not a multiple of 4")
-    }
-
     @Test
     fun decodeInvalidPadding() {
         val ex = assertFails {
@@ -116,4 +108,24 @@ class Base64Test {
         assertEquals(encoded, decoded.encodeBase64())
         assertEquals(decoded, encoded.decodeBase64())
     }
+
+    @Test
+    fun testUnpaddedInputs() {
+        // from https://github.com/smithy-lang/smithy/pull/2502
+        val input = "v2hkZWZhdWx0c79tZGVmYXVsdFN0cmluZ2JoaW5kZWZhdWx0Qm9vbGVhbvVrZGVmYXVsdExpc3Sf/3BkZWZhdWx0VGltZXN0YW1wwQBrZGVmYXVsdEJsb2JDYWJja2RlZmF1bHRCeXRlAWxkZWZhdWx0U2hvcnQBbmRlZmF1bHRJbnRlZ2VyCmtkZWZhdWx0TG9uZxhkbGRlZmF1bHRGbG9hdPo/gAAAbWRlZmF1bHREb3VibGX6P4AAAGpkZWZhdWx0TWFwv/9rZGVmYXVsdEVudW1jRk9PbmRlZmF1bHRJbnRFbnVtAWtlbXB0eVN0cmluZ2BsZmFsc2VCb29sZWFu9GllbXB0eUJsb2JAaHplcm9CeXRlAGl6ZXJvU2hvcnQAa3plcm9JbnRlZ2VyAGh6ZXJvTG9uZwBpemVyb0Zsb2F0+gAAAABqemVyb0RvdWJsZfoAAAAA//8"
+        input.decodeBase64()
+
+        val inputs = mapOf<String, String>(
+            "YQ" to "a",
+            "Yg" to "b",
+            "YWI" to "ab",
+            "YWJj" to "abc",
+            "SGVsbG8gd29ybGQ" to "Hello world",
+        )
+
+        inputs.forEach { (encoded, expected) ->
+            val actual = encoded.decodeBase64()
+            assertEquals(expected, actual)
+        }
+    }
 }

From 03badf913813df5481b330e9eeff80bcea5586ec Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Thu, 23 Jan 2025 14:04:09 -0500
Subject: [PATCH 028/183] misc: re-enable `kotlinWarningsAsErrors=true` (#1224)

---
 .github/workflows/continuous-integration.yml                   | 3 +--
 .../kotlin/runtime/http/engine/okhttp/MetricsInterceptor.kt    | 2 +-
 .../smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngine.kt   | 2 ++
 .../smithy/kotlin/runtime/http/engine/okhttp/OkHttpUtils.kt    | 2 +-
 .../smithy/kotlin/runtime/http/engine/okhttp4/OkHttp4Engine.kt | 2 +-
 .../common/src/aws/smithy/kotlin/runtime/util/JMESPath.kt      | 3 +--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index ef2cc9db42..d47020ea5d 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -62,8 +62,7 @@ jobs:
       - name: Test
         shell: bash
         run: |
-          # FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
-          # echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties              
+          echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
           ./gradlew apiCheck
           ./gradlew test jvmTest
       - name: Save Test Reports
diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/MetricsInterceptor.kt b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/MetricsInterceptor.kt
index 0ea8ae5e66..8047b870c3 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/MetricsInterceptor.kt
+++ b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/MetricsInterceptor.kt
@@ -30,7 +30,7 @@ public object MetricsInterceptor : Interceptor {
         }
 
         val originalResponse = chain.proceed(request)
-        val response = if (originalResponse.body == null || originalResponse.body?.contentLength() == 0L) {
+        val response = if (originalResponse.body.contentLength() == 0L) {
             originalResponse
         } else {
             originalResponse.newBuilder()
diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngine.kt b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngine.kt
index 061c22a13d..a20387d0a0 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngine.kt
+++ b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngine.kt
@@ -15,6 +15,7 @@ import aws.smithy.kotlin.runtime.net.TlsVersion
 import aws.smithy.kotlin.runtime.operation.ExecutionContext
 import aws.smithy.kotlin.runtime.time.Instant
 import aws.smithy.kotlin.runtime.time.fromEpochMilliseconds
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.job
 import okhttp3.*
 import okhttp3.ConnectionPool
@@ -47,6 +48,7 @@ public class OkHttpEngine(
     private val connectionIdleMonitor = config.connectionIdlePollingInterval?.let { ConnectionIdleMonitor(it) }
     private val client = config.buildClientWithConnectionListener(metrics, connectionIdleMonitor)
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     override suspend fun roundTrip(context: ExecutionContext, request: HttpRequest): HttpCall {
         val callContext = callContext()
 
diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpUtils.kt b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpUtils.kt
index c287228fdf..181ed400c3 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpUtils.kt
+++ b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpUtils.kt
@@ -104,7 +104,7 @@ public fun Headers.toOkHttpHeaders(): OkHttpHeaders = OkHttpHeaders.Builder().al
 @InternalApi
 public fun OkHttpResponse.toSdkResponse(): HttpResponse {
     val sdkHeaders = OkHttpHeadersAdapter(headers)
-    val httpBody = if (body == null || body!!.contentLength() == 0L) {
+    val httpBody = if (body.contentLength() == 0L) {
         HttpBody.Empty
     } else {
         object : HttpBody.SourceContent() {
diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp4/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp4/OkHttp4Engine.kt b/runtime/protocol/http-client-engines/http-client-engine-okhttp4/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp4/OkHttp4Engine.kt
index ff59823201..026bbd942c 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-okhttp4/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp4/OkHttp4Engine.kt
+++ b/runtime/protocol/http-client-engines/http-client-engine-okhttp4/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp4/OkHttp4Engine.kt
@@ -99,7 +99,7 @@ private suspend fun Call.executeAsync(): Response =
                     call: Call,
                     response: Response,
                 ) {
-                    continuation.resume(response) {
+                    continuation.resume(response) { cause, _, _ ->
                         response.closeQuietly()
                     }
                 }
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/JMESPath.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/JMESPath.kt
index 9b691a79a2..c8437b2b33 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/JMESPath.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/JMESPath.kt
@@ -62,8 +62,7 @@ public fun Any?.type(): String = when (this) {
     is List<*>, is Array<*> -> "array"
     is Number -> "number"
     is Any -> "object"
-    null -> "null"
-    else -> throw Exception("Undetected type for: $this")
+    else -> "null"
 }
 
 // Collection `flattenIfPossible` functions

From 9f44cdbd82adc1dd30eaf4bc4290b61eee09bbd4 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:33:23 -0800
Subject: [PATCH 029/183] fix: ignore hop-by-hop headers when signing requests
 (#1227)

---
 .../b0646077-397d-48a8-94f2-ea2db40b1dea.json   |  5 +++++
 gradle/libs.versions.toml                       |  2 +-
 .../runtime/auth/awssigning/Canonicalizer.kt    | 17 ++++++++++++++---
 .../auth/awssigning/DefaultCanonicalizerTest.kt |  9 +++++++--
 .../runtime/http/auth/AwsHttpSignerTestBase.kt  | 16 +++++++++-------
 5 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 .changes/b0646077-397d-48a8-94f2-ea2db40b1dea.json

diff --git a/.changes/b0646077-397d-48a8-94f2-ea2db40b1dea.json b/.changes/b0646077-397d-48a8-94f2-ea2db40b1dea.json
new file mode 100644
index 0000000000..96e13a4a82
--- /dev/null
+++ b/.changes/b0646077-397d-48a8-94f2-ea2db40b1dea.json
@@ -0,0 +1,5 @@
+{
+    "id": "b0646077-397d-48a8-94f2-ea2db40b1dea",
+    "type": "bugfix",
+    "description": "Ignore hop-by-hop headers when signing requests"
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 31f5d17afa..bdc0c8e98b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ okio-version = "3.9.1"
 otel-version = "1.45.0"
 slf4j-version = "2.0.16"
 slf4j-v1x-version = "1.7.36"
-crt-kotlin-version = "0.9.0"
+crt-kotlin-version = "0.9.1"
 micrometer-version = "1.14.2"
 binary-compatibility-validator-version = "0.16.3"
 
diff --git a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/Canonicalizer.kt b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/Canonicalizer.kt
index 69d742de79..c7c47fe5a2 100644
--- a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/Canonicalizer.kt
+++ b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/Canonicalizer.kt
@@ -58,16 +58,27 @@ internal interface Canonicalizer {
     ): CanonicalRequest
 }
 
-// Taken from https://github.com/awslabs/aws-c-auth/blob/dd505b55fd46222834f35c6e54165d8cbebbfaaa/source/aws_signing.c#L118-L156
 private val skipHeaders = setOf(
-    "connection",
     "expect", // https://github.com/awslabs/aws-sdk-kotlin/issues/862
+
+    // Taken from https://github.com/awslabs/aws-c-auth/blob/274a1d21330731cc51bb742794adc70ada5f4380/source/aws_signing.c#L121-L164
     "sec-websocket-key",
     "sec-websocket-protocol",
     "sec-websocket-version",
-    "upgrade",
     "user-agent",
     "x-amzn-trace-id",
+
+    // Taken from https://datatracker.ietf.org/doc/html/rfc2616#section-13.5.1. These are "hop-by-hop" headers which may
+    // be modified/removed by intervening proxies or caches. These are unsafe to sign because if they change they render
+    // the signature invalid.
+    "connection",
+    "keep-alive",
+    "proxy-authenticate",
+    "proxy-authorization",
+    "te",
+    "trailers",
+    "transfer-encoding",
+    "upgrade",
 )
 
 internal class DefaultCanonicalizer(private val sha256Supplier: HashSupplier = ::Sha256) : Canonicalizer {
diff --git a/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultCanonicalizerTest.kt b/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultCanonicalizerTest.kt
index 7fc20ddb83..2dfbdf48e1 100644
--- a/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultCanonicalizerTest.kt
+++ b/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultCanonicalizerTest.kt
@@ -6,8 +6,12 @@ package aws.smithy.kotlin.runtime.auth.awssigning
 
 import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
 import aws.smithy.kotlin.runtime.auth.awssigning.tests.DEFAULT_TEST_CREDENTIALS
-import aws.smithy.kotlin.runtime.http.*
-import aws.smithy.kotlin.runtime.http.request.*
+import aws.smithy.kotlin.runtime.http.Headers
+import aws.smithy.kotlin.runtime.http.HttpBody
+import aws.smithy.kotlin.runtime.http.HttpMethod
+import aws.smithy.kotlin.runtime.http.request.HttpRequest
+import aws.smithy.kotlin.runtime.http.request.headers
+import aws.smithy.kotlin.runtime.http.request.url
 import aws.smithy.kotlin.runtime.net.Host
 import aws.smithy.kotlin.runtime.net.url.Url
 import aws.smithy.kotlin.runtime.time.Instant
@@ -136,6 +140,7 @@ class DefaultCanonicalizerTest {
                 // These should not be signed
                 set("Expect", "100-continue")
                 set("X-Amzn-Trace-Id", "qux")
+                set("Transfer-Encoding", "chunked")
             }
             body = HttpBody.Empty
         }
diff --git a/runtime/auth/http-auth-aws/common/test/aws/smithy/kotlin/runtime/http/auth/AwsHttpSignerTestBase.kt b/runtime/auth/http-auth-aws/common/test/aws/smithy/kotlin/runtime/http/auth/AwsHttpSignerTestBase.kt
index 2ce308df8f..7d10b35e14 100644
--- a/runtime/auth/http-auth-aws/common/test/aws/smithy/kotlin/runtime/http/auth/AwsHttpSignerTestBase.kt
+++ b/runtime/auth/http-auth-aws/common/test/aws/smithy/kotlin/runtime/http/auth/AwsHttpSignerTestBase.kt
@@ -12,7 +12,9 @@ import aws.smithy.kotlin.runtime.auth.awssigning.DefaultAwsSigner
 import aws.smithy.kotlin.runtime.auth.awssigning.internal.AWS_CHUNKED_THRESHOLD
 import aws.smithy.kotlin.runtime.collections.Attributes
 import aws.smithy.kotlin.runtime.collections.get
-import aws.smithy.kotlin.runtime.http.*
+import aws.smithy.kotlin.runtime.http.HttpBody
+import aws.smithy.kotlin.runtime.http.HttpMethod
+import aws.smithy.kotlin.runtime.http.SdkHttpClient
 import aws.smithy.kotlin.runtime.http.operation.*
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
 import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
@@ -149,8 +151,8 @@ public abstract class AwsHttpSignerTestBase(
         val op = buildOperation(streaming = true, replayable = false, requestBody = "a".repeat(AWS_CHUNKED_THRESHOLD + 1))
         val expectedDate = "20201016T195600Z"
         val expectedSig = "AWS4-HMAC-SHA256 Credential=AKID/20201016/us-east-1/demo/aws4_request, " +
-            "SignedHeaders=content-encoding;host;transfer-encoding;x-amz-archive-description;x-amz-date;x-amz-decoded-content-length;x-amz-security-token, " +
-            "Signature=ac341b9b248a0b23d2fcd9f7e805f4eb0b8a1b789bb23a8ec6adc6c48dd084ad"
+            "SignedHeaders=content-encoding;host;x-amz-archive-description;x-amz-date;x-amz-decoded-content-length;x-amz-security-token, " +
+            "Signature=ef06c95647c4d2daa6c89ac90274f1c780777cba8eaab772df6d8009def3eb8f"
 
         val signed = getSignedRequest(op)
         assertEquals(expectedDate, signed.headers["X-Amz-Date"])
@@ -162,8 +164,8 @@ public abstract class AwsHttpSignerTestBase(
         val op = buildOperation(streaming = true, replayable = true, requestBody = "a".repeat(AWS_CHUNKED_THRESHOLD + 1))
         val expectedDate = "20201016T195600Z"
         val expectedSig = "AWS4-HMAC-SHA256 Credential=AKID/20201016/us-east-1/demo/aws4_request, " +
-            "SignedHeaders=content-encoding;host;transfer-encoding;x-amz-archive-description;x-amz-date;x-amz-decoded-content-length;x-amz-security-token, " +
-            "Signature=ac341b9b248a0b23d2fcd9f7e805f4eb0b8a1b789bb23a8ec6adc6c48dd084ad"
+            "SignedHeaders=content-encoding;host;x-amz-archive-description;x-amz-date;x-amz-decoded-content-length;x-amz-security-token, " +
+            "Signature=ef06c95647c4d2daa6c89ac90274f1c780777cba8eaab772df6d8009def3eb8f"
 
         val signed = getSignedRequest(op)
         assertEquals(expectedDate, signed.headers["X-Amz-Date"])
@@ -176,8 +178,8 @@ public abstract class AwsHttpSignerTestBase(
         val expectedDate = "20201016T195600Z"
         // should have same signature as testSignAwsChunkedStreamNonReplayable(), except for the hash, since the body is different
         val expectedSig = "AWS4-HMAC-SHA256 Credential=AKID/20201016/us-east-1/demo/aws4_request, " +
-            "SignedHeaders=content-encoding;host;transfer-encoding;x-amz-archive-description;x-amz-date;x-amz-decoded-content-length;x-amz-security-token, " +
-            "Signature=3f0277123c9ed8a8858f793886a0ac0fcb457bc54401ffc22d470f373397cff0"
+            "SignedHeaders=content-encoding;host;x-amz-archive-description;x-amz-date;x-amz-decoded-content-length;x-amz-security-token, " +
+            "Signature=a902702b57057a864bf41cc22ee846a1b7bd047e22784367ec6a459f6791330e"
 
         val signed = getSignedRequest(op)
         assertEquals(expectedDate, signed.headers["X-Amz-Date"])

From 97ac44792df8016d27988bcde1d112c69b46ab29 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Tue, 28 Jan 2025 18:35:54 +0000
Subject: [PATCH 030/183] chore: release 1.4.2

---
 .changes/b0646077-397d-48a8-94f2-ea2db40b1dea.json | 5 -----
 CHANGELOG.md                                       | 5 +++++
 gradle.properties                                  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 .changes/b0646077-397d-48a8-94f2-ea2db40b1dea.json

diff --git a/.changes/b0646077-397d-48a8-94f2-ea2db40b1dea.json b/.changes/b0646077-397d-48a8-94f2-ea2db40b1dea.json
deleted file mode 100644
index 96e13a4a82..0000000000
--- a/.changes/b0646077-397d-48a8-94f2-ea2db40b1dea.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "b0646077-397d-48a8-94f2-ea2db40b1dea",
-    "type": "bugfix",
-    "description": "Ignore hop-by-hop headers when signing requests"
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4c4a65548..2e925d0943 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.4.2] - 01/28/2025
+
+### Fixes
+* Ignore hop-by-hop headers when signing requests
+
 ## [1.4.1] - 01/16/2025
 
 ## [1.4.0] - 01/15/2025
diff --git a/gradle.properties b/gradle.properties
index df0e651ce1..1b11779bb6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.2-SNAPSHOT
+sdkVersion=1.4.2
 
 # codegen
-codegenVersion=0.34.2-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.2
\ No newline at end of file

From b7e50e3c66a073e5696b363aae29823284beef09 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Tue, 28 Jan 2025 18:35:55 +0000
Subject: [PATCH 031/183] chore: bump snapshot version to 1.4.3-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 1b11779bb6..9e53dbcaf0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.2
+sdkVersion=1.4.3-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.2
\ No newline at end of file
+codegenVersion=0.34.3-SNAPSHOT
\ No newline at end of file

From e6357f92abd84dd2276a0f9ba27204be610d0068 Mon Sep 17 00:00:00 2001
From: Xinsong Cui <xicu@amazon.com>
Date: Thu, 30 Jan 2025 16:34:10 -0500
Subject: [PATCH 032/183] misc: add telemetry configuration to DefaultAwsSigner
 (#1226)

* add telemetry provider configuration

* lint

* address pr reviews

* add changelog
---
 .../d3ce7511-6fb2-4435-8f46-db724551b384.json |  5 ++++
 .../api/aws-signing-default.api               |  8 ++++++
 .../auth/awssigning/DefaultAwsSigner.kt       | 27 ++++++++++++++++---
 3 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 .changes/d3ce7511-6fb2-4435-8f46-db724551b384.json

diff --git a/.changes/d3ce7511-6fb2-4435-8f46-db724551b384.json b/.changes/d3ce7511-6fb2-4435-8f46-db724551b384.json
new file mode 100644
index 0000000000..aa89d9167e
--- /dev/null
+++ b/.changes/d3ce7511-6fb2-4435-8f46-db724551b384.json
@@ -0,0 +1,5 @@
+{
+    "id": "d3ce7511-6fb2-4435-8f46-db724551b384",
+    "type": "misc",
+    "description": "Add telemetry provider configuration to `DefaultAwsSigner`"
+}
\ No newline at end of file
diff --git a/runtime/auth/aws-signing-default/api/aws-signing-default.api b/runtime/auth/aws-signing-default/api/aws-signing-default.api
index 3b9535c403..e00e6d829a 100644
--- a/runtime/auth/aws-signing-default/api/aws-signing-default.api
+++ b/runtime/auth/aws-signing-default/api/aws-signing-default.api
@@ -1,4 +1,12 @@
+public final class aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSignerBuilder {
+	public fun <init> ()V
+	public final fun build ()Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;
+	public final fun getTelemetryProvider ()Laws/smithy/kotlin/runtime/telemetry/TelemetryProvider;
+	public final fun setTelemetryProvider (Laws/smithy/kotlin/runtime/telemetry/TelemetryProvider;)V
+}
+
 public final class aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSignerKt {
+	public static final fun DefaultAwsSigner (Lkotlin/jvm/functions/Function1;)Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;
 	public static final fun getDefaultAwsSigner ()Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;
 }
 
diff --git a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSigner.kt b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSigner.kt
index df613d31b0..791d8fce0a 100644
--- a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSigner.kt
+++ b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSigner.kt
@@ -4,8 +4,10 @@
  */
 package aws.smithy.kotlin.runtime.auth.awssigning
 
+import aws.smithy.kotlin.runtime.ExperimentalApi
 import aws.smithy.kotlin.runtime.http.Headers
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
+import aws.smithy.kotlin.runtime.telemetry.TelemetryProvider
 import aws.smithy.kotlin.runtime.telemetry.logging.logger
 import aws.smithy.kotlin.runtime.time.TimestampFormat
 import kotlin.coroutines.coroutineContext
@@ -13,13 +15,30 @@ import kotlin.coroutines.coroutineContext
 /** The default implementation of [AwsSigner] */
 public val DefaultAwsSigner: AwsSigner = DefaultAwsSignerImpl()
 
+/** Creates a customized instance of [AwsSigner] */
+@Suppress("ktlint:standard:function-naming")
+public fun DefaultAwsSigner(block: DefaultAwsSignerBuilder.() -> Unit): AwsSigner =
+    DefaultAwsSignerBuilder().apply(block).build()
+
+/** A builder class for creating instances of [AwsSigner] using the default implementation */
+public class DefaultAwsSignerBuilder {
+    public var telemetryProvider: TelemetryProvider? = null
+
+    public fun build(): AwsSigner = DefaultAwsSignerImpl(
+        telemetryProvider = telemetryProvider,
+    )
+}
+
+@OptIn(ExperimentalApi::class)
 internal class DefaultAwsSignerImpl(
     private val canonicalizer: Canonicalizer = Canonicalizer.Default,
     private val signatureCalculator: SignatureCalculator = SignatureCalculator.Default,
     private val requestMutator: RequestMutator = RequestMutator.Default,
+    private val telemetryProvider: TelemetryProvider? = null,
 ) : AwsSigner {
     override suspend fun sign(request: HttpRequest, config: AwsSigningConfig): AwsSigningResult<HttpRequest> {
-        val logger = coroutineContext.logger<DefaultAwsSignerImpl>()
+        val logger = telemetryProvider?.loggerProvider?.getOrCreateLogger("DefaultAwsSigner")
+            ?: coroutineContext.logger<DefaultAwsSignerImpl>()
 
         // TODO: implement SigV4a
         if (config.algorithm != AwsSigningAlgorithm.SIGV4) {
@@ -52,7 +71,8 @@ internal class DefaultAwsSignerImpl(
         prevSignature: ByteArray,
         config: AwsSigningConfig,
     ): AwsSigningResult<Unit> {
-        val logger = coroutineContext.logger<DefaultAwsSignerImpl>()
+        val logger = telemetryProvider?.loggerProvider?.getOrCreateLogger("DefaultAwsSigner")
+            ?: coroutineContext.logger<DefaultAwsSignerImpl>()
 
         val stringToSign = signatureCalculator.chunkStringToSign(chunkBody, prevSignature, config)
         logger.trace { "Chunk string to sign:\n$stringToSign" }
@@ -70,7 +90,8 @@ internal class DefaultAwsSignerImpl(
         prevSignature: ByteArray,
         config: AwsSigningConfig,
     ): AwsSigningResult<Unit> {
-        val logger = coroutineContext.logger<DefaultAwsSignerImpl>()
+        val logger = telemetryProvider?.loggerProvider?.getOrCreateLogger("DefaultAwsSigner")
+            ?: coroutineContext.logger<DefaultAwsSignerImpl>()
 
         // FIXME - can we share canonicalization code more than we are..., also this reduce is inefficient.
         // canonicalize the headers

From 9d6857be261d650c1ce1b8145f42881d8054747d Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Tue, 4 Feb 2025 15:22:57 -0500
Subject: [PATCH 033/183] misc: gradle mirror (#1204)

---
 .github/workflows/artifact-size-metrics.yml  |  4 ++++
 .github/workflows/continuous-integration.yml | 14 ++++++++++++++
 .github/workflows/kat-transform.yml          |  5 +++++
 .github/workflows/lint.yml                   |  2 ++
 gradle/wrapper/gradle-wrapper.properties     |  2 +-
 5 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/artifact-size-metrics.yml b/.github/workflows/artifact-size-metrics.yml
index 0591b2b6aa..d1216099ae 100644
--- a/.github/workflows/artifact-size-metrics.yml
+++ b/.github/workflows/artifact-size-metrics.yml
@@ -31,6 +31,8 @@ jobs:
         with:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Generate Artifact Size Metrics
         run: ./gradlew artifactSizeMetrics
       - name: Save Artifact Size Metrics
@@ -54,6 +56,8 @@ jobs:
         with:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Generate Artifact Size Metrics
         run: ./gradlew artifactSizeMetrics
       - name: Analyze Artifact Size Metrics
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index d47020ea5d..5536a141bc 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -39,6 +39,8 @@ jobs:
           distribution: 'corretto'
           java-version: 17
           cache: 'gradle'
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Test
         shell: bash
         run: |
@@ -59,6 +61,8 @@ jobs:
           distribution: 'corretto'
           java-version: 17
           cache: 'gradle'
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Test
         shell: bash
         run: |
@@ -83,6 +87,8 @@ jobs:
           distribution: 'corretto'
           java-version: 17
           cache: 'gradle'
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
       - name: Test
         shell: bash
         run: |
@@ -110,6 +116,14 @@ jobs:
         # smithy-kotlin is checked out as a sibling dir which will automatically make it an included build
         path: 'aws-sdk-kotlin'
         repository: 'awslabs/aws-sdk-kotlin'
+    - name: Configure Gradle - smithy-kotlin
+      uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+      with:
+        working-directory: ./smithy-kotlin
+    - name: Configure Gradle - aws-sdk-kotlin
+      uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+      with:
+        working-directory: ./aws-sdk-kotlin
     - name: Configure JDK
       uses: actions/setup-java@v3
       with:
diff --git a/.github/workflows/kat-transform.yml b/.github/workflows/kat-transform.yml
index 938e936ef9..bcf6c933c1 100644
--- a/.github/workflows/kat-transform.yml
+++ b/.github/workflows/kat-transform.yml
@@ -35,6 +35,11 @@ jobs:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
 
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+        with:
+          working-directory: ./smithy-kotlin
+
       - name: Setup kat
         uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e95b98aded..809b2bc451 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -21,6 +21,8 @@ jobs:
     steps:
     - name: Checkout sources
       uses: actions/checkout@v2
+    - name: Configure Gradle
+      uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
     - name: Lint ${{ env.PACKAGE_NAME }}
       run: |
         ./gradlew ktlint
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3499ded5c1..dace2bff9b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 532388277d794865f2829a970cade066620ab944 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Thu, 6 Feb 2025 10:26:36 -0800
Subject: [PATCH 034/183] fix: correctly check equality for CaseInsensitiveMap
 (#1235)

---
 .../4820850c-8916-47f5-a7e1-8880e6a00d22.json |   5 +
 runtime/runtime-core/api/runtime-core.api     |   1 +
 .../runtime/collections/CaseInsensitiveMap.kt |  22 ++-
 .../CaseInsensitiveMutableStringSet.kt        |  40 ++++++
 .../collections/CaseInsensitiveString.kt      |  11 ++
 .../kotlin/runtime/collections/ValuesMap.kt   |  16 +--
 .../collections/CaseInsensitiveMapTest.kt     |  66 +++++++++
 .../CaseInsensitiveMutableStringSetTest.kt    | 125 ++++++++++++++++++
 .../collections/CaseInsensitiveStringTest.kt  |  27 ++++
 9 files changed, 291 insertions(+), 22 deletions(-)
 create mode 100644 .changes/4820850c-8916-47f5-a7e1-8880e6a00d22.json
 create mode 100644 runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMutableStringSet.kt
 create mode 100644 runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveString.kt
 create mode 100644 runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMutableStringSetTest.kt
 create mode 100644 runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveStringTest.kt

diff --git a/.changes/4820850c-8916-47f5-a7e1-8880e6a00d22.json b/.changes/4820850c-8916-47f5-a7e1-8880e6a00d22.json
new file mode 100644
index 0000000000..297f7e603f
--- /dev/null
+++ b/.changes/4820850c-8916-47f5-a7e1-8880e6a00d22.json
@@ -0,0 +1,5 @@
+{
+    "id": "4820850c-8916-47f5-a7e1-8880e6a00d22",
+    "type": "bugfix",
+    "description": "Fix errors in equality checks for `CaseInsensitiveMap` which affect `Headers` and `ValuesMap` implementations"
+}
\ No newline at end of file
diff --git a/runtime/runtime-core/api/runtime-core.api b/runtime/runtime-core/api/runtime-core.api
index 6d39c3b417..0d5399d430 100644
--- a/runtime/runtime-core/api/runtime-core.api
+++ b/runtime/runtime-core/api/runtime-core.api
@@ -306,6 +306,7 @@ public class aws/smithy/kotlin/runtime/collections/ValuesMapImpl : aws/smithy/ko
 	public fun getAll (Ljava/lang/String;)Ljava/util/List;
 	public fun getCaseInsensitiveName ()Z
 	protected final fun getValues ()Ljava/util/Map;
+	public fun hashCode ()I
 	public fun isEmpty ()Z
 	public fun names ()Ljava/util/Set;
 }
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMap.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMap.kt
index 096e1b6d3d..7e6d6751f9 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMap.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMap.kt
@@ -6,16 +6,6 @@ package aws.smithy.kotlin.runtime.collections
 
 import aws.smithy.kotlin.runtime.InternalApi
 
-private class CaseInsensitiveString(val s: String) {
-    val hash: Int = s.lowercase().hashCode()
-    override fun hashCode(): Int = hash
-    override fun equals(other: Any?): Boolean = other is CaseInsensitiveString && other.s.equals(s, ignoreCase = true)
-    override fun toString(): String = s
-}
-
-private fun String.toInsensitive(): CaseInsensitiveString =
-    CaseInsensitiveString(this)
-
 /**
  * Map of case-insensitive [String] to [Value]
  */
@@ -30,17 +20,17 @@ internal class CaseInsensitiveMap<Value> : MutableMap<String, Value> {
 
     override fun containsValue(value: Value): Boolean = impl.containsValue(value)
 
-    override fun get(key: String): Value? = impl.get(key.toInsensitive())
+    override fun get(key: String): Value? = impl[key.toInsensitive()]
 
     override fun isEmpty(): Boolean = impl.isEmpty()
 
     override val entries: MutableSet<MutableMap.MutableEntry<String, Value>>
         get() = impl.entries.map {
-            Entry(it.key.s, it.value)
+            Entry(it.key.normalized, it.value)
         }.toMutableSet()
 
     override val keys: MutableSet<String>
-        get() = impl.keys.map { it.s }.toMutableSet()
+        get() = CaseInsensitiveMutableStringSet(impl.keys)
 
     override val values: MutableCollection<Value>
         get() = impl.values
@@ -57,6 +47,12 @@ internal class CaseInsensitiveMap<Value> : MutableMap<String, Value> {
 
     override fun remove(key: String): Value? = impl.remove(key.toInsensitive())
 
+    override fun hashCode() = impl.hashCode()
+
+    override fun equals(other: Any?) = other is CaseInsensitiveMap<*> && impl == other.impl
+
+    override fun toString() = impl.toString()
+
     private class Entry<Key, Value>(
         override val key: Key,
         override var value: Value,
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMutableStringSet.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMutableStringSet.kt
new file mode 100644
index 0000000000..63924013c9
--- /dev/null
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMutableStringSet.kt
@@ -0,0 +1,40 @@
+package aws.smithy.kotlin.runtime.collections
+
+internal class CaseInsensitiveMutableStringSet(
+    initialValues: Iterable<CaseInsensitiveString> = setOf(),
+) : MutableSet<String> {
+    private val delegate = initialValues.toMutableSet()
+
+    override fun add(element: String) = delegate.add(element.toInsensitive())
+    override fun clear() = delegate.clear()
+    override fun contains(element: String) = delegate.contains(element.toInsensitive())
+    override fun containsAll(elements: Collection<String>) = elements.all { it in this }
+    override fun equals(other: Any?) = other is CaseInsensitiveMutableStringSet && delegate == other.delegate
+    override fun hashCode() = delegate.hashCode()
+    override fun isEmpty() = delegate.isEmpty()
+    override fun remove(element: String) = delegate.remove(element.toInsensitive())
+    override val size: Int get() = delegate.size
+    override fun toString() = delegate.toString()
+
+    override fun addAll(elements: Collection<String>) =
+        elements.fold(false) { modified, item -> add(item) || modified }
+
+    override fun iterator() = object : MutableIterator<String> {
+        val delegate = this@CaseInsensitiveMutableStringSet.delegate.iterator()
+        override fun hasNext() = delegate.hasNext()
+        override fun next() = delegate.next().normalized
+        override fun remove() = delegate.remove()
+    }
+
+    override fun removeAll(elements: Collection<String>) =
+        elements.fold(false) { modified, item -> remove(item) || modified }
+
+    override fun retainAll(elements: Collection<String>): Boolean {
+        val insensitiveElements = elements.map { it.toInsensitive() }.toSet()
+        val toRemove = delegate.filterNot { it in insensitiveElements }
+        return toRemove.fold(false) { modified, item -> delegate.remove(item) || modified }
+    }
+}
+
+internal fun CaseInsensitiveMutableStringSet(initialValues: Iterable<String>) =
+    CaseInsensitiveMutableStringSet(initialValues.map { it.toInsensitive() })
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveString.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveString.kt
new file mode 100644
index 0000000000..e182ca813d
--- /dev/null
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveString.kt
@@ -0,0 +1,11 @@
+package aws.smithy.kotlin.runtime.collections
+
+internal class CaseInsensitiveString(val original: String) {
+    val normalized = original.lowercase()
+    override fun hashCode() = normalized.hashCode()
+    override fun equals(other: Any?) = other is CaseInsensitiveString && normalized == other.normalized
+    override fun toString() = original
+}
+
+internal fun String.toInsensitive(): CaseInsensitiveString =
+    CaseInsensitiveString(this)
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/ValuesMap.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/ValuesMap.kt
index 763fa21ece..efa7a70af3 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/ValuesMap.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/ValuesMap.kt
@@ -89,15 +89,13 @@ public open class ValuesMapImpl<T>(
 
     override fun isEmpty(): Boolean = values.isEmpty()
 
-    override fun equals(other: Any?): Boolean =
-        other is ValuesMap<*> &&
-            caseInsensitiveName == other.caseInsensitiveName &&
-            names().let { names ->
-                if (names.size != other.names().size) {
-                    return false
-                }
-                names.all { getAll(it) == other.getAll(it) }
-            }
+    override fun equals(other: Any?): Boolean = when (other) {
+        is ValuesMapImpl<*> -> caseInsensitiveName == other.caseInsensitiveName && values == other.values
+        is ValuesMap<*> -> caseInsensitiveName == other.caseInsensitiveName && entries() == other.entries()
+        else -> false
+    }
+
+    override fun hashCode(): Int = values.hashCode()
 
     private fun Map<String, List<T>>.deepCopyValues(): Map<String, List<T>> = mapValues { (_, v) -> v.toList() }
 }
diff --git a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMapTest.kt b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMapTest.kt
index dcf919d52d..a36d8ebc31 100644
--- a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMapTest.kt
+++ b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMapTest.kt
@@ -6,6 +6,8 @@ package aws.smithy.kotlin.runtime.collections
 
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 class CaseInsensitiveMapTest {
     @Test
@@ -18,4 +20,68 @@ class CaseInsensitiveMapTest {
         assertEquals("json", map["content-type"])
         assertEquals("json", map["CONTENT-TYPE"])
     }
+
+    @Test
+    fun testContains() {
+        val map = CaseInsensitiveMap<String>()
+        map["A"] = "apple"
+        map["B"] = "banana"
+        map["C"] = "cherry"
+
+        assertTrue("C" in map)
+        assertTrue("c" in map)
+        assertFalse("D" in map)
+    }
+
+    @Test
+    fun testKeysContains() {
+        val map = CaseInsensitiveMap<String>()
+        map["A"] = "apple"
+        map["B"] = "banana"
+        map["C"] = "cherry"
+        val keys = map.keys
+
+        assertTrue("C" in keys)
+        assertTrue("c" in keys)
+        assertFalse("D" in keys)
+    }
+
+    @Test
+    fun testEquality() {
+        val left = CaseInsensitiveMap<String>()
+        left["A"] = "apple"
+        left["B"] = "banana"
+        left["C"] = "cherry"
+
+        val right = CaseInsensitiveMap<String>()
+        right["c"] = "cherry"
+        right["b"] = "banana"
+        right["a"] = "apple"
+
+        assertEquals(left, right)
+    }
+
+    @Test
+    fun testEntriesEquality() {
+        val left = CaseInsensitiveMap<String>()
+        left["A"] = "apple"
+        left["B"] = "banana"
+        left["C"] = "cherry"
+
+        val right = CaseInsensitiveMap<String>()
+        right["c"] = "cherry"
+        right["b"] = "banana"
+        right["a"] = "apple"
+
+        assertEquals(left.entries, right.entries)
+    }
+
+    @Test
+    fun testToString() {
+        val map = CaseInsensitiveMap<String>()
+        map["A"] = "apple"
+        map["B"] = "banana"
+        map["C"] = "cherry"
+        assertEquals("{A=apple, B=banana, C=cherry}", map.toString())
+    }
 }
diff --git a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMutableStringSetTest.kt b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMutableStringSetTest.kt
new file mode 100644
index 0000000000..258ef4c7f3
--- /dev/null
+++ b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMutableStringSetTest.kt
@@ -0,0 +1,125 @@
+package aws.smithy.kotlin.runtime.collections
+
+import kotlin.test.*
+
+private val input = setOf("APPLE", "banana", "cHeRrY")
+private val variations = (input + input.map { it.lowercase() } + input.map { it.uppercase() })
+private val disjoint = setOf("durIAN", "ELdeRBerRY", "FiG")
+private val subset = input - "APPLE"
+private val intersecting = subset + disjoint
+
+class CaseInsensitiveMutableStringSetTest {
+    private fun assertSize(size: Int, set: CaseInsensitiveMutableStringSet) {
+        assertEquals(size, set.size)
+        val emptyAsserter: (Boolean) -> Unit = if (size == 0) ::assertTrue else ::assertFalse
+        emptyAsserter(set.isEmpty())
+    }
+
+    @Test
+    fun testInitialization() {
+        val set = CaseInsensitiveMutableStringSet(input)
+        assertSize(3, set)
+    }
+
+    @Test
+    fun testAdd() {
+        val set = CaseInsensitiveMutableStringSet(input)
+        set += "durIAN"
+        assertSize(4, set)
+    }
+
+    @Test
+    fun testAddAll() {
+        val set = CaseInsensitiveMutableStringSet(input)
+        assertFalse(set.addAll(set))
+
+        val intersecting = input + "durian"
+        assertTrue(set.addAll(intersecting))
+        assertSize(4, set)
+    }
+
+    @Test
+    fun testClear() {
+        val set = CaseInsensitiveMutableStringSet(input)
+        set.clear()
+        assertSize(0, set)
+    }
+
+    @Test
+    fun testContains() {
+        val set = CaseInsensitiveMutableStringSet(input)
+        variations.forEach { assertTrue("Set should contain element $it") { it in set } }
+
+        assertFalse("durian" in set)
+    }
+
+    @Test
+    fun testContainsAll() {
+        val set = CaseInsensitiveMutableStringSet(input)
+        assertTrue(set.containsAll(variations))
+
+        val intersecting = input + "durian"
+        assertFalse(set.containsAll(intersecting))
+    }
+
+    @Test
+    fun testEquality() {
+        val left = CaseInsensitiveMutableStringSet(input)
+        val right = CaseInsensitiveMutableStringSet(input)
+        assertEquals(left, right)
+
+        left -= "apple"
+        assertNotEquals(left, right)
+
+        right -= "ApPlE"
+        assertEquals(left, right)
+    }
+
+    @Test
+    fun testIterator() {
+        val set = CaseInsensitiveMutableStringSet(input)
+        val iterator = set.iterator()
+
+        assertTrue(iterator.hasNext())
+        assertEquals("apple", iterator.next())
+
+        assertTrue(iterator.hasNext())
+        assertEquals("banana", iterator.next())
+        iterator.remove()
+        assertSize(2, set)
+
+        assertTrue(iterator.hasNext())
+        assertEquals("cherry", iterator.next())
+
+        assertFalse(iterator.hasNext())
+        assertTrue(set.containsAll(input - "banana"))
+    }
+
+    @Test
+    fun testRemove() {
+        val set = CaseInsensitiveMutableStringSet(input)
+        set -= "BANANA"
+        assertSize(2, set)
+    }
+
+    @Test
+    fun testRemoveAll() {
+        val set = CaseInsensitiveMutableStringSet(input)
+        assertFalse(set.removeAll(disjoint))
+
+        assertTrue(set.removeAll(intersecting))
+        assertSize(1, set)
+        assertTrue("apple" in set)
+    }
+
+    @Test
+    fun testRetainAll() {
+        val set = CaseInsensitiveMutableStringSet(input)
+        assertFalse(set.retainAll(set))
+        assertSize(3, set)
+
+        assertTrue(set.retainAll(intersecting))
+        assertSize(2, set)
+        assertTrue(set.containsAll(subset))
+    }
+}
diff --git a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveStringTest.kt b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveStringTest.kt
new file mode 100644
index 0000000000..f3a0c7b600
--- /dev/null
+++ b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveStringTest.kt
@@ -0,0 +1,27 @@
+package aws.smithy.kotlin.runtime.collections
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotEquals
+
+class CaseInsensitiveStringTest {
+    @Test
+    fun testEquality() {
+        val left = "Banana".toInsensitive()
+        val right = "baNAna".toInsensitive()
+        assertEquals(left, right)
+        assertNotEquals<Any>("Banana", left)
+        assertNotEquals<Any>("baNAna", right)
+
+        val nonMatching = "apple".toInsensitive()
+        assertNotEquals(nonMatching, left)
+        assertNotEquals(nonMatching, right)
+    }
+
+    @Test
+    fun testProperties() {
+        val s = "BANANA".toInsensitive()
+        assertEquals("BANANA", s.original)
+        assertEquals("banana", s.normalized)
+    }
+}

From 1af0e8200c3f78949be02d1ef68dd5f120e73aa1 Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Fri, 7 Feb 2025 12:01:47 -0500
Subject: [PATCH 035/183] misc: gradle version bump (#1236)

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dace2bff9b..b136486be8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 120768c37101a25fdfddb3504df048cb25045b8e Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:01:31 -0800
Subject: [PATCH 036/183] fix: correct hash code calculation for
 case-insensitive map entries (#1238)

* fix: correct hash code calculation for case-insensitive map entries

* remove commented-out code
---
 .../c0040355-ffdc-4813-80e9-baf859ef02b9.json    |  5 +++++
 .../runtime/collections/CaseInsensitiveMap.kt    |  2 +-
 .../collections/CaseInsensitiveMapTest.kt        | 16 ++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 .changes/c0040355-ffdc-4813-80e9-baf859ef02b9.json

diff --git a/.changes/c0040355-ffdc-4813-80e9-baf859ef02b9.json b/.changes/c0040355-ffdc-4813-80e9-baf859ef02b9.json
new file mode 100644
index 0000000000..42302b920d
--- /dev/null
+++ b/.changes/c0040355-ffdc-4813-80e9-baf859ef02b9.json
@@ -0,0 +1,5 @@
+{
+    "id": "c0040355-ffdc-4813-80e9-baf859ef02b9",
+    "type": "bugfix",
+    "description": "fix: correct hash code calculation for case-insensitive map entries"
+}
\ No newline at end of file
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMap.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMap.kt
index 7e6d6751f9..e888ad72bc 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMap.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMap.kt
@@ -63,7 +63,7 @@ internal class CaseInsensitiveMap<Value> : MutableMap<String, Value> {
             return value
         }
 
-        override fun hashCode(): Int = 17 * 31 + key!!.hashCode() + value!!.hashCode()
+        override fun hashCode(): Int = key.hashCode() xor value.hashCode() // Match JVM & K/N stdlib implementations
 
         override fun equals(other: Any?): Boolean {
             if (other == null || other !is Map.Entry<*, *>) return false
diff --git a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMapTest.kt b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMapTest.kt
index a36d8ebc31..96fd83612b 100644
--- a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMapTest.kt
+++ b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/CaseInsensitiveMapTest.kt
@@ -76,6 +76,22 @@ class CaseInsensitiveMapTest {
         assertEquals(left.entries, right.entries)
     }
 
+    @Test
+    fun testEntriesEqualityWithNormalMap() {
+        val left = CaseInsensitiveMap<String>()
+        left["A"] = "apple"
+        left["B"] = "banana"
+        left["C"] = "cherry"
+
+        val right = mutableMapOf(
+            "c" to "cherry",
+            "b" to "banana",
+            "a" to "apple",
+        )
+
+        assertEquals(left.entries, right.entries)
+    }
+
     @Test
     fun testToString() {
         val map = CaseInsensitiveMap<String>()

From d7e36039967610e3225321f1bc7ccd47765207d6 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Wed, 12 Feb 2025 17:41:13 -0500
Subject: [PATCH 037/183] misc: bump build plugin version (#1239)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bdc0c8e98b..bfa4c2b4f1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin-version = "2.1.0"
 dokka-version = "1.9.10"
 
-aws-kotlin-repo-tools-version = "0.4.18"
+aws-kotlin-repo-tools-version = "0.4.20"
 
 # libs
 coroutines-version = "1.9.0"

From c1bcb0420a27bc7192c048983190780676c5a386 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Thu, 13 Feb 2025 08:38:17 -0800
Subject: [PATCH 038/183] fix: favor endpointUrl over endpoint discovery when
 provided (#1240)

---
 .../e7d8178c-4211-443d-b4d9-44d7019aefd1.json |  8 ++++
 .../discovery/EndpointDiscovererGenerator.kt  | 37 +++++++++++--------
 .../EndpointDiscovererGeneratorTest.kt        | 30 ++++++++-------
 3 files changed, 47 insertions(+), 28 deletions(-)
 create mode 100644 .changes/e7d8178c-4211-443d-b4d9-44d7019aefd1.json

diff --git a/.changes/e7d8178c-4211-443d-b4d9-44d7019aefd1.json b/.changes/e7d8178c-4211-443d-b4d9-44d7019aefd1.json
new file mode 100644
index 0000000000..51864abe9b
--- /dev/null
+++ b/.changes/e7d8178c-4211-443d-b4d9-44d7019aefd1.json
@@ -0,0 +1,8 @@
+{
+    "id": "e7d8178c-4211-443d-b4d9-44d7019aefd1",
+    "type": "bugfix",
+    "description": "Favor `endpointUrl` over endpoint discovery when provided",
+    "issues": [
+        "https://github.com/awslabs/aws-sdk-kotlin/issues/1413"
+    ]
+}
\ No newline at end of file
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererGenerator.kt
index c492cd743d..73b6e434da 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererGenerator.kt
@@ -13,6 +13,7 @@ import software.amazon.smithy.kotlin.codegen.model.buildSymbol
 import software.amazon.smithy.kotlin.codegen.model.expectShape
 import software.amazon.smithy.kotlin.codegen.model.expectTrait
 import software.amazon.smithy.kotlin.codegen.rendering.endpoints.EndpointResolverAdapterGenerator
+import software.amazon.smithy.kotlin.codegen.rendering.endpoints.SdkEndpointBuiltinIntegration
 import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.model.shapes.ServiceShape
 
@@ -80,21 +81,27 @@ class EndpointDiscovererGenerator(private val ctx: CodegenContext, private val d
             EndpointResolverAdapterGenerator.getSymbol(ctx.settings),
             RuntimeTypes.HttpClient.Operation.EndpointResolver,
         ) {
-            write("val identity = request.identity")
-            write(
-                """require(identity is #T) { "Endpoint discovery requires AWS credentials" }""",
-                RuntimeTypes.Auth.Credentials.AwsCredentials.Credentials,
-            )
-            write("")
-            write("val cacheKey = DiscoveryParams(client.config.region, identity.accessKeyId)")
-            write("request.context[discoveryParamsKey] = cacheKey")
-            write("val discoveredHost = cache.get(cacheKey) { discoverHost(client) }")
-            write("")
-            write("val originalEndpoint = delegate.resolve(request)")
-            withBlock("#T(", ")", RuntimeTypes.SmithyClient.Endpoints.Endpoint) {
-                write("originalEndpoint.uri.copy { host = discoveredHost },")
-                write("originalEndpoint.headers,")
-                write("originalEndpoint.attributes,")
+            // Backported from https://github.com/smithy-lang/smithy-kotlin/pull/1221; replace when merging v1.5 to main
+            withBlock("if (client.config.#L == null) {", "}", SdkEndpointBuiltinIntegration.EndpointUrlProp.propertyName) {
+                write("val identity = request.identity")
+                write(
+                    """require(identity is #T) { "Endpoint discovery requires AWS credentials" }""",
+                    RuntimeTypes.Auth.Credentials.AwsCredentials.Credentials,
+                )
+                write("")
+                write("val cacheKey = DiscoveryParams(client.config.region, identity.accessKeyId)")
+                write("request.context[discoveryParamsKey] = cacheKey")
+                write("val discoveredHost = cache.get(cacheKey) { discoverHost(client) }")
+                write("")
+                write("val originalEndpoint = delegate.resolve(request)")
+                withBlock("#T(", ")", RuntimeTypes.SmithyClient.Endpoints.Endpoint) {
+                    write("originalEndpoint.uri.copy { host = discoveredHost },")
+                    write("originalEndpoint.headers,")
+                    write("originalEndpoint.attributes,")
+                }
+                // If user manually specifies endpointUrl, skip endpoint discovery
+                closeAndOpenBlock("} else {")
+                write("delegate.resolve(request)")
             }
         }
     }
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererGeneratorTest.kt
index b67c51d57a..37b9e6a900 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererGeneratorTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererGeneratorTest.kt
@@ -37,19 +37,23 @@ class EndpointDiscovererGeneratorTest {
         actual.shouldContainOnlyOnceWithDiff(
             """
                 internal fun asEndpointResolver(client: TestClient, delegate: EndpointResolverAdapter) = EndpointResolver { request ->
-                    val identity = request.identity
-                    require(identity is Credentials) { "Endpoint discovery requires AWS credentials" }
-            
-                    val cacheKey = DiscoveryParams(client.config.region, identity.accessKeyId)
-                    request.context[discoveryParamsKey] = cacheKey
-                    val discoveredHost = cache.get(cacheKey) { discoverHost(client) }
-            
-                    val originalEndpoint = delegate.resolve(request)
-                    Endpoint(
-                        originalEndpoint.uri.copy { host = discoveredHost },
-                        originalEndpoint.headers,
-                        originalEndpoint.attributes,
-                    )
+                    if (client.config.endpointUrl == null) {
+                        val identity = request.identity
+                        require(identity is Credentials) { "Endpoint discovery requires AWS credentials" }
+                
+                        val cacheKey = DiscoveryParams(client.config.region, identity.accessKeyId)
+                        request.context[discoveryParamsKey] = cacheKey
+                        val discoveredHost = cache.get(cacheKey) { discoverHost(client) }
+                
+                        val originalEndpoint = delegate.resolve(request)
+                        Endpoint(
+                            originalEndpoint.uri.copy { host = discoveredHost },
+                            originalEndpoint.headers,
+                            originalEndpoint.attributes,
+                        )
+                    } else {
+                        delegate.resolve(request)
+                    }
                 }
             """.formatForTest(),
         )

From 4223bfa224dca5bb6274ae2da77022eed74a5b9e Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 13 Feb 2025 17:13:45 +0000
Subject: [PATCH 039/183] chore: release 1.4.3

---
 .changes/4820850c-8916-47f5-a7e1-8880e6a00d22.json |  5 -----
 .changes/c0040355-ffdc-4813-80e9-baf859ef02b9.json |  5 -----
 .changes/d3ce7511-6fb2-4435-8f46-db724551b384.json |  5 -----
 .changes/e7d8178c-4211-443d-b4d9-44d7019aefd1.json |  8 --------
 CHANGELOG.md                                       | 10 ++++++++++
 gradle.properties                                  |  4 ++--
 6 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 .changes/4820850c-8916-47f5-a7e1-8880e6a00d22.json
 delete mode 100644 .changes/c0040355-ffdc-4813-80e9-baf859ef02b9.json
 delete mode 100644 .changes/d3ce7511-6fb2-4435-8f46-db724551b384.json
 delete mode 100644 .changes/e7d8178c-4211-443d-b4d9-44d7019aefd1.json

diff --git a/.changes/4820850c-8916-47f5-a7e1-8880e6a00d22.json b/.changes/4820850c-8916-47f5-a7e1-8880e6a00d22.json
deleted file mode 100644
index 297f7e603f..0000000000
--- a/.changes/4820850c-8916-47f5-a7e1-8880e6a00d22.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "4820850c-8916-47f5-a7e1-8880e6a00d22",
-    "type": "bugfix",
-    "description": "Fix errors in equality checks for `CaseInsensitiveMap` which affect `Headers` and `ValuesMap` implementations"
-}
\ No newline at end of file
diff --git a/.changes/c0040355-ffdc-4813-80e9-baf859ef02b9.json b/.changes/c0040355-ffdc-4813-80e9-baf859ef02b9.json
deleted file mode 100644
index 42302b920d..0000000000
--- a/.changes/c0040355-ffdc-4813-80e9-baf859ef02b9.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "c0040355-ffdc-4813-80e9-baf859ef02b9",
-    "type": "bugfix",
-    "description": "fix: correct hash code calculation for case-insensitive map entries"
-}
\ No newline at end of file
diff --git a/.changes/d3ce7511-6fb2-4435-8f46-db724551b384.json b/.changes/d3ce7511-6fb2-4435-8f46-db724551b384.json
deleted file mode 100644
index aa89d9167e..0000000000
--- a/.changes/d3ce7511-6fb2-4435-8f46-db724551b384.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "d3ce7511-6fb2-4435-8f46-db724551b384",
-    "type": "misc",
-    "description": "Add telemetry provider configuration to `DefaultAwsSigner`"
-}
\ No newline at end of file
diff --git a/.changes/e7d8178c-4211-443d-b4d9-44d7019aefd1.json b/.changes/e7d8178c-4211-443d-b4d9-44d7019aefd1.json
deleted file mode 100644
index 51864abe9b..0000000000
--- a/.changes/e7d8178c-4211-443d-b4d9-44d7019aefd1.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "id": "e7d8178c-4211-443d-b4d9-44d7019aefd1",
-    "type": "bugfix",
-    "description": "Favor `endpointUrl` over endpoint discovery when provided",
-    "issues": [
-        "https://github.com/awslabs/aws-sdk-kotlin/issues/1413"
-    ]
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e925d0943..5148b8ef03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## [1.4.3] - 02/13/2025
+
+### Fixes
+* Fix errors in equality checks for `CaseInsensitiveMap` which affect `Headers` and `ValuesMap` implementations
+* fix: correct hash code calculation for case-insensitive map entries
+* [#1413](https://github.com/awslabs/aws-sdk-kotlin/issues/1413) Favor `endpointUrl` over endpoint discovery when provided
+
+### Miscellaneous
+* Add telemetry provider configuration to `DefaultAwsSigner`
+
 ## [1.4.2] - 01/28/2025
 
 ### Fixes
diff --git a/gradle.properties b/gradle.properties
index 9e53dbcaf0..ae21839ca4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.3-SNAPSHOT
+sdkVersion=1.4.3
 
 # codegen
-codegenVersion=0.34.3-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.3
\ No newline at end of file

From cea7b1ff15a744c78ab2085469772532a423b7f1 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 13 Feb 2025 17:13:46 +0000
Subject: [PATCH 040/183] chore: bump snapshot version to 1.4.4-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index ae21839ca4..f087c7b551 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.3
+sdkVersion=1.4.4-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.3
\ No newline at end of file
+codegenVersion=0.34.4-SNAPSHOT
\ No newline at end of file

From ad4d2a38b85030a08efbc79aea84f3bd21596375 Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Fri, 14 Feb 2025 10:32:24 -0500
Subject: [PATCH 041/183] misc: test union member name same as union (#1241)

---
 .../smithy/kotlin/codegen/SmithySdkTest.kt    | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/SmithySdkTest.kt b/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/SmithySdkTest.kt
index 8cad9fc623..8adeb29cbf 100644
--- a/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/SmithySdkTest.kt
+++ b/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/SmithySdkTest.kt
@@ -224,6 +224,45 @@ class SmithySdkTest {
 
         assertEquals(KotlinCompilation.ExitCode.OK, compilationResult.exitCode, compileOutputStream.toString())
     }
+
+    // https://github.com/smithy-lang/smithy-kotlin/issues/1129
+    @Test
+    fun `it compiles models with unions with members that have the same name as the union`() {
+        val model = """
+            namespace aws.sdk.kotlin.test
+
+            use aws.protocols#awsJson1_0
+            use smithy.rules#operationContextParams
+            use smithy.rules#endpointRuleSet
+            use aws.api#service
+            
+            @awsJson1_0
+            @service(sdkId: "UnionOperationTest")
+            service TestService {
+                operations: [UnionOperation],
+                version: "1"
+            }
+            
+            operation UnionOperation {
+                input: UnionOperationRequest
+            }
+            
+            structure UnionOperationRequest {
+                Union: Foo
+            }
+            
+            union Foo {
+                foo: Boolean
+            }
+
+        """.asSmithy()
+
+        val compileOutputStream = ByteArrayOutputStream()
+        val compilationResult = compileSdkAndTest(model = model, outputSink = compileOutputStream, emitSourcesToTmp = Debug.emitSourcesToTemp)
+        compileOutputStream.flush()
+
+        assertEquals(KotlinCompilation.ExitCode.OK, compilationResult.exitCode, compileOutputStream.toString())
+    }
 }
 
 /**

From a0be9e4a870c3deffa4a5bc5e871c0c11525e55f Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Fri, 14 Feb 2025 14:10:10 -0500
Subject: [PATCH 042/183] fix: unions with member names matching auto-imported
 Kotlin symbols (#1242)

---
 .../codegen/core/KotlinSymbolProvider.kt      |  4 +-
 .../kotlin/codegen/core/SymbolProviderTest.kt |  8 +--
 .../smithy/kotlin/codegen/SmithySdkTest.kt    | 62 +++++++++++++++++++
 3 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinSymbolProvider.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinSymbolProvider.kt
index f35570dfeb..cca76f0f42 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinSymbolProvider.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinSymbolProvider.kt
@@ -154,7 +154,7 @@ class KotlinSymbolProvider(private val model: Model, private val settings: Kotli
         val fullyQualifiedValueType = "${reference.fullName}$valueSuffix"
         return createSymbolBuilder(shape, "List<$valueType>")
             .addReferences(reference)
-            .putProperty(SymbolProperty.FULLY_QUALIFIED_NAME_HINT, "List<$fullyQualifiedValueType>")
+            .putProperty(SymbolProperty.FULLY_QUALIFIED_NAME_HINT, "kotlin.collections.List<$fullyQualifiedValueType>")
             .putProperty(SymbolProperty.MUTABLE_COLLECTION_FUNCTION, "mutableListOf<$valueType>")
             .putProperty(SymbolProperty.IMMUTABLE_COLLECTION_FUNCTION, "listOf<$valueType>")
             .build()
@@ -173,7 +173,7 @@ class KotlinSymbolProvider(private val model: Model, private val settings: Kotli
         return createSymbolBuilder(shape, "Map<$keyType, $valueType>")
             .addReferences(keyReference)
             .addReferences(valueReference)
-            .putProperty(SymbolProperty.FULLY_QUALIFIED_NAME_HINT, "Map<$fullyQualifiedKeyType, $fullyQualifiedValueType>")
+            .putProperty(SymbolProperty.FULLY_QUALIFIED_NAME_HINT, "kotlin.collections.Map<$fullyQualifiedKeyType, $fullyQualifiedValueType>")
             .putProperty(SymbolProperty.MUTABLE_COLLECTION_FUNCTION, "mutableMapOf<$keyType, $valueType>")
             .putProperty(SymbolProperty.IMMUTABLE_COLLECTION_FUNCTION, "mapOf<$keyType, $valueType>")
             .putProperty(SymbolProperty.ENTRY_EXPRESSION, "Map.Entry<$keyType, $valueType>")
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/SymbolProviderTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/SymbolProviderTest.kt
index bb90fbc0fb..df803ef25e 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/SymbolProviderTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/SymbolProviderTest.kt
@@ -481,8 +481,8 @@ class SymbolProviderTest {
         assertEquals("Record", sparseListSymbol.references[0].symbol.name)
 
         // check the fully qualified name hint is set
-        assertEquals("List<foo.bar.model.Record>", listSymbol.fullNameHint)
-        assertEquals("List<foo.bar.model.Record?>", sparseListSymbol.fullNameHint)
+        assertEquals("kotlin.collections.List<foo.bar.model.Record>", listSymbol.fullNameHint)
+        assertEquals("kotlin.collections.List<foo.bar.model.Record?>", sparseListSymbol.fullNameHint)
     }
 
     @Test
@@ -544,8 +544,8 @@ class SymbolProviderTest {
         assertTrue("com.test.model.Record" in sparseRefNames)
 
         // check the fully qualified name hint is set
-        assertEquals("Map<kotlin.String, com.test.model.Record>", mapSymbol.fullNameHint)
-        assertEquals("Map<kotlin.String, com.test.model.Record?>", sparseMapSymbol.fullNameHint)
+        assertEquals("kotlin.collections.Map<kotlin.String, com.test.model.Record>", mapSymbol.fullNameHint)
+        assertEquals("kotlin.collections.Map<kotlin.String, com.test.model.Record?>", sparseMapSymbol.fullNameHint)
     }
 
     @Test
diff --git a/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/SmithySdkTest.kt b/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/SmithySdkTest.kt
index 8adeb29cbf..a062d6c941 100644
--- a/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/SmithySdkTest.kt
+++ b/tests/compile/src/test/kotlin/software/amazon/smithy/kotlin/codegen/SmithySdkTest.kt
@@ -263,6 +263,68 @@ class SmithySdkTest {
 
         assertEquals(KotlinCompilation.ExitCode.OK, compilationResult.exitCode, compileOutputStream.toString())
     }
+
+    // https://github.com/smithy-lang/smithy-kotlin/issues/1127
+    @Test
+    fun `it compiles models with union member names that match their types`() {
+        val model = """
+            namespace aws.sdk.kotlin.test
+
+            use aws.protocols#awsJson1_0
+            use smithy.rules#operationContextParams
+            use smithy.rules#endpointRuleSet
+            use aws.api#service
+            
+            @awsJson1_0
+            @service(sdkId: "UnionOperationTest")
+            service TestService {
+                operations: [DeleteObjects],
+                version: "1"
+            }
+            
+            operation DeleteObjects {
+                input: DeleteObjectsRequest
+            }
+            
+            structure DeleteObjectsRequest {
+                Delete: Foo
+            }
+            
+            union Foo {
+                list: BarList
+                map: IntegerMap
+                instant: Timestamp
+                byteArray: Blob
+                boolean: Boolean
+                string: String
+                bigInteger: BigInteger
+                bigDecimal: BigDecimal
+                double: Double
+                float: Float
+                long: Long
+                short: Short
+                int: Integer
+                byte: Byte
+            }
+            
+            list BarList {
+                member: Bar
+            }
+            
+            map IntegerMap {
+                key: String
+                value: Integer
+            }
+            
+            string Bar
+        """.asSmithy()
+
+        val compileOutputStream = ByteArrayOutputStream()
+        val compilationResult = compileSdkAndTest(model = model, outputSink = compileOutputStream, emitSourcesToTmp = Debug.emitSourcesToTemp)
+        compileOutputStream.flush()
+
+        assertEquals(KotlinCompilation.ExitCode.OK, compilationResult.exitCode, compileOutputStream.toString())
+    }
 }
 
 /**

From 00500f2f640ec565ad53546a3d660c2eb97b1472 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Tue, 18 Feb 2025 10:33:39 -0500
Subject: [PATCH 043/183] fix: bump maximum event stream message length to 24MB
 (#1243)

---
 .changes/ba71e47f-d546-45f2-bf44-aedaab74a966.json          | 5 +++++
 .../kotlin/runtime/awsprotocol/eventstream/Message.kt       | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 .changes/ba71e47f-d546-45f2-bf44-aedaab74a966.json

diff --git a/.changes/ba71e47f-d546-45f2-bf44-aedaab74a966.json b/.changes/ba71e47f-d546-45f2-bf44-aedaab74a966.json
new file mode 100644
index 0000000000..253c9f7e32
--- /dev/null
+++ b/.changes/ba71e47f-d546-45f2-bf44-aedaab74a966.json
@@ -0,0 +1,5 @@
+{
+    "id": "ba71e47f-d546-45f2-bf44-aedaab74a966",
+    "type": "misc",
+    "description": "Increase maximum event stream message length to 24MB"
+}
\ No newline at end of file
diff --git a/runtime/protocol/aws-event-stream/common/src/aws/smithy/kotlin/runtime/awsprotocol/eventstream/Message.kt b/runtime/protocol/aws-event-stream/common/src/aws/smithy/kotlin/runtime/awsprotocol/eventstream/Message.kt
index 10d19fc603..6280520355 100644
--- a/runtime/protocol/aws-event-stream/common/src/aws/smithy/kotlin/runtime/awsprotocol/eventstream/Message.kt
+++ b/runtime/protocol/aws-event-stream/common/src/aws/smithy/kotlin/runtime/awsprotocol/eventstream/Message.kt
@@ -12,15 +12,15 @@ import aws.smithy.kotlin.runtime.text.encoding.encodeToHex
 
 internal const val MESSAGE_CRC_BYTE_LEN = 4
 
-// max message size is 16 MB
-internal const val MAX_MESSAGE_SIZE = 16 * 1024 * 1024
+// max message size is 24 MB
+internal const val MAX_MESSAGE_SIZE = 24 * 1024 * 1024
 
 // max header size is 128 KB
 internal const val MAX_HEADER_SIZE = 128 * 1024
 
 /*
     Message Wire Format
-    See also: https://docs.aws.amazon.com/transcribe/latest/dg/event-stream-med.html
+    See also: https://docs.aws.amazon.com/transcribe/latest/dg/streaming-setting-up.html
 
     +--------------------------------------------------------------------+   --
     |                            Total Len (32)                          |     |

From 73292129c36dca46d50d25326eb63d9515f1758d Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Tue, 18 Feb 2025 15:52:07 +0000
Subject: [PATCH 044/183] chore: release 1.4.4

---
 .changes/ba71e47f-d546-45f2-bf44-aedaab74a966.json | 5 -----
 CHANGELOG.md                                       | 5 +++++
 gradle.properties                                  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 .changes/ba71e47f-d546-45f2-bf44-aedaab74a966.json

diff --git a/.changes/ba71e47f-d546-45f2-bf44-aedaab74a966.json b/.changes/ba71e47f-d546-45f2-bf44-aedaab74a966.json
deleted file mode 100644
index 253c9f7e32..0000000000
--- a/.changes/ba71e47f-d546-45f2-bf44-aedaab74a966.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "ba71e47f-d546-45f2-bf44-aedaab74a966",
-    "type": "misc",
-    "description": "Increase maximum event stream message length to 24MB"
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5148b8ef03..8c0bee275f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.4.4] - 02/18/2025
+
+### Miscellaneous
+* Increase maximum event stream message length to 24MB
+
 ## [1.4.3] - 02/13/2025
 
 ### Fixes
diff --git a/gradle.properties b/gradle.properties
index f087c7b551..2b8a818fdc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.4-SNAPSHOT
+sdkVersion=1.4.4
 
 # codegen
-codegenVersion=0.34.4-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.4
\ No newline at end of file

From 612c39ba446e6403ea2bd9a51c4d1db111b6e26f Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Tue, 18 Feb 2025 15:52:08 +0000
Subject: [PATCH 045/183] chore: bump snapshot version to 1.4.5-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 2b8a818fdc..f178e06d20 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.4
+sdkVersion=1.4.5-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.4
\ No newline at end of file
+codegenVersion=0.34.5-SNAPSHOT
\ No newline at end of file

From 283ca31eb93043a967ebfc482ea76d4f94881cb5 Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Mon, 24 Feb 2025 13:34:11 -0500
Subject: [PATCH 046/183] misc: Remove Elastic Inference SDK ID test (#1247)

---
 .../src/test/resources/sdk-ids-test-output.csv                   | 1 -
 codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids.csv     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids-test-output.csv b/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids-test-output.csv
index 2482d0640e..9c16785c67 100644
--- a/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids-test-output.csv
+++ b/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids-test-output.csv
@@ -113,7 +113,6 @@ ECS,Ecs
 EFS,Efs
 EKS,Eks
 Elastic Beanstalk,ElasticBeanstalk
-Elastic Inference,ElasticInference
 Elastic Load Balancing v2,ElasticLoadBalancingV2
 Elastic Load Balancing,ElasticLoadBalancing
 Elastic Transcoder,ElasticTranscoder
diff --git a/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids.csv b/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids.csv
index 52a5c68450..369edd3e01 100644
--- a/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids.csv
+++ b/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids.csv
@@ -113,7 +113,6 @@ ECS
 EFS
 EKS
 Elastic Beanstalk
-Elastic Inference
 Elastic Load Balancing v2
 Elastic Load Balancing
 Elastic Transcoder

From 82b9ffe794476313faaf6e4d3830c9a09455804a Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Mon, 24 Feb 2025 15:10:11 -0500
Subject: [PATCH 047/183] feat: Kotlin implementation of SigV4a signing (#1246)

---
 .../4b6debe1-7706-484a-8599-ef8c14cecde2.json |   5 +
 .../api/aws-signing-common.api                |   1 +
 .../auth/awssigning/AwsSigningConfig.kt       |   7 +-
 .../auth/awssigning/AwsSigningExceptions.kt   |   1 +
 .../auth/aws-signing-default/build.gradle.kts |   1 +
 .../BaseSigV4SignatureCalculator.kt           |  98 ++++++++++++++
 .../runtime/auth/awssigning/Canonicalizer.kt  |   3 +-
 .../auth/awssigning/DefaultAwsSigner.kt       |  33 ++---
 .../runtime/auth/awssigning/RequestMutator.kt |   2 +-
 .../awssigning/SigV4SignatureCalculator.kt    |  30 +++++
 .../awssigning/SigV4aSignatureCalculator.kt   |  88 +++++++++++++
 .../auth/awssigning/SignatureCalculator.kt    |  99 +-------------
 .../awssigning/DefaultBasicSigningTest.kt     |   7 -
 .../awssigning/DefaultRequestMutatorTest.kt   |  38 +++++-
 ...est.kt => SigV4SignatureCalculatorTest.kt} |  10 +-
 .../SigV4aSignatureCalculatorTest.kt          | 121 ++++++++++++++++++
 .../awssigning/DefaultSigningSuiteTest.kt     |   8 +-
 runtime/runtime-core/api/runtime-core.api     |   4 +
 .../smithy/kotlin/runtime/hashing/Ecdsa.kt    |  10 ++
 .../smithy/kotlin/runtime/hashing/EcdsaJVM.kt |  37 ++++++
 .../kotlin/runtime/hashing/EcdsaJVMTest.kt    |  84 ++++++++++++
 .../kotlin/runtime/hashing/EcdsaNative.kt     |  13 ++
 22 files changed, 571 insertions(+), 129 deletions(-)
 create mode 100644 .changes/4b6debe1-7706-484a-8599-ef8c14cecde2.json
 create mode 100644 runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/BaseSigV4SignatureCalculator.kt
 create mode 100644 runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SigV4SignatureCalculator.kt
 create mode 100644 runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SigV4aSignatureCalculator.kt
 rename runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/{DefaultSignatureCalculatorTest.kt => SigV4SignatureCalculatorTest.kt} (92%)
 create mode 100644 runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/SigV4aSignatureCalculatorTest.kt
 create mode 100644 runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/hashing/Ecdsa.kt
 create mode 100644 runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/hashing/EcdsaJVM.kt
 create mode 100644 runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/hashing/EcdsaJVMTest.kt
 create mode 100644 runtime/runtime-core/native/src/aws/smithy/kotlin/runtime/hashing/EcdsaNative.kt

diff --git a/.changes/4b6debe1-7706-484a-8599-ef8c14cecde2.json b/.changes/4b6debe1-7706-484a-8599-ef8c14cecde2.json
new file mode 100644
index 0000000000..6770d0caa6
--- /dev/null
+++ b/.changes/4b6debe1-7706-484a-8599-ef8c14cecde2.json
@@ -0,0 +1,5 @@
+{
+    "id": "4b6debe1-7706-484a-8599-ef8c14cecde2",
+    "type": "feature",
+    "description": "Add SigV4a support to the default AWS signer"
+}
\ No newline at end of file
diff --git a/runtime/auth/aws-signing-common/api/aws-signing-common.api b/runtime/auth/aws-signing-common/api/aws-signing-common.api
index d128b0bd6f..c9353509be 100644
--- a/runtime/auth/aws-signing-common/api/aws-signing-common.api
+++ b/runtime/auth/aws-signing-common/api/aws-signing-common.api
@@ -55,6 +55,7 @@ public final class aws/smithy/kotlin/runtime/auth/awssigning/AwsSigningAlgorithm
 	public static final field SIGV4 Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningAlgorithm;
 	public static final field SIGV4_ASYMMETRIC Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningAlgorithm;
 	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public final fun getSigningName ()Ljava/lang/String;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningAlgorithm;
 	public static fun values ()[Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningAlgorithm;
 }
diff --git a/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig.kt b/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig.kt
index 0728e553e8..c26fcf624d 100644
--- a/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig.kt
+++ b/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig.kt
@@ -12,18 +12,19 @@ public typealias ShouldSignHeaderPredicate = (String) -> Boolean
 
 /**
  * Defines the AWS signature version to use
+ * @param signingName The name of this algorithm to use when signing requests.
  */
-public enum class AwsSigningAlgorithm {
+public enum class AwsSigningAlgorithm(public val signingName: String) {
     /**
      * AWS Signature Version 4
      * see: https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
      */
-    SIGV4,
+    SIGV4("AWS4-HMAC-SHA256"),
 
     /**
      * AWS Signature Version 4 Asymmetric
      */
-    SIGV4_ASYMMETRIC,
+    SIGV4_ASYMMETRIC("AWS4-ECDSA-P256-SHA256"),
 }
 
 /**
diff --git a/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsSigningExceptions.kt b/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsSigningExceptions.kt
index 450337090b..8ff8c1e35f 100644
--- a/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsSigningExceptions.kt
+++ b/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsSigningExceptions.kt
@@ -17,6 +17,7 @@ import aws.smithy.kotlin.runtime.InternalApi
  * @param cause The cause of the exception
  */
 @InternalApi
+@Deprecated("This exception is no longer thrown. It will be removed in the next minor version, v1.5.x.")
 public class UnsupportedSigningAlgorithmException(
     message: String,
     public val signingAlgorithm: AwsSigningAlgorithm,
diff --git a/runtime/auth/aws-signing-default/build.gradle.kts b/runtime/auth/aws-signing-default/build.gradle.kts
index 088c82f658..22e20d39fd 100644
--- a/runtime/auth/aws-signing-default/build.gradle.kts
+++ b/runtime/auth/aws-signing-default/build.gradle.kts
@@ -18,6 +18,7 @@ kotlin {
             dependencies {
                 implementation(project(":runtime:auth:aws-signing-tests"))
                 implementation(libs.kotlinx.coroutines.test)
+                implementation(libs.kotlinx.serialization.json)
             }
         }
 
diff --git a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/BaseSigV4SignatureCalculator.kt b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/BaseSigV4SignatureCalculator.kt
new file mode 100644
index 0000000000..ae90003070
--- /dev/null
+++ b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/BaseSigV4SignatureCalculator.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.auth.awssigning
+
+import aws.smithy.kotlin.runtime.hashing.HashSupplier
+import aws.smithy.kotlin.runtime.hashing.Sha256
+import aws.smithy.kotlin.runtime.hashing.hash
+import aws.smithy.kotlin.runtime.hashing.sha256
+import aws.smithy.kotlin.runtime.text.encoding.encodeToHex
+import aws.smithy.kotlin.runtime.time.Instant
+import aws.smithy.kotlin.runtime.time.TimestampFormat
+import aws.smithy.kotlin.runtime.time.epochMilliseconds
+
+/**
+ * Common signature implementation used for SigV4 and SigV4a, primarily for forming the strings-to-sign which don't differ
+ * between the two signing algorithms (besides their names).
+ */
+internal abstract class BaseSigV4SignatureCalculator(
+    val algorithm: AwsSigningAlgorithm,
+    open val sha256Provider: HashSupplier = ::Sha256,
+) : SignatureCalculator {
+    private val supportedAlgorithms = setOf(AwsSigningAlgorithm.SIGV4, AwsSigningAlgorithm.SIGV4_ASYMMETRIC)
+
+    init {
+        check(algorithm in supportedAlgorithms) {
+            "This class should only be used for ${supportedAlgorithms.joinToString()}, got $algorithm"
+        }
+    }
+
+    override fun stringToSign(canonicalRequest: String, config: AwsSigningConfig): String = buildString {
+        appendLine(algorithm.signingName)
+        appendLine(config.signingDate.format(TimestampFormat.ISO_8601_CONDENSED))
+        appendLine(config.credentialScope)
+        append(canonicalRequest.encodeToByteArray().hash(sha256Provider).encodeToHex())
+    }
+
+    override fun chunkStringToSign(chunkBody: ByteArray, prevSignature: ByteArray, config: AwsSigningConfig): String = buildString {
+        appendLine("${algorithm.signingName}-PAYLOAD")
+        appendLine(config.signingDate.format(TimestampFormat.ISO_8601_CONDENSED))
+        appendLine(config.credentialScope)
+        appendLine(prevSignature.decodeToString()) // Should already be a byte array of ASCII hex chars
+
+        val nonSignatureHeadersHash = when (config.signatureType) {
+            AwsSignatureType.HTTP_REQUEST_EVENT -> eventStreamNonSignatureHeaders(config.signingDate)
+            else -> HashSpecification.EmptyBody.hash
+        }
+
+        appendLine(nonSignatureHeadersHash)
+        append(chunkBody.hash(sha256Provider).encodeToHex())
+    }
+
+    override fun chunkTrailerStringToSign(trailingHeaders: ByteArray, prevSignature: ByteArray, config: AwsSigningConfig): String =
+        buildString {
+            appendLine("${algorithm.signingName}-TRAILER")
+            appendLine(config.signingDate.format(TimestampFormat.ISO_8601_CONDENSED))
+            appendLine(config.credentialScope)
+            appendLine(prevSignature.decodeToString())
+            append(trailingHeaders.hash(sha256Provider).encodeToHex())
+        }
+}
+
+private const val HEADER_TIMESTAMP_TYPE: Byte = 8
+
+/**
+ * Return the sha256 hex representation of the encoded event stream date header
+ *
+ * ```
+ * sha256Hex( Header(":date", HeaderValue::Timestamp(date)).encodeToByteArray() )
+ * ```
+ *
+ * NOTE: This duplicates parts of the event stream encoding implementation here to avoid a direct dependency.
+ * Should this become more involved than encoding a single date header we should reconsider this choice.
+ *
+ * see [Event Stream implementation](https://github.com/smithy-lang/smithy-kotlin/blob/612c39ba446e6403ea2bd9a51c4d1db111b6e26f/runtime/protocol/aws-event-stream/common/src/aws/smithy/kotlin/runtime/awsprotocol/eventstream/Header.kt#L52)
+ */
+private fun eventStreamNonSignatureHeaders(date: Instant): String {
+    val bytes = ByteArray(15)
+    // encode header name
+    val name = ":date".encodeToByteArray()
+    var offset = 0
+    bytes[offset++] = name.size.toByte()
+    name.copyInto(bytes, destinationOffset = offset)
+    offset += name.size
+
+    // encode header value
+    bytes[offset++] = HEADER_TIMESTAMP_TYPE
+    writeLongBE(bytes, offset, date.epochMilliseconds)
+    return bytes.sha256().encodeToHex()
+}
+
+private fun writeLongBE(dest: ByteArray, offset: Int, x: Long) {
+    var idx = offset
+    for (i in 7 downTo 0) {
+        dest[idx++] = ((x ushr (i * 8)) and 0xff).toByte()
+    }
+}
diff --git a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/Canonicalizer.kt b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/Canonicalizer.kt
index c7c47fe5a2..37d85f2704 100644
--- a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/Canonicalizer.kt
+++ b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/Canonicalizer.kt
@@ -124,12 +124,13 @@ internal class DefaultCanonicalizer(private val sha256Supplier: HashSupplier = :
         }
 
         param("Host", builder.url.hostAndPort, !signViaQueryParams, overwrite = false)
-        param("X-Amz-Algorithm", ALGORITHM_NAME, signViaQueryParams)
+        param("X-Amz-Algorithm", config.algorithm.signingName, signViaQueryParams)
         param("X-Amz-Credential", credentialValue(config), signViaQueryParams)
         param("X-Amz-Content-Sha256", hash, addHashHeader)
         param("X-Amz-Date", config.signingDate.format(TimestampFormat.ISO_8601_CONDENSED))
         param("X-Amz-Expires", config.expiresAfter?.inWholeSeconds?.toString(), signViaQueryParams)
         param("X-Amz-Security-Token", sessionToken, !config.omitSessionToken) // Add pre-sig if omitSessionToken=false
+        param("X-Amz-Region-Set", config.region, config.algorithm == AwsSigningAlgorithm.SIGV4_ASYMMETRIC)
 
         val headers = builder
             .headers
diff --git a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSigner.kt b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSigner.kt
index 791d8fce0a..85896349b1 100644
--- a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSigner.kt
+++ b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/DefaultAwsSigner.kt
@@ -29,10 +29,15 @@ public class DefaultAwsSignerBuilder {
     )
 }
 
+private val AwsSigningAlgorithm.signatureCalculator
+    get() = when (this) {
+        AwsSigningAlgorithm.SIGV4 -> SignatureCalculator.SigV4
+        AwsSigningAlgorithm.SIGV4_ASYMMETRIC -> SignatureCalculator.SigV4a
+    }
+
 @OptIn(ExperimentalApi::class)
 internal class DefaultAwsSignerImpl(
     private val canonicalizer: Canonicalizer = Canonicalizer.Default,
-    private val signatureCalculator: SignatureCalculator = SignatureCalculator.Default,
     private val requestMutator: RequestMutator = RequestMutator.Default,
     private val telemetryProvider: TelemetryProvider? = null,
 ) : AwsSigner {
@@ -40,19 +45,13 @@ internal class DefaultAwsSignerImpl(
         val logger = telemetryProvider?.loggerProvider?.getOrCreateLogger("DefaultAwsSigner")
             ?: coroutineContext.logger<DefaultAwsSignerImpl>()
 
-        // TODO: implement SigV4a
-        if (config.algorithm != AwsSigningAlgorithm.SIGV4) {
-            throw UnsupportedSigningAlgorithmException(
-                "${config.algorithm} support is not yet implemented for the default signer.",
-                config.algorithm,
-            )
-        }
-
         val canonical = canonicalizer.canonicalRequest(request, config)
         if (config.logRequest) {
             logger.trace { "Canonical request:\n${canonical.requestString}" }
         }
 
+        val signatureCalculator = config.algorithm.signatureCalculator
+
         val stringToSign = signatureCalculator.stringToSign(canonical.requestString, config)
         logger.trace { "String to sign:\n$stringToSign" }
 
@@ -74,6 +73,8 @@ internal class DefaultAwsSignerImpl(
         val logger = telemetryProvider?.loggerProvider?.getOrCreateLogger("DefaultAwsSigner")
             ?: coroutineContext.logger<DefaultAwsSignerImpl>()
 
+        val signatureCalculator = config.algorithm.signatureCalculator
+
         val stringToSign = signatureCalculator.chunkStringToSign(chunkBody, prevSignature, config)
         logger.trace { "Chunk string to sign:\n$stringToSign" }
 
@@ -93,6 +94,8 @@ internal class DefaultAwsSignerImpl(
         val logger = telemetryProvider?.loggerProvider?.getOrCreateLogger("DefaultAwsSigner")
             ?: coroutineContext.logger<DefaultAwsSignerImpl>()
 
+        val signatureCalculator = config.algorithm.signatureCalculator
+
         // FIXME - can we share canonicalization code more than we are..., also this reduce is inefficient.
         // canonicalize the headers
         val trailingHeadersBytes = trailingHeaders.entries().sortedBy { e -> e.key.lowercase() }
@@ -117,16 +120,16 @@ internal class DefaultAwsSignerImpl(
     }
 }
 
-/** The name of the SigV4 algorithm. */
-internal const val ALGORITHM_NAME = "AWS4-HMAC-SHA256"
-
 /**
- * Formats a credential scope consisting of a signing date, region, service, and a signature type
+ * Formats a credential scope consisting of a signing date, region (SigV4 only), service, and a signature type
  */
 internal val AwsSigningConfig.credentialScope: String
-    get() {
+    get() = run {
         val signingDate = signingDate.format(TimestampFormat.ISO_8601_CONDENSED_DATE)
-        return "$signingDate/$region/$service/aws4_request"
+        return when (algorithm) {
+            AwsSigningAlgorithm.SIGV4 -> "$signingDate/$region/$service/aws4_request"
+            AwsSigningAlgorithm.SIGV4_ASYMMETRIC -> "$signingDate/$service/aws4_request"
+        }
     }
 
 /**
diff --git a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/RequestMutator.kt b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/RequestMutator.kt
index 5bfe982e54..0c1882cd54 100644
--- a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/RequestMutator.kt
+++ b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/RequestMutator.kt
@@ -43,7 +43,7 @@ internal class DefaultRequestMutator : RequestMutator {
                 val credential = "Credential=${credentialValue(config)}"
                 val signedHeaders = "SignedHeaders=${canonical.signedHeaders}"
                 val signature = "Signature=$signatureHex"
-                canonical.request.headers["Authorization"] = "$ALGORITHM_NAME $credential, $signedHeaders, $signature"
+                canonical.request.headers["Authorization"] = "${config.algorithm.signingName} $credential, $signedHeaders, $signature"
             }
 
             AwsSignatureType.HTTP_REQUEST_VIA_QUERY_PARAMS ->
diff --git a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SigV4SignatureCalculator.kt b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SigV4SignatureCalculator.kt
new file mode 100644
index 0000000000..c210c964c2
--- /dev/null
+++ b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SigV4SignatureCalculator.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.auth.awssigning
+
+import aws.smithy.kotlin.runtime.hashing.HashSupplier
+import aws.smithy.kotlin.runtime.hashing.Sha256
+import aws.smithy.kotlin.runtime.hashing.hmac
+import aws.smithy.kotlin.runtime.text.encoding.encodeToHex
+import aws.smithy.kotlin.runtime.time.TimestampFormat
+
+/**
+ * [SignatureCalculator] for the SigV4 ("AWS4-HMAC-SHA256") algorithm
+ * @param sha256Provider the [HashSupplier] to use for computing SHA-256 hashes
+ */
+internal class SigV4SignatureCalculator(override val sha256Provider: HashSupplier = ::Sha256) : BaseSigV4SignatureCalculator(AwsSigningAlgorithm.SIGV4, sha256Provider) {
+    override fun calculate(signingKey: ByteArray, stringToSign: String): String =
+        hmac(signingKey, stringToSign.encodeToByteArray(), sha256Provider).encodeToHex()
+
+    override fun signingKey(config: AwsSigningConfig): ByteArray {
+        fun hmac(key: ByteArray, message: String) = hmac(key, message.encodeToByteArray(), sha256Provider)
+
+        val initialKey = ("AWS4" + config.credentials.secretAccessKey).encodeToByteArray()
+        val kDate = hmac(initialKey, config.signingDate.format(TimestampFormat.ISO_8601_CONDENSED_DATE))
+        val kRegion = hmac(kDate, config.region)
+        val kService = hmac(kRegion, config.service)
+        return hmac(kService, "aws4_request")
+    }
+}
diff --git a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SigV4aSignatureCalculator.kt b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SigV4aSignatureCalculator.kt
new file mode 100644
index 0000000000..4f4239a2ce
--- /dev/null
+++ b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SigV4aSignatureCalculator.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.auth.awssigning
+
+import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
+import aws.smithy.kotlin.runtime.collections.ReadThroughCache
+import aws.smithy.kotlin.runtime.content.BigInteger
+import aws.smithy.kotlin.runtime.hashing.HashSupplier
+import aws.smithy.kotlin.runtime.hashing.Sha256
+import aws.smithy.kotlin.runtime.hashing.ecdsaSecp256r1
+import aws.smithy.kotlin.runtime.hashing.hmac
+import aws.smithy.kotlin.runtime.text.encoding.decodeHexBytes
+import aws.smithy.kotlin.runtime.text.encoding.encodeToHex
+import aws.smithy.kotlin.runtime.time.Instant
+import aws.smithy.kotlin.runtime.util.ExpiringValue
+import kotlinx.coroutines.runBlocking
+import kotlin.time.Duration.Companion.hours
+
+/**
+ * The maximum number of iterations to attempt private key derivation using KDF in counter mode
+ * Taken from CRT: https://github.com/awslabs/aws-c-auth/blob/e8360a65e0f3337d4ac827945e00c3b55a641a5f/source/key_derivation.c#L22
+ */
+internal const val MAX_KDF_COUNTER_ITERATIONS = 254.toByte()
+
+// N value from NIST P-256 curve, minus two.
+internal val N_MINUS_TWO = "FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC63254F".decodeHexBytes().toPositiveBigInteger()
+
+/**
+ * A [SignatureCalculator] for the SigV4a ("AWS4-ECDSA-P256-SHA256") algorithm.
+ * @param sha256Provider the [HashSupplier] to use for computing SHA-256 hashes
+ */
+internal class SigV4aSignatureCalculator(override val sha256Provider: HashSupplier = ::Sha256) : BaseSigV4SignatureCalculator(AwsSigningAlgorithm.SIGV4_ASYMMETRIC, sha256Provider) {
+    private val privateKeyCache = ReadThroughCache<Credentials, ByteArray>(
+        minimumSweepPeriod = 1.hours, // note: Sweeps are effectively a no-op because expiration is [Instant.MAX_VALUE]
+    )
+
+    override fun calculate(signingKey: ByteArray, stringToSign: String): String = ecdsaSecp256r1(signingKey, stringToSign.encodeToByteArray()).encodeToHex()
+
+    /**
+     * Retrieve a signing key based on the signing credentials. If not cached, the key will be derived using a counter-based key derivation function (KDF)
+     * as specified in NIST SP 800-108.
+     *
+     * See https://github.com/awslabs/aws-c-auth/blob/e8360a65e0f3337d4ac827945e00c3b55a641a5f/source/key_derivation.c#L70 and
+     * https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_sigv-create-signed-request.html#derive-signing-key-sigv4a for
+     * more information on the derivation process.
+     */
+    override fun signingKey(config: AwsSigningConfig): ByteArray = runBlocking {
+        privateKeyCache.get(config.credentials) {
+            var counter: Byte = 1
+            var privateKey: ByteArray
+
+            val inputKey = ("AWS4A" + config.credentials.secretAccessKey).encodeToByteArray()
+
+            do {
+                val k0 = hmac(inputKey, fixedInputString(config.credentials.accessKeyId, counter), sha256Provider)
+
+                val c = k0.toPositiveBigInteger()
+                privateKey = (c + BigInteger("1")).toByteArray()
+
+                if (counter == MAX_KDF_COUNTER_ITERATIONS && c > N_MINUS_TWO) {
+                    throw IllegalStateException("Counter exceeded maximum length")
+                } else {
+                    counter++
+                }
+            } while (c > N_MINUS_TWO)
+
+            ExpiringValue<ByteArray>(privateKey, Instant.MAX_VALUE)
+        }
+    }
+
+    /**
+     * Forms the fixed input string used for ECDSA private key derivation
+     * The final output looks like:
+     * 0x00000001 || "AWS4-ECDSA-P256-SHA256" || 0x00 || AccessKeyId || counter || 0x00000100
+     */
+    private fun fixedInputString(accessKeyId: String, counter: Byte): ByteArray =
+        byteArrayOf(0x00, 0x00, 0x00, 0x01) +
+            AwsSigningAlgorithm.SIGV4_ASYMMETRIC.signingName.encodeToByteArray() +
+            byteArrayOf(0x00) +
+            accessKeyId.encodeToByteArray() +
+            counter +
+            byteArrayOf(0x00, 0x00, 0x01, 0x00)
+}
+
+// Convert [this] [ByteArray] to a positive [BigInteger] by prepending 0x00.
+private fun ByteArray.toPositiveBigInteger() = BigInteger(byteArrayOf(0x00) + this)
diff --git a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SignatureCalculator.kt b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SignatureCalculator.kt
index fe27320ffc..80652e6dbf 100644
--- a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SignatureCalculator.kt
+++ b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SignatureCalculator.kt
@@ -4,21 +4,20 @@
  */
 package aws.smithy.kotlin.runtime.auth.awssigning
 
-import aws.smithy.kotlin.runtime.hashing.*
-import aws.smithy.kotlin.runtime.text.encoding.encodeToHex
-import aws.smithy.kotlin.runtime.time.Instant
-import aws.smithy.kotlin.runtime.time.TimestampFormat
-import aws.smithy.kotlin.runtime.time.epochMilliseconds
-
 /**
  * An object that can calculate signatures based on canonical requests.
  */
 internal interface SignatureCalculator {
     companion object {
         /**
-         * The default implementation of [SignatureCalculator].
+         * The SigV4 implementation of [SignatureCalculator].
+         */
+        val SigV4 = SigV4SignatureCalculator()
+
+        /**
+         * The SigV4a implementation of [SignatureCalculator].
          */
-        val Default = DefaultSignatureCalculator()
+        val SigV4a = SigV4aSignatureCalculator()
     }
 
     /**
@@ -62,87 +61,3 @@ internal interface SignatureCalculator {
      */
     fun chunkTrailerStringToSign(trailingHeaders: ByteArray, prevSignature: ByteArray, config: AwsSigningConfig): String
 }
-
-internal class DefaultSignatureCalculator(private val sha256Provider: HashSupplier = ::Sha256) : SignatureCalculator {
-    override fun calculate(signingKey: ByteArray, stringToSign: String): String =
-        hmac(signingKey, stringToSign.encodeToByteArray(), sha256Provider).encodeToHex()
-
-    override fun chunkStringToSign(chunkBody: ByteArray, prevSignature: ByteArray, config: AwsSigningConfig): String =
-        buildString {
-            appendLine("AWS4-HMAC-SHA256-PAYLOAD")
-            appendLine(config.signingDate.format(TimestampFormat.ISO_8601_CONDENSED))
-            appendLine(config.credentialScope)
-            appendLine(prevSignature.decodeToString()) // Should already be a byte array of ASCII hex chars
-
-            val nonSignatureHeadersHash = when (config.signatureType) {
-                AwsSignatureType.HTTP_REQUEST_EVENT -> eventStreamNonSignatureHeaders(config.signingDate)
-                else -> HashSpecification.EmptyBody.hash
-            }
-
-            appendLine(nonSignatureHeadersHash)
-            append(chunkBody.hash(sha256Provider).encodeToHex())
-        }
-
-    override fun chunkTrailerStringToSign(trailingHeaders: ByteArray, prevSignature: ByteArray, config: AwsSigningConfig): String =
-        buildString {
-            appendLine("AWS4-HMAC-SHA256-TRAILER")
-            appendLine(config.signingDate.format(TimestampFormat.ISO_8601_CONDENSED))
-            appendLine(config.credentialScope)
-            appendLine(prevSignature.decodeToString())
-            append(trailingHeaders.hash(sha256Provider).encodeToHex())
-        }
-
-    override fun signingKey(config: AwsSigningConfig): ByteArray {
-        fun hmac(key: ByteArray, message: String) = hmac(key, message.encodeToByteArray(), sha256Provider)
-
-        val initialKey = ("AWS4" + config.credentials.secretAccessKey).encodeToByteArray()
-        val kDate = hmac(initialKey, config.signingDate.format(TimestampFormat.ISO_8601_CONDENSED_DATE))
-        val kRegion = hmac(kDate, config.region)
-        val kService = hmac(kRegion, config.service)
-        return hmac(kService, "aws4_request")
-    }
-
-    override fun stringToSign(canonicalRequest: String, config: AwsSigningConfig): String =
-        buildString {
-            appendLine("AWS4-HMAC-SHA256")
-            appendLine(config.signingDate.format(TimestampFormat.ISO_8601_CONDENSED))
-            appendLine(config.credentialScope)
-            append(canonicalRequest.encodeToByteArray().hash(sha256Provider).encodeToHex())
-        }
-}
-
-private const val HEADER_TIMESTAMP_TYPE: Byte = 8
-
-/**
- * Return the sha256 hex representation of the encoded event stream date header
- *
- * ```
- * sha256Hex( Header(":date", HeaderValue::Timestamp(date)).encodeToByteArray() )
- * ```
- *
- * NOTE: This duplicates parts of the event stream encoding implementation here to avoid a direct dependency.
- * Should this become more involved than encoding a single date header we should reconsider this choice.
- *
- * see [Event Stream implementation](https://github.com/awslabs/aws-sdk-kotlin/blob/v0.16.4-beta/aws-runtime/protocols/aws-event-stream/common/src/aws/sdk/kotlin/runtime/protocol/eventstream/Header.kt#L51)
- */
-private fun eventStreamNonSignatureHeaders(date: Instant): String {
-    val bytes = ByteArray(15)
-    // encode header name
-    val name = ":date".encodeToByteArray()
-    var offset = 0
-    bytes[offset++] = name.size.toByte()
-    name.copyInto(bytes, destinationOffset = offset)
-    offset += name.size
-
-    // encode header value
-    bytes[offset++] = HEADER_TIMESTAMP_TYPE
-    writeLongBE(bytes, offset, date.epochMilliseconds)
-    return bytes.sha256().encodeToHex()
-}
-
-private fun writeLongBE(dest: ByteArray, offset: Int, x: Long) {
-    var idx = offset
-    for (i in 7 downTo 0) {
-        dest[idx++] = ((x ushr (i * 8)) and 0xff).toByte()
-    }
-}
diff --git a/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultBasicSigningTest.kt b/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultBasicSigningTest.kt
index 5a36a1fd46..ba766f1692 100644
--- a/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultBasicSigningTest.kt
+++ b/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultBasicSigningTest.kt
@@ -5,14 +5,7 @@
 package aws.smithy.kotlin.runtime.auth.awssigning
 
 import aws.smithy.kotlin.runtime.auth.awssigning.tests.BasicSigningTestBase
-import kotlinx.coroutines.test.TestResult
-import kotlin.test.Ignore
-import kotlin.test.Test
 
 class DefaultBasicSigningTest : BasicSigningTestBase() {
     override val signer: AwsSigner = DefaultAwsSigner
-
-    @Ignore
-    @Test
-    override fun testSignRequestSigV4Asymmetric(): TestResult = TODO("Add support for SigV4a in default signer")
 }
diff --git a/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultRequestMutatorTest.kt b/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultRequestMutatorTest.kt
index 7eb10ab692..5cb36c9a3f 100644
--- a/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultRequestMutatorTest.kt
+++ b/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultRequestMutatorTest.kt
@@ -16,11 +16,12 @@ import kotlin.test.assertEquals
 
 class DefaultRequestMutatorTest {
     @Test
-    fun testAppendAuthHeader() {
+    fun testSigV4AppendAuthHeader() {
         val canonical = CanonicalRequest(baseRequest.toBuilder(), "", "action;host;x-amz-date", "")
         val signature = "0123456789abcdef"
 
         val config = AwsSigningConfig {
+            algorithm = AwsSigningAlgorithm.SIGV4
             region = "us-west-2"
             service = "fooservice"
             signingDate = Instant.fromIso8601("20220427T012345Z")
@@ -45,6 +46,41 @@ class DefaultRequestMutatorTest {
 
         assertEquals(expectedHeaders, mutated.headers.entries())
     }
+
+    @Test
+    fun testSigV4aAppendAuthHeader() {
+        val canonical = CanonicalRequest(baseRequest.toBuilder(), "", "action;host;x-amz-date", "")
+        val signature = "0123456789abcdef"
+
+        val config = AwsSigningConfig {
+            algorithm = AwsSigningAlgorithm.SIGV4_ASYMMETRIC
+            region = "us-west-2"
+            service = "fooservice"
+            signingDate = Instant.fromIso8601("20220427T012345Z")
+            credentials = Credentials("", "secret key")
+            omitSessionToken = true
+        }
+
+        val mutated = RequestMutator.Default.appendAuth(config, canonical, signature)
+
+        assertEquals(baseRequest.method, mutated.method)
+        assertEquals(baseRequest.url.toString(), mutated.url.toString())
+        assertEquals(baseRequest.body, mutated.body)
+
+        val expectedCredentialScope = "20220427/fooservice/aws4_request"
+        val expectedAuthValue = buildString {
+            append("AWS4-ECDSA-P256-SHA256 ")
+            append("Credential=${config.credentials.accessKeyId}/$expectedCredentialScope, ")
+            append("SignedHeaders=${canonical.signedHeaders}, ")
+            append("Signature=$signature")
+        }
+        val expectedHeaders = Headers {
+            appendAll(baseRequest.headers)
+            append("Authorization", expectedAuthValue)
+        }.entries()
+
+        assertEquals(expectedHeaders, mutated.headers.entries())
+    }
 }
 
 private val baseRequest = HttpRequest {
diff --git a/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultSignatureCalculatorTest.kt b/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/SigV4SignatureCalculatorTest.kt
similarity index 92%
rename from runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultSignatureCalculatorTest.kt
rename to runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/SigV4SignatureCalculatorTest.kt
index fc5c23304c..b1df30fb5b 100644
--- a/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultSignatureCalculatorTest.kt
+++ b/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/SigV4SignatureCalculatorTest.kt
@@ -14,7 +14,7 @@ import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-class DefaultSignatureCalculatorTest {
+class SigV4SignatureCalculatorTest {
     // Test adapted from https://docs.aws.amazon.com/general/latest/gr/sigv4-calculate-signature.html
     @Test
     fun testCalculate() {
@@ -27,7 +27,7 @@ class DefaultSignatureCalculatorTest {
         """.trimIndent()
 
         val expected = "5d672d79c15b13162d9279b0855cfba6789a8edb4c82c400e06b5924a6f2b5d7"
-        val actual = SignatureCalculator.Default.calculate(signingKey, stringToSign)
+        val actual = SignatureCalculator.SigV4.calculate(signingKey, stringToSign)
         assertEquals(expected, actual)
     }
 
@@ -42,7 +42,7 @@ class DefaultSignatureCalculatorTest {
         }
 
         val expected = "c4afb1cc5771d871763a393e44b703571b55cc28424d1a5e86da6ed3c154a4b9"
-        val actual = SignatureCalculator.Default.signingKey(config).encodeToHex()
+        val actual = SignatureCalculator.SigV4.signingKey(config).encodeToHex()
         assertEquals(expected, actual)
     }
 
@@ -74,7 +74,7 @@ class DefaultSignatureCalculatorTest {
             20150830/us-east-1/iam/aws4_request
             f536975d06c0309214f805bb90ccff089219ecd68b2577efef23edd43b7e1a59
         """.trimIndent()
-        val actual = SignatureCalculator.Default.stringToSign(canonicalRequest, config)
+        val actual = SignatureCalculator.SigV4.stringToSign(canonicalRequest, config)
         assertEquals(expected, actual)
     }
 
@@ -114,7 +114,7 @@ class DefaultSignatureCalculatorTest {
             813ca5285c28ccee5cab8b10ebda9c908fd6d78ed9dc94cc65ea6cb67a7f13ae
             """.trimIndent()
 
-            val actual = SignatureCalculator.Default.chunkStringToSign(chunkBody, prevSignature, config)
+            val actual = SignatureCalculator.SigV4.chunkStringToSign(chunkBody, prevSignature, config)
             assertEquals(expected, actual)
         }
     }
diff --git a/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/SigV4aSignatureCalculatorTest.kt b/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/SigV4aSignatureCalculatorTest.kt
new file mode 100644
index 0000000000..c4c4abe953
--- /dev/null
+++ b/runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/SigV4aSignatureCalculatorTest.kt
@@ -0,0 +1,121 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.auth.awssigning
+
+import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
+import aws.smithy.kotlin.runtime.time.Instant
+import aws.smithy.kotlin.runtime.util.PlatformProvider
+import kotlinx.coroutines.test.runTest
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.jsonObject
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+private const val SIGV4A_RESOURCES_BASE = "../aws-signing-tests/common/resources/aws-signing-test-suite/v4a"
+
+/**
+ * Tests which are defined in resources/sigv4a.
+ * Copied directly from https://github.com/awslabs/aws-c-auth/tree/e8360a65e0f3337d4ac827945e00c3b55a641a5f/tests/aws-signing-test-suite/v4a.
+ * get-vanilla-query-order-key and get-vanilla-query-order-value were deleted since they are not complete tests.
+ */
+private val TESTS = listOf(
+    "get-header-key-duplicate",
+    "get-header-value-multiline",
+    "get-header-value-order",
+    "get-header-value-trim",
+    "get-relative-normalized",
+    "get-relative-relative-normalized",
+    "get-relative-relative-unnormalized",
+    "get-relative-unnormalized",
+    "get-slash-dot-slash-normalized",
+    "get-slash-dot-slash-unnormalized",
+    "get-slash-normalized",
+    "get-slash-pointless-dot-normalized",
+    "get-slash-pointless-dot-unnormalized",
+    "get-slash-unnormalized",
+    "get-slashes-normalized",
+    "get-slashes-unnormalized",
+    "get-space-normalized",
+    "get-space-unnormalized",
+    "get-unreserved",
+    "get-utf8",
+    "get-vanilla",
+    "get-vanilla-empty-query-key",
+    "get-vanilla-query",
+    "get-vanilla-query-order-encoded",
+    "get-vanilla-query-order-key-case",
+    "get-vanilla-query-unreserved",
+    "get-vanilla-utf8-query",
+    "get-vanilla-with-session-token",
+    "post-header-key-case",
+    "post-header-key-sort",
+    "post-header-value-case",
+    "post-sts-header-after",
+    "post-sts-header-before",
+    "post-vanilla",
+    "post-vanilla-empty-query-value",
+    "post-vanilla-query",
+    "post-x-www-form-urlencoded",
+    "post-x-www-form-urlencoded-parameters",
+)
+
+// TODO Add tests against header-signature.txt when java.security implements RFC 6979 / deterministic ECDSA. https://bugs.openjdk.org/browse/JDK-8239382
+/**
+ * Tests for [SigV4aSignatureCalculator]. Currently only tests forming the string-to-sign.
+ */
+class SigV4aSignatureCalculatorTest {
+    @Test
+    fun testStringToSign() = TESTS.forEach { testId ->
+        runTest {
+            val testDir = "$SIGV4A_RESOURCES_BASE/$testId/"
+            assertTrue(PlatformProvider.System.fileExists(testDir), "Failed to find test directory for $testId")
+
+            val context = Json.parseToJsonElement(testDir.fileContents("context.json")).jsonObject
+            val signingConfig = context.parseAwsSigningConfig()
+
+            val expectedStringToSign = testDir.fileContents("header-string-to-sign.txt")
+            val canonicalRequest = testDir.fileContents("header-canonical-request.txt")
+            val actualStringToSign = SignatureCalculator.SigV4a.stringToSign(canonicalRequest, signingConfig)
+
+            assertEquals(expectedStringToSign, actualStringToSign, "$testId failed")
+        }
+    }
+
+    private fun JsonObject.parseAwsSigningConfig(): AwsSigningConfig {
+        fun JsonObject.getStringValue(key: String): String {
+            val value = checkNotNull(get(key)) { "Failed to find key $key in JSON object $this" }
+            return value.toString().replace("\"", "")
+        }
+
+        val contextCredentials = checkNotNull(get("credentials")?.jsonObject) { "credentials unexpectedly null" }
+
+        val credentials = Credentials(
+            contextCredentials.getStringValue("access_key_id"),
+            contextCredentials.getStringValue("secret_access_key"),
+        )
+
+        val region = getStringValue("region")
+        val service = getStringValue("service")
+        val signingDate = Instant.fromIso8601(getStringValue("timestamp"))
+
+        return AwsSigningConfig {
+            algorithm = AwsSigningAlgorithm.SIGV4_ASYMMETRIC
+            this.credentials = credentials
+            this.region = region
+            this.service = service
+            this.signingDate = signingDate
+        }
+    }
+
+    private suspend fun String.fileContents(path: String): String = checkNotNull(
+        PlatformProvider.System.readFileOrNull(this + path)
+            ?.decodeToString()
+            ?.replace("\r\n", "\n"),
+    ) {
+        "Unable to read contents at ${this + path}"
+    }
+}
diff --git a/runtime/auth/aws-signing-default/jvm/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultSigningSuiteTest.kt b/runtime/auth/aws-signing-default/jvm/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultSigningSuiteTest.kt
index 614c2fe016..1edbca9f88 100644
--- a/runtime/auth/aws-signing-default/jvm/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultSigningSuiteTest.kt
+++ b/runtime/auth/aws-signing-default/jvm/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultSigningSuiteTest.kt
@@ -17,13 +17,13 @@ class DefaultSigningSuiteTest : SigningSuiteTestBase() {
 
     override val signatureProvider: SigningStateProvider = { request, config ->
         val canonical = Canonicalizer.Default.canonicalRequest(request, config)
-        val stringToSign = SignatureCalculator.Default.stringToSign(canonical.requestString, config)
-        val signingKey = SignatureCalculator.Default.signingKey(config)
-        SignatureCalculator.Default.calculate(signingKey, stringToSign)
+        val stringToSign = SignatureCalculator.SigV4.stringToSign(canonical.requestString, config)
+        val signingKey = SignatureCalculator.SigV4.signingKey(config)
+        SignatureCalculator.SigV4.calculate(signingKey, stringToSign)
     }
 
     override val stringToSignProvider: SigningStateProvider = { request, config ->
         val canonical = Canonicalizer.Default.canonicalRequest(request, config)
-        SignatureCalculator.Default.stringToSign(canonical.requestString, config)
+        SignatureCalculator.SigV4.stringToSign(canonical.requestString, config)
     }
 }
diff --git a/runtime/runtime-core/api/runtime-core.api b/runtime/runtime-core/api/runtime-core.api
index 0d5399d430..576903f1cf 100644
--- a/runtime/runtime-core/api/runtime-core.api
+++ b/runtime/runtime-core/api/runtime-core.api
@@ -693,6 +693,10 @@ public final class aws/smithy/kotlin/runtime/hashing/Crc32cKt {
 	public static final fun crc32c ([B)I
 }
 
+public final class aws/smithy/kotlin/runtime/hashing/EcdsaJVMKt {
+	public static final fun ecdsaSecp256r1 ([B[B)[B
+}
+
 public abstract interface class aws/smithy/kotlin/runtime/hashing/HashFunction {
 	public abstract fun digest ()[B
 	public abstract fun getBlockSizeBytes ()I
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/hashing/Ecdsa.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/hashing/Ecdsa.kt
new file mode 100644
index 0000000000..ad58fc118b
--- /dev/null
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/hashing/Ecdsa.kt
@@ -0,0 +1,10 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.hashing
+
+/**
+ * ECDSA on the SECP256R1 curve.
+ */
+public expect fun ecdsaSecp256r1(key: ByteArray, message: ByteArray): ByteArray
diff --git a/runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/hashing/EcdsaJVM.kt b/runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/hashing/EcdsaJVM.kt
new file mode 100644
index 0000000000..2f2e86b139
--- /dev/null
+++ b/runtime/runtime-core/jvm/src/aws/smithy/kotlin/runtime/hashing/EcdsaJVM.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.hashing
+
+import aws.smithy.kotlin.runtime.content.BigInteger
+import java.security.*
+import java.security.interfaces.*
+import java.security.spec.*
+
+/**
+ * ECDSA on the SECP256R1 curve.
+ */
+public actual fun ecdsaSecp256r1(key: ByteArray, message: ByteArray): ByteArray {
+    // Convert private key to BigInteger
+    val d = BigInteger(key)
+
+    // Create key pair generator to get curve parameters
+    val keyGen = KeyPairGenerator.getInstance("EC").apply {
+        initialize(ECGenParameterSpec("secp256r1"))
+    }
+    val params = (keyGen.generateKeyPair().private as ECPrivateKey).params
+
+    // Create private key directly from the provided key bytes
+    val privateKeySpec = ECPrivateKeySpec(d.toJvm(), params)
+    val keyFactory = KeyFactory.getInstance("EC")
+    val privateKey = keyFactory.generatePrivate(privateKeySpec)
+
+    // Sign the message
+    return Signature.getInstance("SHA256withECDSA").apply {
+        initSign(privateKey)
+        update(message)
+    }.sign()
+}
+
+private fun BigInteger.toJvm(): java.math.BigInteger = java.math.BigInteger(1, toByteArray())
diff --git a/runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/hashing/EcdsaJVMTest.kt b/runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/hashing/EcdsaJVMTest.kt
new file mode 100644
index 0000000000..0072d112d1
--- /dev/null
+++ b/runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/hashing/EcdsaJVMTest.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.hashing
+
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+import java.security.*
+import java.security.interfaces.*
+import java.security.spec.*
+import kotlin.test.Test
+
+class EcdsaJVMTest {
+    // Helper function to generate valid test key
+    private fun generateValidPrivateKey(): ByteArray {
+        val keyGen = KeyPairGenerator.getInstance("EC")
+        keyGen.initialize(ECGenParameterSpec("secp256r1"))
+        val keyPair = keyGen.generateKeyPair()
+        val privateKey = keyPair.private as ECPrivateKey
+        return privateKey.s.toByteArray()
+    }
+
+    @Test
+    fun testValidSignature() {
+        val privateKey = generateValidPrivateKey()
+        val message = "Hello, World!".toByteArray()
+
+        val signature = ecdsaSecp256r1(privateKey, message)
+
+        assertTrue(signature.isNotEmpty())
+        assertTrue(signature.size >= 64) // ECDSA signatures are typically 70-72 bytes in DER format
+    }
+
+    @Test
+    fun testDifferentMessages() {
+        val privateKey = generateValidPrivateKey()
+        val message1 = "Hello, World!".toByteArray()
+        val message2 = "Different message".toByteArray()
+
+        val signature1 = ecdsaSecp256r1(privateKey, message1)
+        val signature2 = ecdsaSecp256r1(privateKey, message2)
+
+        assertTrue(signature1.isNotEmpty())
+        assertTrue(signature2.isNotEmpty())
+        assertFalse(signature1.contentEquals(signature2))
+    }
+
+    @Test
+    fun testEmptyMessage() {
+        val privateKey = generateValidPrivateKey()
+        val message = ByteArray(0)
+
+        val signature = ecdsaSecp256r1(privateKey, message)
+        assertTrue(signature.isNotEmpty())
+    }
+
+    @Test
+    fun testLargeMessage() {
+        val privateKey = generateValidPrivateKey()
+        val largeMessage = ByteArray(1000000) { it.toByte() }
+
+        val signature = ecdsaSecp256r1(privateKey, largeMessage)
+        assertTrue(signature.isNotEmpty())
+    }
+
+    @Test
+    fun testVerifySignature() {
+        val keyGen = KeyPairGenerator.getInstance("EC")
+        keyGen.initialize(ECGenParameterSpec("secp256r1"))
+        val keyPair = keyGen.generateKeyPair()
+        val privateKey = (keyPair.private as ECPrivateKey).s.toByteArray()
+        val publicKey = keyPair.public
+
+        val message = "Hello, World!".toByteArray()
+        val signature = ecdsaSecp256r1(privateKey, message)
+
+        val verifier = Signature.getInstance("SHA256withECDSA")
+        verifier.initVerify(publicKey)
+        verifier.update(message)
+
+        assertTrue(verifier.verify(signature))
+    }
+}
diff --git a/runtime/runtime-core/native/src/aws/smithy/kotlin/runtime/hashing/EcdsaNative.kt b/runtime/runtime-core/native/src/aws/smithy/kotlin/runtime/hashing/EcdsaNative.kt
new file mode 100644
index 0000000000..a2bca1c4e6
--- /dev/null
+++ b/runtime/runtime-core/native/src/aws/smithy/kotlin/runtime/hashing/EcdsaNative.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.hashing
+
+// FIXME Implement using aws-c-cal: https://github.com/awslabs/aws-c-cal/blob/main/include/aws/cal/ecc.h
+// Will need to be implemented and exposed in aws-crt-kotlin. Or maybe we can _only_ offer the CRT signer on Native?
+// Will require updating DefaultAwsSigner to be expect/actual and set to CrtSigner on Native.
+/**
+ * ECDSA on the SECP256R1 curve.
+ */
+public actual fun ecdsaSecp256r1(key: ByteArray, message: ByteArray): ByteArray = TODO("Not yet implemented")

From 0df4e42b22d440031f07dfff6eb195e6510e1b58 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Mon, 24 Feb 2025 20:12:31 +0000
Subject: [PATCH 048/183] chore: release 1.4.5

---
 .changes/4b6debe1-7706-484a-8599-ef8c14cecde2.json | 5 -----
 CHANGELOG.md                                       | 5 +++++
 gradle.properties                                  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 .changes/4b6debe1-7706-484a-8599-ef8c14cecde2.json

diff --git a/.changes/4b6debe1-7706-484a-8599-ef8c14cecde2.json b/.changes/4b6debe1-7706-484a-8599-ef8c14cecde2.json
deleted file mode 100644
index 6770d0caa6..0000000000
--- a/.changes/4b6debe1-7706-484a-8599-ef8c14cecde2.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "4b6debe1-7706-484a-8599-ef8c14cecde2",
-    "type": "feature",
-    "description": "Add SigV4a support to the default AWS signer"
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c0bee275f..7d95e5e269 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.4.5] - 02/24/2025
+
+### Features
+* Add SigV4a support to the default AWS signer
+
 ## [1.4.4] - 02/18/2025
 
 ### Miscellaneous
diff --git a/gradle.properties b/gradle.properties
index f178e06d20..2093fcb77d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.5-SNAPSHOT
+sdkVersion=1.4.5
 
 # codegen
-codegenVersion=0.34.5-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.5
\ No newline at end of file

From 7430722de7869f6b73fea99fde168beca2cc87e7 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Mon, 24 Feb 2025 20:12:32 +0000
Subject: [PATCH 049/183] chore: bump snapshot version to 1.4.6-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 2093fcb77d..de71e13446 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.5
+sdkVersion=1.4.6-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.5
\ No newline at end of file
+codegenVersion=0.34.6-SNAPSHOT
\ No newline at end of file

From 80d395bb57466f1434f486ab3361e24b3c1c2d28 Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Tue, 25 Feb 2025 10:38:41 -0500
Subject: [PATCH 050/183] fix: account ID based endpoints (#1245)

---
 .../KotlinJmespathExpressionVisitor.kt        | 39 ++++++++++++++-----
 .../endpoints/OperationContextParamsTest.kt   | 29 +++++++++++++-
 .../waiter-tests/model/function-keys.smithy   | 14 +++++++
 .../test/kotlin/com/test/FunctionKeysTest.kt  |  9 +++++
 4 files changed, 81 insertions(+), 10 deletions(-)

diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/KotlinJmespathExpressionVisitor.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/KotlinJmespathExpressionVisitor.kt
index 20b07454e4..a7b28180f2 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/KotlinJmespathExpressionVisitor.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/KotlinJmespathExpressionVisitor.kt
@@ -19,16 +19,26 @@ import software.amazon.smithy.kotlin.codegen.model.isEnum
 import software.amazon.smithy.kotlin.codegen.model.targetOrSelf
 import software.amazon.smithy.kotlin.codegen.model.traits.OperationInput
 import software.amazon.smithy.kotlin.codegen.model.traits.OperationOutput
+import software.amazon.smithy.kotlin.codegen.utils.doubleQuote
 import software.amazon.smithy.kotlin.codegen.utils.dq
 import software.amazon.smithy.kotlin.codegen.utils.getOrNull
 import software.amazon.smithy.kotlin.codegen.utils.toCamelCase
-import software.amazon.smithy.model.shapes.ListShape
-import software.amazon.smithy.model.shapes.MapShape
-import software.amazon.smithy.model.shapes.MemberShape
-import software.amazon.smithy.model.shapes.Shape
+import software.amazon.smithy.model.shapes.*
 
 private val suffixSequence = sequenceOf("") + generateSequence(2) { it + 1 }.map(Int::toString) // "", "2", "3", etc.
 
+/*
+JMESPath has the concept of objects.
+This visitor assumes JMESPath objects will be Kotlin objects/classes.
+The smithy spec contains an instance where it's assumed a JMESPath object will be a Kotlin map.
+
+Specifically it's the keys function
+Smithy spec: https://smithy.io/2.0/additional-specs/rules-engine/parameters.html#smithy-rules-operationcontextparams-trait
+JMESPath spec: https://jmespath.org/specification.html#keys
+
+TODO: Test relevant uses of JMESPath to determine if we should support JMESPath objects as Kotlin maps throughout the entire visitor
+ */
+
 /**
  * An [ExpressionVisitor] used for traversing a JMESPath expression to generate code for traversing an equivalent
  * modeled object. This visitor is passed to [JmespathExpression.accept], at which point specific expression methods
@@ -526,11 +536,22 @@ class KotlinJmespathExpressionVisitor(
             ".$expr"
         }
 
-    private fun VisitedExpression.getKeys(): String {
-        val keys = this.shape?.targetOrSelf(ctx.model)?.allMembers
-            ?.keys?.joinToString(", ", "listOf(", ")") { "\"$it\"" }
-        return keys ?: "listOf<String>()"
-    }
+    /*
+    Smithy spec expects a map, JMESPath spec expects an object
+    Smithy spec: https://smithy.io/2.0/additional-specs/rules-engine/parameters.html#smithy-rules-operationcontextparams-trait
+    JMESPath spec: https://jmespath.org/specification.html#keys
+     */
+    private fun VisitedExpression.getKeys(): String =
+        if (shape?.targetOrSelf(ctx.model)?.type == ShapeType.MAP) {
+            "$identifier?.keys?.map { it.toString() }?.toList()"
+        } else {
+            shape
+                ?.targetOrSelf(ctx.model)
+                ?.allMembers
+                ?.keys
+                ?.joinToString(", ", "listOf(", ")") { it.doubleQuote() }
+                ?: "listOf<String>()"
+        }
 
     private fun VisitedExpression.getValues(): String {
         val values = this.shape?.targetOrSelf(ctx.model)?.allMembers?.keys
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/OperationContextParamsTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/OperationContextParamsTest.kt
index 1e7feeb172..6d5d713a49 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/OperationContextParamsTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/OperationContextParamsTest.kt
@@ -88,7 +88,7 @@ class OperationContextParamsTest {
     }
 
     @Test
-    fun testKeysFunctionPath() {
+    fun testKeysFunctionPathWithStructure() {
         val input = """
             structure TestOperationRequest {
                 Object: Object
@@ -114,4 +114,31 @@ class OperationContextParamsTest {
 
         codegen(pathResultType, path, input).shouldContainOnlyOnceWithDiff(expected)
     }
+
+    @Test
+    fun testKeysFunctionPathWithMap() {
+        val input = """
+            structure TestOperationRequest {
+                Object: StringMap
+            }
+            
+            map StringMap {
+                key: String
+                value: String
+            }
+        """.trimIndent()
+
+        val path = "keys(Object)"
+        val pathResultType = "stringArray"
+
+        val expected = """
+            @Suppress("UNCHECKED_CAST")
+            val input = request.context[HttpOperationContext.OperationInput] as TestOperationRequest
+            val object = input.object
+            val keys = object?.keys?.map { it.toString() }?.toList()
+            builder.foo = keys
+        """.formatForTest("    ")
+
+        codegen(pathResultType, path, input).shouldContainOnlyOnceWithDiff(expected)
+    }
 }
diff --git a/tests/codegen/waiter-tests/model/function-keys.smithy b/tests/codegen/waiter-tests/model/function-keys.smithy
index c35989f345..f625ee0791 100644
--- a/tests/codegen/waiter-tests/model/function-keys.smithy
+++ b/tests/codegen/waiter-tests/model/function-keys.smithy
@@ -32,6 +32,20 @@ use smithy.waiters#waitable
             }
         ]
     },
+    KeysFunctionMapStringEquals: {
+        acceptors: [
+            {
+                state: "success",
+                matcher: {
+                    output: {
+                        path: "keys(maps.strings)",
+                        expected: "key",
+                        comparator: "anyStringEquals"
+                    }
+                }
+            }
+        ]
+    },
 )
 @readonly
 @http(method: "GET", uri: "/keys/{name}", code: 200)
diff --git a/tests/codegen/waiter-tests/src/test/kotlin/com/test/FunctionKeysTest.kt b/tests/codegen/waiter-tests/src/test/kotlin/com/test/FunctionKeysTest.kt
index 26b11a9d1b..f39a193685 100644
--- a/tests/codegen/waiter-tests/src/test/kotlin/com/test/FunctionKeysTest.kt
+++ b/tests/codegen/waiter-tests/src/test/kotlin/com/test/FunctionKeysTest.kt
@@ -5,10 +5,12 @@
 
 package com.test
 
+import com.test.model.EntityMaps
 import com.test.model.EntityPrimitives
 import com.test.model.GetFunctionKeysEqualsRequest
 import com.test.model.GetFunctionKeysEqualsResponse
 import com.test.utils.successTest
+import com.test.waiters.waitUntilKeysFunctionMapStringEquals
 import com.test.waiters.waitUntilKeysFunctionPrimitivesIntegerEquals
 import com.test.waiters.waitUntilKeysFunctionPrimitivesStringEquals
 import kotlin.test.Test
@@ -27,4 +29,11 @@ class FunctionKeysTest {
         WaitersTestClient::waitUntilKeysFunctionPrimitivesIntegerEquals,
         GetFunctionKeysEqualsResponse { primitives = EntityPrimitives { } },
     )
+
+    @Test
+    fun testKeysFunctionMapStringEquals() = successTest(
+        GetFunctionKeysEqualsRequest { name = "test" },
+        WaitersTestClient::waitUntilKeysFunctionMapStringEquals,
+        GetFunctionKeysEqualsResponse { maps = EntityMaps { strings = mapOf("key" to "value") } },
+    )
 }

From 5dbc6840acfd512ceb0c26109a4b3d647b4ce976 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Tue, 25 Feb 2025 15:55:51 +0000
Subject: [PATCH 051/183] chore: release 1.4.6

---
 CHANGELOG.md      | 2 ++
 gradle.properties | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d95e5e269..28aa448040 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.4.6] - 02/25/2025
+
 ## [1.4.5] - 02/24/2025
 
 ### Features
diff --git a/gradle.properties b/gradle.properties
index de71e13446..5a4c8a03e9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.6-SNAPSHOT
+sdkVersion=1.4.6
 
 # codegen
-codegenVersion=0.34.6-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.6
\ No newline at end of file

From dc6b6466094b92ae3255908d461d9450a994855c Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Tue, 25 Feb 2025 15:55:52 +0000
Subject: [PATCH 052/183] chore: bump snapshot version to 1.4.7-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5a4c8a03e9..266b1c6f6c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.6
+sdkVersion=1.4.7-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.6
\ No newline at end of file
+codegenVersion=0.34.7-SNAPSHOT
\ No newline at end of file

From 09838a7ecb582c21719cbc17a1f4f06c4e604ee1 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Tue, 25 Feb 2025 13:10:49 -0500
Subject: [PATCH 053/183] fix: replace `Span.makeCurrent()` with
 `Span.asContextElement()` (#1237)

---
 .brazil.json                                             | 1 +
 .changes/ec884c41-7bda-4033-a80b-5da20836a64b.json       | 8 ++++++++
 gradle/libs.versions.toml                                | 1 +
 .../observability/telemetry-api/api/telemetry-api.api    | 3 +++
 .../kotlin/runtime/telemetry/trace/AbstractTraceSpan.kt  | 3 +++
 .../runtime/telemetry/trace/CoroutineContextTraceExt.kt  | 2 +-
 .../smithy/kotlin/runtime/telemetry/trace/TraceSpan.kt   | 7 +++++++
 .../telemetry-provider-otel/build.gradle.kts             | 1 +
 .../kotlin/runtime/telemetry/otel/OtelTracerProvider.kt  | 9 +++++----
 9 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 .changes/ec884c41-7bda-4033-a80b-5da20836a64b.json

diff --git a/.brazil.json b/.brazil.json
index dbb2135d1b..56055e11d1 100644
--- a/.brazil.json
+++ b/.brazil.json
@@ -7,6 +7,7 @@
     "com.squareup.okhttp3:okhttp:5.*": "OkHttp3-5.x",
     "com.squareup.okio:okio-jvm:3.*": "OkioJvm-3.x",
     "io.opentelemetry:opentelemetry-api:1.*": "Maven-io-opentelemetry_opentelemetry-api-1.x",
+    "io.opentelemetry:opentelemetry-extension-kotlin:1.*": "Maven-io-opentelemetry_opentelemetry-extension-kotlin-1.x",
     "org.slf4j:slf4j-api:2.*": "Maven-org-slf4j_slf4j-api-2.x",
     "aws.sdk.kotlin.crt:aws-crt-kotlin:0.9.*": "AwsCrtKotlin-0.9.x",
     "aws.sdk.kotlin.crt:aws-crt-kotlin:0.8.*": "AwsCrtKotlin-0.8.x",
diff --git a/.changes/ec884c41-7bda-4033-a80b-5da20836a64b.json b/.changes/ec884c41-7bda-4033-a80b-5da20836a64b.json
new file mode 100644
index 0000000000..78aff6e839
--- /dev/null
+++ b/.changes/ec884c41-7bda-4033-a80b-5da20836a64b.json
@@ -0,0 +1,8 @@
+{
+    "id": "ec884c41-7bda-4033-a80b-5da20836a64b",
+    "type": "bugfix",
+    "description": "Fix OpenTelemetry span concurrency by using Span.asContextElement() instead of Span.makeCurrent()",
+    "issues": [
+        "https://github.com/smithy-lang/smithy-kotlin/issues/1211"
+    ]
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bfa4c2b4f1..577fc9e896 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -57,6 +57,7 @@ okhttp4 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp4-versi
 okhttp-coroutines = { module = "com.squareup.okhttp3:okhttp-coroutines", version.ref = "okhttp-version" }
 opentelemetry-api = { module = "io.opentelemetry:opentelemetry-api", version.ref = "otel-version" }
 opentelemetry-sdk-testing = {module = "io.opentelemetry:opentelemetry-sdk-testing", version.ref = "otel-version" }
+opentelemetry-kotlin-extension = { module = "io.opentelemetry:opentelemetry-extension-kotlin", version.ref = "otel-version" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j-version" }
 slf4j-api-v1x = { module = "org.slf4j:slf4j-api", version.ref = "slf4j-v1x-version" }
 slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j-version" }
diff --git a/runtime/observability/telemetry-api/api/telemetry-api.api b/runtime/observability/telemetry-api/api/telemetry-api.api
index 33adef236a..cf14c4c7c0 100644
--- a/runtime/observability/telemetry-api/api/telemetry-api.api
+++ b/runtime/observability/telemetry-api/api/telemetry-api.api
@@ -364,6 +364,7 @@ public final class aws/smithy/kotlin/runtime/telemetry/metrics/UpDownCounter$Def
 
 public abstract class aws/smithy/kotlin/runtime/telemetry/trace/AbstractTraceSpan : aws/smithy/kotlin/runtime/telemetry/trace/TraceSpan {
 	public fun <init> ()V
+	public fun asContextElement ()Lkotlin/coroutines/CoroutineContext;
 	public fun close ()V
 	public fun emitEvent (Ljava/lang/String;Laws/smithy/kotlin/runtime/collections/Attributes;)V
 	public fun getSpanContext ()Laws/smithy/kotlin/runtime/telemetry/trace/SpanContext;
@@ -424,6 +425,7 @@ public final class aws/smithy/kotlin/runtime/telemetry/trace/SpanStatus : java/l
 
 public abstract interface class aws/smithy/kotlin/runtime/telemetry/trace/TraceSpan : aws/smithy/kotlin/runtime/telemetry/context/Scope {
 	public static final field Companion Laws/smithy/kotlin/runtime/telemetry/trace/TraceSpan$Companion;
+	public abstract fun asContextElement ()Lkotlin/coroutines/CoroutineContext;
 	public abstract fun close ()V
 	public abstract fun emitEvent (Ljava/lang/String;Laws/smithy/kotlin/runtime/collections/Attributes;)V
 	public abstract fun getSpanContext ()Laws/smithy/kotlin/runtime/telemetry/trace/SpanContext;
@@ -437,6 +439,7 @@ public final class aws/smithy/kotlin/runtime/telemetry/trace/TraceSpan$Companion
 }
 
 public final class aws/smithy/kotlin/runtime/telemetry/trace/TraceSpan$DefaultImpls {
+	public static fun asContextElement (Laws/smithy/kotlin/runtime/telemetry/trace/TraceSpan;)Lkotlin/coroutines/CoroutineContext;
 	public static synthetic fun emitEvent$default (Laws/smithy/kotlin/runtime/telemetry/trace/TraceSpan;Ljava/lang/String;Laws/smithy/kotlin/runtime/collections/Attributes;ILjava/lang/Object;)V
 }
 
diff --git a/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/trace/AbstractTraceSpan.kt b/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/trace/AbstractTraceSpan.kt
index fbc6369ec3..1892098b7b 100644
--- a/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/trace/AbstractTraceSpan.kt
+++ b/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/trace/AbstractTraceSpan.kt
@@ -6,6 +6,8 @@ package aws.smithy.kotlin.runtime.telemetry.trace
 
 import aws.smithy.kotlin.runtime.collections.AttributeKey
 import aws.smithy.kotlin.runtime.collections.Attributes
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
 
 /**
  * An abstract implementation of a trace span. By default, this class uses no-op implementations for all members unless
@@ -18,4 +20,5 @@ public abstract class AbstractTraceSpan : TraceSpan {
     override operator fun <T : Any> set(key: AttributeKey<T>, value: T) { }
     override fun mergeAttributes(attributes: Attributes) { }
     override fun close() { }
+    override fun asContextElement(): CoroutineContext = EmptyCoroutineContext
 }
diff --git a/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/trace/CoroutineContextTraceExt.kt b/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/trace/CoroutineContextTraceExt.kt
index cb6795fe9c..73e84dd756 100644
--- a/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/trace/CoroutineContextTraceExt.kt
+++ b/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/trace/CoroutineContextTraceExt.kt
@@ -71,7 +71,7 @@ public suspend inline fun <R> withSpan(
     // or else traces may be disconnected from their parent
     val updatedCtx = coroutineContext[TelemetryProviderContext]?.provider?.contextManager?.current()
     val telemetryCtxElement = (updatedCtx?.let { TelemetryContextElement(it) } ?: coroutineContext[TelemetryContextElement]) ?: EmptyCoroutineContext
-    withContext(context + TraceSpanContext(span) + telemetryCtxElement) {
+    withContext(context + TraceSpanContext(span) + telemetryCtxElement + span.asContextElement()) {
         block(span)
     }
 } catch (ex: Exception) {
diff --git a/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/trace/TraceSpan.kt b/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/trace/TraceSpan.kt
index d3c7972a85..78a92e6057 100644
--- a/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/trace/TraceSpan.kt
+++ b/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/trace/TraceSpan.kt
@@ -9,6 +9,8 @@ import aws.smithy.kotlin.runtime.collections.AttributeKey
 import aws.smithy.kotlin.runtime.collections.Attributes
 import aws.smithy.kotlin.runtime.collections.emptyAttributes
 import aws.smithy.kotlin.runtime.telemetry.context.Scope
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
 
 /**
  * Represents a single operation/task within a trace. Each trace contains a root span and
@@ -27,6 +29,11 @@ public interface TraceSpan : Scope {
      */
     public val spanContext: SpanContext
 
+    /**
+     * A representation of this span as a [CoroutineContext] element
+     */
+    public fun asContextElement(): CoroutineContext = EmptyCoroutineContext
+
     /**
      * Set an attribute on the span
      * @param key the attribute key to use
diff --git a/runtime/observability/telemetry-provider-otel/build.gradle.kts b/runtime/observability/telemetry-provider-otel/build.gradle.kts
index 8792275766..bdee5b1d6a 100644
--- a/runtime/observability/telemetry-provider-otel/build.gradle.kts
+++ b/runtime/observability/telemetry-provider-otel/build.gradle.kts
@@ -18,6 +18,7 @@ kotlin {
         jvmMain {
             dependencies {
                 api(libs.opentelemetry.api)
+                api(libs.opentelemetry.kotlin.extension)
             }
         }
         all {
diff --git a/runtime/observability/telemetry-provider-otel/jvm/src/aws/smithy/kotlin/runtime/telemetry/otel/OtelTracerProvider.kt b/runtime/observability/telemetry-provider-otel/jvm/src/aws/smithy/kotlin/runtime/telemetry/otel/OtelTracerProvider.kt
index cf6eb39dfd..20ef72f139 100644
--- a/runtime/observability/telemetry-provider-otel/jvm/src/aws/smithy/kotlin/runtime/telemetry/otel/OtelTracerProvider.kt
+++ b/runtime/observability/telemetry-provider-otel/jvm/src/aws/smithy/kotlin/runtime/telemetry/otel/OtelTracerProvider.kt
@@ -10,6 +10,8 @@ import aws.smithy.kotlin.runtime.collections.Attributes
 import aws.smithy.kotlin.runtime.telemetry.context.Context
 import aws.smithy.kotlin.runtime.telemetry.trace.*
 import io.opentelemetry.api.OpenTelemetry
+import io.opentelemetry.extension.kotlin.asContextElement
+import kotlin.coroutines.CoroutineContext
 import io.opentelemetry.api.trace.Span as OtelSpan
 import io.opentelemetry.api.trace.SpanContext as OtelSpanContext
 import io.opentelemetry.api.trace.SpanKind as OtelSpanKind
@@ -62,11 +64,11 @@ private class OtelSpanContextImpl(private val otelSpanContext: OtelSpanContext)
 internal class OtelTraceSpanImpl(
     private val otelSpan: OtelSpan,
 ) : TraceSpan {
-
-    private val spanScope = otelSpan.makeCurrent()
-
     override val spanContext: SpanContext
         get() = OtelSpanContextImpl(otelSpan.spanContext)
+
+    override fun asContextElement(): CoroutineContext = otelSpan.asContextElement()
+
     override fun <T : Any> set(key: AttributeKey<T>, value: T) {
         key.otelAttrKeyOrNull(value)?.let { otelKey ->
             otelSpan.setAttribute(otelKey, value)
@@ -90,7 +92,6 @@ internal class OtelTraceSpanImpl(
 
     override fun close() {
         otelSpan.end()
-        spanScope.close()
     }
 }
 

From d06ccf3f12894cc0dd8a97c43e5ec5af5d74dd32 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Tue, 25 Feb 2025 18:16:01 +0000
Subject: [PATCH 054/183] chore: release 1.4.7

---
 .changes/ec884c41-7bda-4033-a80b-5da20836a64b.json | 8 --------
 CHANGELOG.md                                       | 5 +++++
 gradle.properties                                  | 4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 .changes/ec884c41-7bda-4033-a80b-5da20836a64b.json

diff --git a/.changes/ec884c41-7bda-4033-a80b-5da20836a64b.json b/.changes/ec884c41-7bda-4033-a80b-5da20836a64b.json
deleted file mode 100644
index 78aff6e839..0000000000
--- a/.changes/ec884c41-7bda-4033-a80b-5da20836a64b.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "id": "ec884c41-7bda-4033-a80b-5da20836a64b",
-    "type": "bugfix",
-    "description": "Fix OpenTelemetry span concurrency by using Span.asContextElement() instead of Span.makeCurrent()",
-    "issues": [
-        "https://github.com/smithy-lang/smithy-kotlin/issues/1211"
-    ]
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28aa448040..c365ff2deb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.4.7] - 02/25/2025
+
+### Fixes
+* [#1211](https://github.com/smithy-lang/smithy-kotlin/issues/1211) Fix OpenTelemetry span concurrency by using Span.asContextElement() instead of Span.makeCurrent()
+
 ## [1.4.6] - 02/25/2025
 
 ## [1.4.5] - 02/24/2025
diff --git a/gradle.properties b/gradle.properties
index 266b1c6f6c..a46d60cb0d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.7-SNAPSHOT
+sdkVersion=1.4.7
 
 # codegen
-codegenVersion=0.34.7-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.7
\ No newline at end of file

From 03a8e6293fa468209641164639018e6600249794 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Tue, 25 Feb 2025 18:16:02 +0000
Subject: [PATCH 055/183] chore: bump snapshot version to 1.4.8-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index a46d60cb0d..85b12b7dc0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.7
+sdkVersion=1.4.8-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.7
\ No newline at end of file
+codegenVersion=0.34.8-SNAPSHOT
\ No newline at end of file

From aae827c61d75de33b0dffd4dc797d6279288a96c Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Thu, 27 Feb 2025 11:07:35 -0500
Subject: [PATCH 056/183] fix: idempotency tokens being code-generated for
 nested structures (#1248)

---
 .../a928feea-f455-4263-8bae-cf50676a551a.json |   5 +
 .../codegen/aws/protocols/AwsQueryTest.kt     | 105 ++++++++++++++++++
 .../codegen/aws/protocols/RestJson1Test.kt    | 104 +++++++++++++++++
 .../codegen/aws/protocols/RestXmlTest.kt      | 104 +++++++++++++++++
 .../codegen/aws/protocols/RpcV2CborTest.kt    |  84 +++++++++++++-
 .../codegen/model/knowledge/TopLevelIndex.kt  |  20 ++++
 .../serde/SerializeStructGenerator.kt         |  14 ++-
 7 files changed, 433 insertions(+), 3 deletions(-)
 create mode 100644 .changes/a928feea-f455-4263-8bae-cf50676a551a.json
 create mode 100644 codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/AwsQueryTest.kt
 create mode 100644 codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestJson1Test.kt
 create mode 100644 codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestXmlTest.kt
 create mode 100644 codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/model/knowledge/TopLevelIndex.kt

diff --git a/.changes/a928feea-f455-4263-8bae-cf50676a551a.json b/.changes/a928feea-f455-4263-8bae-cf50676a551a.json
new file mode 100644
index 0000000000..1a1f543dc2
--- /dev/null
+++ b/.changes/a928feea-f455-4263-8bae-cf50676a551a.json
@@ -0,0 +1,5 @@
+{
+    "id": "a928feea-f455-4263-8bae-cf50676a551a",
+    "type": "bugfix",
+    "description": "Idempotency tokens are no longer code-generated for nested structures. See: https://smithy.io/2.0/spec/behavior-traits.html#smithy-api-idempotencytoken-trait"
+}
\ No newline at end of file
diff --git a/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/AwsQueryTest.kt b/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/AwsQueryTest.kt
new file mode 100644
index 0000000000..8a575c7cd4
--- /dev/null
+++ b/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/AwsQueryTest.kt
@@ -0,0 +1,105 @@
+package software.amazon.smithy.kotlin.codegen.aws.protocols
+
+import software.amazon.smithy.kotlin.codegen.test.*
+import kotlin.test.Test
+
+class AwsQueryTest {
+    @Test
+    fun testNonNestedIdempotencyToken() {
+        val ctx = model.newTestContext("Example")
+
+        val generator = AwsQuery()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val expected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.bar?.let { field(BAR_DESCRIPTOR, it) } ?: field(BAR_DESCRIPTOR, context.idempotencyTokenProvider.generateToken())
+            }
+        """.trimIndent()
+
+        val actual = ctx
+            .manifest
+            .expectFileString("/src/main/kotlin/com/test/serde/GetBarUnNestedOperationSerializer.kt")
+            .lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "    }")
+            .trimIndent()
+
+        actual.shouldContainOnlyOnceWithDiff(expected)
+    }
+
+    @Test
+    fun testNestedIdempotencyToken() {
+        val ctx = model.newTestContext("Example")
+
+        val generator = AwsQuery()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val expected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.baz?.let { field(BAZ_DESCRIPTOR, it) }
+            }
+        """.trimIndent()
+
+        val actual = ctx
+            .manifest
+            .expectFileString("/src/main/kotlin/com/test/serde/NestDocumentSerializer.kt")
+            .lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "    }")
+            .trimIndent()
+
+        actual.shouldContainOnlyOnceWithDiff(expected)
+
+        val unexpected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.baz?.let { field(BAZ_DESCRIPTOR, it) } ?: field(BAR_DESCRIPTOR, context.idempotencyTokenProvider.generateToken())
+            }
+        """.trimIndent()
+
+        actual.shouldNotContainOnlyOnceWithDiff(unexpected)
+    }
+
+    private val model = """
+        ${"$"}version: "2"
+    
+        namespace com.test
+        
+        use aws.protocols#awsQuery
+        use aws.api#service
+    
+        @awsQuery
+        @service(sdkId: "Example")
+        @xmlNamespace(uri: "http://foo.com")
+        service Example {
+            version: "1.0.0",
+            operations: [GetBarUnNested, GetBarNested]
+        }
+    
+        @http(method: "POST", uri: "/get-bar-un-nested")
+        operation GetBarUnNested {
+            input: BarUnNested
+        }
+        
+        structure BarUnNested {
+            @idempotencyToken
+            bar: String
+        }
+        
+        @http(method: "POST", uri: "/get-bar-nested")
+        operation GetBarNested {
+            input: BarNested
+        }
+        
+        structure BarNested {
+            bar: Nest
+        }
+        
+        structure Nest {
+            @idempotencyToken
+            baz: String
+        }
+    """.toSmithyModel()
+}
diff --git a/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestJson1Test.kt b/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestJson1Test.kt
new file mode 100644
index 0000000000..e1a4b22c01
--- /dev/null
+++ b/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestJson1Test.kt
@@ -0,0 +1,104 @@
+package software.amazon.smithy.kotlin.codegen.aws.protocols
+
+import software.amazon.smithy.kotlin.codegen.test.*
+import kotlin.test.Test
+
+class RestJson1Test {
+    @Test
+    fun testNonNestedIdempotencyToken() {
+        val ctx = model.newTestContext("Example")
+
+        val generator = RestJson1()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val expected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.bar?.let { field(BAR_DESCRIPTOR, it) } ?: field(BAR_DESCRIPTOR, context.idempotencyTokenProvider.generateToken())
+            }
+        """.trimIndent()
+
+        val actual = ctx
+            .manifest
+            .expectFileString("/src/main/kotlin/com/test/serde/GetBarUnNestedOperationSerializer.kt")
+            .lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "    }")
+            .trimIndent()
+
+        actual.shouldContainOnlyOnceWithDiff(expected)
+    }
+
+    @Test
+    fun testNestedIdempotencyToken() {
+        val ctx = model.newTestContext("Example")
+
+        val generator = RestJson1()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val expected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.baz?.let { field(BAZ_DESCRIPTOR, it) }
+            }
+        """.trimIndent()
+
+        val actual = ctx
+            .manifest
+            .expectFileString("/src/main/kotlin/com/test/serde/NestDocumentSerializer.kt")
+            .lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "    }")
+            .trimIndent()
+
+        actual.shouldContainOnlyOnceWithDiff(expected)
+
+        val unexpected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.baz?.let { field(BAZ_DESCRIPTOR, it) } ?: field(BAR_DESCRIPTOR, context.idempotencyTokenProvider.generateToken())
+            }
+        """.trimIndent()
+
+        actual.shouldNotContainOnlyOnceWithDiff(unexpected)
+    }
+
+    private val model = """
+        ${"$"}version: "2"
+    
+        namespace com.test
+        
+        use aws.protocols#restJson1
+        use aws.api#service
+    
+        @restJson1
+        @service(sdkId: "Example")
+        service Example {
+            version: "1.0.0",
+            operations: [GetBarUnNested, GetBarNested]
+        }
+    
+        @http(method: "POST", uri: "/get-bar-un-nested")
+        operation GetBarUnNested {
+            input: BarUnNested
+        }
+        
+        structure BarUnNested {
+            @idempotencyToken
+            bar: String
+        }
+        
+        @http(method: "POST", uri: "/get-bar-nested")
+        operation GetBarNested {
+            input: BarNested
+        }
+        
+        structure BarNested {
+            bar: Nest
+        }
+        
+        structure Nest {
+            @idempotencyToken
+            baz: String
+        }
+    """.toSmithyModel()
+}
diff --git a/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestXmlTest.kt b/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestXmlTest.kt
new file mode 100644
index 0000000000..4f59359bee
--- /dev/null
+++ b/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestXmlTest.kt
@@ -0,0 +1,104 @@
+package software.amazon.smithy.kotlin.codegen.aws.protocols
+
+import software.amazon.smithy.kotlin.codegen.test.*
+import kotlin.test.Test
+
+class RestXmlTest {
+    @Test
+    fun testNonNestedIdempotencyToken() {
+        val ctx = model.newTestContext("Example")
+
+        val generator = RestXml()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val expected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.bar?.let { field(BAR_DESCRIPTOR, it) } ?: field(BAR_DESCRIPTOR, context.idempotencyTokenProvider.generateToken())
+            }
+        """.trimIndent()
+
+        val actual = ctx
+            .manifest
+            .expectFileString("/src/main/kotlin/com/test/serde/GetBarUnNestedOperationSerializer.kt")
+            .lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "    }")
+            .trimIndent()
+
+        actual.shouldContainOnlyOnceWithDiff(expected)
+    }
+
+    @Test
+    fun testNestedIdempotencyToken() {
+        val ctx = model.newTestContext("Example")
+
+        val generator = RestXml()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val expected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.baz?.let { field(BAZ_DESCRIPTOR, it) }
+            }
+        """.trimIndent()
+
+        val actual = ctx
+            .manifest
+            .expectFileString("/src/main/kotlin/com/test/serde/NestDocumentSerializer.kt")
+            .lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "    }")
+            .trimIndent()
+
+        actual.shouldContainOnlyOnceWithDiff(expected)
+
+        val unexpected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.baz?.let { field(BAZ_DESCRIPTOR, it) } ?: field(BAR_DESCRIPTOR, context.idempotencyTokenProvider.generateToken())
+            }
+        """.trimIndent()
+
+        actual.shouldNotContainOnlyOnceWithDiff(unexpected)
+    }
+
+    private val model = """
+        ${"$"}version: "2"
+    
+        namespace com.test
+        
+        use aws.protocols#restXml
+        use aws.api#service
+    
+        @restXml
+        @service(sdkId: "Example")
+        service Example {
+            version: "1.0.0",
+            operations: [GetBarUnNested, GetBarNested]
+        }
+    
+        @http(method: "POST", uri: "/get-bar-un-nested")
+        operation GetBarUnNested {
+            input: BarUnNested
+        }
+        
+        structure BarUnNested {
+            @idempotencyToken
+            bar: String
+        }
+        
+        @http(method: "POST", uri: "/get-bar-nested")
+        operation GetBarNested {
+            input: BarNested
+        }
+        
+        structure BarNested {
+            bar: Nest
+        }
+        
+        structure Nest {
+            @idempotencyToken
+            baz: String
+        }
+    """.toSmithyModel()
+}
diff --git a/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RpcV2CborTest.kt b/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RpcV2CborTest.kt
index 0114185004..a52456d61a 100644
--- a/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RpcV2CborTest.kt
+++ b/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RpcV2CborTest.kt
@@ -21,7 +21,7 @@ class RpcV2CborTest {
         @service(sdkId: "CborExample")
         service CborExample {
             version: "1.0.0",
-            operations: [GetFoo, GetFooStreaming, PutFooStreaming]
+            operations: [GetFoo, GetFooStreaming, PutFooStreaming, GetBarUnNested, GetBarNested]
         }
 
         @http(method: "POST", uri: "/foo")
@@ -74,6 +74,30 @@ class RpcV2CborTest {
         @error("client")
         @retryable(throttling: true)
         structure ThrottlingError {}
+
+        @http(method: "POST", uri: "/get-bar-un-nested")
+        operation GetBarUnNested {
+            input: BarUnNested
+        }
+        
+        structure BarUnNested {
+            @idempotencyToken
+            bar: String
+        }
+        
+        @http(method: "POST", uri: "/get-bar-nested")
+        operation GetBarNested {
+            input: BarNested
+        }
+        
+        structure BarNested {
+            bar: Nest
+        }
+        
+        structure Nest {
+            @idempotencyToken
+            baz: String
+        }
         """.toSmithyModel()
 
     @Test
@@ -162,4 +186,62 @@ class RpcV2CborTest {
         val serializeBody = documentSerializer.lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "}")
         serializeBody.shouldNotContain("input.messages") // `messages` is the stream member and should not be serialized in the initial request
     }
+
+    @Test
+    fun testNonNestedIdempotencyToken() {
+        val ctx = model.newTestContext("CborExample")
+
+        val generator = RpcV2Cbor()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val expected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.bar?.let { field(BAR_DESCRIPTOR, it) } ?: field(BAR_DESCRIPTOR, context.idempotencyTokenProvider.generateToken())
+            }
+        """.trimIndent()
+
+        val actual = ctx
+            .manifest
+            .expectFileString("/src/main/kotlin/com/test/serde/GetBarUnNestedOperationSerializer.kt")
+            .lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "    }")
+            .trimIndent()
+
+        actual.shouldContainOnlyOnceWithDiff(expected)
+    }
+
+    @Test
+    fun testNestedIdempotencyToken() {
+        val ctx = model.newTestContext("CborExample")
+
+        val generator = RpcV2Cbor()
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val expected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.baz?.let { field(BAZ_DESCRIPTOR, it) }
+            }
+        """.trimIndent()
+
+        val actual = ctx
+            .manifest
+            .expectFileString("/src/main/kotlin/com/test/serde/NestDocumentSerializer.kt")
+            .lines("    serializer.serializeStruct(OBJ_DESCRIPTOR) {", "    }")
+            .trimIndent()
+
+        actual.shouldContainOnlyOnceWithDiff(expected)
+
+        val unexpected = """
+            serializer.serializeStruct(OBJ_DESCRIPTOR) {
+                input.baz?.let { field(BAZ_DESCRIPTOR, it) } ?: field(BAR_DESCRIPTOR, context.idempotencyTokenProvider.generateToken())
+            }
+        """.trimIndent()
+
+        actual.shouldNotContainOnlyOnceWithDiff(unexpected)
+    }
 }
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/model/knowledge/TopLevelIndex.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/model/knowledge/TopLevelIndex.kt
new file mode 100644
index 0000000000..df89e2d782
--- /dev/null
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/model/knowledge/TopLevelIndex.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package software.amazon.smithy.kotlin.codegen.model.knowledge
+
+import software.amazon.smithy.kotlin.codegen.utils.getOrNull
+import software.amazon.smithy.model.Model
+import software.amazon.smithy.model.knowledge.TopDownIndex
+import software.amazon.smithy.model.shapes.MemberShape
+import software.amazon.smithy.model.shapes.ServiceShape
+
+class TopLevelIndex(model: Model, service: ServiceShape) {
+    private val operations = TopDownIndex(model).getContainedOperations(service)
+    private val inputStructs = operations.mapNotNull { it.input.getOrNull() }.map { model.expectShape(it) }
+    private val inputMembers = inputStructs.flatMap { it.members() }.toSet()
+
+    fun isTopLevelInputMember(member: MemberShape): Boolean = member in inputMembers
+}
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGenerator.kt
index d8810044a5..3cfbc0dcfe 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGenerator.kt
@@ -8,10 +8,12 @@ import software.amazon.smithy.codegen.core.CodegenException
 import software.amazon.smithy.kotlin.codegen.DefaultValueSerializationMode
 import software.amazon.smithy.kotlin.codegen.core.*
 import software.amazon.smithy.kotlin.codegen.model.*
+import software.amazon.smithy.kotlin.codegen.model.knowledge.TopLevelIndex
 import software.amazon.smithy.kotlin.codegen.model.targetOrSelf
 import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
 import software.amazon.smithy.model.shapes.*
 import software.amazon.smithy.model.traits.*
+import java.util.logging.Logger
 
 /**
  * Generate serialization for members bound to the payload.
@@ -43,6 +45,9 @@ open class SerializeStructGenerator(
     protected val writer: KotlinWriter,
     protected val defaultTimestampFormat: TimestampFormatTrait.Format,
 ) {
+    private val logger = Logger.getLogger(javaClass.name)
+    private val topLevelIndex = TopLevelIndex(ctx.model, ctx.service)
+
     /**
      * Container for serialization information for a particular shape being serialized to
      */
@@ -587,7 +592,7 @@ open class SerializeStructGenerator(
      * @param serializerFn [SerializeFunction] the serializer responsible for returning the function to invoke
      */
     open fun renderShapeSerializer(memberShape: MemberShape, serializerFn: SerializeFunction) {
-        val postfix = idempotencyTokenPostfix(memberShape)
+        val postfix = if (memberShape.hasTrait<IdempotencyTokenTrait>()) idempotencyTokenPostfix(memberShape) else ""
         val memberSymbol = ctx.symbolProvider.toSymbol(memberShape)
         val memberName = ctx.symbolProvider.toMemberName(memberShape)
         if (memberSymbol.isNullable) {
@@ -614,10 +619,15 @@ open class SerializeStructGenerator(
      * @return string intended for codegen output
      */
     private fun idempotencyTokenPostfix(memberShape: MemberShape): String =
-        if (memberShape.hasTrait<IdempotencyTokenTrait>()) {
+        // https://github.com/smithy-lang/smithy-kotlin/issues/1128
+        if (topLevelIndex.isTopLevelInputMember(memberShape)) {
             writer.addImport(RuntimeTypes.SmithyClient.IdempotencyTokenProviderExt)
             " ?: field(${memberShape.descriptorName()}, context.idempotencyTokenProvider.generateToken())"
         } else {
+            logger.warning(
+                "$memberShape has the idempotency token trait but is not eligible to be used as an idempotency token. " +
+                    "It must be a top-level structure member within the input of an operation. ",
+            )
             ""
         }
 

From c498b4282dd3666c2d9c6c0bcc0a2d82d12101c1 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 27 Feb 2025 16:57:49 +0000
Subject: [PATCH 057/183] chore: release 1.4.8

---
 .changes/a928feea-f455-4263-8bae-cf50676a551a.json | 5 -----
 CHANGELOG.md                                       | 5 +++++
 gradle.properties                                  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 .changes/a928feea-f455-4263-8bae-cf50676a551a.json

diff --git a/.changes/a928feea-f455-4263-8bae-cf50676a551a.json b/.changes/a928feea-f455-4263-8bae-cf50676a551a.json
deleted file mode 100644
index 1a1f543dc2..0000000000
--- a/.changes/a928feea-f455-4263-8bae-cf50676a551a.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "a928feea-f455-4263-8bae-cf50676a551a",
-    "type": "bugfix",
-    "description": "Idempotency tokens are no longer code-generated for nested structures. See: https://smithy.io/2.0/spec/behavior-traits.html#smithy-api-idempotencytoken-trait"
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c365ff2deb..760b2fb7c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.4.8] - 02/27/2025
+
+### Fixes
+* Idempotency tokens are no longer code-generated for nested structures. See: https://smithy.io/2.0/spec/behavior-traits.html#smithy-api-idempotencytoken-trait
+
 ## [1.4.7] - 02/25/2025
 
 ### Fixes
diff --git a/gradle.properties b/gradle.properties
index 85b12b7dc0..91d9339d95 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.8-SNAPSHOT
+sdkVersion=1.4.8
 
 # codegen
-codegenVersion=0.34.8-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.8
\ No newline at end of file

From 462967be812ecc160ee784b5c2f1cdeeddafb917 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 27 Feb 2025 16:57:51 +0000
Subject: [PATCH 058/183] chore: bump snapshot version to 1.4.9-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 91d9339d95..64e9a5db45 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.8
+sdkVersion=1.4.9-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.8
\ No newline at end of file
+codegenVersion=0.34.9-SNAPSHOT
\ No newline at end of file

From 72155f765f427d9a4275b19a5f4ec4fbe1d594cf Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Thu, 27 Feb 2025 09:29:20 -0800
Subject: [PATCH 059/183] fix: correctly codegen paginators for types which
 require fully-qualified names (#1249)

---
 .../13a47747-197a-4b88-bc3b-393af5f5127a.json |   5 +
 .../codegen/rendering/PaginatorGenerator.kt   |  28 ++--
 .../rendering/PaginatorGeneratorTest.kt       | 124 ++++++++++++++++++
 3 files changed, 144 insertions(+), 13 deletions(-)
 create mode 100644 .changes/13a47747-197a-4b88-bc3b-393af5f5127a.json

diff --git a/.changes/13a47747-197a-4b88-bc3b-393af5f5127a.json b/.changes/13a47747-197a-4b88-bc3b-393af5f5127a.json
new file mode 100644
index 0000000000..42d876eaa8
--- /dev/null
+++ b/.changes/13a47747-197a-4b88-bc3b-393af5f5127a.json
@@ -0,0 +1,5 @@
+{
+    "id": "13a47747-197a-4b88-bc3b-393af5f5127a",
+    "type": "bugfix",
+    "description": "Correctly generate paginators for item type names which collide with other used types (e.g., an item type `com.foo.Flow` which conflicts with `kotlinx.coroutines.flow.Flow`)"
+}
\ No newline at end of file
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/PaginatorGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/PaginatorGenerator.kt
index 7ac76fee7d..1a829dbb5a 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/PaginatorGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/PaginatorGenerator.kt
@@ -8,12 +8,7 @@ import software.amazon.smithy.codegen.core.CodegenException
 import software.amazon.smithy.codegen.core.Symbol
 import software.amazon.smithy.codegen.core.SymbolReference
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
-import software.amazon.smithy.kotlin.codegen.core.CodegenContext
-import software.amazon.smithy.kotlin.codegen.core.ExternalTypes
-import software.amazon.smithy.kotlin.codegen.core.KotlinDelegator
-import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
-import software.amazon.smithy.kotlin.codegen.core.defaultName
-import software.amazon.smithy.kotlin.codegen.core.withBlock
+import software.amazon.smithy.kotlin.codegen.core.*
 import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
 import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
 import software.amazon.smithy.kotlin.codegen.model.*
@@ -54,7 +49,7 @@ class PaginatorGenerator : KotlinIntegration {
             paginatedOperations.forEach { paginatedOperation ->
                 val paginationInfo = paginatedIndex.getPaginationInfo(service, paginatedOperation).getOrNull()
                     ?: throw CodegenException("Unexpectedly unable to get PaginationInfo from $service $paginatedOperation")
-                val paginationItemInfo = getItemDescriptorOrNull(paginationInfo, ctx)
+                val paginationItemInfo = getItemDescriptorOrNull(paginationInfo, ctx, writer)
 
                 renderPaginatorForOperation(ctx, writer, paginatedOperation, paginationInfo, paginationItemInfo)
             }
@@ -264,7 +259,11 @@ private data class ItemDescriptor(
 /**
  * Return an [ItemDescriptor] if model supplies, otherwise null
  */
-private fun getItemDescriptorOrNull(paginationInfo: PaginationInfo, ctx: CodegenContext): ItemDescriptor? {
+private fun getItemDescriptorOrNull(
+    paginationInfo: PaginationInfo,
+    ctx: CodegenContext,
+    writer: KotlinWriter,
+): ItemDescriptor? {
     val itemMemberId = paginationInfo.itemsMemberPath?.lastOrNull()?.target ?: return null
 
     val itemLiteral = paginationInfo.itemsMemberPath!!.last()!!.defaultName()
@@ -273,15 +272,18 @@ private fun getItemDescriptorOrNull(paginationInfo: PaginationInfo, ctx: Codegen
     val isSparse = itemMember.isSparse
     val (collectionLiteral, targetMember) = when (itemMember) {
         is MapShape -> {
-            val symbol = ctx.symbolProvider.toSymbol(itemMember)
-            val entryExpression = symbol.expectProperty(SymbolProperty.ENTRY_EXPRESSION) as String
-            entryExpression to itemMember
+            val keySymbol = ctx.symbolProvider.toSymbol(itemMember.key)
+            val valueSymbol = ctx.symbolProvider.toSymbol(itemMember.value)
+            val valueSuffix = if (isSparse || valueSymbol.isNullable) "?" else ""
+            val elementExpression = writer.format("Map.Entry<#T, #T#L>", keySymbol, valueSymbol, valueSuffix)
+            elementExpression to itemMember
         }
         is CollectionShape -> {
             val target = ctx.model.expectShape(itemMember.member.target)
             val symbol = ctx.symbolProvider.toSymbol(target)
-            val literal = symbol.name + if (symbol.isNullable || isSparse) "?" else ""
-            literal to target
+            val suffix = if (isSparse || symbol.isNullable) "?" else ""
+            val elementExpression = writer.format("#T#L", symbol, suffix)
+            elementExpression to target
         }
         else -> error("Unexpected shape type ${itemMember.type}")
     }
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/PaginatorGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/PaginatorGeneratorTest.kt
index 7b08a6d869..a3c33532d5 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/PaginatorGeneratorTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/PaginatorGeneratorTest.kt
@@ -263,6 +263,130 @@ class PaginatorGeneratorTest {
         actual.shouldContainOnlyOnceWithDiff(expectedImports)
     }
 
+    @Test
+    fun testRenderPaginatorWithItemRequiringFullName() {
+        val testModelWithItems = """
+            namespace com.test
+            
+            use aws.protocols#restJson1
+            
+            service FlowService {
+                operations: [ListFlows]
+            }
+            
+            @paginated(
+                inputToken: "Marker",
+                outputToken: "NextMarker",
+                pageSize: "MaxItems",
+                items: "Flows"
+            )
+            @readonly
+            @http(method: "GET", uri: "/flows", code: 200)
+            operation ListFlows {
+                input: ListFlowsRequest,
+                output: ListFlowsResponse
+            }
+            
+            structure ListFlowsRequest {
+                @httpQuery("FlowVersion")
+                FlowVersion: String,
+                @httpQuery("Marker")
+                Marker: String,
+                @httpQuery("MasterRegion")
+                MasterRegion: String,
+                @httpQuery("MaxItems")
+                MaxItems: Integer
+            }
+            
+            structure ListFlowsResponse {
+                Flows: FlowList,
+                NextMarker: String
+            }
+            
+            list FlowList {
+                member: Flow
+            }
+            
+            structure Flow {
+                Name: String
+            }
+        """.toSmithyModel()
+        val testContextWithItems = testModelWithItems.newTestContext("FlowService", "com.test")
+
+        val codegenContextWithItems = object : CodegenContext {
+            override val model: Model = testContextWithItems.generationCtx.model
+            override val symbolProvider: SymbolProvider = testContextWithItems.generationCtx.symbolProvider
+            override val settings: KotlinSettings = testContextWithItems.generationCtx.settings
+            override val protocolGenerator: ProtocolGenerator = testContextWithItems.generator
+            override val integrations: List<KotlinIntegration> = testContextWithItems.generationCtx.integrations
+        }
+
+        val unit = PaginatorGenerator()
+        unit.writeAdditionalFiles(codegenContextWithItems, testContextWithItems.generationCtx.delegator)
+
+        testContextWithItems.generationCtx.delegator.flushWriters()
+        val testManifest = testContextWithItems.generationCtx.delegator.fileManifest as MockManifest
+        val actual = testManifest.expectFileString("src/main/kotlin/com/test/paginators/Paginators.kt")
+
+        val expectedCode = """
+            /**
+             * Paginate over [ListFlowsResponse] results.
+             *
+             * When this operation is called, a [kotlinx.coroutines.Flow] is created. Flows are lazy (cold) so no service
+             * calls are made until the flow is collected. This also means there is no guarantee that the request is valid
+             * until then. Once you start collecting the flow, the SDK will lazily load response pages by making service
+             * calls until there are no pages left or the flow is cancelled. If there are errors in your request, you will
+             * see the failures only after you start collection.
+             * @param initialRequest A [ListFlowsRequest] to start pagination
+             * @return A [kotlinx.coroutines.flow.Flow] that can collect [ListFlowsResponse]
+             */
+            public fun TestClient.listFlowsPaginated(initialRequest: ListFlowsRequest = ListFlowsRequest { }): kotlinx.coroutines.flow.Flow<ListFlowsResponse> =
+                flow {
+                    var cursor: kotlin.String? = initialRequest.marker
+                    var hasNextPage: Boolean = true
+            
+                    while (hasNextPage) {
+                        val req = initialRequest.copy {
+                            this.marker = cursor
+                        }
+                        val result = this@listFlowsPaginated.listFlows(req)
+                        cursor = result.nextMarker
+                        hasNextPage = cursor?.isNotEmpty() == true
+                        emit(result)
+                    }
+                }
+            
+            /**
+             * Paginate over [ListFlowsResponse] results.
+             *
+             * When this operation is called, a [kotlinx.coroutines.Flow] is created. Flows are lazy (cold) so no service
+             * calls are made until the flow is collected. This also means there is no guarantee that the request is valid
+             * until then. Once you start collecting the flow, the SDK will lazily load response pages by making service
+             * calls until there are no pages left or the flow is cancelled. If there are errors in your request, you will
+             * see the failures only after you start collection.
+             * @param block A builder block used for DSL-style invocation of the operation
+             * @return A [kotlinx.coroutines.flow.Flow] that can collect [ListFlowsResponse]
+             */
+            public fun TestClient.listFlowsPaginated(block: ListFlowsRequest.Builder.() -> Unit): kotlinx.coroutines.flow.Flow<ListFlowsResponse> =
+                listFlowsPaginated(ListFlowsRequest.Builder().apply(block).build())
+            
+            /**
+             * This paginator transforms the flow returned by [listFlowsPaginated]
+             * to access the nested member [Flow]
+             * @return A [kotlinx.coroutines.flow.Flow] that can collect [Flow]
+             */
+            @JvmName("listFlowsResponseFlow")
+            public fun kotlinx.coroutines.flow.Flow<ListFlowsResponse>.flows(): kotlinx.coroutines.flow.Flow<Flow> =
+                transform() { response ->
+                    response.flows?.forEach {
+                        emit(it)
+                    }
+                }
+        """.trimIndent()
+
+        actual.shouldContainOnlyOnceWithDiff(expectedCode)
+    }
+
     @Test
     fun testRenderPaginatorWithSparseItem() {
         val testModelWithItems = """

From 0e4a7cb8a69d582c9ba0a9ec1421deed2fef48b3 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Thu, 27 Feb 2025 11:07:38 -0800
Subject: [PATCH 060/183] chore: bump Ktor dependency (#1250)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 577fc9e896..c3e00661d1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@ kotlin-compile-testing-version = "0.7.0"
 kotlinx-benchmark-version = "0.4.12"
 kotlinx-serialization-version = "1.7.3"
 docker-java-version = "3.4.0"
-ktor-version = "3.0.0"
+ktor-version = "3.1.1"
 kaml-version = "0.55.0"
 jsoup-version = "1.18.1"
 

From aa02ac477c99309efe208997fa1a37ff506f8f56 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 27 Feb 2025 19:23:37 +0000
Subject: [PATCH 061/183] chore: release 1.4.9

---
 .changes/13a47747-197a-4b88-bc3b-393af5f5127a.json | 5 -----
 CHANGELOG.md                                       | 5 +++++
 gradle.properties                                  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 .changes/13a47747-197a-4b88-bc3b-393af5f5127a.json

diff --git a/.changes/13a47747-197a-4b88-bc3b-393af5f5127a.json b/.changes/13a47747-197a-4b88-bc3b-393af5f5127a.json
deleted file mode 100644
index 42d876eaa8..0000000000
--- a/.changes/13a47747-197a-4b88-bc3b-393af5f5127a.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "13a47747-197a-4b88-bc3b-393af5f5127a",
-    "type": "bugfix",
-    "description": "Correctly generate paginators for item type names which collide with other used types (e.g., an item type `com.foo.Flow` which conflicts with `kotlinx.coroutines.flow.Flow`)"
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 760b2fb7c6..3ed6348229 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.4.9] - 02/27/2025
+
+### Fixes
+* Correctly generate paginators for item type names which collide with other used types (e.g., an item type `com.foo.Flow` which conflicts with `kotlinx.coroutines.flow.Flow`)
+
 ## [1.4.8] - 02/27/2025
 
 ### Fixes
diff --git a/gradle.properties b/gradle.properties
index 64e9a5db45..9a662d4a5f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.9-SNAPSHOT
+sdkVersion=1.4.9
 
 # codegen
-codegenVersion=0.34.9-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.9
\ No newline at end of file

From 8178808ff144a553b73752ab6cbcfa10b17a0d95 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 27 Feb 2025 19:23:39 +0000
Subject: [PATCH 062/183] chore: bump snapshot version to 1.4.10-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 9a662d4a5f..d59c4c4c0c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.9
+sdkVersion=1.4.10-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.9
\ No newline at end of file
+codegenVersion=0.34.10-SNAPSHOT
\ No newline at end of file

From 4b0df676a14ba1985beee9e6807fa7f72125f9a2 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Mon, 3 Mar 2025 11:27:48 -0500
Subject: [PATCH 063/183] misc: remove `@InternalApi` from `SdkClientOption`
 extension functions (#1252)

---
 .../src/aws/smithy/kotlin/runtime/client/SdkClientOption.kt  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/SdkClientOption.kt b/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/SdkClientOption.kt
index 49045379b3..226ff8efbd 100644
--- a/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/SdkClientOption.kt
+++ b/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/SdkClientOption.kt
@@ -5,7 +5,6 @@
 
 package aws.smithy.kotlin.runtime.client
 
-import aws.smithy.kotlin.runtime.InternalApi
 import aws.smithy.kotlin.runtime.collections.AttributeKey
 import aws.smithy.kotlin.runtime.operation.ExecutionContext
 
@@ -48,27 +47,23 @@ public object SdkClientOption {
 /**
  * Get the [IdempotencyTokenProvider] from the context. If one is not set the default will be returned.
  */
-@InternalApi
 public val ExecutionContext.idempotencyTokenProvider: IdempotencyTokenProvider
     get() = getOrNull(SdkClientOption.IdempotencyTokenProvider) ?: IdempotencyTokenProvider.Default
 
 /**
  * Get the [LogMode] from the context. If one is not set a default will be returned
  */
-@InternalApi
 public val ExecutionContext.logMode: LogMode
     get() = getOrNull(SdkClientOption.LogMode) ?: LogMode.Default
 
 /**
  * Get the name of the operation being invoked from the context.
  */
-@InternalApi
 public val ExecutionContext.operationName: String?
     get() = getOrNull(SdkClientOption.OperationName)
 
 /**
  * Get the name of the service being invoked from the context.
  */
-@InternalApi
 public val ExecutionContext.serviceName: String?
     get() = getOrNull(SdkClientOption.ServiceName)

From 6f94c6a07a6fd17e643615e265084cad274c6b8c Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Mon, 3 Mar 2025 09:24:33 -0800
Subject: [PATCH 064/183] fix: correctly handle sequential calls to
 `SingleFlightGroup` (#1251)

---
 .changes/065e6349-8e2a-403b-b588-067161f260fd.json     |  5 +++++
 .../smithy/kotlin/runtime/util/SingleFlightGroup.kt    |  2 +-
 .../kotlin/runtime/util/SingleFlightGroupTest.kt       | 10 ++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 .changes/065e6349-8e2a-403b-b588-067161f260fd.json

diff --git a/.changes/065e6349-8e2a-403b-b588-067161f260fd.json b/.changes/065e6349-8e2a-403b-b588-067161f260fd.json
new file mode 100644
index 0000000000..80a6796004
--- /dev/null
+++ b/.changes/065e6349-8e2a-403b-b588-067161f260fd.json
@@ -0,0 +1,5 @@
+{
+    "id": "065e6349-8e2a-403b-b588-067161f260fd",
+    "type": "bugfix",
+    "description": "Correctly handle sequential calls to `SingleFlightGroup`"
+}
\ No newline at end of file
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/SingleFlightGroup.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/SingleFlightGroup.kt
index 6234d20733..5f36f3a4ae 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/SingleFlightGroup.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/SingleFlightGroup.kt
@@ -30,7 +30,7 @@ public class SingleFlightGroup<T> {
     public suspend fun singleFlight(block: suspend () -> T): T {
         mu.lock()
         val job = inFlight
-        if (job != null) {
+        if (job?.isActive == true) {
             waitCount++
             mu.unlock()
 
diff --git a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/util/SingleFlightGroupTest.kt b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/util/SingleFlightGroupTest.kt
index cfe9d626fb..f468889d7b 100644
--- a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/util/SingleFlightGroupTest.kt
+++ b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/util/SingleFlightGroupTest.kt
@@ -109,4 +109,14 @@ class SingleFlightGroupTest {
             }
         }
     }
+
+    @Test
+    fun testSequential() = runTest {
+        val group = SingleFlightGroup<String>()
+        val first = group.singleFlight { "Foo" }
+        assertEquals("Foo", first)
+
+        val second = group.singleFlight { "Bar" }
+        assertEquals("Bar", second)
+    }
 }

From 667161b5856bfb3519c93d888f1c0290a7c4d07e Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 6 Mar 2025 14:38:30 +0000
Subject: [PATCH 065/183] chore: release 1.4.10

---
 .changes/065e6349-8e2a-403b-b588-067161f260fd.json | 5 -----
 CHANGELOG.md                                       | 5 +++++
 gradle.properties                                  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 .changes/065e6349-8e2a-403b-b588-067161f260fd.json

diff --git a/.changes/065e6349-8e2a-403b-b588-067161f260fd.json b/.changes/065e6349-8e2a-403b-b588-067161f260fd.json
deleted file mode 100644
index 80a6796004..0000000000
--- a/.changes/065e6349-8e2a-403b-b588-067161f260fd.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "065e6349-8e2a-403b-b588-067161f260fd",
-    "type": "bugfix",
-    "description": "Correctly handle sequential calls to `SingleFlightGroup`"
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ed6348229..28f8c84430 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.4.10] - 03/06/2025
+
+### Fixes
+* Correctly handle sequential calls to `SingleFlightGroup`
+
 ## [1.4.9] - 02/27/2025
 
 ### Fixes
diff --git a/gradle.properties b/gradle.properties
index d59c4c4c0c..1f53236226 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.10-SNAPSHOT
+sdkVersion=1.4.10
 
 # codegen
-codegenVersion=0.34.10-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.10
\ No newline at end of file

From f1d5f6b27b834de30e1b86ca6cbaf1c37b449a71 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 6 Mar 2025 14:38:32 +0000
Subject: [PATCH 066/183] chore: bump snapshot version to 1.4.11-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 1f53236226..f5f5e8b0f2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.10
+sdkVersion=1.4.11-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.10
\ No newline at end of file
+codegenVersion=0.34.11-SNAPSHOT
\ No newline at end of file

From bf9a2007f637ecc618039e3b21e77c32ce928c74 Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Wed, 12 Mar 2025 14:26:54 -0700
Subject: [PATCH 067/183] feat: main to feature branches merge (#1254)

---
 .github/workflows/merge-main.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .github/workflows/merge-main.yml

diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
new file mode 100644
index 0000000000..560876bdf3
--- /dev/null
+++ b/.github/workflows/merge-main.yml
@@ -0,0 +1,14 @@
+name: Merge main
+on:
+  schedule:
+    - cron: "0 7 * * 1-5"  # At 07:00 UTC (00:00 PST, 03:00 EST), Monday through Friday
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Merge main
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@main
+        with:
+          exempt-branches: # Add any if required
\ No newline at end of file

From 6e10c011d6edb1d9abe52cd9ac05114e1c2d8f20 Mon Sep 17 00:00:00 2001
From: Xinsong Cui <xicu@amazon.com>
Date: Fri, 14 Mar 2025 14:28:22 -0400
Subject: [PATCH 068/183] feat: emit accountId metrics (#1255)

* add support for md5 checksum validation

* add businees metrics

* remove unrelated changes

* remove unrelated changes

* update api

* lint

* remove comment
---
 runtime/runtime-core/api/runtime-core.api                     | 4 ++++
 .../kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/runtime/runtime-core/api/runtime-core.api b/runtime/runtime-core/api/runtime-core.api
index 576903f1cf..3c8fbfa2bd 100644
--- a/runtime/runtime-core/api/runtime-core.api
+++ b/runtime/runtime-core/api/runtime-core.api
@@ -104,6 +104,9 @@ public final class aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtil
 
 public final class aws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric : java/lang/Enum, aws/smithy/kotlin/runtime/businessmetrics/BusinessMetric {
 	public static final field ACCOUNT_ID_BASED_ENDPOINT Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
+	public static final field ACCOUNT_ID_MODE_DISABLED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
+	public static final field ACCOUNT_ID_MODE_PREFERRED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
+	public static final field ACCOUNT_ID_MODE_REQUIRED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field FLEXIBLE_CHECKSUMS_REQ_CRC32 Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field FLEXIBLE_CHECKSUMS_REQ_CRC32C Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field FLEXIBLE_CHECKSUMS_REQ_SHA1 Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
@@ -115,6 +118,7 @@ public final class aws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetri
 	public static final field GZIP_REQUEST_COMPRESSION Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field PAGINATOR Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field PROTOCOL_RPC_V2_CBOR Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
+	public static final field RESOLVED_ACCOUNT_ID Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field RETRY_MODE_ADAPTIVE Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field RETRY_MODE_STANDARD Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field SERVICE_ENDPOINT_OVERRIDE Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt
index 0600752a6e..13a88aea29 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt
@@ -89,7 +89,11 @@ public enum class SmithyBusinessMetric(public override val identifier: String) :
     PROTOCOL_RPC_V2_CBOR("M"),
     SERVICE_ENDPOINT_OVERRIDE("N"),
     ACCOUNT_ID_BASED_ENDPOINT("O"),
+    ACCOUNT_ID_MODE_PREFERRED("P"),
+    ACCOUNT_ID_MODE_DISABLED("Q"),
+    ACCOUNT_ID_MODE_REQUIRED("R"),
     SIGV4A_SIGNING("S"),
+    RESOLVED_ACCOUNT_ID("T"),
     FLEXIBLE_CHECKSUMS_REQ_CRC32("U"),
     FLEXIBLE_CHECKSUMS_REQ_CRC32C("V"),
     FLEXIBLE_CHECKSUMS_REQ_SHA1("X"),

From 1caac3030bc7a87054216a639dce213bb1eec0eb Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 14 Mar 2025 19:51:24 +0000
Subject: [PATCH 069/183] chore: release 1.4.11

---
 CHANGELOG.md      | 2 ++
 gradle.properties | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28f8c84430..cbcfddf75f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.4.11] - 03/14/2025
+
 ## [1.4.10] - 03/06/2025
 
 ### Fixes
diff --git a/gradle.properties b/gradle.properties
index f5f5e8b0f2..2a633287da 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.11-SNAPSHOT
+sdkVersion=1.4.11
 
 # codegen
-codegenVersion=0.34.11-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.11
\ No newline at end of file

From 0a29a00a17964b7126974744127765c52a8af2a0 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 14 Mar 2025 19:51:26 +0000
Subject: [PATCH 070/183] chore: bump snapshot version to 1.4.12-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 2a633287da..dff2f2c264 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.11
+sdkVersion=1.4.12-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.11
\ No newline at end of file
+codegenVersion=0.34.12-SNAPSHOT
\ No newline at end of file

From 3e307f749e6ff5eb3b38d94a64e83f914ee0c212 Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Tue, 1 Apr 2025 08:45:44 -0700
Subject: [PATCH 071/183] misc: run merge main on push to main (#1261)

---
 .github/workflows/merge-main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
index 560876bdf3..1b354b2ad7 100644
--- a/.github/workflows/merge-main.yml
+++ b/.github/workflows/merge-main.yml
@@ -1,11 +1,11 @@
 name: Merge main
 on:
-  schedule:
-    - cron: "0 7 * * 1-5"  # At 07:00 UTC (00:00 PST, 03:00 EST), Monday through Friday
+  push:
+    branches: [ main ]
   workflow_dispatch:
 
 jobs:
-  test:
+  merge:
     runs-on: ubuntu-latest
     steps:
       - name: Merge main

From f6557bad312e5ac5ba9198cdfd222cddcf02fb7a Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Tue, 1 Apr 2025 08:53:11 -0700
Subject: [PATCH 072/183] feat: sync mirror (#1260)

---
 .github/workflows/sync-mirror.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/workflows/sync-mirror.yml

diff --git a/.github/workflows/sync-mirror.yml b/.github/workflows/sync-mirror.yml
new file mode 100644
index 0000000000..edc80ce30c
--- /dev/null
+++ b/.github/workflows/sync-mirror.yml
@@ -0,0 +1,20 @@
+name: Sync Mirror
+
+on:
+  push:
+    branches: [ main ]
+  workflow_dispatch:
+
+jobs:
+  git-sync:
+    # Only sync when pushing to source repo
+    if: github.repository == 'smithy-lang/smithy-kotlin'
+    runs-on: ubuntu-latest
+    steps:
+      - name: git-sync
+        uses: wei/git-sync@v3
+        with:
+          source_repo: "https://aws-sdk-kotlin-ci:${{ secrets.CI_USER_PAT }}@github.com/smithy-lang/smithy-kotlin.git"
+          source_branch: "main"
+          destination_repo: "https://aws-sdk-kotlin-ci:${{ secrets.CI_USER_PAT }}@github.com/smithy-lang/private-smithy-kotlin-staging.git"
+          destination_branch: "main"
\ No newline at end of file

From 5d8d7fd10db90d3da67fa0b33554c8f06d7833ab Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Wed, 2 Apr 2025 16:08:50 -0700
Subject: [PATCH 073/183] chore: reintegrate E2E smoke tests into the top-level
 Gradle build; modularize smoke test runners to improve testability (#1262)

---
 .../kotlin/codegen/core/RuntimeTypes.kt       |  1 +
 .../smithy/kotlin/codegen/lang/KotlinTypes.kt |  1 +
 .../smoketests/SmokeTestsRunnerGenerator.kt   | 86 +++++++++-------
 .../SmokeTestsRunnerGeneratorTest.kt          | 99 ++++++++++++-------
 runtime/runtime-core/api/runtime-core.api     |  1 +
 .../runtime/smoketests/SmokeTestsFunctions.kt | 14 +++
 6 files changed, 131 insertions(+), 71 deletions(-)

diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
index b6341e0443..3d59c8d1e9 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
@@ -115,6 +115,7 @@ object RuntimeTypes {
         }
 
         object SmokeTests : RuntimeTypePackage(KotlinDependency.CORE, "smoketests") {
+            val DefaultPrinter = symbol("DefaultPrinter")
             val exitProcess = symbol("exitProcess")
             val printExceptionStackTrace = symbol("printExceptionStackTrace")
             val SmokeTestsException = symbol("SmokeTestsException")
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/lang/KotlinTypes.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/lang/KotlinTypes.kt
index 242ba4d0da..6d2384584e 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/lang/KotlinTypes.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/lang/KotlinTypes.kt
@@ -109,6 +109,7 @@ object KotlinTypes {
     }
 
     object Text : RuntimeTypePackage(KotlinDependency.KOTLIN_STDLIB, "text") {
+        val Appendable = stdlibSymbol("Appendable")
         val encodeToByteArray = stdlibSymbol("encodeToByteArray")
     }
 
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt
index df8eeda53e..a3124d7bff 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt
@@ -4,6 +4,7 @@ import software.amazon.smithy.codegen.core.Symbol
 import software.amazon.smithy.kotlin.codegen.core.*
 import software.amazon.smithy.kotlin.codegen.integration.SectionId
 import software.amazon.smithy.kotlin.codegen.integration.SectionKey
+import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
 import software.amazon.smithy.kotlin.codegen.model.getTrait
 import software.amazon.smithy.kotlin.codegen.model.hasTrait
 import software.amazon.smithy.kotlin.codegen.rendering.ShapeValueGenerator
@@ -17,8 +18,8 @@ import software.amazon.smithy.kotlin.codegen.rendering.util.format
 import software.amazon.smithy.kotlin.codegen.utils.dq
 import software.amazon.smithy.kotlin.codegen.utils.toCamelCase
 import software.amazon.smithy.kotlin.codegen.utils.topDownOperations
-import software.amazon.smithy.model.node.*
-import software.amazon.smithy.model.shapes.*
+import software.amazon.smithy.model.node.Node
+import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.smoketests.traits.SmokeTestCase
 import software.amazon.smithy.smoketests.traits.SmokeTestsTrait
 import kotlin.jvm.optionals.getOrNull
@@ -61,25 +62,47 @@ class SmokeTestsRunnerGenerator(
 ) {
     internal fun render() {
         writer.declareSection(SmokeTestSectionIds.SmokeTestsFile) {
-            writer.write("private var exitCode = 0")
+            write("")
+
+            withBlock("public suspend fun main() {", "}") {
+                write("val success = SmokeTestRunner().runAllTests()")
+                withBlock("if (!success) {", "}") {
+                    write("#T(1)", RuntimeTypes.Core.SmokeTests.exitProcess)
+                }
+            }
+            write("")
+            renderRunnerClass()
+        }
+    }
+
+    private fun renderRunnerClass() {
+        writer.withBlock(
+            "public class SmokeTestRunner(private val platform: #1T = #1T.System, private val printer: #2T = #3T) {",
+            "}",
+            RuntimeTypes.Core.Utils.PlatformProvider,
+            KotlinTypes.Text.Appendable,
+            RuntimeTypes.Core.SmokeTests.DefaultPrinter,
+        ) {
             renderEnvironmentVariables()
-            writer.declareSection(SmokeTestSectionIds.AdditionalEnvironmentVariables)
-            writer.write("")
-            writer.withBlock("public suspend fun main() {", "}") {
-                renderFunctionCalls()
-                write("#T(exitCode)", RuntimeTypes.Core.SmokeTests.exitProcess)
+            declareSection(SmokeTestSectionIds.AdditionalEnvironmentVariables)
+            write("")
+
+            withBlock("public suspend fun runAllTests(): Boolean =", "") {
+                withBlock("listOf<suspend () -> Boolean>(", ")") {
+                    renderFunctionReferences()
+                }
+                indent()
+                write(".map { it() }")
+                write(".all { it }")
+                dedent()
             }
-            writer.write("")
             renderFunctions()
         }
     }
 
     private fun renderEnvironmentVariables() {
         // Skip tags
-        writer.writeInline(
-            "private val skipTags = #T.System.getenv(",
-            RuntimeTypes.Core.Utils.PlatformProvider,
-        )
+        writer.writeInline("private val skipTags = platform.getenv(")
         writer.declareSection(SmokeTestSectionIds.SkipTags) {
             writer.writeInline("#S", SKIP_TAGS)
         }
@@ -89,10 +112,7 @@ class SmokeTestsRunnerGenerator(
         )
 
         // Service filter
-        writer.writeInline(
-            "private val serviceFilter = #T.System.getenv(",
-            RuntimeTypes.Core.Utils.PlatformProvider,
-        )
+        writer.writeInline("private val serviceFilter = platform.getenv(")
         writer.declareSection(SmokeTestSectionIds.ServiceFilter) {
             writer.writeInline("#S", SERVICE_FILTER)
         }
@@ -102,10 +122,10 @@ class SmokeTestsRunnerGenerator(
         )
     }
 
-    private fun renderFunctionCalls() {
+    private fun renderFunctionReferences() {
         operations.forEach { operation ->
             operation.getTrait<SmokeTestsTrait>()?.testCases?.forEach { testCase ->
-                writer.write("${testCase.functionName}()")
+                writer.write("::${testCase.functionName},")
             }
         }
     }
@@ -120,7 +140,7 @@ class SmokeTestsRunnerGenerator(
     }
 
     private fun renderFunction(operation: OperationShape, testCase: SmokeTestCase) {
-        writer.withBlock("private suspend fun ${testCase.functionName}() {", "}") {
+        writer.withBlock("private suspend fun ${testCase.functionName}(): Boolean {", "}") {
             write("val tags = setOf<String>(${testCase.tags.joinToString(",") { it.dq()} })")
             writer.withBlock("if ((serviceFilter.isNotEmpty() && #S !in serviceFilter) || tags.any { it in skipTags }) {", "}", sdkId) {
                 printTestResult(
@@ -131,10 +151,10 @@ class SmokeTestsRunnerGenerator(
                     "ok",
                     "# skip",
                 )
-                writer.write("return")
+                writer.write("return true")
             }
             write("")
-            withInlineBlock("try {", "} ") {
+            withInlineBlock("return try {", "} ") {
                 renderTestCase(operation, testCase)
             }
             withBlock("catch (exception: Exception) {", "}") {
@@ -149,6 +169,8 @@ class SmokeTestsRunnerGenerator(
             closeAndOpenBlock("}.#T { client ->", RuntimeTypes.Core.IO.use)
             renderOperation(operation, testCase)
         }
+        writer.write("")
+        writer.write("error(#S)", "Unexpectedly completed smoke test operation without throwing exception")
     }
 
     private fun renderClientConfig(testCase: SmokeTestCase) {
@@ -212,9 +234,11 @@ class SmokeTestsRunnerGenerator(
         )
 
         writer.withBlock("if (!success) {", "}") {
-            write("#T(exception)", RuntimeTypes.Core.SmokeTests.printExceptionStackTrace)
-            write("exitCode = 1")
+            write("printer.appendLine(exception.stackTraceToString().prependIndent(#S))", "# ")
         }
+
+        writer.write("")
+        writer.write("success")
     }
 
     // Helpers
@@ -241,7 +265,7 @@ class SmokeTestsRunnerGenerator(
         val expectation = if (errorExpected) "error expected from service" else "no error expected from service"
         val status = statusOverride ?: "\$status"
         val testResult = "$status $service $testCase - $expectation $directive"
-        writer.write("println(#S)", testResult)
+        writer.write("printer.appendLine(#S)", testResult)
     }
 
     /**
@@ -250,18 +274,6 @@ class SmokeTestsRunnerGenerator(
     private val SmokeTestCase.functionName: String
         get() = this.id.toCamelCase()
 
-    /**
-     * Get the operation parameters for a [SmokeTestCase]
-     */
-    private val SmokeTestCase.operationParameters: Map<StringNode, Node>
-        get() = this.params.get().members
-
-    /**
-     * Checks if there are operation parameters for a [SmokeTestCase]
-     */
-    private val SmokeTestCase.hasOperationParameters: Boolean
-        get() = this.params.isPresent
-
     /**
      * Check if a [SmokeTestCase] is expecting a specific error
      */
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGeneratorTest.kt
index 50291a482f..c9d4b535c1 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGeneratorTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGeneratorTest.kt
@@ -74,10 +74,9 @@ class SmokeTestsRunnerGeneratorTest {
     fun variablesTest() {
         generatedCode.shouldContainOnlyOnceWithDiff(
             """
-                private var exitCode = 0
-                private val skipTags = PlatformProvider.System.getenv("SMOKE_TEST_SKIP_TAGS")?.let { it.split(",").map { it.trim() }.toSet() } ?: emptySet()
-                private val serviceFilter = PlatformProvider.System.getenv("SMOKE_TEST_SERVICE_IDS")?.let { it.split(",").map { it.trim() }.toSet() }
-            """.trimIndent(),
+                private val skipTags = platform.getenv("SMOKE_TEST_SKIP_TAGS")?.let { it.split(",").map { it.trim() }.toSet() } ?: emptySet()
+                private val serviceFilter = platform.getenv("SMOKE_TEST_SERVICE_IDS")?.let { it.split(",").map { it.trim() }.toSet() }
+            """.formatForTest(),
         )
     }
 
@@ -86,27 +85,50 @@ class SmokeTestsRunnerGeneratorTest {
         generatedCode.shouldContainOnlyOnceWithDiff(
             """
                 public suspend fun main() {
-                    successTest()
-                    invalidMessageErrorTest()
-                    failureTest()
-                    exitProcess(exitCode)
+                    val success = SmokeTestRunner().runAllTests()
+                    if (!success) {
+                        exitProcess(1)
+                    }
                 }
             """.trimIndent(),
         )
     }
 
+    @Test
+    fun runnerClassTest() {
+        generatedCode.shouldContainOnlyOnceWithDiff(
+            "public class SmokeTestRunner(private val platform: PlatformProvider = PlatformProvider.System, private val printer: Appendable = DefaultPrinter) {",
+        )
+    }
+
+    @Test
+    fun runAllTestsTest() {
+        generatedCode.shouldContainOnlyOnceWithDiff(
+            """
+                public suspend fun runAllTests(): Boolean =
+                    listOf<suspend () -> Boolean>(
+                        ::successTest,
+                        ::invalidMessageErrorTest,
+                        ::failureTest,
+                    )
+                        .map { it() }
+                        .all { it }
+            """.formatForTest(),
+        )
+    }
+
     @Test
     fun successTest() {
         generatedCode.shouldContainOnlyOnceWithDiff(
             """
-                private suspend fun successTest() {
+                private suspend fun successTest(): Boolean {
                     val tags = setOf<String>("success")
                     if ((serviceFilter.isNotEmpty() && "Test" !in serviceFilter) || tags.any { it in skipTags }) {
-                        println("ok Test SuccessTest - no error expected from service # skip")
-                        return
+                        printer.appendLine("ok Test SuccessTest - no error expected from service # skip")
+                        return true
                     }
-
-                    try {
+                
+                    return try {
                         TestClient {
                             interceptors.add(SmokeTestsInterceptor())
                             region = "eu-central-1"
@@ -118,18 +140,21 @@ class SmokeTestsRunnerGeneratorTest {
                                 }
                             )
                         }
-
+                
+                        error("Unexpectedly completed smoke test operation without throwing exception")
+                
                     } catch (exception: Exception) {
                         val success: Boolean = exception is SmokeTestsSuccessException
                         val status: String = if (success) "ok" else "not ok"
-                        println("${'$'}status Test SuccessTest - no error expected from service ")
+                        printer.appendLine("${'$'}status Test SuccessTest - no error expected from service ")
                         if (!success) {
-                            printExceptionStackTrace(exception)
-                            exitCode = 1
+                            printer.appendLine(exception.stackTraceToString().prependIndent("# "))
                         }
+                
+                        success
                     }
                 }
-            """.trimIndent(),
+            """.formatForTest(),
         )
     }
 
@@ -137,14 +162,14 @@ class SmokeTestsRunnerGeneratorTest {
     fun invalidMessageErrorTest() {
         generatedCode.shouldContainOnlyOnceWithDiff(
             """
-                private suspend fun invalidMessageErrorTest() {
+                private suspend fun invalidMessageErrorTest(): Boolean {
                     val tags = setOf<String>()
                     if ((serviceFilter.isNotEmpty() && "Test" !in serviceFilter) || tags.any { it in skipTags }) {
-                        println("ok Test InvalidMessageErrorTest - error expected from service # skip")
-                        return
+                        printer.appendLine("ok Test InvalidMessageErrorTest - error expected from service # skip")
+                        return true
                     }
                 
-                    try {
+                    return try {
                         TestClient {
                         }.use { client ->
                             client.testOperation(
@@ -154,17 +179,20 @@ class SmokeTestsRunnerGeneratorTest {
                             )
                         }
                 
+                        error("Unexpectedly completed smoke test operation without throwing exception")
+                
                     } catch (exception: Exception) {
                         val success: Boolean = exception is InvalidMessageError
                         val status: String = if (success) "ok" else "not ok"
-                        println("${'$'}status Test InvalidMessageErrorTest - error expected from service ")
+                        printer.appendLine("${'$'}status Test InvalidMessageErrorTest - error expected from service ")
                         if (!success) {
-                            printExceptionStackTrace(exception)
-                            exitCode = 1
+                            printer.appendLine(exception.stackTraceToString().prependIndent("# "))
                         }
+                
+                        success
                     }
                 }
-            """.trimIndent(),
+            """.formatForTest(),
         )
     }
 
@@ -172,14 +200,14 @@ class SmokeTestsRunnerGeneratorTest {
     fun failureTest() {
         generatedCode.shouldContainOnlyOnceWithDiff(
             """
-                private suspend fun failureTest() {
+                private suspend fun failureTest(): Boolean {
                     val tags = setOf<String>()
                     if ((serviceFilter.isNotEmpty() && "Test" !in serviceFilter) || tags.any { it in skipTags }) {
-                        println("ok Test FailureTest - error expected from service # skip")
-                        return
+                        printer.appendLine("ok Test FailureTest - error expected from service # skip")
+                        return true
                     }
                 
-                    try {
+                    return try {
                         TestClient {
                             interceptors.add(SmokeTestsInterceptor())
                         }.use { client ->
@@ -190,17 +218,20 @@ class SmokeTestsRunnerGeneratorTest {
                             )
                         }
                 
+                        error("Unexpectedly completed smoke test operation without throwing exception")
+                
                     } catch (exception: Exception) {
                         val success: Boolean = exception is SmokeTestsFailureException
                         val status: String = if (success) "ok" else "not ok"
-                        println("${'$'}status Test FailureTest - error expected from service ")
+                        printer.appendLine("${'$'}status Test FailureTest - error expected from service ")
                         if (!success) {
-                            printExceptionStackTrace(exception)
-                            exitCode = 1
+                            printer.appendLine(exception.stackTraceToString().prependIndent("# "))
                         }
+                
+                        success
                     }
                 }
-            """.trimIndent(),
+            """.formatForTest(),
         )
     }
 
diff --git a/runtime/runtime-core/api/runtime-core.api b/runtime/runtime-core/api/runtime-core.api
index 3c8fbfa2bd..21b70b9b5c 100644
--- a/runtime/runtime-core/api/runtime-core.api
+++ b/runtime/runtime-core/api/runtime-core.api
@@ -2093,6 +2093,7 @@ public final class aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctionsJVMKt
 }
 
 public final class aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctionsKt {
+	public static final fun getDefaultPrinter ()Ljava/lang/Appendable;
 	public static final fun printExceptionStackTrace (Ljava/lang/Exception;)V
 }
 
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctions.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctions.kt
index 682817193d..3da3bb8c23 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctions.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctions.kt
@@ -15,7 +15,21 @@ public expect fun exitProcess(status: Int): Nothing
  * #	at executors.JavaRunnerExecutor$Companion.main(JavaRunnerExecutor.kt:27)
  * #	at executors.JavaRunnerExecutor.main(JavaRunnerExecutor.kt)
  */
+@Deprecated(
+    message = "No longer used, target for removal in 1.5",
+    replaceWith = ReplaceWith("println(exception.stackTraceToString().prependIndent(\"#\"))"),
+    level = DeprecationLevel.WARNING,
+)
 public fun printExceptionStackTrace(exception: Exception): Unit =
     println(exception.stackTraceToString().split("\n").joinToString("\n") { "#$it" })
 
 public class SmokeTestsException(message: String) : Exception(message)
+
+/**
+ * An [Appendable] which can be used for printing test results to the console
+ */
+public val DefaultPrinter: Appendable = object : Appendable {
+    override fun append(c: Char) = this.also { print(c) }
+    override fun append(csq: CharSequence?) = this.also { print(csq) }
+    override fun append(csq: CharSequence?, start: Int, end: Int) = this.also { print(csq?.subSequence(start, end)) }
+}

From 2109a72aa7e7ffb7531f22bc4b9c31273dc0600d Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Thu, 3 Apr 2025 09:38:32 -0400
Subject: [PATCH 074/183] misc: include `aws-crt-kotlin` as a composite build
 (#1263)

---
 settings.gradle.kts | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 414df686a0..2c8d3df112 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,6 +26,40 @@ dependencyResolutionManagement {
     }
 }
 
+// TODO This is largely shared with aws-sdk-kotlin, consider commonizing
+// Set up a sibling directory aws-crt-kotlin as a composite build, if it exists.
+// Allows overrides via local.properties:
+// compositeProjects=~/repos/aws-crt-kotlin,/tmp/some/other/thing,../../another/project
+val compositeProjectList = try {
+    val localProperties = java.util.Properties().also {
+        it.load(File(rootProject.projectDir, "local.properties").inputStream())
+    }
+    val compositeProjects = localProperties.getProperty("compositeProjects") ?: "../aws-crt-kotlin"
+
+    val compositeProjectPaths = compositeProjects.split(",")
+        .map { it.replaceFirst("^~".toRegex(), System.getProperty("user.home")) } // expand ~ to user's home directory
+        .filter { it.isNotBlank() }
+        .map { file(it) }
+
+    compositeProjectPaths.also {
+        if (it.isNotEmpty()) {
+            println("Adding composite build projects from local.properties: ${compositeProjectPaths.joinToString { it.name }}")
+        }
+    }
+} catch (_: Throwable) {
+    logger.error("Could not load composite project paths from local.properties")
+    listOf(file("../aws-crt-kotlin"))
+}
+
+compositeProjectList.forEach {
+    if (it.exists()) {
+        println("Including build '$it'")
+        includeBuild(it)
+    } else {
+        println("Ignoring invalid build directory '$it'")
+    }
+}
+
 rootProject.name = "smithy-kotlin"
 
 include(":dokka-smithy")

From b092fd6f58b989a0eb9609c35049f01c3b5a5884 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 4 Apr 2025 15:29:31 +0000
Subject: [PATCH 075/183] chore: release 1.4.12

---
 CHANGELOG.md      | 2 ++
 gradle.properties | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbcfddf75f..8de3e37c29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.4.12] - 04/04/2025
+
 ## [1.4.11] - 03/14/2025
 
 ## [1.4.10] - 03/06/2025
diff --git a/gradle.properties b/gradle.properties
index dff2f2c264..b8edb593fd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.12-SNAPSHOT
+sdkVersion=1.4.12
 
 # codegen
-codegenVersion=0.34.12-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.12
\ No newline at end of file

From ce7c62d650f1b6841eaa24e3934a08b228596da2 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 4 Apr 2025 15:29:32 +0000
Subject: [PATCH 076/183] chore: bump snapshot version to 1.4.13-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index b8edb593fd..1cbc070656 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.12
+sdkVersion=1.4.13-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.12
\ No newline at end of file
+codegenVersion=0.34.13-SNAPSHOT
\ No newline at end of file

From fc3837b346cbde06faadcf09c198089a82f31920 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Wed, 9 Apr 2025 15:49:13 -0400
Subject: [PATCH 077/183] misc: prepare codegen packages for internal import
 (#1266)

---
 .brazil.json                                  | 25 ++++++++++++++-----
 .../build.gradle.kts                          |  6 +----
 gradle/libs.versions.toml                     |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.brazil.json b/.brazil.json
index 56055e11d1..0908ffedb4 100644
--- a/.brazil.json
+++ b/.brazil.json
@@ -11,19 +11,31 @@
     "org.slf4j:slf4j-api:2.*": "Maven-org-slf4j_slf4j-api-2.x",
     "aws.sdk.kotlin.crt:aws-crt-kotlin:0.9.*": "AwsCrtKotlin-0.9.x",
     "aws.sdk.kotlin.crt:aws-crt-kotlin:0.8.*": "AwsCrtKotlin-0.8.x",
-    "com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x"
+    "com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x",
+
+    "software.amazon.smithy:smithy-aws-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-traits-1.x",
+    "software.amazon.smithy:smithy-aws-iam-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-iam-traits-1.x",
+    "software.amazon.smithy:smithy-aws-cloudformation-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-cloudformation-traits-1.x",
+    "software.amazon.smithy:smithy-protocol-test-traits:1.*": "Maven-software-amazon-smithy_smithy-protocol-test-traits-1.x",
+    "software.amazon.smithy:smithy-protocol-traits:1.*": "Maven-software-amazon-smithy_smithy-protocol-traits-1.x",
+    "software.amazon.smithy:smithy-aws-endpoints:1.*": "Maven-software-amazon-smithy_smithy-aws-endpoints-1.x",
+    "software.amazon.smithy:smithy-codegen-core:1.*": "Maven-software-amazon-smithy_smithy-codegen-core-1.x",
+    "software.amazon.smithy:smithy-waiters:1.*": "Maven-software-amazon-smithy_smithy-waiters-1.x",
+    "software.amazon.smithy:smithy-rules-engine:1.*": "Maven-software-amazon-smithy_smithy-rules-engine-1.x",
+    "software.amazon.smithy:smithy-smoke-test-traits:1.*": "Maven-software-amazon-smithy_smithy-smoke-test-traits-1.x",
+    "org.jsoup:jsoup:1.19.*": "Maven-jsoup-1.19.x"
   },
   "packageHandlingRules": {
     "versioning": {
       "defaultVersionLayout": "{MAJOR}.0.x",
       "overrides": {
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "{MAJOR}.{MINOR}.x",
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils": "{MAJOR}.{MINOR}.x"
+        "software.amazon.smithy.kotlin:smithy-aws-kotlin-codegen": "{MAJOR}.x",
+        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "{MAJOR}.x"
       }
     },
     "rename": {
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "SmithyKotlinCodegen",
-        "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils": "SmithyKotlinCodegenTestUtils"
+        "software.amazon.smithy.kotlin:smithy-aws-kotlin-codegen": "AwsSmithyAwsKotlinCodegen",
+        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "AwsSmithyKotlinCodegen"
     },
     "ignore": [
       "aws.smithy.kotlin:http-test",
@@ -31,7 +43,8 @@
       "aws.smithy.kotlin:telemetry-provider-micrometer",
       "aws.smithy.kotlin:testing",
       "aws.smithy.kotlin:bom",
-      "aws.smithy.kotlin:version-catalog"
+      "aws.smithy.kotlin:version-catalog",
+      "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils"
     ],
     "resolvesConflictDependencies": {
       "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": [
diff --git a/codegen/smithy-aws-kotlin-codegen/build.gradle.kts b/codegen/smithy-aws-kotlin-codegen/build.gradle.kts
index 96a7442a5c..d2fdef82f4 100644
--- a/codegen/smithy-aws-kotlin-codegen/build.gradle.kts
+++ b/codegen/smithy-aws-kotlin-codegen/build.gradle.kts
@@ -13,15 +13,11 @@ plugins {
 }
 
 val codegenVersion: String by project
-description = "Codegen support for AWS protocols"
+description = "Smithy codegen support for AWS protocols"
 group = "software.amazon.smithy.kotlin"
 version = codegenVersion
 
-val sdkVersion: String by project
-
 dependencies {
-
-    implementation(libs.kotlin.stdlib.jdk8)
     api(project(":codegen:smithy-kotlin-codegen"))
 
     api(libs.smithy.aws.traits)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c3e00661d1..f8871199a4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -30,7 +30,7 @@ kotlinx-serialization-version = "1.7.3"
 docker-java-version = "3.4.0"
 ktor-version = "3.1.1"
 kaml-version = "0.55.0"
-jsoup-version = "1.18.1"
+jsoup-version = "1.19.1"
 
 [libraries]
 aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" }

From a5e1874f7233f4e1d160d0a549cc7f0f889f3a77 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 10 Apr 2025 16:06:16 +0000
Subject: [PATCH 078/183] chore: release 1.4.13

---
 CHANGELOG.md      | 2 ++
 gradle.properties | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8de3e37c29..f44b2726cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.4.13] - 04/10/2025
+
 ## [1.4.12] - 04/04/2025
 
 ## [1.4.11] - 03/14/2025
diff --git a/gradle.properties b/gradle.properties
index 1cbc070656..dbd0bdb155 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.13-SNAPSHOT
+sdkVersion=1.4.13
 
 # codegen
-codegenVersion=0.34.13-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.13
\ No newline at end of file

From f6e959caa2d08d7984822d1aa02d9288ab3e9ae2 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 10 Apr 2025 16:06:18 +0000
Subject: [PATCH 079/183] chore: bump snapshot version to 1.4.14-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index dbd0bdb155..3a05b65be2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.13
+sdkVersion=1.4.14-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.13
\ No newline at end of file
+codegenVersion=0.34.14-SNAPSHOT
\ No newline at end of file

From 9621ad1da5bac4f14339ec342ab2e91f1b387499 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Fri, 11 Apr 2025 16:43:18 -0400
Subject: [PATCH 080/183] misc: use aws-kotlin-repo-tools show-results action
 (#1268)

---
 .github/workflows/artifact-size-metrics.yml | 51 +--------------------
 1 file changed, 2 insertions(+), 49 deletions(-)

diff --git a/.github/workflows/artifact-size-metrics.yml b/.github/workflows/artifact-size-metrics.yml
index d1216099ae..d690d87916 100644
--- a/.github/workflows/artifact-size-metrics.yml
+++ b/.github/workflows/artifact-size-metrics.yml
@@ -62,56 +62,9 @@ jobs:
         run: ./gradlew artifactSizeMetrics
       - name: Analyze Artifact Size Metrics
         run: ./gradlew analyzeArtifactSizeMetrics
-      - name: Show Results
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const getComments = 
-              `query { 
-                repository(owner:"${context.repo.owner}", name:"${context.repo.repo}"){
-                  pullRequest(number: ${context.issue.number}) {
-                    id
-                    comments(last:100) {
-                      nodes {
-                        id
-                        body
-                        author {
-                          login
-                        }
-                        isMinimized
-                      }
-                    }
-                  }
-                } 
-              }`
-            
-            const response = await github.graphql(getComments)
-            const comments = response.repository.pullRequest.comments.nodes
-
-            const mutations = comments
-              .filter(comment => comment.author.login == 'github-actions' && !comment.isMinimized && comment.body.startsWith('Affected Artifacts'))
-              .map(comment =>
-                github.graphql(
-                  `mutation {
-                    minimizeComment(input:{subjectId:"${comment.id}", classifier:OUTDATED}){
-                      clientMutationId
-                    }
-                  }`
-                )
-              )
-            await Promise.all(mutations)
 
-            const fs = require('node:fs')
-            const comment = fs.readFileSync('build/reports/metrics/artifact-analysis.md', 'utf8')
-
-            const writeComment = 
-              `mutation {
-                addComment(input:{body:"""${comment}""", subjectId:"${response.repository.pullRequest.id}"}){
-                  clientMutationId
-                }
-              }`
-            
-            await github.graphql(writeComment)
+      - name: Show Results
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/artifact-size-metrics/show-results@main
 
       - name: Evaluate
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'acknowledge-artifact-size-increase') }}

From 286474a1f711c6fb8bbf9c77de926336d0cdcb37 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Mon, 14 Apr 2025 08:08:53 -0700
Subject: [PATCH 081/183] chore: upgrade aws-kotlin-repo-tools (#1270)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f8871199a4..cc55baed5b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin-version = "2.1.0"
 dokka-version = "1.9.10"
 
-aws-kotlin-repo-tools-version = "0.4.20"
+aws-kotlin-repo-tools-version = "0.4.22"
 
 # libs
 coroutines-version = "1.9.0"

From 44d19cdd328d955efa05ef0398c46b050723f1af Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Mon, 14 Apr 2025 17:35:00 -0400
Subject: [PATCH 082/183] misc: add lineSeparator to Filesystem (#1267)

---
 runtime/runtime-core/api/runtime-core.api                | 4 ++++
 .../src/aws/smithy/kotlin/runtime/util/Platform.kt       | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/runtime/runtime-core/api/runtime-core.api b/runtime/runtime-core/api/runtime-core.api
index 21b70b9b5c..fa4c1d2d2e 100644
--- a/runtime/runtime-core/api/runtime-core.api
+++ b/runtime/runtime-core/api/runtime-core.api
@@ -2392,6 +2392,10 @@ public final class aws/smithy/kotlin/runtime/util/OsFamily : java/lang/Enum {
 public abstract interface class aws/smithy/kotlin/runtime/util/PlatformEnvironProvider : aws/smithy/kotlin/runtime/util/EnvironmentProvider, aws/smithy/kotlin/runtime/util/PropertyProvider {
 }
 
+public final class aws/smithy/kotlin/runtime/util/PlatformKt {
+	public static final fun getLineSeparator (Laws/smithy/kotlin/runtime/util/OperatingSystem;)Ljava/lang/String;
+}
+
 public abstract interface class aws/smithy/kotlin/runtime/util/PlatformProvider : aws/smithy/kotlin/runtime/util/Filesystem, aws/smithy/kotlin/runtime/util/PlatformEnvironProvider {
 	public static final field Companion Laws/smithy/kotlin/runtime/util/PlatformProvider$Companion;
 	public abstract fun isAndroid ()Z
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/Platform.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/Platform.kt
index 684949943a..610a7b3405 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/Platform.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/util/Platform.kt
@@ -52,6 +52,15 @@ internal expect object SystemDefaultProvider : PlatformProvider {
 
 public data class OperatingSystem(val family: OsFamily, val version: String?)
 
+/**
+ * The string which represents a line separator on this file system. For example, on Windows, this is CRLF.
+ */
+public val OperatingSystem.lineSeparator: String
+    get() = when {
+        family == OsFamily.Windows -> "\r\n"
+        else -> "\n"
+    }
+
 public enum class OsFamily {
     Linux,
     MacOs,

From b56b9f2ab4d6441ca86fa0ad71d0849332b5847b Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Wed, 16 Apr 2025 08:37:38 -0700
Subject: [PATCH 083/183] feat: release readiness check (#1264)

---
 .github/workflows/release-readiness.yml | 27 +++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/release-readiness.yml

diff --git a/.github/workflows/release-readiness.yml b/.github/workflows/release-readiness.yml
new file mode 100644
index 0000000000..25ec507b50
--- /dev/null
+++ b/.github/workflows/release-readiness.yml
@@ -0,0 +1,27 @@
+name: Release readiness (snapshot dependency)
+
+# Makes sure that we aren't relying on SNAPSHOT/dev versions of aws-crt-kotlin before merging
+# Otherwise we could forget because the rest of CI is masking it
+
+on:
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  release-readiness:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Configure Gradle
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/configure-gradle@main
+
+      - name: Build smithy-kotlin
+        run: ./gradlew test jvmTest
+
+      - name: Emit error message
+        if: ${{ failure() }}
+        run: |
+          echo "::error ::Build failed. Did you forget to release aws-crt-kotlin and bump the dependency version?"
+          exit 1

From 57251e15ac518295b8b7749b96c26ebf670d1dc3 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Wed, 16 Apr 2025 12:09:13 -0400
Subject: [PATCH 084/183] misc: add 1.x JSON configuration (#1275)

---
 .brazil-1.x.json | 66 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 .brazil-1.x.json

diff --git a/.brazil-1.x.json b/.brazil-1.x.json
new file mode 100644
index 0000000000..45e6b2e251
--- /dev/null
+++ b/.brazil-1.x.json
@@ -0,0 +1,66 @@
+{
+  "dependencies": {
+    "org.jetbrains.kotlin:kotlin-stdlib:2.*": "KotlinStdlib-2.x",
+    "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": "KotlinxCoroutinesCoreJvm-1.x",
+
+    "com.squareup.okhttp3:okhttp-coroutines:5.*": "OkHttp3Coroutines-5.x",
+    "com.squareup.okhttp3:okhttp:5.*": "OkHttp3-5.x",
+    "com.squareup.okio:okio-jvm:3.*": "OkioJvm-3.x",
+    "io.opentelemetry:opentelemetry-api:1.*": "Maven-io-opentelemetry_opentelemetry-api-1.x",
+    "io.opentelemetry:opentelemetry-extension-kotlin:1.*": "Maven-io-opentelemetry_opentelemetry-extension-kotlin-1.x",
+    "org.slf4j:slf4j-api:2.*": "Maven-org-slf4j_slf4j-api-2.x",
+    "aws.sdk.kotlin.crt:aws-crt-kotlin:0.9.*": "AwsCrtKotlin-0.9.x",
+    "aws.sdk.kotlin.crt:aws-crt-kotlin:0.8.*": "AwsCrtKotlin-0.8.x",
+    "com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x",
+
+    "software.amazon.smithy:smithy-aws-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-traits-1.x",
+    "software.amazon.smithy:smithy-aws-iam-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-iam-traits-1.x",
+    "software.amazon.smithy:smithy-aws-cloudformation-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-cloudformation-traits-1.x",
+    "software.amazon.smithy:smithy-protocol-test-traits:1.*": "Maven-software-amazon-smithy_smithy-protocol-test-traits-1.x",
+    "software.amazon.smithy:smithy-protocol-traits:1.*": "Maven-software-amazon-smithy_smithy-protocol-traits-1.x",
+    "software.amazon.smithy:smithy-aws-endpoints:1.*": "Maven-software-amazon-smithy_smithy-aws-endpoints-1.x",
+    "software.amazon.smithy:smithy-codegen-core:1.*": "Maven-software-amazon-smithy_smithy-codegen-core-1.x",
+    "software.amazon.smithy:smithy-waiters:1.*": "Maven-software-amazon-smithy_smithy-waiters-1.x",
+    "software.amazon.smithy:smithy-rules-engine:1.*": "Maven-software-amazon-smithy_smithy-rules-engine-1.x",
+    "software.amazon.smithy:smithy-smoke-test-traits:1.*": "Maven-software-amazon-smithy_smithy-smoke-test-traits-1.x",
+    "org.jsoup:jsoup:1.19.*": "Maven-jsoup-1.19.x"
+  },
+  "packageHandlingRules": {
+    "versioning": {
+      "defaultVersionLayout": "{MAJOR}.x"
+    },
+    "rename": {
+        "software.amazon.smithy.kotlin:smithy-aws-kotlin-codegen": "AwsSmithyAwsKotlinCodegen",
+        "software.amazon.smithy.kotlin:smithy-kotlin-codegen": "AwsSmithyKotlinCodegen"
+    },
+    "ignore": [
+      "aws.smithy.kotlin:http-test",
+      "aws.smithy.kotlin:smithy-test",
+      "aws.smithy.kotlin:telemetry-provider-micrometer",
+      "aws.smithy.kotlin:testing",
+      "aws.smithy.kotlin:bom",
+      "aws.smithy.kotlin:version-catalog",
+      "software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils"
+    ],
+    "resolvesConflictDependencies": {
+      "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": [
+        "KotlinxCoroutinesCoreJvm-1.x"
+      ],
+      "com.squareup.okhttp3:okhttp-coroutines:5.*": [
+        "KotlinStdlib-2.x",
+        "KotlinxCoroutinesCoreJvm-1.x",
+        "KotlinStdlibJdk7-2.x",
+        "KotlinStdlibJdk8-2.x"
+      ],
+      "com.squareup.okhttp3:okhttp:5.*": [
+        "KotlinStdlib-2.x"
+      ],
+      "com.squareup.okio:okio-jvm:3.*": [
+        "KotlinStdlib-2.x"
+      ],
+      "com.squareup.okhttp3:okhttp:4.*": [
+        "OkHttp3-4.x"
+      ]
+    }
+  }
+}

From 875e13372225bb5fb28a3d804544c811da921d22 Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Wed, 16 Apr 2025 09:13:36 -0700
Subject: [PATCH 085/183] fix: merge main workflow credentials (#1274)

---
 .github/workflows/merge-main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
index 1b354b2ad7..db1df3a142 100644
--- a/.github/workflows/merge-main.yml
+++ b/.github/workflows/merge-main.yml
@@ -11,4 +11,5 @@ jobs:
       - name: Merge main
         uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@main
         with:
+          ci-user-pat: ${{ secrets.CI_USER_PAT }}
           exempt-branches: # Add any if required
\ No newline at end of file

From 4672748c6a983307f263fba92296e098bb655068 Mon Sep 17 00:00:00 2001
From: Xinsong Cui <xicu@amazon.com>
Date: Fri, 18 Apr 2025 12:31:07 -0400
Subject: [PATCH 086/183] feat: add service protocol benchmarks (#1271)

* add protocol benchmarks

* lint
---
 .../telemetry-api/api/telemetry-api.api             |  2 ++
 .../kotlin/runtime/telemetry/metrics/Histogram.kt   | 13 +++++++++++++
 runtime/protocol/http-client/api/http-client.api    |  2 ++
 .../interceptors/OperationTelemetryInterceptor.kt   |  9 +++++++++
 .../runtime/http/operation/OperationMetrics.kt      |  2 ++
 5 files changed, 28 insertions(+)

diff --git a/runtime/observability/telemetry-api/api/telemetry-api.api b/runtime/observability/telemetry-api/api/telemetry-api.api
index cf14c4c7c0..470061210b 100644
--- a/runtime/observability/telemetry-api/api/telemetry-api.api
+++ b/runtime/observability/telemetry-api/api/telemetry-api.api
@@ -298,6 +298,8 @@ public final class aws/smithy/kotlin/runtime/telemetry/metrics/Histogram$Default
 public final class aws/smithy/kotlin/runtime/telemetry/metrics/HistogramKt {
 	public static final fun measureSeconds (Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;Laws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/context/Context;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
 	public static synthetic fun measureSeconds$default (Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;Laws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/context/Context;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun recordPayloadSize (Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;Ljava/lang/Long;Laws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/context/Context;)V
+	public static synthetic fun recordPayloadSize$default (Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;Ljava/lang/Long;Laws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/context/Context;ILjava/lang/Object;)V
 	public static final fun recordSeconds-dWUq8MI (Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;JLaws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/context/Context;)V
 	public static synthetic fun recordSeconds-dWUq8MI$default (Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;JLaws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/context/Context;ILjava/lang/Object;)V
 }
diff --git a/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/metrics/Histogram.kt b/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/metrics/Histogram.kt
index e9e46a466a..71aa18c95d 100644
--- a/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/metrics/Histogram.kt
+++ b/runtime/observability/telemetry-api/common/src/aws/smithy/kotlin/runtime/telemetry/metrics/Histogram.kt
@@ -67,3 +67,16 @@ public inline fun <T> DoubleHistogram.measureSeconds(attributes: Attributes = em
     recordSeconds(tv.duration, attributes, context)
     return tv.value
 }
+
+/**
+ * Records the size of a payload in bytes to this histogram.
+ *
+ * @param value The payload size in bytes, or null if no payload
+ * @param attributes attributes to associate with this measurement
+ * @param context (Optional) trace context to associate with this measurement
+ */
+@InternalApi
+public fun DoubleHistogram.recordPayloadSize(value: Long?, attributes: Attributes = emptyAttributes(), context: Context? = null) {
+    val bytes = value?.toDouble() ?: 0.0
+    record(bytes, attributes, context)
+}
diff --git a/runtime/protocol/http-client/api/http-client.api b/runtime/protocol/http-client/api/http-client.api
index e8527c2c2b..9a752b6788 100644
--- a/runtime/protocol/http-client/api/http-client.api
+++ b/runtime/protocol/http-client/api/http-client.api
@@ -601,8 +601,10 @@ public final class aws/smithy/kotlin/runtime/http/operation/OperationMetrics {
 	public fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/telemetry/TelemetryProvider;)V
 	public final fun getDeserializationDuration ()Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;
 	public final fun getProvider ()Laws/smithy/kotlin/runtime/telemetry/TelemetryProvider;
+	public final fun getRequestPayloadSize ()Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;
 	public final fun getResolveEndpointDuration ()Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;
 	public final fun getResolveIdentityDuration ()Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;
+	public final fun getResponsePayloadSize ()Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;
 	public final fun getRpcAttemptDuration ()Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;
 	public final fun getRpcAttemptOverheadDuration ()Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;
 	public final fun getRpcAttempts ()Laws/smithy/kotlin/runtime/telemetry/metrics/MonotonicCounter;
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/OperationTelemetryInterceptor.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/OperationTelemetryInterceptor.kt
index ab33776a31..0bbc8d2323 100644
--- a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/OperationTelemetryInterceptor.kt
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/OperationTelemetryInterceptor.kt
@@ -17,6 +17,7 @@ import aws.smithy.kotlin.runtime.http.engine.EngineAttributes
 import aws.smithy.kotlin.runtime.http.operation.OperationMetrics
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
 import aws.smithy.kotlin.runtime.http.response.HttpResponse
+import aws.smithy.kotlin.runtime.telemetry.metrics.recordPayloadSize
 import aws.smithy.kotlin.runtime.telemetry.metrics.recordSeconds
 import kotlin.time.TimeMark
 import kotlin.time.TimeSource
@@ -105,4 +106,12 @@ internal class OperationTelemetryInterceptor(
     override fun readBeforeAttempt(context: ProtocolRequestInterceptorContext<Any, HttpRequest>) {
         attemptStart = timeSource.markNow()
     }
+
+    override fun readBeforeTransmit(context: ProtocolRequestInterceptorContext<Any, HttpRequest>) {
+        metrics.requestPayloadSize.recordPayloadSize(context.protocolRequest.body.contentLength)
+    }
+
+    override fun readAfterTransmit(context: ProtocolResponseInterceptorContext<Any, HttpRequest, HttpResponse>) {
+        metrics.responsePayloadSize.recordPayloadSize(context.protocolResponse.body.contentLength)
+    }
 }
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/OperationMetrics.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/OperationMetrics.kt
index 8c3dcaa881..351c4a7d80 100644
--- a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/OperationMetrics.kt
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/OperationMetrics.kt
@@ -37,4 +37,6 @@ public class OperationMetrics(
     public val resolveEndpointDuration: DoubleHistogram = meter.createDoubleHistogram("smithy.client.call.resolve_endpoint_duration", "s", "The time it takes to resolve an endpoint for a request")
     public val resolveIdentityDuration: DoubleHistogram = meter.createDoubleHistogram("smithy.client.call.auth.resolve_identity_duration", "s", "The time it takes to resolve an identity for signing a request")
     public val signingDuration: DoubleHistogram = meter.createDoubleHistogram("smithy.client.call.auth.signing_duration", "s", "The time it takes to sign a request")
+    public val requestPayloadSize: DoubleHistogram = meter.createDoubleHistogram("smithy.client.call.request_payload_size", "bytes", "The payload size of a request")
+    public val responsePayloadSize: DoubleHistogram = meter.createDoubleHistogram("smithy.client.call.response_payload_size", "bytes", "The payload size of a response")
 }

From 82a3004fb801ddac8bd8daf06d0ffb7896ba39cd Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 18 Apr 2025 18:10:47 +0000
Subject: [PATCH 087/183] chore: release 1.4.14

---
 CHANGELOG.md      | 2 ++
 gradle.properties | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f44b2726cf..b39650e2f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.4.14] - 04/18/2025
+
 ## [1.4.13] - 04/10/2025
 
 ## [1.4.12] - 04/04/2025
diff --git a/gradle.properties b/gradle.properties
index 3a05b65be2..0b9e7661af 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.14-SNAPSHOT
+sdkVersion=1.4.14
 
 # codegen
-codegenVersion=0.34.14-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.14
\ No newline at end of file

From a6f248a73d4a1d44106579ff215ebfc7c613c2a1 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 18 Apr 2025 18:10:49 +0000
Subject: [PATCH 088/183] chore: bump snapshot version to 1.4.15-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 0b9e7661af..01e57bd46b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.14
+sdkVersion=1.4.15-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.14
\ No newline at end of file
+codegenVersion=0.34.15-SNAPSHOT
\ No newline at end of file

From 73370d773927d7c5f66e190a8c8a2b199d7290f7 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Mon, 21 Apr 2025 10:02:37 -0700
Subject: [PATCH 089/183] fix: improve handling of expected socket exceptions
 when using connection poller (#1276)

---
 .changes/6795f037-bb98-434b-8b87-1bbe59b2edb2.json        | 8 ++++++++
 .../runtime/http/engine/okhttp/ConnectionIdleMonitor.kt   | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 .changes/6795f037-bb98-434b-8b87-1bbe59b2edb2.json

diff --git a/.changes/6795f037-bb98-434b-8b87-1bbe59b2edb2.json b/.changes/6795f037-bb98-434b-8b87-1bbe59b2edb2.json
new file mode 100644
index 0000000000..7ac1481eee
--- /dev/null
+++ b/.changes/6795f037-bb98-434b-8b87-1bbe59b2edb2.json
@@ -0,0 +1,8 @@
+{
+    "id": "6795f037-bb98-434b-8b87-1bbe59b2edb2",
+    "type": "bugfix",
+    "description": "Improve handling of excepted socket exceptions when using connection polling",
+    "issues": [
+        "awslabs/aws-sdk-kotlin#1214"
+    ]
+}
\ No newline at end of file
diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/ConnectionIdleMonitor.kt b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/ConnectionIdleMonitor.kt
index f64a6b5f8d..3f4c366f70 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/ConnectionIdleMonitor.kt
+++ b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/ConnectionIdleMonitor.kt
@@ -11,7 +11,7 @@ import okhttp3.Connection
 import okhttp3.ConnectionListener
 import okhttp3.ExperimentalOkHttpApi
 import okhttp3.internal.closeQuietly
-import okio.EOFException
+import okio.IOException
 import okio.buffer
 import okio.source
 import java.net.SocketException
@@ -96,7 +96,7 @@ internal class ConnectionIdleMonitor(val pollInterval: Duration) : ConnectionLis
                     source.readByte() // Blocking read; will take up to `pollInterval` time to complete
                 } catch (_: SocketTimeoutException) {
                     logger.trace { "Socket still alive for $conn" }
-                } catch (_: EOFException) {
+                } catch (_: IOException) {
                     logger.trace { "Socket closed remotely for $conn" }
                     socket.closeQuietly()
                     resetTimeout = false

From b7c7da1aec59ef570a0458dbbb3654c346f7ef04 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Mon, 21 Apr 2025 17:07:34 +0000
Subject: [PATCH 090/183] chore: release 1.4.15

---
 .changes/6795f037-bb98-434b-8b87-1bbe59b2edb2.json | 8 --------
 CHANGELOG.md                                       | 5 +++++
 gradle.properties                                  | 4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 .changes/6795f037-bb98-434b-8b87-1bbe59b2edb2.json

diff --git a/.changes/6795f037-bb98-434b-8b87-1bbe59b2edb2.json b/.changes/6795f037-bb98-434b-8b87-1bbe59b2edb2.json
deleted file mode 100644
index 7ac1481eee..0000000000
--- a/.changes/6795f037-bb98-434b-8b87-1bbe59b2edb2.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "id": "6795f037-bb98-434b-8b87-1bbe59b2edb2",
-    "type": "bugfix",
-    "description": "Improve handling of excepted socket exceptions when using connection polling",
-    "issues": [
-        "awslabs/aws-sdk-kotlin#1214"
-    ]
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b39650e2f3..20c6dab9f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.4.15] - 04/21/2025
+
+### Fixes
+* [#1214](https://github.com/awslabs/aws-sdk-kotlin/issues/1214) Improve handling of excepted socket exceptions when using connection polling
+
 ## [1.4.14] - 04/18/2025
 
 ## [1.4.13] - 04/10/2025
diff --git a/gradle.properties b/gradle.properties
index 01e57bd46b..1a6b3cc6bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.15-SNAPSHOT
+sdkVersion=1.4.15
 
 # codegen
-codegenVersion=0.34.15-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.15
\ No newline at end of file

From 4ba27625cecbd726b0dac9204de0e8e8dd76b5e8 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Mon, 21 Apr 2025 17:07:36 +0000
Subject: [PATCH 091/183] chore: bump snapshot version to 1.4.16-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 1a6b3cc6bd..80c9c4469d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.15
+sdkVersion=1.4.16-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.15
\ No newline at end of file
+codegenVersion=0.34.16-SNAPSHOT
\ No newline at end of file

From fddb0faf29099f96302b768c034284a9a6110f60 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Mon, 28 Apr 2025 12:04:11 -0400
Subject: [PATCH 092/183] feat: add `authSchemePreference` configuration
 (#1277)

---
 .../d40dc5d3-4c91-4e98-8420-ee465714c9bc.json |  5 ++
 .../kotlin/codegen/core/RuntimeTypes.kt       |  2 +
 .../rendering/ServiceClientConfigGenerator.kt |  1 +
 .../AuthSchemeProviderConfigIntegration.kt    |  4 +-
 .../auth/AuthSchemeProviderGenerator.kt       | 19 +++--
 .../rendering/util/RuntimeConfigProperty.kt   | 11 +++
 .../ServiceClientConfigGeneratorTest.kt       |  7 ++
 gradle/libs.versions.toml                     |  2 +-
 .../auth/http-auth-api/api/http-auth-api.api  |  3 +
 .../runtime/http/auth/HttpAuthConfig.kt       | 12 +++
 runtime/auth/http-auth/api/http-auth.api      |  4 +
 .../http/auth/ReprioritizeAuthOptions.kt      | 29 +++++++
 .../http/auth/ReprioritizeAuthOptionsTest.kt  | 79 +++++++++++++++++++
 13 files changed, 169 insertions(+), 9 deletions(-)
 create mode 100644 .changes/d40dc5d3-4c91-4e98-8420-ee465714c9bc.json
 create mode 100644 runtime/auth/http-auth/common/src/aws/smithy/kotlin/runtime/http/auth/ReprioritizeAuthOptions.kt
 create mode 100644 runtime/auth/http-auth/common/test/aws/smithy/kotlin/runtime/http/auth/ReprioritizeAuthOptionsTest.kt

diff --git a/.changes/d40dc5d3-4c91-4e98-8420-ee465714c9bc.json b/.changes/d40dc5d3-4c91-4e98-8420-ee465714c9bc.json
new file mode 100644
index 0000000000..16f686cd90
--- /dev/null
+++ b/.changes/d40dc5d3-4c91-4e98-8420-ee465714c9bc.json
@@ -0,0 +1,5 @@
+{
+    "id": "d40dc5d3-4c91-4e98-8420-ee465714c9bc",
+    "type": "feature",
+    "description": "Add `authSchemePreference` configuration"
+}
\ No newline at end of file
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
index 3d59c8d1e9..53fb49c71a 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
@@ -374,6 +374,8 @@ object RuntimeTypes {
             val BearerTokenAuthScheme = symbol("BearerTokenAuthScheme")
             val BearerTokenProviderConfig = symbol("BearerTokenProviderConfig")
             val BearerTokenProvider = symbol("BearerTokenProvider")
+
+            val reprioritizeAuthOptions = symbol("reprioritizeAuthOptions")
         }
 
         object HttpAuthAws : RuntimeTypePackage(KotlinDependency.HTTP_AUTH_AWS) {
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGenerator.kt
index 70077a0062..421f841f13 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGenerator.kt
@@ -47,6 +47,7 @@ class ServiceClientConfigGenerator(
             add(RuntimeConfigProperty.HttpClient)
             add(RuntimeConfigProperty.HttpInterceptors)
             add(RuntimeConfigProperty.AuthSchemes)
+            add(RuntimeConfigProperty.AuthSchemePreference)
         }
         if (shape.hasIdempotentTokenMember(context.model)) {
             add(RuntimeConfigProperty.IdempotencyTokenProvider)
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/auth/AuthSchemeProviderConfigIntegration.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/auth/AuthSchemeProviderConfigIntegration.kt
index 17d2e9bdb0..896742fe0b 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/auth/AuthSchemeProviderConfigIntegration.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/auth/AuthSchemeProviderConfigIntegration.kt
@@ -24,9 +24,9 @@ class AuthSchemeProviderConfigIntegration : KotlinIntegration {
                 documentation = "Configure the provider used to resolve the authentication scheme to use for a particular operation."
                 additionalImports = listOf(defaultProvider)
                 if (ctx.settings.api.enableEndpointAuthProvider) {
-                    propertyType = ConfigPropertyType.RequiredWithDefault("${defaultProvider.name}(endpointProvider)")
+                    propertyType = ConfigPropertyType.RequiredWithDefault("${defaultProvider.name}(endpointProvider, authSchemePreference)")
                 } else {
-                    propertyType = ConfigPropertyType.RequiredWithDefault("${defaultProvider.name}()")
+                    propertyType = ConfigPropertyType.RequiredWithDefault("${defaultProvider.name}(authSchemePreference = authSchemePreference)")
                 }
                 // needs to come after endpointProvider
                 order = 100
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/auth/AuthSchemeProviderGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/auth/AuthSchemeProviderGenerator.kt
index 15f26e9818..d5b0be0752 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/auth/AuthSchemeProviderGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/auth/AuthSchemeProviderGenerator.kt
@@ -14,6 +14,7 @@ import software.amazon.smithy.kotlin.codegen.model.buildSymbol
 import software.amazon.smithy.kotlin.codegen.model.knowledge.AuthIndex
 import software.amazon.smithy.kotlin.codegen.rendering.endpoints.EndpointProviderGenerator
 import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
+import software.amazon.smithy.kotlin.codegen.rendering.util.RuntimeConfigProperty
 import software.amazon.smithy.model.shapes.OperationShape
 
 /**
@@ -65,11 +66,12 @@ open class AuthSchemeProviderGenerator {
 
     private fun renderDefaultImpl(ctx: ProtocolGenerator.GenerationContext, writer: KotlinWriter) {
         writer.withBlock(
-            "#L class #T(private val endpointProvider: #T? = null) : #T {",
+            "#L class #T(private val endpointProvider: #T? = null, private val authSchemePreference: #T? = null) : #T {",
             "}",
             ctx.settings.api.visibility,
             getDefaultSymbol(ctx.settings),
             EndpointProviderGenerator.getSymbol(ctx.settings),
+            RuntimeConfigProperty.AuthSchemePreference.symbol,
             getSymbol(ctx.settings),
         ) {
             val paramsSymbol = AuthSchemeParametersGenerator.getSymbol(ctx.settings)
@@ -87,6 +89,7 @@ open class AuthSchemeProviderGenerator {
                     renderAuthOptionsListOverrideForOperation(ctx, "\"${op.id.name}\"", authHandlersForOperation, writer, op)
                 }
             }
+            write("")
 
             withBlock(
                 "private val serviceDefaults = listOf<#T>(",
@@ -102,6 +105,7 @@ open class AuthSchemeProviderGenerator {
                     write("#W,", inlineWriter)
                 }
             }
+            write("")
 
             withBlock(
                 "override suspend fun resolveAuthScheme(params: #T): List<#T> {",
@@ -109,12 +113,12 @@ open class AuthSchemeProviderGenerator {
                 paramsSymbol,
                 RuntimeTypes.Auth.Identity.AuthOption,
             ) {
-                withBlock("val modeledAuthOptions = operationOverrides.getOrElse(params.operationName) {", "}") {
-                    write("serviceDefaults")
-                }
+                write("val modeledAuthOptions = operationOverrides.getOrElse(params.operationName) { serviceDefaults }")
+                write("")
 
                 if (ctx.settings.api.enableEndpointAuthProvider) {
                     write("")
+
                     write("val endpointParams = params.endpointParameters")
                     openBlock("val endpointAuthOptions = if (endpointProvider != null && endpointParams != null) {")
                         .write("val endpoint = endpointProvider.resolveEndpoint(endpointParams)")
@@ -123,10 +127,13 @@ open class AuthSchemeProviderGenerator {
                         .write("emptyList()")
                         .closeBlock("}")
                     write("")
-                    write("return #T(modeledAuthOptions, endpointAuthOptions)", RuntimeTypes.Auth.HttpAuthAws.mergeAuthOptions)
+                    write("val authOptions = #T(modeledAuthOptions, endpointAuthOptions)", RuntimeTypes.Auth.HttpAuthAws.mergeAuthOptions)
                 } else {
-                    write("return modeledAuthOptions")
+                    write("val authOptions = modeledAuthOptions")
                 }
+                write("")
+
+                write("return authSchemePreference?.let { #T(it, authOptions) } ?: authOptions", RuntimeTypes.Auth.HttpAuth.reprioritizeAuthOptions)
             }
 
             // render any helper methods
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/util/RuntimeConfigProperty.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/util/RuntimeConfigProperty.kt
index 7e581149c9..0108838d9c 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/util/RuntimeConfigProperty.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/util/RuntimeConfigProperty.kt
@@ -174,6 +174,17 @@ object RuntimeConfigProperty {
             authentication schemes.
         """.trimIndent()
     }
+
+    val AuthSchemePreference = ConfigProperty {
+        name = "authSchemePreference"
+        symbol = KotlinTypes.Collections.list(RuntimeTypes.Auth.Identity.AuthSchemeId, isNullable = true)
+        baseClass = RuntimeTypes.Auth.HttpAuth.HttpAuthConfig
+        useNestedBuilderBaseClass()
+
+        documentation = """
+            The ordered preference of [AuthScheme] that this client will use. 
+        """.trimIndent()
+    }
 }
 
 internal val Symbol.nestedBuilder: Symbol
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGeneratorTest.kt
index 389dd96628..7f1521ee02 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGeneratorTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGeneratorTest.kt
@@ -48,6 +48,7 @@ public class Config private constructor(builder: Builder) : HttpAuthConfig, Http
 
         val expectedProps = """
     override val clientName: String = builder.clientName
+    override val authSchemePreference: kotlin.collections.List<aws.smithy.kotlin.runtime.auth.AuthSchemeId>? = builder.authSchemePreference
     override val authSchemes: kotlin.collections.List<aws.smithy.kotlin.runtime.http.auth.AuthScheme> = builder.authSchemes
     public val endpointProvider: TestEndpointProvider = requireNotNull(builder.endpointProvider) { "endpointProvider is a required configuration property" }
     override val idempotencyTokenProvider: IdempotencyTokenProvider = builder.idempotencyTokenProvider ?: IdempotencyTokenProvider.Default
@@ -65,6 +66,11 @@ public class Config private constructor(builder: Builder) : HttpAuthConfig, Http
          */
         override var clientName: String = "Test"
 
+        /**
+         * The ordered preference of [AuthScheme] that this client will use.
+         */
+        override var authSchemePreference: kotlin.collections.List<aws.smithy.kotlin.runtime.auth.AuthSchemeId>? = null
+
         /**
          * Register new or override default [AuthScheme]s configured for this client. By default, the set
          * of auth schemes configured comes from the service model. An auth scheme configured explicitly takes
@@ -239,6 +245,7 @@ public class Config private constructor(builder: Builder) {
         // Expect logMode config value to override default to LogMode.Request
         val expectedConfigValues = """
     override val clientName: String = builder.clientName
+    override val authSchemePreference: kotlin.collections.List<aws.smithy.kotlin.runtime.auth.AuthSchemeId>? = builder.authSchemePreference
     override val authSchemes: kotlin.collections.List<aws.smithy.kotlin.runtime.http.auth.AuthScheme> = builder.authSchemes
     public val customProp: Int? = builder.customProp
     public val endpointProvider: TestEndpointProvider = requireNotNull(builder.endpointProvider) { "endpointProvider is a required configuration property" }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cc55baed5b..b302022658 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin-version = "2.1.0"
 dokka-version = "1.9.10"
 
-aws-kotlin-repo-tools-version = "0.4.22"
+aws-kotlin-repo-tools-version = "0.4.23"
 
 # libs
 coroutines-version = "1.9.0"
diff --git a/runtime/auth/http-auth-api/api/http-auth-api.api b/runtime/auth/http-auth-api/api/http-auth-api.api
index 75c1bb304a..491aa48555 100644
--- a/runtime/auth/http-auth-api/api/http-auth-api.api
+++ b/runtime/auth/http-auth-api/api/http-auth-api.api
@@ -9,11 +9,14 @@ public final class aws/smithy/kotlin/runtime/http/auth/AuthScheme$DefaultImpls {
 }
 
 public abstract interface class aws/smithy/kotlin/runtime/http/auth/HttpAuthConfig {
+	public abstract fun getAuthSchemePreference ()Ljava/util/List;
 	public abstract fun getAuthSchemes ()Ljava/util/List;
 }
 
 public abstract interface class aws/smithy/kotlin/runtime/http/auth/HttpAuthConfig$Builder {
+	public abstract fun getAuthSchemePreference ()Ljava/util/List;
 	public abstract fun getAuthSchemes ()Ljava/util/List;
+	public abstract fun setAuthSchemePreference (Ljava/util/List;)V
 	public abstract fun setAuthSchemes (Ljava/util/List;)V
 }
 
diff --git a/runtime/auth/http-auth-api/common/src/aws/smithy/kotlin/runtime/http/auth/HttpAuthConfig.kt b/runtime/auth/http-auth-api/common/src/aws/smithy/kotlin/runtime/http/auth/HttpAuthConfig.kt
index a970b36969..5a17704eba 100644
--- a/runtime/auth/http-auth-api/common/src/aws/smithy/kotlin/runtime/http/auth/HttpAuthConfig.kt
+++ b/runtime/auth/http-auth-api/common/src/aws/smithy/kotlin/runtime/http/auth/HttpAuthConfig.kt
@@ -5,6 +5,8 @@
 
 package aws.smithy.kotlin.runtime.http.auth
 
+import aws.smithy.kotlin.runtime.auth.AuthSchemeId
+
 /**
  * The user-accessible configuration properties for the SDKs HTTP authentication schemes
  */
@@ -17,6 +19,11 @@ public interface HttpAuthConfig {
      */
     public val authSchemes: List<AuthScheme>
 
+    /**
+     * The ordered preference of [AuthScheme] that this client will use.
+     */
+    public val authSchemePreference: List<AuthSchemeId>?
+
     public interface Builder {
         /**
          * Register new or override default [AuthScheme]'s configured for this client. By default, the set
@@ -25,5 +32,10 @@ public interface HttpAuthConfig {
          * authentication schemes.
          */
         public var authSchemes: List<AuthScheme>
+
+        /**
+         * The ordered preference of [AuthScheme] that this client will use.
+         */
+        public var authSchemePreference: List<AuthSchemeId>?
     }
 }
diff --git a/runtime/auth/http-auth/api/http-auth.api b/runtime/auth/http-auth/api/http-auth.api
index 82934a1893..709166a395 100644
--- a/runtime/auth/http-auth/api/http-auth.api
+++ b/runtime/auth/http-auth/api/http-auth.api
@@ -59,3 +59,7 @@ public final class aws/smithy/kotlin/runtime/http/auth/BearerTokenSigner : aws/s
 public abstract interface class aws/smithy/kotlin/runtime/http/auth/CloseableBearerTokenProvider : aws/smithy/kotlin/runtime/http/auth/BearerTokenProvider, java/io/Closeable {
 }
 
+public final class aws/smithy/kotlin/runtime/http/auth/ReprioritizeAuthOptionsKt {
+	public static final fun reprioritizeAuthOptions (Ljava/util/List;Ljava/util/List;)Ljava/util/List;
+}
+
diff --git a/runtime/auth/http-auth/common/src/aws/smithy/kotlin/runtime/http/auth/ReprioritizeAuthOptions.kt b/runtime/auth/http-auth/common/src/aws/smithy/kotlin/runtime/http/auth/ReprioritizeAuthOptions.kt
new file mode 100644
index 0000000000..90122dea1f
--- /dev/null
+++ b/runtime/auth/http-auth/common/src/aws/smithy/kotlin/runtime/http/auth/ReprioritizeAuthOptions.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.http.auth
+
+import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.auth.AuthOption
+import aws.smithy.kotlin.runtime.auth.AuthSchemeId
+
+/**
+ * Re-prioritize a resolved list of auth options based on a user's preference list
+ */
+@InternalApi
+public fun reprioritizeAuthOptions(authSchemePreference: List<AuthSchemeId>, authOptions: List<AuthOption>): List<AuthOption> {
+    // add preferred candidates first
+    val preferredAuthOptions = authSchemePreference.mapNotNull { preferredSchemeId ->
+        val preferredSchemeName = preferredSchemeId.id.substringAfter('#')
+        authOptions.singleOrNull {
+            it.schemeId.id.substringAfter('#') == preferredSchemeName
+        }
+    }
+
+    // add any remaining candidates that weren't in the preference list
+    val nonPreferredAuthOptions = authOptions.filterNot { it in preferredAuthOptions }
+
+    return preferredAuthOptions + nonPreferredAuthOptions
+}
diff --git a/runtime/auth/http-auth/common/test/aws/smithy/kotlin/runtime/http/auth/ReprioritizeAuthOptionsTest.kt b/runtime/auth/http-auth/common/test/aws/smithy/kotlin/runtime/http/auth/ReprioritizeAuthOptionsTest.kt
new file mode 100644
index 0000000000..db479c10f8
--- /dev/null
+++ b/runtime/auth/http-auth/common/test/aws/smithy/kotlin/runtime/http/auth/ReprioritizeAuthOptionsTest.kt
@@ -0,0 +1,79 @@
+import aws.smithy.kotlin.runtime.auth.AuthOption
+import aws.smithy.kotlin.runtime.auth.AuthSchemeId
+import aws.smithy.kotlin.runtime.http.auth.reprioritizeAuthOptions
+import kotlinx.coroutines.test.runTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class ReprioritizeAuthOptionsTest {
+    @Test
+    fun testReprioritizeAuthOptions() = runTest {
+        val preference = listOf(AuthSchemeId.AwsSigV4Asymmetric)
+        val authOptions = listOf(
+            AuthOption(AuthSchemeId.AwsSigV4),
+            AuthOption(AuthSchemeId.AwsSigV4Asymmetric),
+        )
+
+        val expected = listOf(
+            AuthOption(AuthSchemeId.AwsSigV4Asymmetric),
+            AuthOption(AuthSchemeId.AwsSigV4),
+        )
+
+        assertEquals(expected, reprioritizeAuthOptions(preference, authOptions))
+    }
+
+    @Test
+    fun testReprioritizeAuthOptionsNoOp() = runTest {
+        val preference = listOf(AuthSchemeId.AwsSigV4)
+        val authOptions = listOf(
+            AuthOption(AuthSchemeId.AwsSigV4),
+            AuthOption(AuthSchemeId.AwsSigV4Asymmetric),
+        )
+
+        val expected = listOf(
+            AuthOption(AuthSchemeId.AwsSigV4),
+            AuthOption(AuthSchemeId.AwsSigV4Asymmetric),
+        )
+
+        assertEquals(expected, reprioritizeAuthOptions(preference, authOptions))
+    }
+
+    @Test
+    fun testReprioritizeAuthOptionsAllPreferred() = runTest {
+        val preference = listOf(AuthSchemeId.HttpDigest, AuthSchemeId.HttpBasic)
+        val authOptions = listOf(
+            AuthOption(AuthSchemeId.HttpBasic),
+            AuthOption(AuthSchemeId.HttpDigest),
+        )
+
+        val expected = listOf(
+            AuthOption(AuthSchemeId.HttpDigest),
+            AuthOption(AuthSchemeId.HttpBasic),
+        )
+
+        assertEquals(expected, reprioritizeAuthOptions(preference, authOptions))
+    }
+
+    @Test
+    fun testReprioritizeAuthOptionsNoPreference() = runTest {
+        val preference = emptyList<AuthSchemeId>()
+        val authOptions = listOf(
+            AuthOption(AuthSchemeId.AwsSigV4),
+            AuthOption(AuthSchemeId.HttpBearer),
+        )
+
+        val expected = authOptions
+
+        assertEquals(expected, reprioritizeAuthOptions(preference, authOptions))
+    }
+
+    @Test
+    fun testReprioritizeAuthOptionsEmptyAuthOptions() = runTest {
+        val preference = listOf(AuthSchemeId.AwsSigV4)
+        val authOptions = emptyList<AuthOption>()
+
+        val expected = emptyList<AuthOption>()
+
+        assertEquals(expected, reprioritizeAuthOptions(preference, authOptions))
+    }
+}

From 1c490f0017f21c43a2a7bf265b7435fb3eb2d35e Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Mon, 28 Apr 2025 16:06:48 +0000
Subject: [PATCH 093/183] chore: release 1.4.16

---
 .changes/d40dc5d3-4c91-4e98-8420-ee465714c9bc.json | 5 -----
 CHANGELOG.md                                       | 5 +++++
 gradle.properties                                  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 .changes/d40dc5d3-4c91-4e98-8420-ee465714c9bc.json

diff --git a/.changes/d40dc5d3-4c91-4e98-8420-ee465714c9bc.json b/.changes/d40dc5d3-4c91-4e98-8420-ee465714c9bc.json
deleted file mode 100644
index 16f686cd90..0000000000
--- a/.changes/d40dc5d3-4c91-4e98-8420-ee465714c9bc.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "d40dc5d3-4c91-4e98-8420-ee465714c9bc",
-    "type": "feature",
-    "description": "Add `authSchemePreference` configuration"
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20c6dab9f4..acd9fac75a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.4.16] - 04/28/2025
+
+### Features
+* Add `authSchemePreference` configuration
+
 ## [1.4.15] - 04/21/2025
 
 ### Fixes
diff --git a/gradle.properties b/gradle.properties
index 80c9c4469d..478acc4600 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.16-SNAPSHOT
+sdkVersion=1.4.16
 
 # codegen
-codegenVersion=0.34.16-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.16
\ No newline at end of file

From b6a032c97a713050455412a4f62bdee42e4a50e1 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Mon, 28 Apr 2025 16:06:50 +0000
Subject: [PATCH 094/183] chore: bump snapshot version to 1.4.17-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 478acc4600..eb0c2c9f7a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.16
+sdkVersion=1.4.17-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.16
\ No newline at end of file
+codegenVersion=0.34.17-SNAPSHOT
\ No newline at end of file

From eea5086233c707d0c4cfc1e309bf1adbb17b4955 Mon Sep 17 00:00:00 2001
From: Xinsong Cui <xicu@amazon.com>
Date: Tue, 6 May 2025 17:12:36 -0400
Subject: [PATCH 095/183] feat: add analytic to smithy kotlin api ref docs
 (#1278)

* add analytic to smithy kotlin api ref docs

* style
---
 docs/dokka-presets/templates/base.ftl         | 12 ++++++
 dokka-smithy/build.gradle.kts                 | 38 ++++++++++++++++++
 .../smithy/kotlin/dokka/DokkaSmithyTest.kt    | 39 +++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 dokka-smithy/src/test/kotlin/aws/smithy/kotlin/dokka/DokkaSmithyTest.kt

diff --git a/docs/dokka-presets/templates/base.ftl b/docs/dokka-presets/templates/base.ftl
index 81bd1f0982..e299a0c115 100644
--- a/docs/dokka-presets/templates/base.ftl
+++ b/docs/dokka-presets/templates/base.ftl
@@ -7,6 +7,8 @@
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
     <@page_metadata.display/>
+    <#-- AWS Analytics tracking script - Implements site-wide analytics and tracking functionality -->
+    <script src="https://a0.awsstatic.com/s_code/js/3.0/awshome_s_code.js"></script>
     <@template_cmd name="pathToRoot"><script>var pathToRoot = "${pathToRoot}";</script></@template_cmd>
     <script>document.documentElement.classList.replace("no-js","js");</script>
     <#-- This script doesn't need to be there but it is nice to have
@@ -24,6 +26,16 @@
             }
         }
     </script>
+    <#-- Scripts for onboarding AWS Shortbread - Manages cookie consent banners and user preferences to help ensure
+compliance with privacy regulations like GDPR -->
+    <script>var existingShortbreadEl = document.getElementById("awsccc-sb-ux-c");
+        existingShortbreadEl && existingShortbreadEl.remove();
+    </script>
+    <script src="https://prod.assets.shortbread.aws.dev/shortbread.js"></script>
+    <link href="https://prod.assets.shortbread.aws.dev/shortbread.css" rel="stylesheet">
+    <script>const shortbread = AWSCShortbread();
+        shortbread.checkForCookieConsent();
+    </script>
     <#-- Resources (scripts, stylesheets) are handled by Dokka.
     Use customStyleSheets and customAssets to change them. -->
     <@resources/>
diff --git a/dokka-smithy/build.gradle.kts b/dokka-smithy/build.gradle.kts
index 3126e0a24d..839100fa08 100644
--- a/dokka-smithy/build.gradle.kts
+++ b/dokka-smithy/build.gradle.kts
@@ -3,12 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import java.time.LocalDate
 
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 plugins {
+    alias(libs.plugins.dokka)
     alias(libs.plugins.kotlin.jvm)
 }
 
@@ -17,6 +19,16 @@ description = "Custom Dokka plugin for Kotlin Smithy SDK API docs"
 dependencies {
     compileOnly(libs.dokka.base)
     compileOnly(libs.dokka.core)
+
+    testImplementation(libs.jsoup)
+    testImplementation(libs.junit.jupiter)
+    testImplementation(libs.kotest.assertions.core.jvm)
+    testImplementation(libs.kotlin.test.junit5)
+}
+
+tasks.test {
+    useJUnitPlatform()
+    dependsOn(tasks.dokkaHtml)
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
@@ -30,3 +42,29 @@ tasks.withType<JavaCompile> {
     sourceCompatibility = JavaVersion.VERSION_1_8.toString()
     targetCompatibility = JavaVersion.VERSION_1_8.toString()
 }
+
+tasks.withType<org.jetbrains.dokka.gradle.AbstractDokkaTask>().configureEach {
+    val sdkVersion: String by project
+    moduleVersion.set(sdkVersion)
+
+    val year = LocalDate.now().year
+    val pluginConfigMap = mapOf(
+        "org.jetbrains.dokka.base.DokkaBase" to """
+                {
+                    "customStyleSheets": [
+                        "${rootProject.file("docs/dokka-presets/css/logo-styles.css").absolutePath.replace("\\", "/")}",
+                        "${rootProject.file("docs/dokka-presets/css/aws-styles.css").absolutePath.replace("\\", "/")}"
+                    ],
+                    "customAssets": [
+                        "${rootProject.file("docs/dokka-presets/assets/logo-icon.svg").absolutePath.replace("\\", "/")}",
+                        "${rootProject.file("docs/dokka-presets/assets/aws_logo_white_59x35.png").absolutePath.replace("\\", "/")}",
+                        "${rootProject.file("docs/dokka-presets/scripts/accessibility.js").absolutePath.replace("\\", "/")}"
+                    ],
+                    "footerMessage": "© $year, Amazon Web Services, Inc. or its affiliates. All rights reserved.",
+                    "separateInheritedMembers" : true,
+                    "templatesDir": "${rootProject.file("docs/dokka-presets/templates").absolutePath.replace("\\", "/")}"
+                }
+            """,
+    )
+    pluginsMapConfiguration.set(pluginConfigMap)
+}
diff --git a/dokka-smithy/src/test/kotlin/aws/smithy/kotlin/dokka/DokkaSmithyTest.kt b/dokka-smithy/src/test/kotlin/aws/smithy/kotlin/dokka/DokkaSmithyTest.kt
new file mode 100644
index 0000000000..1f539ae463
--- /dev/null
+++ b/dokka-smithy/src/test/kotlin/aws/smithy/kotlin/dokka/DokkaSmithyTest.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.dokka
+
+import org.jsoup.Jsoup
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import java.io.File
+import kotlin.test.assertTrue
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class DokkaSmithyTest {
+    @Test
+    fun testLoadScripts() {
+        val testFile = File("build/dokka/html/index.html")
+
+        assertTrue(
+            testFile.exists(),
+            "Test file does not exist: ${testFile.absolutePath}",
+        )
+
+        val document = Jsoup.parse(testFile, "UTF-8")
+
+        val expectedScripts = listOf(
+            "awshome_s_code.js",
+        )
+
+        val scripts = document.head().select("script[src]")
+
+        expectedScripts.forEach { expectedScript ->
+            assertTrue(
+                scripts.any { it.attr("src").endsWith(expectedScript) },
+                "Expected script $expectedScript not found",
+            )
+        }
+    }
+}

From 378e30ed7959a247cc3624fbc1ee41e22109a9ae Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Thu, 8 May 2025 11:45:47 -0400
Subject: [PATCH 096/183] misc: downgrade "response headers didn't contain a
 valid checksum" to INFO (#1279)

---
 .../http/interceptors/FlexibleChecksumsResponseInterceptor.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptor.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptor.kt
index eceb19e739..7086374c91 100644
--- a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptor.kt
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptor.kt
@@ -62,7 +62,7 @@ public open class FlexibleChecksumsResponseInterceptor(
 
         val checksumHeader = CHECKSUM_HEADER_VALIDATION_PRIORITY_LIST
             .firstOrNull { context.protocolResponse.headers.contains(it) } ?: run {
-            logger.warn { "Checksum validation was requested but the response headers didn't contain a valid checksum." }
+            logger.info { "Checksum validation was requested but the response headers didn't contain a valid checksum." }
             return context.protocolResponse
         }
 

From 60f55367e67092c246ed54f1ed06c752b316f898 Mon Sep 17 00:00:00 2001
From: Manuel Sugawara <sugmanue@amazon.com>
Date: Fri, 9 May 2025 09:22:26 -0700
Subject: [PATCH 097/183] style: properly indent the dependencies in the gradle
 file (#1280)

* style: properly indent the dependencies in the gradle file

* retrigger CI

---------

Co-authored-by: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
---
 .changes/14965afd-c9f4-48b0-a053-de860b81ecd2.json         | 5 +++++
 .../smithy/kotlin/codegen/rendering/GradleGenerator.kt     | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 .changes/14965afd-c9f4-48b0-a053-de860b81ecd2.json

diff --git a/.changes/14965afd-c9f4-48b0-a053-de860b81ecd2.json b/.changes/14965afd-c9f4-48b0-a053-de860b81ecd2.json
new file mode 100644
index 0000000000..5e5cc3b50d
--- /dev/null
+++ b/.changes/14965afd-c9f4-48b0-a053-de860b81ecd2.json
@@ -0,0 +1,5 @@
+{
+  "id": "14965afd-c9f4-48b0-a053-de860b81ecd2",
+  "type": "style",
+  "description": "Properly indent the dependencies in the gradle file and add some new lines to separate sections"
+}
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/GradleGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/GradleGenerator.kt
index dcaacf2f30..07f7541a06 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/GradleGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/GradleGenerator.kt
@@ -95,7 +95,7 @@ fun renderKmpGradleBuild(
             #W
         }  
         #W
-        
+
         kotlin {
             #W
             #W
@@ -165,14 +165,17 @@ fun renderJvmGradleBuild(
         plugins {
             #W
         }
+
         #W
 
         dependencies {
             #W
         }
+
         val optInAnnotations = listOf(
             #W
         )
+
         kotlin {
             #W
             sourceSets.all {
@@ -223,7 +226,7 @@ private fun renderDependencies(writer: GradleWriter, scope: Scope, isKmp: Boolea
         }
         .forEach { dependency ->
             writer.write(
-                "${dependency.config}(\"#L:#L:#L\")",
+                "${writer.indentText}${dependency.config}(\"#L:#L:#L\")",
                 dependency.group,
                 dependency.artifact,
                 dependency.version,

From 2fe1397acb35c11f6a371f899c3bec627519ca30 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Wed, 14 May 2025 09:25:39 -0500
Subject: [PATCH 098/183] misc: remove erroneous changelog (#1283)

---
 .changes/14965afd-c9f4-48b0-a053-de860b81ecd2.json | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .changes/14965afd-c9f4-48b0-a053-de860b81ecd2.json

diff --git a/.changes/14965afd-c9f4-48b0-a053-de860b81ecd2.json b/.changes/14965afd-c9f4-48b0-a053-de860b81ecd2.json
deleted file mode 100644
index 5e5cc3b50d..0000000000
--- a/.changes/14965afd-c9f4-48b0-a053-de860b81ecd2.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id": "14965afd-c9f4-48b0-a053-de860b81ecd2",
-  "type": "style",
-  "description": "Properly indent the dependencies in the gradle file and add some new lines to separate sections"
-}

From 8ac05eebee0409615a1347b2f65ddcd5573958b8 Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Wed, 21 May 2025 10:46:46 -0500
Subject: [PATCH 099/183] misc: deprecate private networks service (#1288)

---
 .../src/test/resources/sdk-ids-test-output.csv                   | 1 -
 codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids.csv     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids-test-output.csv b/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids-test-output.csv
index 9c16785c67..c17f157867 100644
--- a/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids-test-output.csv
+++ b/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids-test-output.csv
@@ -259,7 +259,6 @@ Pinpoint,Pinpoint
 Pipes,Pipes
 Polly,Polly
 Pricing,Pricing
-PrivateNetworks,PrivateNetworks
 Proton,Proton
 QLDB Session,QldbSession
 QLDB,Qldb
diff --git a/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids.csv b/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids.csv
index 369edd3e01..659f36b3a3 100644
--- a/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids.csv
+++ b/codegen/smithy-kotlin-codegen/src/test/resources/sdk-ids.csv
@@ -259,7 +259,6 @@ Pinpoint
 Pipes
 Polly
 Pricing
-PrivateNetworks
 Proton
 QLDB Session
 QLDB

From e099cdd444a3daf12cd2d78eab3d6dfb31208dbb Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Wed, 21 May 2025 10:49:59 -0500
Subject: [PATCH 100/183] misc: add release readiness to contributing.md
 (#1286)

---
 .github/workflows/release-readiness.yml |  7 ++++---
 CONTRIBUTING.md                         | 11 +++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release-readiness.yml b/.github/workflows/release-readiness.yml
index 25ec507b50..e88c6931fa 100644
--- a/.github/workflows/release-readiness.yml
+++ b/.github/workflows/release-readiness.yml
@@ -1,7 +1,7 @@
 name: Release readiness (snapshot dependency)
-
-# Makes sure that we aren't relying on SNAPSHOT/dev versions of aws-crt-kotlin before merging
-# Otherwise we could forget because the rest of CI is masking it
+description: >
+  Makes sure that we aren't relying on SNAPSHOT/dev versions of aws-crt-kotlin before merging
+  Otherwise we could forget because the rest of CI is masking it
 
 on:
   pull_request:
@@ -9,6 +9,7 @@ on:
 
 jobs:
   release-readiness:
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'ready-for-release') }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e0c24fffbf..ecd32a40ae 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -204,6 +204,17 @@ The `.api` files can be updated by running `./gradlew apiDump`.
 
 The binary compatibility validator can also be run manually using `./gradlew apiCheck`.
 
+#### Release readiness
+
+This checks for cross repo changes by looking at matching branch names across repos.
+It verifies that downstream changes are ready to be released. If your change spans
+multiple repos (aws-sdk-kotlin, smithy-kotlin, aws-crt-kotlin), the upstream
+changes must be merged and released first. For release assistance ask the team
+to run a release for you.
+
+If this check is failing, and you have cross repo changes that do not rely on
+each other, you can add the `ready-for-release` label to your PR to override it.
+
 ## Finding contributions to work on
 Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any 'help wanted' issues is a great place to start.
 

From d3089e6e1a0360f5661f0cd217a42a81fc2eab49 Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Thu, 22 May 2025 12:48:02 -0500
Subject: [PATCH 101/183] misc: repo tools version bump (#1289)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b302022658..93bc30f94e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin-version = "2.1.0"
 dokka-version = "1.9.10"
 
-aws-kotlin-repo-tools-version = "0.4.23"
+aws-kotlin-repo-tools-version = "0.4.24"
 
 # libs
 coroutines-version = "1.9.0"

From bcad3b4e065797820fc752b06cf1f641e5615d73 Mon Sep 17 00:00:00 2001
From: Manuel Sugawara <sugmanue@amazon.com>
Date: Thu, 22 May 2025 14:21:18 -0700
Subject: [PATCH 102/183] fix: add import references when needed (#1281)

---
 .changes/bbe2e7de-79d3-4aea-97d1-d5c244ede433.json  |  5 +++++
 .../kotlin/codegen/core/KotlinSymbolProvider.kt     | 13 +++++--------
 .../kotlin/codegen/rendering/ShapeValueGenerator.kt | 12 +++++-------
 .../rendering/serde/SerializeStructGenerator.kt     |  2 ++
 .../kotlin/codegen/core/SymbolProviderTest.kt       |  4 ++--
 5 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 .changes/bbe2e7de-79d3-4aea-97d1-d5c244ede433.json

diff --git a/.changes/bbe2e7de-79d3-4aea-97d1-d5c244ede433.json b/.changes/bbe2e7de-79d3-4aea-97d1-d5c244ede433.json
new file mode 100644
index 0000000000..1fd028eb57
--- /dev/null
+++ b/.changes/bbe2e7de-79d3-4aea-97d1-d5c244ede433.json
@@ -0,0 +1,5 @@
+{
+  "id": "bbe2e7de-79d3-4aea-97d1-d5c244ede433",
+  "type": "bugfix",
+  "description": "Adds import to the symbols references when needed. This issue surfaced when building the protocol tests with the latest Smithy release"
+}
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinSymbolProvider.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinSymbolProvider.kt
index cca76f0f42..8313f38c9c 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinSymbolProvider.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinSymbolProvider.kt
@@ -252,7 +252,7 @@ class KotlinSymbolProvider(private val model: Model, private val settings: Kotli
             }
 
             targetShape.isDocumentShape -> getDefaultValueForDocument(node)
-            targetShape.isTimestampShape -> getDefaultValueForTimestamp(node.asNumberNode().get())
+            targetShape.isTimestampShape -> getDefaultValueForTimestamp(this, node.asNumberNode().get())
 
             node.isNumberNode -> getDefaultValueForNumber(targetShape.type, node.toString())
             node.isArrayNode -> "listOf()"
@@ -264,17 +264,14 @@ class KotlinSymbolProvider(private val model: Model, private val settings: Kotli
         defaultValue(defaultValue)
     }
 
-    private fun getDefaultValueForTimestamp(node: NumberNode): String {
-        val instant = RuntimeTypes.Core.Instant
-
+    private fun getDefaultValueForTimestamp(builder: Symbol.Builder, node: NumberNode): String {
+        builder.addReferences(RuntimeTypes.Core.Instant)
         return if (node.isFloatingPointNumber) {
-            val fromEpochMilliseconds = RuntimeTypes.Core.fromEpochMilliseconds
-
             val value = node.value as Double
             val ms = round(value * 1e3).toLong()
-            "$fromEpochMilliseconds.invoke($instant, $ms)"
+            "Instant.fromEpochMilliseconds($ms)"
         } else {
-            "$instant.fromEpochSeconds(${node.value}, 0)"
+            "Instant.fromEpochSeconds(${node.value}, 0)"
         }
     }
 
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ShapeValueGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ShapeValueGenerator.kt
index 371fd98574..f2296b8d43 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ShapeValueGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ShapeValueGenerator.kt
@@ -6,6 +6,7 @@ package software.amazon.smithy.kotlin.codegen.rendering
 
 import software.amazon.smithy.codegen.core.CodegenException
 import software.amazon.smithy.codegen.core.SymbolProvider
+import software.amazon.smithy.codegen.core.SymbolReference
 import software.amazon.smithy.kotlin.codegen.core.*
 import software.amazon.smithy.kotlin.codegen.model.SymbolProperty
 import software.amazon.smithy.kotlin.codegen.model.hasTrait
@@ -90,9 +91,9 @@ class ShapeValueGenerator(
     private fun mapDeclaration(writer: KotlinWriter, shape: MapShape, block: () -> Unit) {
         writer.pushState()
         writer.trimTrailingSpaces(false)
-
-        val collectionGeneratorFunction = symbolProvider.toSymbol(shape).expectProperty(SymbolProperty.IMMUTABLE_COLLECTION_FUNCTION)
-
+        val mapSymbol = symbolProvider.toSymbol(shape)
+        writer.addImportReferences(mapSymbol, SymbolReference.ContextOption.USE)
+        val collectionGeneratorFunction = mapSymbol.expectProperty(SymbolProperty.IMMUTABLE_COLLECTION_FUNCTION)
         writer.writeInline("$collectionGeneratorFunction(")
             .ensureNewline()
             .indent()
@@ -109,11 +110,8 @@ class ShapeValueGenerator(
         writer.trimTrailingSpaces(false)
 
         val collectionSymbol = symbolProvider.toSymbol(shape)
+        writer.addImportReferences(collectionSymbol, SymbolReference.ContextOption.USE)
         val generatorFn = collectionSymbol.expectProperty(SymbolProperty.IMMUTABLE_COLLECTION_FUNCTION)
-
-        collectionSymbol.references.forEach {
-            writer.addImport(it.symbol)
-        }
         writer.writeInline("$generatorFn(")
             .ensureNewline()
             .indent()
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGenerator.kt
index 3cfbc0dcfe..6a3885043e 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGenerator.kt
@@ -5,6 +5,7 @@
 package software.amazon.smithy.kotlin.codegen.rendering.serde
 
 import software.amazon.smithy.codegen.core.CodegenException
+import software.amazon.smithy.codegen.core.SymbolReference
 import software.amazon.smithy.kotlin.codegen.DefaultValueSerializationMode
 import software.amazon.smithy.kotlin.codegen.core.*
 import software.amazon.smithy.kotlin.codegen.model.*
@@ -595,6 +596,7 @@ open class SerializeStructGenerator(
         val postfix = if (memberShape.hasTrait<IdempotencyTokenTrait>()) idempotencyTokenPostfix(memberShape) else ""
         val memberSymbol = ctx.symbolProvider.toSymbol(memberShape)
         val memberName = ctx.symbolProvider.toMemberName(memberShape)
+        writer.addImportReferences(memberSymbol, SymbolReference.ContextOption.USE)
         if (memberSymbol.isNullable) {
             val identifier = valueToSerializeName("it")
             val fn = serializerFn.format(memberShape, identifier)
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/SymbolProviderTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/SymbolProviderTest.kt
index df803ef25e..548a5baa77 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/SymbolProviderTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/SymbolProviderTest.kt
@@ -186,8 +186,8 @@ class SymbolProviderTest {
         "boolean,true,true",
         "bigInteger,5,5",
         "bigDecimal,9.0123456789,9.0123456789",
-        "timestamp,1684869901,'aws.smithy.kotlin.runtime.time.Instant.fromEpochSeconds(1684869901, 0)'",
-        "timestamp,1.5,'aws.smithy.kotlin.runtime.time.fromEpochMilliseconds.invoke(aws.smithy.kotlin.runtime.time.Instant, 1500)'",
+        "timestamp,1684869901,'Instant.fromEpochSeconds(1684869901, 0)'",
+        "timestamp,1.5,'Instant.fromEpochMilliseconds(1500)'",
     )
     fun `can default simple types`(typeName: String, modeledDefault: String, expectedDefault: String) {
         val model = """

From 3c0da29eadfa4463383090f76ac467b86daed737 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Tue, 3 Jun 2025 11:12:26 -0700
Subject: [PATCH 103/183] chore: add unit test for protocol selection behavior
 (#1290)

---
 .../kotlin/codegen/KotlinSettingsTest.kt      | 130 +++++++++++++++++-
 1 file changed, 124 insertions(+), 6 deletions(-)

diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettingsTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettingsTest.kt
index fc5aaf99bb..2de132c9fa 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettingsTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettingsTest.kt
@@ -5,20 +5,22 @@
 
 package software.amazon.smithy.kotlin.codegen
 
+import org.junit.jupiter.api.extension.ExtensionContext
 import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.Arguments
+import org.junit.jupiter.params.provider.ArgumentsProvider
+import org.junit.jupiter.params.provider.ArgumentsSource
 import org.junit.jupiter.params.provider.CsvSource
 import software.amazon.smithy.codegen.core.CodegenException
 import software.amazon.smithy.kotlin.codegen.test.TestModelDefault
 import software.amazon.smithy.kotlin.codegen.test.toSmithyModel
+import software.amazon.smithy.kotlin.codegen.utils.dq
 import software.amazon.smithy.model.knowledge.NullableIndex.CheckMode
+import software.amazon.smithy.model.knowledge.ServiceIndex
 import software.amazon.smithy.model.node.Node
 import software.amazon.smithy.model.shapes.ShapeId
-import java.lang.IllegalArgumentException
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
+import java.util.stream.Stream
+import kotlin.test.*
 
 class KotlinSettingsTest {
     @Test
@@ -330,4 +332,120 @@ class KotlinSettingsTest {
 
         assertEquals(expected, apiSettings.defaultValueSerializationMode)
     }
+
+    @ParameterizedTest
+    @ArgumentsSource(TestProtocolSelectionArgumentProvider::class)
+    fun testProtocolSelection(
+        protocolPriorityCsv: String,
+        serviceProtocolsCsv: String,
+        expectedProtocolName: String?,
+    ) {
+        val serviceProtocols = serviceProtocolsCsv.csvToProtocolList()
+        val serviceProtocolImports = serviceProtocols.joinToString("\n") { "use $it" }
+        val serviceProtocolTraits = serviceProtocols.joinToString("\n") { "@${it.name}" }
+        val supportedProtocols = protocolPriorityCsv.csvToProtocolList().toSet()
+        val protocolPriorityList = supportedProtocols.joinToString(", ") { it.toString().dq() }
+
+        val model = """
+            |namespace com.test
+            |
+            |$serviceProtocolImports
+            |
+            |$serviceProtocolTraits
+            |@xmlNamespace(uri: "http://test.com") // required for @awsQuery
+            |service Test {
+            |    version: "1.0.0"
+            |}
+        """.trimMargin().toSmithyModel()
+        val service = model.serviceShapes.single()
+        val serviceIndex = ServiceIndex.of(model)
+
+        val contents = """
+            {
+                "package": {
+                    "name": "name",
+                    "version": "1.0.0"
+                },
+                "api": {
+                    "protocolResolutionPriority": [ $protocolPriorityList ]
+                }
+            }
+        """.trimIndent()
+        val settings = KotlinSettings.from(model, Node.parse(contents).expectObjectNode())
+
+        val expectedProtocol = expectedProtocolName?.nameToProtocol()
+        val actualProtocol = runCatching {
+            settings.resolveServiceProtocol(serviceIndex, service, supportedProtocols)
+        }.getOrElse { null }
+
+        assertEquals(expectedProtocol, actualProtocol)
+    }
+}
+
+/**
+ * A junit [ArgumentsProvider] which supplies protocol selection parameterized test values sourced from the Smithy RPCv2
+ * CBOR Support SEP § Smithy protocol selection tests.
+ */
+class TestProtocolSelectionArgumentProvider : ArgumentsProvider {
+    companion object {
+        private const val ALL_PROTOCOLS = "rpcv2Cbor, awsJson1_0, awsJson1_1, restJson1, restXml, awsQuery, ec2Query"
+        private const val NO_CBOR = "awsJson1_0, awsJson1_1, restJson1, restXml, awsQuery, ec2Query"
+    }
+
+    override fun provideArguments(context: ExtensionContext?): Stream<out Arguments> = Stream.of(
+        Arguments.of(
+            ALL_PROTOCOLS,
+            "rpcv2Cbor, awsJson1_0",
+            "rpcv2Cbor",
+        ),
+        Arguments.of(
+            ALL_PROTOCOLS,
+            "rpcv2Cbor",
+            "rpcv2Cbor",
+        ),
+        Arguments.of(
+            ALL_PROTOCOLS,
+            "rpcv2Cbor, awsJson1_0, awsQuery",
+            "rpcv2Cbor",
+        ),
+        Arguments.of(
+            ALL_PROTOCOLS,
+            "awsJson1_0, awsQuery",
+            "awsJson1_0",
+        ),
+        Arguments.of(
+            ALL_PROTOCOLS,
+            "awsQuery",
+            "awsQuery",
+        ),
+        Arguments.of(
+            NO_CBOR,
+            "rpcv2Cbor, awsJson1_0",
+            "awsJson1_0",
+        ),
+        Arguments.of(
+            NO_CBOR,
+            "rpcv2Cbor",
+            null,
+        ),
+        Arguments.of(
+            NO_CBOR,
+            "rpcv2Cbor, awsJson1_0, awsQuery",
+            "awsJson1_0",
+        ),
+        Arguments.of(
+            NO_CBOR,
+            "awsJson1_0, awsQuery",
+            "awsJson1_0",
+        ),
+        Arguments.of(
+            NO_CBOR,
+            "awsQuery",
+            "awsQuery",
+        ),
+    )
 }
+
+private val allProtocols = ApiSettings().protocolResolutionPriority
+private fun String.nameToProtocol() = allProtocols.single { protocol -> protocol.name == this }
+private fun String.csvToProtocolList() = split(",").map(String::trim).map(String::nameToProtocol)

From 747dafb0774ab027fb0770024756f5508d7fb86d Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Wed, 4 Jun 2025 11:15:35 -0500
Subject: [PATCH 104/183] misc: repo tools version bump (#1291)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 93bc30f94e..fda89e3a23 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin-version = "2.1.0"
 dokka-version = "1.9.10"
 
-aws-kotlin-repo-tools-version = "0.4.24"
+aws-kotlin-repo-tools-version = "0.4.25"
 
 # libs
 coroutines-version = "1.9.0"

From aa36e75499f8d4af4c6017293583d95a1dd4000c Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Wed, 11 Jun 2025 15:37:55 +0000
Subject: [PATCH 105/183] chore: release 1.4.17

---
 .changes/bbe2e7de-79d3-4aea-97d1-d5c244ede433.json | 5 -----
 CHANGELOG.md                                       | 5 +++++
 gradle.properties                                  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 .changes/bbe2e7de-79d3-4aea-97d1-d5c244ede433.json

diff --git a/.changes/bbe2e7de-79d3-4aea-97d1-d5c244ede433.json b/.changes/bbe2e7de-79d3-4aea-97d1-d5c244ede433.json
deleted file mode 100644
index 1fd028eb57..0000000000
--- a/.changes/bbe2e7de-79d3-4aea-97d1-d5c244ede433.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id": "bbe2e7de-79d3-4aea-97d1-d5c244ede433",
-  "type": "bugfix",
-  "description": "Adds import to the symbols references when needed. This issue surfaced when building the protocol tests with the latest Smithy release"
-}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index acd9fac75a..fefb289c38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.4.17] - 06/11/2025
+
+### Fixes
+* Adds import to the symbols references when needed. This issue surfaced when building the protocol tests with the latest Smithy release
+
 ## [1.4.16] - 04/28/2025
 
 ### Features
diff --git a/gradle.properties b/gradle.properties
index eb0c2c9f7a..93b4870827 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.17-SNAPSHOT
+sdkVersion=1.4.17
 
 # codegen
-codegenVersion=0.34.17-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.17
\ No newline at end of file

From da208cdcb21e56d96e7c9e9c1765ac42a157520d Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Wed, 11 Jun 2025 15:37:57 +0000
Subject: [PATCH 106/183] chore: bump snapshot version to 1.4.18-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 93b4870827..cb50c5401e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.17
+sdkVersion=1.4.18-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.17
\ No newline at end of file
+codegenVersion=0.34.18-SNAPSHOT
\ No newline at end of file

From af7e5c5ba8d65525f14bdcde39969b7244e332d8 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Fri, 13 Jun 2025 11:35:17 -0400
Subject: [PATCH 107/183] misc: upgrade to Dokka 2.0.0 (#1284)

---
 .../50a9ce20-c4d7-4952-8fad-f9ffb38c9259.json |   5 +
 .editorconfig                                 |   2 +-
 build.gradle.kts                              |  62 +++-------
 buildSrc/build.gradle.kts                     |  13 +++
 buildSrc/settings.gradle.kts                  |   9 ++
 .../main/kotlin/dokka-convention.gradle.kts   |  30 +++++
 .../build.gradle.kts                          |   2 +-
 .../build.gradle.kts                          |   2 +-
 .../smithy-kotlin-codegen/build.gradle.kts    |   2 +-
 .../assets/aws_logo_white_59x35.png           | Bin 2278 -> 0 bytes
 docs/dokka-presets/assets/logo-icon.svg       |  16 +--
 docs/dokka-presets/css/aws-styles.css         | 107 ++++++++----------
 docs/dokka-presets/css/logo-styles.css        |  39 -------
 docs/dokka-presets/scripts/accessibility.js   |  82 ++------------
 docs/dokka-presets/templates/base.ftl         |  42 +++++--
 .../templates/includes/footer.ftl             |   8 --
 .../templates/includes/header.ftl             |  50 ++++----
 .../templates/includes/page_metadata.ftl      |   7 --
 .../includes/source_set_selector.ftl          |  39 ++++++-
 dokka-smithy/build.gradle.kts                 |  34 +-----
 gradle.properties                             |   6 +-
 gradle/libs.versions.toml                     |   8 +-
 runtime/build.gradle.kts                      |  20 +++-
 .../nullability-tests/build.gradle.kts        |   4 +-
 .../codegen/paginator-tests/build.gradle.kts  |   2 +-
 tests/codegen/serde-tests/build.gradle.kts    |   4 +-
 tests/codegen/waiter-tests/build.gradle.kts   |   2 +-
 27 files changed, 262 insertions(+), 335 deletions(-)
 create mode 100644 .changes/50a9ce20-c4d7-4952-8fad-f9ffb38c9259.json
 create mode 100644 buildSrc/build.gradle.kts
 create mode 100644 buildSrc/settings.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/dokka-convention.gradle.kts
 delete mode 100644 docs/dokka-presets/assets/aws_logo_white_59x35.png
 delete mode 100644 docs/dokka-presets/css/logo-styles.css
 delete mode 100644 docs/dokka-presets/templates/includes/footer.ftl
 delete mode 100644 docs/dokka-presets/templates/includes/page_metadata.ftl

diff --git a/.changes/50a9ce20-c4d7-4952-8fad-f9ffb38c9259.json b/.changes/50a9ce20-c4d7-4952-8fad-f9ffb38c9259.json
new file mode 100644
index 0000000000..9ef75de5ed
--- /dev/null
+++ b/.changes/50a9ce20-c4d7-4952-8fad-f9ffb38c9259.json
@@ -0,0 +1,5 @@
+{
+    "id": "50a9ce20-c4d7-4952-8fad-f9ffb38c9259",
+    "type": "misc",
+    "description": "Upgrade to Dokka 2.0.0"
+}
\ No newline at end of file
diff --git a/.editorconfig b/.editorconfig
index 47da0e8886..3dbc6d83a4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,4 +9,4 @@ ktlint_standard_backing-property-naming = disabled
 # enable trailing commas per JetBrains recommendation
 # (https://kotlinlang.org/docs/coding-conventions.html#trailing-commas)
 ij_kotlin_allow_trailing_comma_on_call_site = true
-ij_kotlin_allow_trailing_comma = true
\ No newline at end of file
+ij_kotlin_allow_trailing_comma = true
diff --git a/build.gradle.kts b/build.gradle.kts
index ab17214cda..bdec55641a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,13 +18,13 @@ buildscript {
 }
 
 plugins {
-    alias(libs.plugins.dokka)
+    `dokka-convention`
     alias(libs.plugins.kotlinx.binary.compatibility.validator)
+    alias(libs.plugins.aws.kotlin.repo.tools.artifactsizemetrics)
     // ensure the correct version of KGP ends up on our buildscript classpath
     // since build-plugins also has <some> version in its dependency closure
-    alias(libs.plugins.kotlin.multiplatform) apply false
-    alias(libs.plugins.kotlin.jvm) apply false
-    alias(libs.plugins.aws.kotlin.repo.tools.artifactsizemetrics)
+    id(libs.plugins.kotlin.multiplatform.get().pluginId) apply false
+    id(libs.plugins.kotlin.jvm.get().pluginId) apply false
 }
 
 artifactSizeMetrics {
@@ -40,35 +40,9 @@ val testJavaVersion = typedProp<String>("test.java.version")?.let {
 }
 
 allprojects {
-    tasks.withType<org.jetbrains.dokka.gradle.AbstractDokkaTask>().configureEach {
-        val sdkVersion: String by project
-        moduleVersion.set(sdkVersion)
-
-        val year = java.time.LocalDate.now().year
-        val pluginConfigMap = mapOf(
-            "org.jetbrains.dokka.base.DokkaBase" to """
-                {
-                    "customStyleSheets": [
-                        "${rootProject.file("docs/dokka-presets/css/logo-styles.css")}",
-                        "${rootProject.file("docs/dokka-presets/css/aws-styles.css")}"
-                    ],
-                    "customAssets": [
-                        "${rootProject.file("docs/dokka-presets/assets/logo-icon.svg")}",
-                        "${rootProject.file("docs/dokka-presets/assets/aws_logo_white_59x35.png")}",
-                        "${rootProject.file("docs/dokka-presets/scripts/accessibility.js")}"
-                    ],
-                    "footerMessage": "© $year, Amazon Web Services, Inc. or its affiliates. All rights reserved.",
-                    "separateInheritedMembers" : true,
-                    "templatesDir": "${rootProject.file("docs/dokka-presets/templates")}"
-                }
-            """,
-        )
-        pluginsMapConfiguration.set(pluginConfigMap)
-    }
-
     if (rootProject.typedProp<Boolean>("kotlinWarningsAsErrors") == true) {
         tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-            kotlinOptions.allWarningsAsErrors = true
+            compilerOptions.allWarningsAsErrors = true
         }
     }
 
@@ -90,27 +64,18 @@ allprojects {
 }
 
 // configure the root multimodule docs
-tasks.dokkaHtmlMultiModule.configure {
+dokka {
     moduleName.set("Smithy Kotlin")
 
-    // Output subprojects' docs to <docs-base>/project-name/* instead of <docs-base>/path/to/project-name/*
-    // This is especially important for inter-repo linking (e.g., via externalDocumentationLink) because the
-    // package-list doesn't contain enough project path information to indicate where modules' documentation are
-    // located.
-    fileLayout.set { parent, child ->
-        parent.outputDirectory.dir(child.moduleName)
+    dokkaPublications.html {
+        includes.from(
+            rootProject.file("docs/dokka-presets/README.md"),
+        )
     }
+}
 
-    includes.from(
-        // NOTE: these get concatenated
-        rootProject.file("docs/dokka-presets/README.md"),
-    )
-
-    val excludeFromDocumentation = listOf(
-        project(":runtime:testing"),
-        project(":runtime:smithy-test"),
-    )
-    removeChildTasks(excludeFromDocumentation)
+dependencies {
+    dokka(project(":runtime"))
 }
 
 // Publishing
@@ -121,6 +86,7 @@ val lintPaths = listOf(
     "**/*.{kt,kts}",
     "!**/generated-src/**",
     "!**/smithyprojections/**",
+    "!**/build/**",
 )
 
 configureLinting(lintPaths)
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 0000000000..306b0211ac
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation(libs.dokka.gradle.plugin)
+    implementation(libs.kotlin.gradle.plugin)
+}
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
new file mode 100644
index 0000000000..62991c1ef5
--- /dev/null
+++ b/buildSrc/settings.gradle.kts
@@ -0,0 +1,9 @@
+rootProject.name = "buildSrc"
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
diff --git a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
new file mode 100644
index 0000000000..0260162ba1
--- /dev/null
+++ b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
@@ -0,0 +1,30 @@
+import kotlin.text.set
+
+plugins {
+    id("org.jetbrains.dokka")
+}
+
+dokka {
+    val sdkVersion: String by project
+    moduleVersion.set(sdkVersion)
+
+    pluginsConfiguration.html {
+        customStyleSheets.from(
+            rootProject.file("docs/dokka-presets/css/aws-styles.css"),
+        )
+
+        customAssets.from(
+            rootProject.file("docs/dokka-presets/assets/logo-icon.svg"),
+            rootProject.file("docs/dokka-presets/scripts/accessibility.js"),
+        )
+
+        templatesDir.set(rootProject.file("docs/dokka-presets/templates"))
+
+        footerMessage.set("© ${java.time.LocalDate.now().year}, Amazon Web Services, Inc. or its affiliates. All rights reserved.")
+        separateInheritedMembers.set(true)
+    }
+}
+
+dependencies {
+    dokkaPlugin(project(":dokka-smithy"))
+}
diff --git a/codegen/smithy-aws-kotlin-codegen/build.gradle.kts b/codegen/smithy-aws-kotlin-codegen/build.gradle.kts
index d2fdef82f4..dddde158e8 100644
--- a/codegen/smithy-aws-kotlin-codegen/build.gradle.kts
+++ b/codegen/smithy-aws-kotlin-codegen/build.gradle.kts
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     jacoco
     `maven-publish`
 }
diff --git a/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts b/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts
index 3bd714fb60..b24f9ac8b2 100644
--- a/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts
+++ b/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     jacoco
     `maven-publish`
 }
diff --git a/codegen/smithy-kotlin-codegen/build.gradle.kts b/codegen/smithy-kotlin-codegen/build.gradle.kts
index 0381edb03b..0ac6c27c6a 100644
--- a/codegen/smithy-kotlin-codegen/build.gradle.kts
+++ b/codegen/smithy-kotlin-codegen/build.gradle.kts
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     jacoco
     `maven-publish`
 }
diff --git a/docs/dokka-presets/assets/aws_logo_white_59x35.png b/docs/dokka-presets/assets/aws_logo_white_59x35.png
deleted file mode 100644
index a35f38afd376e2dd813515b371ab0c0e389aacf3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2278
zcmV<C2pRW@P)<h;3K|Lk000e1NJLTq0027x001Kh1^@s6Dxh*j00004XF*Lt006O%
z3;baP000P`Nkl<ZXa((=dvIMv8Nkopd(xydNOKcx(b{Hcff>pr!~!X$wnRJH075{(
zDO!AtRi}_Jj-!s^h*+P0=-51%=~QqAh7MB@N_jZIL`rLIV+(Bv;AkH~OUk3<wuPn%
z&An&+ednG%XV1;OZ7OQ5x|8pIyWeZ~+x_<2-4o>$DO&4#$X5Zgff>L=;9X!JuoYOP
zlzIjn7Ify*_%NV>XW?%PnN|fkk(mc5;6>z~w%B16xfG2>z&PMF<n9ldRNyZF-3VL^
zoDO7xexL_<3RsJdjJbHhz%-y+YY%iR(5nz~jV0=LMmqXWhF*w~d)bm3rd?SmBW>tE
zw&b2SGSDXgk3_su<J97G>4K3j#Et0Jq5U4{0$u`g1^gcwYw)ft;7u_+gOPcETt)`!
zuaFT5G4!pGtp0&vKz}r%`}(_}Jprr%HUkGEzOFKQqcDP>1bTt*0y7H*piKofSjG;~
zK2_wv<AK8#Z*dX*Ya_l{5q(DyxhiZ~6YGb*^f5ou*Af*?MRdnOUkLmHNEY&stBrvV
z0a>flg~kAME4=jGhHfx?2H>xTOwzuf-evd(!)vze|IMO*&!Vq2^s(Z^SOtw7n|=><
zdrwX`Jg_~0MvHE$bA!qz@P?q?fOFyA4`?3^u%I<oeS%dl9io<yT|I7R1LZd?Bk!~7
zkCS928&h;GPSpBUX^~h!^+8)4U7xSV=mFdLn5lptvFgu7bv+lGthAPFJ*HC9S&Y;G
zO~B`Y&jBPLeI6jIAZgwdIYRuxs=rR<k3mzAy}BG@;R;&L`qE~_Wl|;~cW&N>+7Es<
zU-y4;T<wh7{(j$sP8%>ENJhLd)KEARco?t}gh?j;ej9=}XziWv*k<9~X7TPZJm|OQ
z>G}wDNoGkP$ej8&mfRvs|6W5k7#*4L{zxV^wm0E*0_Pa{k{F>20V{R;&W%7Lnb;1-
zIw*8D9Sub9F`c3Rbl~hCEZT1aTDUEcTWRTk%E;OnnH2C7;EhN&HYO6N{+6v1tHYF(
zy)#nQyJ=r8bR$SzRzxObn<W=>R%GG#S^OEaUErNOP5;cY_ian=tU#A@QwFXjg6xE3
z)ItnjqGKK)$IL5{Ez$RFd^!}iD{$G9M#vW&b<P@jWV<3+UCdebkg=tgAkPGa?JF%i
zms<2MA~(%yKWgO0g3(pL)c_ZvurDj2IgXw3FNln)S4cK5MeR|w4_cHkL0L2zXiLzR
zBo(ZXpQ$%ma$86^L&U;(Xp*FYOzunAM~<aZyvle*mvdg90$vqJ)yX6TyqL3LxFRSD
zMGMNa7?Yg<irsD3;l$g>$+0BPmIub<;x8H2FVrPjb<?;E5NFE(it_k5u9fxG@;`l6
zeb_iEH2dh;6$!~5R?EvIR-l~+;h`AOaT*HR4jqg@dooYglfhR6GV23uBRPgBTK237
z@lDux(<fU$^v}&|^tg-&Jc+WUrVZX~)nh9w7lJ`L4MNUYi*h@{63%j4krlcIKB2Gv
z3=URTHzGHa!4-zR+@`JvDB7%S;8>m-{8|&B<tZtpR0w|qTXX17R!^RWy?~jNGpW;G
z{vJ(T%1`sC$S+2|6m4#^$!#oWuYYT)24^B!%_PJNd^sMhJG9u*ABamawEUBeaE|pe
zqfk!T$le#1vvuscZ|v*EY{Y07l#KRr+^ByMcnrEcl>I_oZdaRtj~iMchPMpZ5<o{G
z-?ZWX(2|pADq4_{qpt<n2oy}DKbdmA%5(41Vg@9}ixw27z>uu_4)9mPbg-!42_iDS
z3c8l9bUGlXN(PVwco_Wu@;@~LCByh+odvyO)+rq1HEwQX{7BXrOie!LHFd)SIq~Pe
z!rA>D>3Lqx`HXf{BNr*|;*noCcmy{$mnAE%Rd2PWcW}3OvSNJ2vdSgh;p^jMSlP^q
zSyT19NAAM81;-k%Qe~GUT;(p}2HiY7ba>}LTl$WHwg&sl!?A3fP`=9MQrw8wBps(&
zCEYoWTXwE;E2g??+zdCV7I2k&#tcw<Ud|8W!4<R47#<#ZSUb8wDTh0)TInRqmsj7s
zC47$>rIQI~Ixe`}%jF)IF?(*=S>c}5zrL&@^Y*}Uo(^9YrgBsk^q`YW+?~3)xl5_<
z%jNt(whVOC&2(~l2?Lz%mM0dU_SNk>GVOJr^*rxhob(RoDl0>0jTf2rbd#smueh6q
zS36dF4~O+VPSRbSTKfD8M)pKwiO8Yh>~$oi8@Xi2ziL<|wa<0+?1@WzcW2tt?VfgS
zVdd7<wDvZRa#rLI+?lTOvg((F^<q1-`L-P1x(WFzpLi@aQEyZ?z3^|lS>cd6*jZPf
z^_+$5)h7Q@V7=T}l-1)L_m)#zx9yX$4lF;v4<BliPU5DjTYF@MOP2%f^%v&6+|N-M
z_1qIJ33a{?Y*#w5fyZJugcnm~?qAebo*OA`b?lr&D;p+}IMa?+7ojzW6}*JWuO4kd
z?MNmP->hoc9=?{|YOA~0(Ox$Z*_TSE&Q^`<vPX5+7~Q`-eKn`@ZM3D+qZW+gsNTU*
zw@W#CFB89)EwPu0IG~)wP$J<C=W>Z5m2mj;$~}4h>14`tylNiTlL)(7oT|mavzg?Y
zqjkn)_tW39s&v&|;*2fJs!C+us#M|=)vY~G32#i!8Y7v`y16{^zQ*92No0)e#1z7H
z6OOi5m6ttOEQ)knQ+dXDwV%;-R=4)vZbo@r&KjkGw)3a(;s1JO|AsIz80NnUD`zLc
zu$q4FPqp;+9<7^0ofl0W&K<d~rnM*bto(<ZwL9A1Q9q6E=~rma`3P|`7w6?^_?`>l
zd64K?&j5c%Sa%)E!LfAso}Df1M4Ttg>v>8~$MNY5bUM4`4CE>qynLLSK&NHwC%!8B
zZ_fkJUM0KsvoZQexV^69_MFzTbvF*9^3N-O2eEZhK6os#R{#J207*qoM6N<$f*zGx
AdH?_b

diff --git a/docs/dokka-presets/assets/logo-icon.svg b/docs/dokka-presets/assets/logo-icon.svg
index ba320e493d..7011eb7c39 100644
--- a/docs/dokka-presets/assets/logo-icon.svg
+++ b/docs/dokka-presets/assets/logo-icon.svg
@@ -1,15 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">  <image id="image0" width="16" height="16" x="0" y="0"
-    xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
-AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAkFBMVEX////9mCf9mCf9mCf9
-mCf9mCf9mCf9mCf9mCfzfCP0fiP6jyb2hSXqYyDsaCH1gSTsaSHpXyD2hSTvcSLzfSP4iSXyeiPp
-YCDzfCPzfCPpXyDpXyDzfCPzfCPpXyDpXyDzfCPzfCPpXyDpXyDzfCPzeyPpXyDpXyD9mCfzfCP7
-kyb5jSbpXyD8lif8lCf///9jOjcpAAAAKHRSTlMAUOAwwBCggPBA8PX18Ezo6EDo6Pbw8PaA8PCA
-EKCgEDDAwDBQ6OBQjKuQ+AAAAAFiS0dEAIgFHUgAAAAHdElNRQflBBwRMSsSF1nDAAAAeElEQVQY
-053PyQKCMAxF0ZS5DqgIiiggOJBI8P8/TwuFsuau+s6qAegTliXAZDv4z7H1dD3Uea7afoBTgQ8g
-V2sDm20Ikmj3GWa7Zz4oIIo6xO+ReQKKk9OZ50DEvBwgvRjIruqrt3yEotTX3CsF9WN27/P1bobX
-D4qaG2DrJKPCAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIxLTA0LTI4VDE3OjQ5OjQzKzAzOjAwXlQE
-twAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMS0wNC0yOFQxNzo0OTo0MyswMzowMC8JvAsAAAAASUVO
-RK5CYII=" />
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 51.82"><defs><style>.cls-1{fill:#df231d;}</style></defs><path class="cls-1" d="M82,51.82s0,0,0,0H16.3s0,0,0,0v-7.53l19.23-8.99s0,0,0,0v-6.44L0,11.8V0s0,0,0,0h69.03v35.29l12.97,16.53ZM100,4.08h-24.45v24.77l24.45-24.77Z"/></svg>
\ No newline at end of file
diff --git a/docs/dokka-presets/css/aws-styles.css b/docs/dokka-presets/css/aws-styles.css
index 3781deecee..119670a726 100644
--- a/docs/dokka-presets/css/aws-styles.css
+++ b/docs/dokka-presets/css/aws-styles.css
@@ -4,45 +4,29 @@
  */
 
 :root {
-    --aws-color-dark: #232f3e;
-    --horizontal-spacing-for-content: 16px;
-    --default-font-family: JetBrains Sans, Inter, system-ui, -apple-system, BlinkMacSystemFont, Segoe UI,Roboto, Oxygen, Ubuntu,Cantarell, Droid Sans, Helvetica Neue, Arial, sans-serif;
+    --color-background-nav: #232f3e;
+    --dokka-logo-height: 60px;
+    --dokka-logo-width: 90px;
 }
 
-.menu-toggle {
-    background: none;
-}
-
-.menu-toggle:focus {
-    outline: 2px solid #fff; /* White outline */
-    outline-offset: 2px;    /* Space between the outline and the button */
-}
-
-#pages-search:focus {
-    outline: revert;
-}
-
-/* copied from Dokka except for background-color attribute */
-.navigation {
-    display: flex;
-    justify-content: space-between;
-
-    color: #fff;
-    background-color: var(--aws-color-dark);
-    font-family: var(--default-font-family);
-    letter-spacing: -0.1px;
-
-    /* Reset margin and use padding for border */
-    margin-left: 0;
-    margin-right: 0;
-    padding: 10px var(--horizontal-spacing-for-content);
-
-    z-index: 4;
+.skip-to-content {
+    position: absolute; /* Remove from normal flow */
+    top: 0; /* Position off-screen */
+    left: 0;
+    width: 1px;
+    height: 1px;
+    overflow: hidden;
+    opacity: 0;
+    z-index: -1; /* Ensure it's not visible */
 }
 
-/* Styles for section tabs like "Types" and "Functions" */
-.section-tab:focus, .section-tab:active {
-    outline: 2px solid var(--active-tab-border-color); /* The color appears unresolved, but it is defined in Dokka style sheets */
+.skip-to-content:focus,
+.skip-to-content:active {
+    position: static; /* Restore to normal flow when focused */
+    width: auto;
+    height: auto;
+    opacity: 1;
+    z-index: 999; /* Ensure it's on top */
 }
 
 /*
@@ -55,44 +39,45 @@
 .symbol {
     overflow-wrap: break-word;
 }
-
 .keyValue {
     display: block;
 }
 
-/*
-    Disable the playground run button for generated samples
-    https://github.com/Kotlin/dokka/issues/3041
-*/
-div .compiler-info, .fold-button, .run-button {
-    display: none;
+/* FIXME Taken from Dokka mainline. Remove these styles once Dokka 2.1.0 is released. */
+.toc--skip-link {
+    background-color: #458cff;
+    color: #fff;
+    font: 400 13px/24px Inter, system-ui, -apple-system, Segoe UI, Roboto, Ubuntu, Cantarell, Noto Sans, sans-serif, BlinkMacSystemFont, Oxygen, Droid Sans, Helvetica Neue, Arial;
+    margin-top: 36px;
+    padding: 1px;
+    position: absolute;
+    z-index: 100;
 }
 
-.skip-to-content {
-    width: 1px;
-    height: 1px;
-    overflow: hidden;
-    opacity: 0;
+.toc--skip-link:not(:focus) {
+    overflow: hidden !important;
+    clip: rect(1px, 1px, 1px, 1px) !important;
+    border: 0 !important;
+    height: 1px !important;
+    padding: 0 !important;
+    width: 1px !important;
 }
 
-.skip-to-content:focus,
-.skip-to-content:active {
-    width: auto;
-    height: auto;
-    opacity: 1;
-    z-index: 999; /* Ensure the skip link is on top of other content */
+.toc--skip-link:focus {
+    outline: 4px solid rgb(48, 127, 255, 0.5);
+    outline-offset: 0;
+}
+
+.sidebar > .toc--skip-link {
+    margin-top: 0;
 }
 
-.aws-toggle-content-btn {
-    font-size: 24px;
-    background: none;
-    border: none;
-    cursor: pointer;
-    padding: 8px;
+.toc--part_hidden > .toc--row > .toc--button ~ .toc--skip-link {
+    display: none;
 }
 
-@media (max-width: 550px) {
-    .content[data-togglable] {
+@media (max-width: 899px) {
+    .toc--skip-link {
         display: none;
     }
 }
\ No newline at end of file
diff --git a/docs/dokka-presets/css/logo-styles.css b/docs/dokka-presets/css/logo-styles.css
deleted file mode 100644
index e53d3a536c..0000000000
--- a/docs/dokka-presets/css/logo-styles.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-.library-name a {
-    position: relative;
-    --logo-width: 72px;
-    margin-left: calc(var(--logo-width) + 5px);
-    display: flex;
-    align-items: center;
-    color: #fff;
-    font-weight: 700;
-    margin-top: 10px;
-    margin-right: 8px;
-}
-
-.library-name a::before {
-    content: '';
-    /* path is relative to final asset location output dir */
-    background-image: url('../images/aws_logo_white_59x35.png');
-    background-size: contain;
-    position: absolute;
-    width: 59px;
-    height: 35px;
-    left: calc(-1 * var(--logo-width) - 5px);
-    margin-right: 5px;
-}
-
-/* Copied from Dokka except `top` replaced with `margin-top` attribute */
-.library-version {
-    position: relative;
-    margin-left: 3px;
-    color: rgba(255,255,255,.7);
-    font-size: 13px;
-    font-weight: normal;
-    line-height: 16px;
-    margin-top: 19px;
-}
diff --git a/docs/dokka-presets/scripts/accessibility.js b/docs/dokka-presets/scripts/accessibility.js
index c27d4531ea..aa61b12f9f 100644
--- a/docs/dokka-presets/scripts/accessibility.js
+++ b/docs/dokka-presets/scripts/accessibility.js
@@ -1,8 +1,8 @@
 /**
- * Check for elements with a navButton class, which indicates the sidebar has finished loading.
+ * Check for elements with a `toc--button` class, which indicates the sidebar has finished loading.
  */
 async function dispatchNavigationLoadedEvent() {
-    while (!document.querySelectorAll('.navButton').length > 0) {
+    while (!document.querySelectorAll('.toc--button').length > 0) {
         await new Promise(resolve => setTimeout(resolve, 100));
     }
     window.dispatchEvent(new Event('navigationLoaded'));
@@ -12,7 +12,7 @@ document.addEventListener('DOMContentLoaded', dispatchNavigationLoadedEvent);
 if (document.readyState === "interactive" || document.readyState === "complete" ) { dispatchNavigationLoadedEvent() }
 
 /**
- * Apply "skip to main content" buttons after each active left sidebar `sideMenuPart`.
+ * Apply "skip to main content" buttons after each active left sidebar `toc--part`.
  * These are invisible and only accessible via keyboard
  * Fixes accessibility violation: "Provide a mechanism for skipping past repetitive content"
  */
@@ -42,20 +42,20 @@ function applySkipLinks() {
 
     function handleChanges(mutationsList) {
         for (const mutation of mutationsList) {
-            if (mutation.type === 'attributes' && mutation.target.classList.contains('sideMenuPart') && !mutation.target.classList.contains('hidden')) {
+            if (mutation.type === 'attributes' && mutation.target.classList.contains('toc--part') && !mutation.target.classList.contains('toc--part_hidden')) {
                 insertSkipLink(mutation.target);
             }
         }
+    }
 
-        // Insert a skip link on all sideMenuParts with [data-active] property
-        document.querySelectorAll('.sideMenuPart[data-active]').forEach(function(sideMenuPart) {
-            insertSkipLink(sideMenuPart)
-        });
+    // Insert a skip link on all visible toc-parts
+    document.querySelectorAll('.toc--part:not(.toc--part_hidden)').forEach(function(sideMenuPart) {
+        insertSkipLink(sideMenuPart)
+    });
 
-        // Insert a skip link on the first sideMenuPart
-        const firstSideMenuPart = document.getElementById("sideMenu").children[0].querySelectorAll(".sideMenuPart")[0]
-        insertSkipLink(firstSideMenuPart)
-    }
+    // Insert a skip link on the first toc-part, regardless of visibility.
+    const firstSideMenuPart = document.getElementById("sideMenu").children[0].querySelectorAll(".toc--part")[0]
+    insertSkipLink(firstSideMenuPart)
 
     const observer = new MutationObserver(handleChanges);
     const observerConfig = {
@@ -67,61 +67,3 @@ function applySkipLinks() {
     observer.observe(document.body, observerConfig);
 }
 window.addEventListener('navigationLoaded', applySkipLinks);
-
-/**
- * Ensure `navButton` elements are interactable and have proper accessibility properties
- * Fixes accessibilty violation: "Ensure all interactive functionality is operable with the keyboard"
- */
-function ensureNavButtonInteractable() {
-    const navButtons = document.querySelectorAll('.navButton');
-
-    navButtons.forEach(function(navButton) {
-        if (navButton.hasAttribute('aria-expanded')) {
-            return;
-        }
-
-        // Make the navButton focusable, add accessibility information
-        navButton.setAttribute('tabindex', '0');
-        navButton.setAttribute('role', 'button');
-
-        const sideMenuPartParent = navButton.closest(".sideMenuPart")
-        const navButtonExpanded = sideMenuPartParent ? (sideMenuPartParent.classList.contains('hidden') ? 'false' : 'true') : 'false'
-        navButton.setAttribute('aria-expanded', navButtonExpanded);
-
-        // Grab the page ID, use it for aria-label and aria-controls
-        const sectionName = navButton.parentElement.parentElement.getAttribute('pageid')
-        // Remove the page ID suffix auto-generated by Dokka
-        const cleanedSectionName = sectionName.substring(0, sectionName.indexOf("////PointingToDeclaration"))
-        navButton.setAttribute('aria-label', cleanedSectionName);
-
-        const sectionID = navButton.parentElement.parentElement.id
-        navButton.setAttribute('aria-controls', sectionID);
-
-        // Add event listener for Enter and Space keys
-        navButton.addEventListener('keydown', function(event) {
-            if (event.key === 'Enter' || event.key === ' ') {
-                event.preventDefault(); // Prevent the default action to avoid navigation
-                this.click(); // Trigger the onclick event
-            }
-        });
-
-        // Update aria-expanded attribute on click
-        navButton.addEventListener('click', function() {
-            const isExpanded = navButton.getAttribute('aria-expanded') === 'true';
-            navButton.setAttribute('aria-expanded', (!isExpanded).toString());
-        });
-    });
-}
-window.addEventListener('navigationLoaded', ensureNavButtonInteractable);
-
-/**
- * Ensure that content (specifically, code blocks) reflows on small page sizes.
- * Fixes accessibility violation: "Ensure pages reflow without requiring two-dimensional scrolling without loss of content or functionality"
- */
-function ensureContentReflow() {
-    // Ensure `content` sections are reflowable
-    document.querySelectorAll('.content[data-togglable]').forEach(function(content) {
-        content.style.display = 'block'
-    });
-}
-window.addEventListener('navigationLoaded', ensureContentReflow);
\ No newline at end of file
diff --git a/docs/dokka-presets/templates/base.ftl b/docs/dokka-presets/templates/base.ftl
index e299a0c115..21fca73968 100644
--- a/docs/dokka-presets/templates/base.ftl
+++ b/docs/dokka-presets/templates/base.ftl
@@ -1,4 +1,7 @@
-<#-- This is an unchanged copy of Dokka's base.ftl -->
+<#--
+    This is a copy of Dokka's base.ftl, modified to add custom scripts for S_Code and Shortbread.
+    Keep in sync with Dokka.
+-->
 <#import "includes/page_metadata.ftl" as page_metadata>
 <#import "includes/header.ftl" as header>
 <#import "includes/footer.ftl" as footer>
@@ -9,8 +12,9 @@
     <@page_metadata.display/>
     <#-- AWS Analytics tracking script - Implements site-wide analytics and tracking functionality -->
     <script src="https://a0.awsstatic.com/s_code/js/3.0/awshome_s_code.js"></script>
-    <@template_cmd name="pathToRoot"><script>var pathToRoot = "${pathToRoot}";</script></@template_cmd>
-    <script>document.documentElement.classList.replace("no-js","js");</script>
+    <@template_cmd name="pathToRoot">
+        <script>var pathToRoot = "${pathToRoot}";</script></@template_cmd>
+    <script>document.documentElement.classList.replace("no-js", "js");</script>
     <#-- This script doesn't need to be there but it is nice to have
     since app in dark mode doesn't 'blink' (class is added before it is rendered) -->
     <script>const storage = localStorage.getItem("dokka-dark-mode")
@@ -21,13 +25,12 @@
             }
         } else {
             const savedDarkMode = JSON.parse(storage)
-            if(savedDarkMode === true) {
+            if (savedDarkMode === true) {
                 document.getElementsByTagName("html")[0].classList.add("theme-dark")
             }
         }
     </script>
-    <#-- Scripts for onboarding AWS Shortbread - Manages cookie consent banners and user preferences to help ensure
-compliance with privacy regulations like GDPR -->
+    <#-- Scripts for AWS Shortbread -->
     <script>var existingShortbreadEl = document.getElementById("awsccc-sb-ux-c");
         existingShortbreadEl && existingShortbreadEl.remove();
     </script>
@@ -44,11 +47,28 @@ compliance with privacy regulations like GDPR -->
 <div class="root">
     <@header.display/>
     <div id="container">
-        <div class="sidebar" id="leftColumn">
-            <div><a class="skip-to-content" href="#content" tabindex="0">Skip to Main Content</a></div>
-            <div class="sidebar--inner" id="sideMenu"></div>
-        </div>
-        <div id="main">
+        <nav id="leftColumn" class="sidebar" data-item-type="SECTION" data-item-config='{"defaultSize": 280, "minSize": 200, "maxSize": 400}'>
+            <a class="toc--skip-link" href="#main">Skip to content</a>
+            <div class="dropdown theme-dark_mobile" data-role="dropdown" id="toc-dropdown">
+                <ul role="listbox" id="toc-listbox" class="dropdown--list dropdown--list_toc-list"
+                    data-role="dropdown-listbox" aria-label="Table of contents">
+                    <div class="dropdown--header">
+                            <span>
+                                <@template_cmd name="projectName">
+                                    ${projectName}
+                                </@template_cmd>
+                            </span>
+                        <button class="button" data-role="dropdown-toggle" aria-label="Close table of contents">
+                            <i class="ui-kit-icon ui-kit-icon_cross"></i>
+                        </button>
+                    </div>
+                    <div class="sidebar--inner" id="sideMenu"></div>
+                </ul>
+                <div class="dropdown--overlay"></div>
+            </div>
+        </nav>
+        <div id="resizer" class="resizer" data-item-type="BAR"></div>
+        <div id="main" data-item-type="SECTION" role="main">
             <@content/>
             <@footer.display/>
         </div>
diff --git a/docs/dokka-presets/templates/includes/footer.ftl b/docs/dokka-presets/templates/includes/footer.ftl
deleted file mode 100644
index 157f0b9542..0000000000
--- a/docs/dokka-presets/templates/includes/footer.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-<#-- This is an unchanged copy of Dokka's footer.ftl -->
-<#macro display>
-    <div class="footer">
-        <span class="go-to-top-icon"><a href="#content" id="go-to-top-link"></a></span><span>${footerMessage}</span><span
-                class="pull-right"><span>Generated by </span><a
-                href="https://github.com/Kotlin/dokka"><span>dokka</span><span class="padded-icon"></span></a></span>
-    </div>
-</#macro>
\ No newline at end of file
diff --git a/docs/dokka-presets/templates/includes/header.ftl b/docs/dokka-presets/templates/includes/header.ftl
index 4ef1f0ed12..51e80541a6 100644
--- a/docs/dokka-presets/templates/includes/header.ftl
+++ b/docs/dokka-presets/templates/includes/header.ftl
@@ -1,28 +1,34 @@
-<#-- This is a modified copy of Dokka's header.ftl, adding a label to the search icon to allow focusing on it. -->
+<#--
+    This is a modified version of Dokka's header.ftl, removing the search button.
+    https://github.com/Kotlin/dokka/blob/83b0f8ad9ad920df0d842caa9c43d69e6e2c44f6/dokka-subprojects/plugin-base/src/main/resources/dokka/templates/includes/header.ftl
+ -->
 <#import "source_set_selector.ftl" as source_set_selector>
 <#macro display>
-    <nav class="navigation" id="navigation-wrapper">
-        <div class="navigation--inner">
-            <div class="navigation-title">
-                <button class="menu-toggle" id="menu-toggle" type="button">toggle menu</button>
-                <div class="library-name">
-                    <@template_cmd name="pathToRoot">
-                        <a class="library-name--link" href="${pathToRoot}index.html">
-                            <@template_cmd name="projectName">
-                                ${projectName}
-                            </@template_cmd>
-                        </a>
-                    </@template_cmd>
-                </div>
-                <div class="library-version">
-                    <#-- This can be handled by the versioning plugin -->
-                    <@version/>
-                </div>
-            </div>
-            <@source_set_selector.display/>
+    <header class="navigation theme-dark" id="navigation-wrapper" role="banner">
+        <@template_cmd name="pathToRoot">
+            <a class="library-name--link" href="${pathToRoot}index.html" tabindex="1">
+                <@template_cmd name="projectName">
+                    ${projectName}
+                </@template_cmd>
+            </a>
+        </@template_cmd>
+        <button class="navigation-controls--btn navigation-controls--btn_toc ui-kit_mobile-only" id="toc-toggle"
+                type="button">Toggle table of contents
+        </button>
+        <div class="navigation-controls--break ui-kit_mobile-only"></div>
+        <div class="library-version" id="library-version">
+            <#-- This can be handled by the versioning plugin -->
+            <@version/>
         </div>
         <div class="navigation-controls">
-            <button class="navigation-controls--btn navigation-controls--theme" id="theme-toggle-button" type="button">switch theme</button>
+            <@source_set_selector.display/>
+            <#if homepageLink?has_content>
+                <a class="navigation-controls--btn navigation-controls--btn_homepage" id="homepage-link"
+                   href="${homepageLink}"></a>
+            </#if>
+            <button class="navigation-controls--btn navigation-controls--btn_theme" id="theme-toggle-button"
+                    type="button">Switch theme
+            </button>
         </div>
-    </nav>
+    </header>
 </#macro>
\ No newline at end of file
diff --git a/docs/dokka-presets/templates/includes/page_metadata.ftl b/docs/dokka-presets/templates/includes/page_metadata.ftl
deleted file mode 100644
index fbfed49067..0000000000
--- a/docs/dokka-presets/templates/includes/page_metadata.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-<#-- This is an unchanged copy of Dokka's page_metadata.ftl -->
-<#macro display>
-    <title>${pageName}</title>
-    <@template_cmd name="pathToRoot">
-    <link href="${pathToRoot}images/logo-icon.svg" rel="icon" type="image/svg">
-    </@template_cmd>
-</#macro>
diff --git a/docs/dokka-presets/templates/includes/source_set_selector.ftl b/docs/dokka-presets/templates/includes/source_set_selector.ftl
index 1e7ed967a8..7868b4f33b 100644
--- a/docs/dokka-presets/templates/includes/source_set_selector.ftl
+++ b/docs/dokka-presets/templates/includes/source_set_selector.ftl
@@ -1,10 +1,41 @@
-<#-- This is an unchanged copy of Dokka's source_set_selector.ftl -->
+<#--
+    This is an unmodified version of Dokka's source_set_selector.ftl
+    https://github.com/Kotlin/dokka/blob/83b0f8ad9ad920df0d842caa9c43d69e6e2c44f6/dokka-subprojects/plugin-base/src/main/resources/dokka/templates/includes/source_set_selector.ftl
+-->
 <#macro display>
     <#if sourceSets?has_content>
-        <div class="filter-section" id="filter-section">
+        <ul class="filter-section filter-section_loading" id="filter-section" aria-label="Platform filter">
             <#list sourceSets as ss>
-                <button class="platform-tag platform-selector ${ss.platform}-like" data-active="" data-filter="${ss.filter}">${ss.name}</button>
+                <button class="platform-tag platform-selector ${ss.platform}-like" data-active="" aria-pressed="true"
+                        data-filter="${ss.filter}">${ss.name}</button>
             </#list>
-        </div>
+            <div class="dropdown filter-section--dropdown" data-role="dropdown" id="filter-section-dropdown">
+                <button class="button button_dropdown filter-section--dropdown-toggle" role="combobox"
+                        data-role="dropdown-toggle"
+                        aria-controls="platform-tags-listbox"
+                        aria-haspopup="listbox"
+                        aria-expanded="false"
+                        aria-label="Toggle source sets"
+                ></button>
+                <ul role="listbox" id="platform-tags-listbox" class="dropdown--list" data-role="dropdown-listbox" aria-label="Platform filter">
+                    <div class="dropdown--header"><span>Platform filter</span>
+                        <button class="button" data-role="dropdown-toggle" aria-label="Close platform filter">
+                            <i class="ui-kit-icon ui-kit-icon_cross"></i>
+                        </button>
+                    </div>
+                    <#list sourceSets as ss>
+                        <li role="option" class="dropdown--option platform-selector-option ${ss.platform}-like" tabindex="0">
+                            <label class="checkbox">
+                                <input type="checkbox" class="checkbox--input" id="${ss.filter}"
+                                       data-filter="${ss.filter}"/>
+                                <span class="checkbox--icon"></span>
+                                ${ss.name}
+                            </label>
+                        </li>
+                    </#list>
+                </ul>
+                <div class="dropdown--overlay"></div>
+            </div>
+        </ul>
     </#if>
 </#macro>
\ No newline at end of file
diff --git a/dokka-smithy/build.gradle.kts b/dokka-smithy/build.gradle.kts
index 839100fa08..341e3680bc 100644
--- a/dokka-smithy/build.gradle.kts
+++ b/dokka-smithy/build.gradle.kts
@@ -2,16 +2,16 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+import org.jetbrains.dokka.gradle.tasks.DokkaGenerateTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import java.time.LocalDate
 
 /*
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 plugins {
-    alias(libs.plugins.dokka)
-    alias(libs.plugins.kotlin.jvm)
+    `dokka-convention`
+    id(libs.plugins.kotlin.jvm.get().pluginId)
 }
 
 description = "Custom Dokka plugin for Kotlin Smithy SDK API docs"
@@ -28,7 +28,7 @@ dependencies {
 
 tasks.test {
     useJUnitPlatform()
-    dependsOn(tasks.dokkaHtml)
+    dependsOn(tasks.withType<DokkaGenerateTask>())
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
@@ -42,29 +42,3 @@ tasks.withType<JavaCompile> {
     sourceCompatibility = JavaVersion.VERSION_1_8.toString()
     targetCompatibility = JavaVersion.VERSION_1_8.toString()
 }
-
-tasks.withType<org.jetbrains.dokka.gradle.AbstractDokkaTask>().configureEach {
-    val sdkVersion: String by project
-    moduleVersion.set(sdkVersion)
-
-    val year = LocalDate.now().year
-    val pluginConfigMap = mapOf(
-        "org.jetbrains.dokka.base.DokkaBase" to """
-                {
-                    "customStyleSheets": [
-                        "${rootProject.file("docs/dokka-presets/css/logo-styles.css").absolutePath.replace("\\", "/")}",
-                        "${rootProject.file("docs/dokka-presets/css/aws-styles.css").absolutePath.replace("\\", "/")}"
-                    ],
-                    "customAssets": [
-                        "${rootProject.file("docs/dokka-presets/assets/logo-icon.svg").absolutePath.replace("\\", "/")}",
-                        "${rootProject.file("docs/dokka-presets/assets/aws_logo_white_59x35.png").absolutePath.replace("\\", "/")}",
-                        "${rootProject.file("docs/dokka-presets/scripts/accessibility.js").absolutePath.replace("\\", "/")}"
-                    ],
-                    "footerMessage": "© $year, Amazon Web Services, Inc. or its affiliates. All rights reserved.",
-                    "separateInheritedMembers" : true,
-                    "templatesDir": "${rootProject.file("docs/dokka-presets/templates").absolutePath.replace("\\", "/")}"
-                }
-            """,
-    )
-    pluginsMapConfiguration.set(pluginConfigMap)
-}
diff --git a/gradle.properties b/gradle.properties
index cb50c5401e..497f6c45a5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,4 +16,8 @@ org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 sdkVersion=1.4.18-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.18-SNAPSHOT
\ No newline at end of file
+codegenVersion=0.34.18-SNAPSHOT
+
+# FIXME Remove after Dokka 2.0 Gradle plugin is stable
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fda89e3a23..26f5ed8bd0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 kotlin-version = "2.1.0"
-dokka-version = "1.9.10"
+dokka-version = "2.0.0"
 
 aws-kotlin-repo-tools-version = "0.4.25"
 
@@ -35,12 +35,14 @@ jsoup-version = "1.19.1"
 [libraries]
 aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" }
 
+kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-version" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-version"}
 kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin-version"}
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin-version" }
 kotlin-test-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5", version.ref = "kotlin-version" }
 dokka-core = { module = "org.jetbrains.dokka:dokka-core", version.ref = "dokka-version" }
 dokka-base = { module = "org.jetbrains.dokka:dokka-base", version.ref = "dokka-version" }
+dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka-version" }
 
 kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu-version" }
 kotlinx-atomicfu-plugin = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "atomicfu-version" }
@@ -103,8 +105,8 @@ jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup-version" }
 
 [plugins]
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka-version"}
-kotlin-jvm = {id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" }
-kotlin-multiplatform = {id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-version" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-version" }
 kotlinx-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlinx-benchmark-version" }
 kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator-version" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version"}
diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts
index 82a5b5fe56..7a6945c178 100644
--- a/runtime/build.gradle.kts
+++ b/runtime/build.gradle.kts
@@ -4,10 +4,11 @@
  */
 import aws.sdk.kotlin.gradle.dsl.configurePublishing
 import aws.sdk.kotlin.gradle.kmp.*
+import org.gradle.kotlin.dsl.apply
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    alias(libs.plugins.dokka)
+    `dokka-convention`
     alias(libs.plugins.aws.kotlin.repo.tools.kmp) apply false
     jacoco
 }
@@ -24,7 +25,6 @@ subprojects {
 
     apply {
         plugin("org.jetbrains.kotlin.multiplatform")
-        plugin("org.jetbrains.dokka")
         plugin(libraries.plugins.aws.kotlin.repo.tools.kmp.get().pluginId)
     }
 
@@ -62,10 +62,6 @@ subprojects {
         listOf("kotlin.RequiresOptIn").forEach { languageSettings.optIn(it) }
     }
 
-    dependencies {
-        dokkaPlugin(project(":dokka-smithy"))
-    }
-
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_1_8)
@@ -78,3 +74,15 @@ subprojects {
         }
     }
 }
+
+val excludeFromDocumentation = listOf(
+    ":runtime:testing",
+    ":runtime:smithy-test",
+)
+
+dependencies {
+    subprojects.filterNot { excludeFromDocumentation.contains(it.path) }.forEach {
+        it.plugins.apply("dokka-convention") // Apply the Dokka conventions plugin to the submodule
+        dokka(project(it.path)) // Aggregate the submodule's generated documentation
+    }
+}
diff --git a/tests/codegen/nullability-tests/build.gradle.kts b/tests/codegen/nullability-tests/build.gradle.kts
index e69809dc62..89e335cb34 100644
--- a/tests/codegen/nullability-tests/build.gradle.kts
+++ b/tests/codegen/nullability-tests/build.gradle.kts
@@ -6,7 +6,7 @@ import aws.sdk.kotlin.gradle.codegen.smithyKotlinProjectionSrcDir
 import aws.sdk.kotlin.gradle.dsl.skipPublishing
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     alias(libs.plugins.aws.kotlin.repo.tools.smithybuild)
 }
 
@@ -46,7 +46,7 @@ kotlin.sourceSets.getByName("main") {
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     dependsOn(tasks.generateSmithyProjections)
     // FIXME - generated code has warnings unfortunately, see https://github.com/awslabs/aws-sdk-kotlin/issues/1169
-    kotlinOptions.allWarningsAsErrors = false
+    compilerOptions.allWarningsAsErrors = false
 }
 
 tasks.test {
diff --git a/tests/codegen/paginator-tests/build.gradle.kts b/tests/codegen/paginator-tests/build.gradle.kts
index caa3afbe42..948f2b0795 100644
--- a/tests/codegen/paginator-tests/build.gradle.kts
+++ b/tests/codegen/paginator-tests/build.gradle.kts
@@ -6,7 +6,7 @@ import aws.sdk.kotlin.gradle.codegen.smithyKotlinProjectionSrcDir
 import aws.sdk.kotlin.gradle.dsl.skipPublishing
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     alias(libs.plugins.aws.kotlin.repo.tools.smithybuild)
 }
 
diff --git a/tests/codegen/serde-tests/build.gradle.kts b/tests/codegen/serde-tests/build.gradle.kts
index 0bfe1ca086..cbde9d4059 100644
--- a/tests/codegen/serde-tests/build.gradle.kts
+++ b/tests/codegen/serde-tests/build.gradle.kts
@@ -6,7 +6,7 @@ import aws.sdk.kotlin.gradle.codegen.smithyKotlinProjectionSrcDir
 import aws.sdk.kotlin.gradle.dsl.skipPublishing
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     alias(libs.plugins.aws.kotlin.repo.tools.smithybuild)
 }
 
@@ -97,7 +97,7 @@ kotlin.sourceSets.getByName("main") {
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     dependsOn(stageGeneratedSources)
     // generated code has warnings unfortunately, see https://github.com/awslabs/aws-sdk-kotlin/issues/1169
-    kotlinOptions.allWarningsAsErrors = false
+    compilerOptions.allWarningsAsErrors = false
 }
 
 tasks.clean.configure {
diff --git a/tests/codegen/waiter-tests/build.gradle.kts b/tests/codegen/waiter-tests/build.gradle.kts
index 4c48a80c6f..72b244a6c9 100644
--- a/tests/codegen/waiter-tests/build.gradle.kts
+++ b/tests/codegen/waiter-tests/build.gradle.kts
@@ -6,7 +6,7 @@ import aws.sdk.kotlin.gradle.codegen.smithyKotlinProjectionSrcDir
 import aws.sdk.kotlin.gradle.dsl.skipPublishing
 
 plugins {
-    alias(libs.plugins.kotlin.jvm)
+    id(libs.plugins.kotlin.jvm.get().pluginId)
     alias(libs.plugins.aws.kotlin.repo.tools.smithybuild)
 }
 

From 729f1eb6b8c91422061e806f6f320397445cdbbf Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 13 Jun 2025 17:44:24 +0000
Subject: [PATCH 108/183] chore: release 1.4.18

---
 .changes/50a9ce20-c4d7-4952-8fad-f9ffb38c9259.json | 5 -----
 CHANGELOG.md                                       | 5 +++++
 gradle.properties                                  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 .changes/50a9ce20-c4d7-4952-8fad-f9ffb38c9259.json

diff --git a/.changes/50a9ce20-c4d7-4952-8fad-f9ffb38c9259.json b/.changes/50a9ce20-c4d7-4952-8fad-f9ffb38c9259.json
deleted file mode 100644
index 9ef75de5ed..0000000000
--- a/.changes/50a9ce20-c4d7-4952-8fad-f9ffb38c9259.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "50a9ce20-c4d7-4952-8fad-f9ffb38c9259",
-    "type": "misc",
-    "description": "Upgrade to Dokka 2.0.0"
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fefb289c38..d71faa881b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.4.18] - 06/13/2025
+
+### Miscellaneous
+* Upgrade to Dokka 2.0.0
+
 ## [1.4.17] - 06/11/2025
 
 ### Fixes
diff --git a/gradle.properties b/gradle.properties
index 497f6c45a5..1882fba903 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,11 +13,11 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.18-SNAPSHOT
+sdkVersion=1.4.18
 
 # codegen
-codegenVersion=0.34.18-SNAPSHOT
+codegenVersion=0.34.18
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
-org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
\ No newline at end of file

From 2ea315212a612eff84299322192de2bb7a313cfd Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 13 Jun 2025 17:44:26 +0000
Subject: [PATCH 109/183] chore: bump snapshot version to 1.4.19-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 1882fba903..ff4629eef5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.18
+sdkVersion=1.4.19-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.18
+codegenVersion=0.34.19-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From c616efefc7219567682c1553af2d67a00a2b649d Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Thu, 19 Jun 2025 17:18:25 -0400
Subject: [PATCH 110/183] fix: preserve Dokka v1 module paths (#1298)

---
 runtime/auth/aws-credentials/build.gradle.kts                 | 4 ++++
 runtime/auth/aws-signing-common/build.gradle.kts              | 4 ++++
 runtime/auth/aws-signing-crt/build.gradle.kts                 | 4 ++++
 runtime/auth/aws-signing-default/build.gradle.kts             | 4 ++++
 runtime/auth/aws-signing-tests/build.gradle.kts               | 4 ++++
 runtime/auth/http-auth-api/build.gradle.kts                   | 4 ++++
 runtime/auth/http-auth-aws/build.gradle.kts                   | 4 ++++
 runtime/auth/http-auth/build.gradle.kts                       | 4 ++++
 runtime/auth/identity-api/build.gradle.kts                    | 4 ++++
 runtime/crt-util/build.gradle.kts                             | 4 ++++
 runtime/observability/logging-slf4j2/build.gradle.kts         | 4 ++++
 runtime/observability/telemetry-api/build.gradle.kts          | 4 ++++
 runtime/observability/telemetry-defaults/build.gradle.kts     | 4 ++++
 .../telemetry-provider-micrometer/build.gradle.kts            | 4 ++++
 .../observability/telemetry-provider-otel/build.gradle.kts    | 4 ++++
 runtime/protocol/aws-event-stream/build.gradle.kts            | 4 ++++
 runtime/protocol/aws-json-protocols/build.gradle.kts          | 4 ++++
 runtime/protocol/aws-protocol-core/build.gradle.kts           | 4 ++++
 runtime/protocol/aws-xml-protocols/build.gradle.kts           | 4 ++++
 .../http-client-engine-crt/build.gradle.kts                   | 4 ++++
 .../http-client-engine-default/build.gradle.kts               | 4 ++++
 .../http-client-engine-okhttp/build.gradle.kts                | 4 ++++
 .../protocol/http-client-engines/test-suite/build.gradle.kts  | 4 ++++
 runtime/protocol/http-client/build.gradle.kts                 | 4 ++++
 runtime/protocol/http-test/build.gradle.kts                   | 4 ++++
 runtime/protocol/http/build.gradle.kts                        | 4 ++++
 runtime/protocol/smithy-rpcv2-protocols/build.gradle.kts      | 4 ++++
 runtime/runtime-core/build.gradle.kts                         | 4 ++++
 runtime/serde/serde-cbor/build.gradle.kts                     | 4 ++++
 runtime/serde/serde-form-url/build.gradle.kts                 | 4 ++++
 runtime/serde/serde-json/build.gradle.kts                     | 4 ++++
 runtime/serde/serde-xml/build.gradle.kts                      | 4 ++++
 runtime/smithy-client/build.gradle.kts                        | 4 ++++
 33 files changed, 132 insertions(+)

diff --git a/runtime/auth/aws-credentials/build.gradle.kts b/runtime/auth/aws-credentials/build.gradle.kts
index 059032c494..a4473f84b7 100644
--- a/runtime/auth/aws-credentials/build.gradle.kts
+++ b/runtime/auth/aws-credentials/build.gradle.kts
@@ -30,3 +30,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "aws-credentials"
+}
diff --git a/runtime/auth/aws-signing-common/build.gradle.kts b/runtime/auth/aws-signing-common/build.gradle.kts
index 45e0ae5d62..535afecab5 100644
--- a/runtime/auth/aws-signing-common/build.gradle.kts
+++ b/runtime/auth/aws-signing-common/build.gradle.kts
@@ -34,3 +34,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "aws-signing-common"
+}
diff --git a/runtime/auth/aws-signing-crt/build.gradle.kts b/runtime/auth/aws-signing-crt/build.gradle.kts
index 4c67282762..89cbb618d8 100644
--- a/runtime/auth/aws-signing-crt/build.gradle.kts
+++ b/runtime/auth/aws-signing-crt/build.gradle.kts
@@ -26,3 +26,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "aws-signing-crt"
+}
diff --git a/runtime/auth/aws-signing-default/build.gradle.kts b/runtime/auth/aws-signing-default/build.gradle.kts
index 22e20d39fd..ef4f295bd8 100644
--- a/runtime/auth/aws-signing-default/build.gradle.kts
+++ b/runtime/auth/aws-signing-default/build.gradle.kts
@@ -27,3 +27,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "aws-signing-default"
+}
diff --git a/runtime/auth/aws-signing-tests/build.gradle.kts b/runtime/auth/aws-signing-tests/build.gradle.kts
index 5810181041..e2d0e49f81 100644
--- a/runtime/auth/aws-signing-tests/build.gradle.kts
+++ b/runtime/auth/aws-signing-tests/build.gradle.kts
@@ -39,3 +39,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "aws-signing-tests"
+}
diff --git a/runtime/auth/http-auth-api/build.gradle.kts b/runtime/auth/http-auth-api/build.gradle.kts
index 6186421327..063a3786d2 100644
--- a/runtime/auth/http-auth-api/build.gradle.kts
+++ b/runtime/auth/http-auth-api/build.gradle.kts
@@ -16,3 +16,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "http-auth-api"
+}
diff --git a/runtime/auth/http-auth-aws/build.gradle.kts b/runtime/auth/http-auth-aws/build.gradle.kts
index dfcc0c7da3..de948f443a 100644
--- a/runtime/auth/http-auth-aws/build.gradle.kts
+++ b/runtime/auth/http-auth-aws/build.gradle.kts
@@ -37,3 +37,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "http-auth-aws"
+}
diff --git a/runtime/auth/http-auth/build.gradle.kts b/runtime/auth/http-auth/build.gradle.kts
index 4c6ad7260d..233e636858 100644
--- a/runtime/auth/http-auth/build.gradle.kts
+++ b/runtime/auth/http-auth/build.gradle.kts
@@ -27,3 +27,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "http-auth"
+}
diff --git a/runtime/auth/identity-api/build.gradle.kts b/runtime/auth/identity-api/build.gradle.kts
index c1c62a055c..16f441b0d1 100644
--- a/runtime/auth/identity-api/build.gradle.kts
+++ b/runtime/auth/identity-api/build.gradle.kts
@@ -28,3 +28,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "identity-api"
+}
diff --git a/runtime/crt-util/build.gradle.kts b/runtime/crt-util/build.gradle.kts
index ddc57d11a9..06fa4087c2 100644
--- a/runtime/crt-util/build.gradle.kts
+++ b/runtime/crt-util/build.gradle.kts
@@ -29,3 +29,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "crt-util"
+}
diff --git a/runtime/observability/logging-slf4j2/build.gradle.kts b/runtime/observability/logging-slf4j2/build.gradle.kts
index 2fd9ad4c70..14b41c75ea 100644
--- a/runtime/observability/logging-slf4j2/build.gradle.kts
+++ b/runtime/observability/logging-slf4j2/build.gradle.kts
@@ -25,3 +25,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "logging-slf4j2"
+}
diff --git a/runtime/observability/telemetry-api/build.gradle.kts b/runtime/observability/telemetry-api/build.gradle.kts
index f3e1f34703..f76e08a711 100644
--- a/runtime/observability/telemetry-api/build.gradle.kts
+++ b/runtime/observability/telemetry-api/build.gradle.kts
@@ -28,3 +28,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "telemetry-api"
+}
diff --git a/runtime/observability/telemetry-defaults/build.gradle.kts b/runtime/observability/telemetry-defaults/build.gradle.kts
index e77655c91d..e53164b980 100644
--- a/runtime/observability/telemetry-defaults/build.gradle.kts
+++ b/runtime/observability/telemetry-defaults/build.gradle.kts
@@ -29,3 +29,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "telemetry-defaults"
+}
diff --git a/runtime/observability/telemetry-provider-micrometer/build.gradle.kts b/runtime/observability/telemetry-provider-micrometer/build.gradle.kts
index 92296a45db..a47c755e7c 100644
--- a/runtime/observability/telemetry-provider-micrometer/build.gradle.kts
+++ b/runtime/observability/telemetry-provider-micrometer/build.gradle.kts
@@ -25,3 +25,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "telemetry-provider-micrometer"
+}
diff --git a/runtime/observability/telemetry-provider-otel/build.gradle.kts b/runtime/observability/telemetry-provider-otel/build.gradle.kts
index bdee5b1d6a..50766e800a 100644
--- a/runtime/observability/telemetry-provider-otel/build.gradle.kts
+++ b/runtime/observability/telemetry-provider-otel/build.gradle.kts
@@ -26,3 +26,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "telemetry-provider-otel"
+}
diff --git a/runtime/protocol/aws-event-stream/build.gradle.kts b/runtime/protocol/aws-event-stream/build.gradle.kts
index 71ffa46f65..9511433cd9 100644
--- a/runtime/protocol/aws-event-stream/build.gradle.kts
+++ b/runtime/protocol/aws-event-stream/build.gradle.kts
@@ -34,3 +34,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "aws-event-stream"
+}
diff --git a/runtime/protocol/aws-json-protocols/build.gradle.kts b/runtime/protocol/aws-json-protocols/build.gradle.kts
index bb393d0cff..6deff77d67 100644
--- a/runtime/protocol/aws-json-protocols/build.gradle.kts
+++ b/runtime/protocol/aws-json-protocols/build.gradle.kts
@@ -33,3 +33,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "aws-json-protocols"
+}
diff --git a/runtime/protocol/aws-protocol-core/build.gradle.kts b/runtime/protocol/aws-protocol-core/build.gradle.kts
index 3c88f1b557..e70e27c23a 100644
--- a/runtime/protocol/aws-protocol-core/build.gradle.kts
+++ b/runtime/protocol/aws-protocol-core/build.gradle.kts
@@ -32,3 +32,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "aws-protocol-core"
+}
diff --git a/runtime/protocol/aws-xml-protocols/build.gradle.kts b/runtime/protocol/aws-xml-protocols/build.gradle.kts
index ca1dbbafd2..4d8fc195f4 100644
--- a/runtime/protocol/aws-xml-protocols/build.gradle.kts
+++ b/runtime/protocol/aws-xml-protocols/build.gradle.kts
@@ -31,3 +31,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "aws-xml-protocols"
+}
diff --git a/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts b/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts
index d2f411578f..33661f0a6f 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts
+++ b/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts
@@ -35,3 +35,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "http-client-engine-crt"
+}
diff --git a/runtime/protocol/http-client-engines/http-client-engine-default/build.gradle.kts b/runtime/protocol/http-client-engines/http-client-engine-default/build.gradle.kts
index d2381c39f0..2ddca2c9c9 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-default/build.gradle.kts
+++ b/runtime/protocol/http-client-engines/http-client-engine-default/build.gradle.kts
@@ -32,3 +32,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "http-client-engine-default"
+}
diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp/build.gradle.kts b/runtime/protocol/http-client-engines/http-client-engine-okhttp/build.gradle.kts
index 3e5d139381..50a88a4372 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-okhttp/build.gradle.kts
+++ b/runtime/protocol/http-client-engines/http-client-engine-okhttp/build.gradle.kts
@@ -39,3 +39,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "http-client-engine-okhttp"
+}
diff --git a/runtime/protocol/http-client-engines/test-suite/build.gradle.kts b/runtime/protocol/http-client-engines/test-suite/build.gradle.kts
index ece9d6e102..0905f02429 100644
--- a/runtime/protocol/http-client-engines/test-suite/build.gradle.kts
+++ b/runtime/protocol/http-client-engines/test-suite/build.gradle.kts
@@ -136,3 +136,7 @@ tasks.jvmTest {
 gradle.buildFinished {
     startTestServers.stop()
 }
+
+dokka {
+    modulePath = "test-suite"
+}
diff --git a/runtime/protocol/http-client/build.gradle.kts b/runtime/protocol/http-client/build.gradle.kts
index d55e5ffe41..079007149c 100644
--- a/runtime/protocol/http-client/build.gradle.kts
+++ b/runtime/protocol/http-client/build.gradle.kts
@@ -36,3 +36,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "http-client"
+}
diff --git a/runtime/protocol/http-test/build.gradle.kts b/runtime/protocol/http-test/build.gradle.kts
index a2077a979c..a59f2ea11a 100644
--- a/runtime/protocol/http-test/build.gradle.kts
+++ b/runtime/protocol/http-test/build.gradle.kts
@@ -33,3 +33,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "http-test"
+}
diff --git a/runtime/protocol/http/build.gradle.kts b/runtime/protocol/http/build.gradle.kts
index 42fcc6927a..104d034704 100644
--- a/runtime/protocol/http/build.gradle.kts
+++ b/runtime/protocol/http/build.gradle.kts
@@ -29,3 +29,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "http"
+}
diff --git a/runtime/protocol/smithy-rpcv2-protocols/build.gradle.kts b/runtime/protocol/smithy-rpcv2-protocols/build.gradle.kts
index 063995b95c..aef14c6c43 100644
--- a/runtime/protocol/smithy-rpcv2-protocols/build.gradle.kts
+++ b/runtime/protocol/smithy-rpcv2-protocols/build.gradle.kts
@@ -33,3 +33,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "smithy-rpcv2-protocols"
+}
diff --git a/runtime/runtime-core/build.gradle.kts b/runtime/runtime-core/build.gradle.kts
index bbaa9d60ef..bfd4bc7f6a 100644
--- a/runtime/runtime-core/build.gradle.kts
+++ b/runtime/runtime-core/build.gradle.kts
@@ -42,3 +42,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "runtime-core"
+}
diff --git a/runtime/serde/serde-cbor/build.gradle.kts b/runtime/serde/serde-cbor/build.gradle.kts
index e561afb774..38fbabdd0b 100644
--- a/runtime/serde/serde-cbor/build.gradle.kts
+++ b/runtime/serde/serde-cbor/build.gradle.kts
@@ -21,3 +21,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "serde-cbor"
+}
diff --git a/runtime/serde/serde-form-url/build.gradle.kts b/runtime/serde/serde-form-url/build.gradle.kts
index 11d7d7bcfa..e7b4af0374 100644
--- a/runtime/serde/serde-form-url/build.gradle.kts
+++ b/runtime/serde/serde-form-url/build.gradle.kts
@@ -20,3 +20,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "serde-form-url"
+}
diff --git a/runtime/serde/serde-json/build.gradle.kts b/runtime/serde/serde-json/build.gradle.kts
index aed9342025..282bc98fe9 100644
--- a/runtime/serde/serde-json/build.gradle.kts
+++ b/runtime/serde/serde-json/build.gradle.kts
@@ -22,3 +22,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "serde-json"
+}
diff --git a/runtime/serde/serde-xml/build.gradle.kts b/runtime/serde/serde-xml/build.gradle.kts
index f3ccc9a64f..d2c78d4b25 100644
--- a/runtime/serde/serde-xml/build.gradle.kts
+++ b/runtime/serde/serde-xml/build.gradle.kts
@@ -22,3 +22,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "serde-xml"
+}
diff --git a/runtime/smithy-client/build.gradle.kts b/runtime/smithy-client/build.gradle.kts
index e464e76163..862bd5516c 100644
--- a/runtime/smithy-client/build.gradle.kts
+++ b/runtime/smithy-client/build.gradle.kts
@@ -28,3 +28,7 @@ kotlin {
         }
     }
 }
+
+dokka {
+    modulePath = "smithy-client"
+}

From 98414ecb80badf23aaaa865837fe048f5e752222 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 19 Jun 2025 21:20:34 +0000
Subject: [PATCH 111/183] chore: release 1.4.19

---
 CHANGELOG.md      | 2 ++
 gradle.properties | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d71faa881b..51f589dfe4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.4.19] - 06/19/2025
+
 ## [1.4.18] - 06/13/2025
 
 ### Miscellaneous
diff --git a/gradle.properties b/gradle.properties
index ff4629eef5..57976ee479 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.19-SNAPSHOT
+sdkVersion=1.4.19
 
 # codegen
-codegenVersion=0.34.19-SNAPSHOT
+codegenVersion=0.34.19
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From c6b2074fabe2072c4fb4bf5b251b4c00f24b1dd8 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 19 Jun 2025 21:20:35 +0000
Subject: [PATCH 112/183] chore: bump snapshot version to 1.4.20-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 57976ee479..334c97b290 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.19
+sdkVersion=1.4.20-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.19
+codegenVersion=0.34.20-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From 3f6fcde3c8e4f1ea005bd2ab6f1eecc6a2c7a829 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Fri, 20 Jun 2025 10:57:54 -0400
Subject: [PATCH 113/183] misc: simplify configuration of `modulePath` (#1299)

---
 runtime/auth/aws-credentials/build.gradle.kts          |  4 ----
 runtime/auth/aws-signing-common/build.gradle.kts       |  4 ----
 runtime/auth/aws-signing-crt/build.gradle.kts          |  4 ----
 runtime/auth/aws-signing-default/build.gradle.kts      |  4 ----
 runtime/auth/aws-signing-tests/build.gradle.kts        |  4 ----
 runtime/auth/http-auth-api/build.gradle.kts            |  4 ----
 runtime/auth/http-auth-aws/build.gradle.kts            |  4 ----
 runtime/auth/http-auth/build.gradle.kts                |  4 ----
 runtime/auth/identity-api/build.gradle.kts             |  4 ----
 runtime/build.gradle.kts                               | 10 ++++++++++
 runtime/crt-util/build.gradle.kts                      |  4 ----
 runtime/observability/logging-slf4j2/build.gradle.kts  |  4 ----
 runtime/observability/telemetry-api/build.gradle.kts   |  4 ----
 .../observability/telemetry-defaults/build.gradle.kts  |  4 ----
 .../telemetry-provider-micrometer/build.gradle.kts     |  4 ----
 .../telemetry-provider-otel/build.gradle.kts           |  4 ----
 runtime/protocol/aws-event-stream/build.gradle.kts     |  4 ----
 runtime/protocol/aws-json-protocols/build.gradle.kts   |  4 ----
 runtime/protocol/aws-protocol-core/build.gradle.kts    |  4 ----
 runtime/protocol/aws-xml-protocols/build.gradle.kts    |  4 ----
 .../http-client-engine-crt/build.gradle.kts            |  4 ----
 .../http-client-engine-default/build.gradle.kts        |  4 ----
 .../http-client-engine-okhttp/build.gradle.kts         |  4 ----
 .../http-client-engines/test-suite/build.gradle.kts    |  4 ----
 runtime/protocol/http-client/build.gradle.kts          |  4 ----
 runtime/protocol/http-test/build.gradle.kts            |  4 ----
 runtime/protocol/http/build.gradle.kts                 |  4 ----
 .../protocol/smithy-rpcv2-protocols/build.gradle.kts   |  4 ----
 runtime/runtime-core/build.gradle.kts                  |  4 ----
 runtime/serde/serde-cbor/build.gradle.kts              |  4 ----
 runtime/serde/serde-form-url/build.gradle.kts          |  4 ----
 runtime/serde/serde-json/build.gradle.kts              |  4 ----
 runtime/serde/serde-xml/build.gradle.kts               |  4 ----
 runtime/smithy-client/build.gradle.kts                 |  4 ----
 34 files changed, 10 insertions(+), 132 deletions(-)

diff --git a/runtime/auth/aws-credentials/build.gradle.kts b/runtime/auth/aws-credentials/build.gradle.kts
index a4473f84b7..059032c494 100644
--- a/runtime/auth/aws-credentials/build.gradle.kts
+++ b/runtime/auth/aws-credentials/build.gradle.kts
@@ -30,7 +30,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-credentials"
-}
diff --git a/runtime/auth/aws-signing-common/build.gradle.kts b/runtime/auth/aws-signing-common/build.gradle.kts
index 535afecab5..45e0ae5d62 100644
--- a/runtime/auth/aws-signing-common/build.gradle.kts
+++ b/runtime/auth/aws-signing-common/build.gradle.kts
@@ -34,7 +34,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-signing-common"
-}
diff --git a/runtime/auth/aws-signing-crt/build.gradle.kts b/runtime/auth/aws-signing-crt/build.gradle.kts
index 89cbb618d8..4c67282762 100644
--- a/runtime/auth/aws-signing-crt/build.gradle.kts
+++ b/runtime/auth/aws-signing-crt/build.gradle.kts
@@ -26,7 +26,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-signing-crt"
-}
diff --git a/runtime/auth/aws-signing-default/build.gradle.kts b/runtime/auth/aws-signing-default/build.gradle.kts
index ef4f295bd8..22e20d39fd 100644
--- a/runtime/auth/aws-signing-default/build.gradle.kts
+++ b/runtime/auth/aws-signing-default/build.gradle.kts
@@ -27,7 +27,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-signing-default"
-}
diff --git a/runtime/auth/aws-signing-tests/build.gradle.kts b/runtime/auth/aws-signing-tests/build.gradle.kts
index e2d0e49f81..5810181041 100644
--- a/runtime/auth/aws-signing-tests/build.gradle.kts
+++ b/runtime/auth/aws-signing-tests/build.gradle.kts
@@ -39,7 +39,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-signing-tests"
-}
diff --git a/runtime/auth/http-auth-api/build.gradle.kts b/runtime/auth/http-auth-api/build.gradle.kts
index 063a3786d2..6186421327 100644
--- a/runtime/auth/http-auth-api/build.gradle.kts
+++ b/runtime/auth/http-auth-api/build.gradle.kts
@@ -16,7 +16,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-auth-api"
-}
diff --git a/runtime/auth/http-auth-aws/build.gradle.kts b/runtime/auth/http-auth-aws/build.gradle.kts
index de948f443a..dfcc0c7da3 100644
--- a/runtime/auth/http-auth-aws/build.gradle.kts
+++ b/runtime/auth/http-auth-aws/build.gradle.kts
@@ -37,7 +37,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-auth-aws"
-}
diff --git a/runtime/auth/http-auth/build.gradle.kts b/runtime/auth/http-auth/build.gradle.kts
index 233e636858..4c6ad7260d 100644
--- a/runtime/auth/http-auth/build.gradle.kts
+++ b/runtime/auth/http-auth/build.gradle.kts
@@ -27,7 +27,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-auth"
-}
diff --git a/runtime/auth/identity-api/build.gradle.kts b/runtime/auth/identity-api/build.gradle.kts
index 16f441b0d1..c1c62a055c 100644
--- a/runtime/auth/identity-api/build.gradle.kts
+++ b/runtime/auth/identity-api/build.gradle.kts
@@ -28,7 +28,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "identity-api"
-}
diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts
index 7a6945c178..1b1ae3224e 100644
--- a/runtime/build.gradle.kts
+++ b/runtime/build.gradle.kts
@@ -85,4 +85,14 @@ dependencies {
         it.plugins.apply("dokka-convention") // Apply the Dokka conventions plugin to the submodule
         dokka(project(it.path)) // Aggregate the submodule's generated documentation
     }
+
+    subprojects {
+        if (excludeFromDocumentation.contains(this@subprojects.path)) {
+            return@subprojects
+        }
+
+        dokka {
+            modulePath = this@subprojects.name
+        }
+    }
 }
diff --git a/runtime/crt-util/build.gradle.kts b/runtime/crt-util/build.gradle.kts
index 06fa4087c2..ddc57d11a9 100644
--- a/runtime/crt-util/build.gradle.kts
+++ b/runtime/crt-util/build.gradle.kts
@@ -29,7 +29,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "crt-util"
-}
diff --git a/runtime/observability/logging-slf4j2/build.gradle.kts b/runtime/observability/logging-slf4j2/build.gradle.kts
index 14b41c75ea..2fd9ad4c70 100644
--- a/runtime/observability/logging-slf4j2/build.gradle.kts
+++ b/runtime/observability/logging-slf4j2/build.gradle.kts
@@ -25,7 +25,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "logging-slf4j2"
-}
diff --git a/runtime/observability/telemetry-api/build.gradle.kts b/runtime/observability/telemetry-api/build.gradle.kts
index f76e08a711..f3e1f34703 100644
--- a/runtime/observability/telemetry-api/build.gradle.kts
+++ b/runtime/observability/telemetry-api/build.gradle.kts
@@ -28,7 +28,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "telemetry-api"
-}
diff --git a/runtime/observability/telemetry-defaults/build.gradle.kts b/runtime/observability/telemetry-defaults/build.gradle.kts
index e53164b980..e77655c91d 100644
--- a/runtime/observability/telemetry-defaults/build.gradle.kts
+++ b/runtime/observability/telemetry-defaults/build.gradle.kts
@@ -29,7 +29,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "telemetry-defaults"
-}
diff --git a/runtime/observability/telemetry-provider-micrometer/build.gradle.kts b/runtime/observability/telemetry-provider-micrometer/build.gradle.kts
index a47c755e7c..92296a45db 100644
--- a/runtime/observability/telemetry-provider-micrometer/build.gradle.kts
+++ b/runtime/observability/telemetry-provider-micrometer/build.gradle.kts
@@ -25,7 +25,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "telemetry-provider-micrometer"
-}
diff --git a/runtime/observability/telemetry-provider-otel/build.gradle.kts b/runtime/observability/telemetry-provider-otel/build.gradle.kts
index 50766e800a..bdee5b1d6a 100644
--- a/runtime/observability/telemetry-provider-otel/build.gradle.kts
+++ b/runtime/observability/telemetry-provider-otel/build.gradle.kts
@@ -26,7 +26,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "telemetry-provider-otel"
-}
diff --git a/runtime/protocol/aws-event-stream/build.gradle.kts b/runtime/protocol/aws-event-stream/build.gradle.kts
index 9511433cd9..71ffa46f65 100644
--- a/runtime/protocol/aws-event-stream/build.gradle.kts
+++ b/runtime/protocol/aws-event-stream/build.gradle.kts
@@ -34,7 +34,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-event-stream"
-}
diff --git a/runtime/protocol/aws-json-protocols/build.gradle.kts b/runtime/protocol/aws-json-protocols/build.gradle.kts
index 6deff77d67..bb393d0cff 100644
--- a/runtime/protocol/aws-json-protocols/build.gradle.kts
+++ b/runtime/protocol/aws-json-protocols/build.gradle.kts
@@ -33,7 +33,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-json-protocols"
-}
diff --git a/runtime/protocol/aws-protocol-core/build.gradle.kts b/runtime/protocol/aws-protocol-core/build.gradle.kts
index e70e27c23a..3c88f1b557 100644
--- a/runtime/protocol/aws-protocol-core/build.gradle.kts
+++ b/runtime/protocol/aws-protocol-core/build.gradle.kts
@@ -32,7 +32,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-protocol-core"
-}
diff --git a/runtime/protocol/aws-xml-protocols/build.gradle.kts b/runtime/protocol/aws-xml-protocols/build.gradle.kts
index 4d8fc195f4..ca1dbbafd2 100644
--- a/runtime/protocol/aws-xml-protocols/build.gradle.kts
+++ b/runtime/protocol/aws-xml-protocols/build.gradle.kts
@@ -31,7 +31,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "aws-xml-protocols"
-}
diff --git a/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts b/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts
index 33661f0a6f..d2f411578f 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts
+++ b/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts
@@ -35,7 +35,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-client-engine-crt"
-}
diff --git a/runtime/protocol/http-client-engines/http-client-engine-default/build.gradle.kts b/runtime/protocol/http-client-engines/http-client-engine-default/build.gradle.kts
index 2ddca2c9c9..d2381c39f0 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-default/build.gradle.kts
+++ b/runtime/protocol/http-client-engines/http-client-engine-default/build.gradle.kts
@@ -32,7 +32,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-client-engine-default"
-}
diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp/build.gradle.kts b/runtime/protocol/http-client-engines/http-client-engine-okhttp/build.gradle.kts
index 50a88a4372..3e5d139381 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-okhttp/build.gradle.kts
+++ b/runtime/protocol/http-client-engines/http-client-engine-okhttp/build.gradle.kts
@@ -39,7 +39,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-client-engine-okhttp"
-}
diff --git a/runtime/protocol/http-client-engines/test-suite/build.gradle.kts b/runtime/protocol/http-client-engines/test-suite/build.gradle.kts
index 0905f02429..ece9d6e102 100644
--- a/runtime/protocol/http-client-engines/test-suite/build.gradle.kts
+++ b/runtime/protocol/http-client-engines/test-suite/build.gradle.kts
@@ -136,7 +136,3 @@ tasks.jvmTest {
 gradle.buildFinished {
     startTestServers.stop()
 }
-
-dokka {
-    modulePath = "test-suite"
-}
diff --git a/runtime/protocol/http-client/build.gradle.kts b/runtime/protocol/http-client/build.gradle.kts
index 079007149c..d55e5ffe41 100644
--- a/runtime/protocol/http-client/build.gradle.kts
+++ b/runtime/protocol/http-client/build.gradle.kts
@@ -36,7 +36,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-client"
-}
diff --git a/runtime/protocol/http-test/build.gradle.kts b/runtime/protocol/http-test/build.gradle.kts
index a59f2ea11a..a2077a979c 100644
--- a/runtime/protocol/http-test/build.gradle.kts
+++ b/runtime/protocol/http-test/build.gradle.kts
@@ -33,7 +33,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http-test"
-}
diff --git a/runtime/protocol/http/build.gradle.kts b/runtime/protocol/http/build.gradle.kts
index 104d034704..42fcc6927a 100644
--- a/runtime/protocol/http/build.gradle.kts
+++ b/runtime/protocol/http/build.gradle.kts
@@ -29,7 +29,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "http"
-}
diff --git a/runtime/protocol/smithy-rpcv2-protocols/build.gradle.kts b/runtime/protocol/smithy-rpcv2-protocols/build.gradle.kts
index aef14c6c43..063995b95c 100644
--- a/runtime/protocol/smithy-rpcv2-protocols/build.gradle.kts
+++ b/runtime/protocol/smithy-rpcv2-protocols/build.gradle.kts
@@ -33,7 +33,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "smithy-rpcv2-protocols"
-}
diff --git a/runtime/runtime-core/build.gradle.kts b/runtime/runtime-core/build.gradle.kts
index bfd4bc7f6a..bbaa9d60ef 100644
--- a/runtime/runtime-core/build.gradle.kts
+++ b/runtime/runtime-core/build.gradle.kts
@@ -42,7 +42,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "runtime-core"
-}
diff --git a/runtime/serde/serde-cbor/build.gradle.kts b/runtime/serde/serde-cbor/build.gradle.kts
index 38fbabdd0b..e561afb774 100644
--- a/runtime/serde/serde-cbor/build.gradle.kts
+++ b/runtime/serde/serde-cbor/build.gradle.kts
@@ -21,7 +21,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "serde-cbor"
-}
diff --git a/runtime/serde/serde-form-url/build.gradle.kts b/runtime/serde/serde-form-url/build.gradle.kts
index e7b4af0374..11d7d7bcfa 100644
--- a/runtime/serde/serde-form-url/build.gradle.kts
+++ b/runtime/serde/serde-form-url/build.gradle.kts
@@ -20,7 +20,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "serde-form-url"
-}
diff --git a/runtime/serde/serde-json/build.gradle.kts b/runtime/serde/serde-json/build.gradle.kts
index 282bc98fe9..aed9342025 100644
--- a/runtime/serde/serde-json/build.gradle.kts
+++ b/runtime/serde/serde-json/build.gradle.kts
@@ -22,7 +22,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "serde-json"
-}
diff --git a/runtime/serde/serde-xml/build.gradle.kts b/runtime/serde/serde-xml/build.gradle.kts
index d2c78d4b25..f3ccc9a64f 100644
--- a/runtime/serde/serde-xml/build.gradle.kts
+++ b/runtime/serde/serde-xml/build.gradle.kts
@@ -22,7 +22,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "serde-xml"
-}
diff --git a/runtime/smithy-client/build.gradle.kts b/runtime/smithy-client/build.gradle.kts
index 862bd5516c..e464e76163 100644
--- a/runtime/smithy-client/build.gradle.kts
+++ b/runtime/smithy-client/build.gradle.kts
@@ -28,7 +28,3 @@ kotlin {
         }
     }
 }
-
-dokka {
-    modulePath = "smithy-client"
-}

From fff09ff55af92e7822704f9f0ec46e0ae4f43957 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Fri, 20 Jun 2025 10:58:08 -0400
Subject: [PATCH 114/183] fix: Add `-Xjdk-release=1.8` everywhere we set
 `jvmTarget` (#1297)

---
 .changes/ba2b99b0-d583-472a-894a-9e56784eda75.json        | 8 ++++++++
 codegen/smithy-kotlin-codegen-testutils/build.gradle.kts  | 1 +
 codegen/smithy-kotlin-codegen/build.gradle.kts            | 1 +
 .../amazon/smithy/kotlin/codegen/model/ShapeExt.kt        | 3 ++-
 dokka-smithy/build.gradle.kts                             | 1 +
 runtime/build.gradle.kts                                  | 1 +
 tests/integration/slf4j-1x-consumer/build.gradle.kts      | 1 +
 tests/integration/slf4j-2x-consumer/build.gradle.kts      | 1 +
 tests/integration/slf4j-hybrid-consumer/build.gradle.kts  | 1 +
 9 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 .changes/ba2b99b0-d583-472a-894a-9e56784eda75.json

diff --git a/.changes/ba2b99b0-d583-472a-894a-9e56784eda75.json b/.changes/ba2b99b0-d583-472a-894a-9e56784eda75.json
new file mode 100644
index 0000000000..b25e9bf6d4
--- /dev/null
+++ b/.changes/ba2b99b0-d583-472a-894a-9e56784eda75.json
@@ -0,0 +1,8 @@
+{
+    "id": "ba2b99b0-d583-472a-894a-9e56784eda75",
+    "type": "bugfix",
+    "description": "Enable building this project on JDK21 by setting -Xjdk-release flag",
+    "issues": [
+        "https://github.com/smithy-lang/smithy-kotlin/issues/1295"
+    ]
+}
\ No newline at end of file
diff --git a/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts b/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts
index b24f9ac8b2..8b3e1fdc8a 100644
--- a/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts
+++ b/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts
@@ -35,6 +35,7 @@ dependencies {
 tasks.withType<KotlinCompile> {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
+        freeCompilerArgs.add("-Xjdk-release=1.8")
         freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
     }
 }
diff --git a/codegen/smithy-kotlin-codegen/build.gradle.kts b/codegen/smithy-kotlin-codegen/build.gradle.kts
index 0ac6c27c6a..0ab1c9881b 100644
--- a/codegen/smithy-kotlin-codegen/build.gradle.kts
+++ b/codegen/smithy-kotlin-codegen/build.gradle.kts
@@ -58,6 +58,7 @@ val generateSdkRuntimeVersion by tasks.registering {
 tasks.withType<KotlinCompile> {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
+        freeCompilerArgs.add("-Xjdk-release=1.8")
         freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
     }
     dependsOn(generateSdkRuntimeVersion)
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/model/ShapeExt.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/model/ShapeExt.kt
index 8c6907fafd..01d02c4bee 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/model/ShapeExt.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/model/ShapeExt.kt
@@ -21,6 +21,7 @@ import software.amazon.smithy.rulesengine.language.EndpointRuleSet
 import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait
 import software.amazon.smithy.rulesengine.traits.EndpointTestCase
 import software.amazon.smithy.rulesengine.traits.EndpointTestsTrait
+import java.util.stream.Collectors
 
 /**
  * Get all shapes of a particular type from the model.
@@ -32,7 +33,7 @@ import software.amazon.smithy.rulesengine.traits.EndpointTestsTrait
  * shape's closure for example)
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-inline fun <reified T : Shape> Model.shapes(): List<T> = shapes(T::class.java).toList()
+inline fun <reified T : Shape> Model.shapes(): List<T> = shapes(T::class.java).collect(Collectors.toList())
 
 /**
  * Extension function to return a shape of expected type.
diff --git a/dokka-smithy/build.gradle.kts b/dokka-smithy/build.gradle.kts
index 341e3680bc..bb4b1ff1ec 100644
--- a/dokka-smithy/build.gradle.kts
+++ b/dokka-smithy/build.gradle.kts
@@ -34,6 +34,7 @@ tasks.test {
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
+        freeCompilerArgs.add("-Xjdk-release=1.8")
         allWarningsAsErrors.set(false) // FIXME Dokka bundles stdlib into the classpath, causing an unfixable warning
     }
 }
diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts
index 1b1ae3224e..4aa9e06b3b 100644
--- a/runtime/build.gradle.kts
+++ b/runtime/build.gradle.kts
@@ -65,6 +65,7 @@ subprojects {
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_1_8)
+            freeCompilerArgs.add("-Xjdk-release=1.8")
             freeCompilerArgs.add("-Xexpect-actual-classes")
         }
     }
diff --git a/tests/integration/slf4j-1x-consumer/build.gradle.kts b/tests/integration/slf4j-1x-consumer/build.gradle.kts
index 9531a2c436..dbe25d4e67 100644
--- a/tests/integration/slf4j-1x-consumer/build.gradle.kts
+++ b/tests/integration/slf4j-1x-consumer/build.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
 tasks.withType<KotlinCompile> {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
+        freeCompilerArgs.add("-Xjdk-release=1.8")
     }
 }
 
diff --git a/tests/integration/slf4j-2x-consumer/build.gradle.kts b/tests/integration/slf4j-2x-consumer/build.gradle.kts
index 527fa52223..b9e2e021a6 100644
--- a/tests/integration/slf4j-2x-consumer/build.gradle.kts
+++ b/tests/integration/slf4j-2x-consumer/build.gradle.kts
@@ -23,6 +23,7 @@ dependencies {
 tasks.withType<KotlinCompile> {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
+        freeCompilerArgs.add("-Xjdk-release=1.8")
     }
 }
 
diff --git a/tests/integration/slf4j-hybrid-consumer/build.gradle.kts b/tests/integration/slf4j-hybrid-consumer/build.gradle.kts
index ef306b0865..52db9e9db0 100644
--- a/tests/integration/slf4j-hybrid-consumer/build.gradle.kts
+++ b/tests/integration/slf4j-hybrid-consumer/build.gradle.kts
@@ -24,6 +24,7 @@ dependencies {
 tasks.withType<KotlinCompile> {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
+        freeCompilerArgs.add("-Xjdk-release=1.8")
     }
 }
 

From 8c990fa88d3e45a14ccc5b437e2d00e2665dc36e Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Fri, 20 Jun 2025 16:59:49 -0400
Subject: [PATCH 115/183] fix: add `explicitReceiver` parameter to
 `ShapeValueGenerator` (#1301)

---
 .../bdcf7bc9-094c-4434-aa34-1df7f4f4c936.json |  5 ++
 .../codegen/rendering/ShapeValueGenerator.kt  | 12 +++-
 .../HttpProtocolUnitTestRequestGenerator.kt   |  2 +-
 .../HttpProtocolUnitTestResponseGenerator.kt  |  2 +-
 .../smoketests/SmokeTestsRunnerGenerator.kt   |  2 +-
 .../rendering/ShapeValueGeneratorTest.kt      | 64 +++++++++++++------
 .../SmokeTestsRunnerGeneratorTest.kt          |  6 +-
 7 files changed, 66 insertions(+), 27 deletions(-)
 create mode 100644 .changes/bdcf7bc9-094c-4434-aa34-1df7f4f4c936.json

diff --git a/.changes/bdcf7bc9-094c-4434-aa34-1df7f4f4c936.json b/.changes/bdcf7bc9-094c-4434-aa34-1df7f4f4c936.json
new file mode 100644
index 0000000000..5f65717731
--- /dev/null
+++ b/.changes/bdcf7bc9-094c-4434-aa34-1df7f4f4c936.json
@@ -0,0 +1,5 @@
+{
+    "id": "bdcf7bc9-094c-4434-aa34-1df7f4f4c936",
+    "type": "bugfix",
+    "description": "Explicitly qualify shape member names in smoke tests and protocol tests"
+}
\ No newline at end of file
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ShapeValueGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ShapeValueGenerator.kt
index f2296b8d43..fcbfccec58 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ShapeValueGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ShapeValueGenerator.kt
@@ -19,10 +19,14 @@ import kotlin.math.round
 
 /**
  * Generates a shape type declaration based on the parameters provided.
+ * @param model the model which contains the shape being generated
+ * @param symbolProvider the symbol provider for the model
+ * @param explicitReceiver Whether shape members should be fully qualified, prefixed with `this.`
  */
 class ShapeValueGenerator(
     internal val model: Model,
     internal val symbolProvider: SymbolProvider,
+    internal val explicitReceiver: Boolean = false,
 ) {
 
     /**
@@ -61,7 +65,7 @@ class ShapeValueGenerator(
     }
 
     private fun writeShapeValuesInline(writer: KotlinWriter, shape: Shape, params: Node) {
-        val nodeVisitor = ShapeValueNodeVisitor(writer, this, shape)
+        val nodeVisitor = ShapeValueNodeVisitor(writer, this, shape, explicitReceiver)
         when (shape.type) {
             ShapeType.STRUCTURE -> params.accept(nodeVisitor)
             ShapeType.MAP -> mapDeclaration(writer, shape.asMapShape().get()) {
@@ -158,6 +162,7 @@ class ShapeValueGenerator(
         val writer: KotlinWriter,
         val generator: ShapeValueGenerator,
         val currShape: Shape,
+        val explicitReceiver: Boolean = false,
     ) : NodeVisitor<Unit> {
 
         override fun objectNode(node: ObjectNode) {
@@ -178,7 +183,10 @@ class ShapeValueGenerator(
                         }
                         memberShape = generator.model.expectShape(member.target)
                         val memberName = generator.symbolProvider.toMemberName(member)
-                        writer.writeInline("#L = ", memberName)
+                        val memberPrefix = if (explicitReceiver) "this." else ""
+
+                        writer.writeInline("#L#L = ", memberPrefix, memberName)
+
                         generator.instantiateShapeInline(writer, memberShape, valueNode)
                         if (i < node.members.size - 1) {
                             writer.ensureNewline()
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolUnitTestRequestGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolUnitTestRequestGenerator.kt
index 6fcc47c3e5..f07eaa9453 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolUnitTestRequestGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolUnitTestRequestGenerator.kt
@@ -189,7 +189,7 @@ open class HttpProtocolUnitTestRequestGenerator protected constructor(builder: B
                     writer.writeInline("\nval input = ")
                         .indent()
                         .call {
-                            ShapeValueGenerator(model, symbolProvider).instantiateShapeInline(writer, inputShape, test.params)
+                            ShapeValueGenerator(model, symbolProvider, explicitReceiver = true).instantiateShapeInline(writer, inputShape, test.params)
                         }
                         .dedent()
                         .write("")
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolUnitTestResponseGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolUnitTestResponseGenerator.kt
index 8cce92305c..90474c06ab 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolUnitTestResponseGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolUnitTestResponseGenerator.kt
@@ -80,7 +80,7 @@ open class HttpProtocolUnitTestResponseGenerator protected constructor(builder:
                     .call {
                         outputShape?.let {
                             writer.writeInline("\nresponse = ")
-                            ShapeValueGenerator(model, symbolProvider).instantiateShapeInline(writer, it, test.params)
+                            ShapeValueGenerator(model, symbolProvider, explicitReceiver = true).instantiateShapeInline(writer, it, test.params)
                         }
                     }
                     .write("")
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt
index a3124d7bff..9c90f6c72c 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGenerator.kt
@@ -211,7 +211,7 @@ class SmokeTestsRunnerGenerator(
         } else {
             writer.withBlock("(", ")") {
                 val inputShape = model.expectShape(operation.input.get())
-                ShapeValueGenerator(model, symbolProvider).instantiateShapeInline(writer, inputShape, inputParams)
+                ShapeValueGenerator(model, symbolProvider, explicitReceiver = true).instantiateShapeInline(writer, inputShape, inputParams)
             }
         }
     }
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ShapeValueGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ShapeValueGeneratorTest.kt
index 101c3e9502..ee9eb4e62e 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ShapeValueGeneratorTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ShapeValueGeneratorTest.kt
@@ -172,6 +172,49 @@ listOf<List<String>>(
 
     @Test
     fun `it renders structs`() {
+        val contents = renderTestStruct()
+
+        val expected = """
+            MyStruct {
+                stringMember = "v1"
+                boolMember = true
+                intMember = 1
+                structMember = Nested {
+                    tsMember = Instant.fromEpochSeconds(11223344, 0)
+                }
+                enumMember = MyEnum.fromValue("fooey")
+                floatMember = 2.toFloat()
+                doubleMember = 3.0.toDouble()
+                nullMember = null
+            }
+        """.trimIndent()
+
+        contents.shouldContainOnlyOnceWithDiff(expected)
+    }
+
+    @Test
+    fun `it renders structs with an explicit receiver`() {
+        val contents = renderTestStruct(explicitReceiver = true)
+
+        val expected = """
+            MyStruct {
+                this.stringMember = "v1"
+                this.boolMember = true
+                this.intMember = 1
+                this.structMember = Nested {
+                    this.tsMember = Instant.fromEpochSeconds(11223344, 0)
+                }
+                this.enumMember = MyEnum.fromValue("fooey")
+                this.floatMember = 2.toFloat()
+                this.doubleMember = 3.0.toDouble()
+                this.nullMember = null
+            }
+        """.trimIndent()
+
+        contents.shouldContainOnlyOnceWithDiff(expected)
+    }
+
+    fun renderTestStruct(explicitReceiver: Boolean = false): String {
         val model = """
             structure MyStruct {
                 stringMember: String,
@@ -218,25 +261,8 @@ listOf<List<String>>(
             .withMember("nullMember", Node.nullNode())
             .build()
 
-        ShapeValueGenerator(model, provider).instantiateShapeInline(writer, structShape, params)
-        val contents = writer.toString()
-
-        val expected = """
-MyStruct {
-    stringMember = "v1"
-    boolMember = true
-    intMember = 1
-    structMember = Nested {
-        tsMember = Instant.fromEpochSeconds(11223344, 0)
-    }
-    enumMember = MyEnum.fromValue("fooey")
-    floatMember = 2.toFloat()
-    doubleMember = 3.0.toDouble()
-    nullMember = null
-}
-        """.trimIndent()
-
-        contents.shouldContainOnlyOnceWithDiff(expected)
+        ShapeValueGenerator(model, provider, explicitReceiver).instantiateShapeInline(writer, structShape, params)
+        return writer.toString()
     }
 
     @Test
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGeneratorTest.kt
index c9d4b535c1..07f680d68a 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGeneratorTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/smoketests/SmokeTestsRunnerGeneratorTest.kt
@@ -136,7 +136,7 @@ class SmokeTestsRunnerGeneratorTest {
                         }.use { client ->
                             client.testOperation(
                                 TestOperationRequest {
-                                    bar = "2"
+                                    this.bar = "2"
                                 }
                             )
                         }
@@ -174,7 +174,7 @@ class SmokeTestsRunnerGeneratorTest {
                         }.use { client ->
                             client.testOperation(
                                 TestOperationRequest {
-                                    bar = "föö"
+                                    this.bar = "föö"
                                 }
                             )
                         }
@@ -213,7 +213,7 @@ class SmokeTestsRunnerGeneratorTest {
                         }.use { client ->
                             client.testOperation(
                                 TestOperationRequest {
-                                    bar = "föö"
+                                    this.bar = "föö"
                                 }
                             )
                         }

From aee6ce6159305e5316d8d66a77e37183364c4c24 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 20 Jun 2025 21:08:23 +0000
Subject: [PATCH 116/183] chore: release 1.4.20

---
 .changes/ba2b99b0-d583-472a-894a-9e56784eda75.json | 8 --------
 .changes/bdcf7bc9-094c-4434-aa34-1df7f4f4c936.json | 5 -----
 CHANGELOG.md                                       | 6 ++++++
 gradle.properties                                  | 4 ++--
 4 files changed, 8 insertions(+), 15 deletions(-)
 delete mode 100644 .changes/ba2b99b0-d583-472a-894a-9e56784eda75.json
 delete mode 100644 .changes/bdcf7bc9-094c-4434-aa34-1df7f4f4c936.json

diff --git a/.changes/ba2b99b0-d583-472a-894a-9e56784eda75.json b/.changes/ba2b99b0-d583-472a-894a-9e56784eda75.json
deleted file mode 100644
index b25e9bf6d4..0000000000
--- a/.changes/ba2b99b0-d583-472a-894a-9e56784eda75.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "id": "ba2b99b0-d583-472a-894a-9e56784eda75",
-    "type": "bugfix",
-    "description": "Enable building this project on JDK21 by setting -Xjdk-release flag",
-    "issues": [
-        "https://github.com/smithy-lang/smithy-kotlin/issues/1295"
-    ]
-}
\ No newline at end of file
diff --git a/.changes/bdcf7bc9-094c-4434-aa34-1df7f4f4c936.json b/.changes/bdcf7bc9-094c-4434-aa34-1df7f4f4c936.json
deleted file mode 100644
index 5f65717731..0000000000
--- a/.changes/bdcf7bc9-094c-4434-aa34-1df7f4f4c936.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "bdcf7bc9-094c-4434-aa34-1df7f4f4c936",
-    "type": "bugfix",
-    "description": "Explicitly qualify shape member names in smoke tests and protocol tests"
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51f589dfe4..8fa12af9fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.4.20] - 06/20/2025
+
+### Fixes
+* Explicitly qualify shape member names in smoke tests and protocol tests
+* [#1295](https://github.com/smithy-lang/smithy-kotlin/issues/1295) Enable building this project on JDK21 by setting -Xjdk-release flag
+
 ## [1.4.19] - 06/19/2025
 
 ## [1.4.18] - 06/13/2025
diff --git a/gradle.properties b/gradle.properties
index 334c97b290..cf03ce7560 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.20-SNAPSHOT
+sdkVersion=1.4.20
 
 # codegen
-codegenVersion=0.34.20-SNAPSHOT
+codegenVersion=0.34.20
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From 6b8e7916523016e243a15ac563dafc3401f4f06c Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 20 Jun 2025 21:08:24 +0000
Subject: [PATCH 117/183] chore: bump snapshot version to 1.4.21-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index cf03ce7560..04181bb99e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.20
+sdkVersion=1.4.21-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.20
+codegenVersion=0.34.21-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From 31a7c8266c3e6184df66a284e199c8771e1e8367 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Wed, 25 Jun 2025 12:30:44 -0400
Subject: [PATCH 118/183] misc: validate changelog entries (#1303)

---
 .github/workflows/changelog-verification.yml | 24 +++++++++-----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/changelog-verification.yml b/.github/workflows/changelog-verification.yml
index ed6efef911..457764177f 100644
--- a/.github/workflows/changelog-verification.yml
+++ b/.github/workflows/changelog-verification.yml
@@ -1,5 +1,8 @@
 name: Changelog verification
 
+permissions:
+  id-token: write
+
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
@@ -11,16 +14,11 @@ jobs:
   changelog-verification:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Check for changelog entry
-        if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-changelog') }}
-        run: |
-          git fetch origin ${{ github.base_ref }} --depth 1 && \
-          git diff remotes/origin/${{ github.base_ref }} --name-only | grep -P "\.changes/[0-9a-f-]+\.json"
-      - name: Error message
-        if: ${{ failure() }}
-        run: |
-          echo "::error ::No new/updated changelog entry found in /.changes directory. Please either:"
-          echo "::error ::* Add a changelog entry (see CONTRIBUTING.md for instructions) –or–"
-          echo "::error ::* Add the 'no-changelog' label to this PR (in rare cases not warranting a changelog entry)"
-          exit 1
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
+          aws-region: us-west-2
+
+      - name: Verify changelog
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/changelog-verification@main
\ No newline at end of file

From efbbddf567ec3f8495cbf1b387b435cc4367bc4b Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Thu, 26 Jun 2025 09:13:31 -0400
Subject: [PATCH 119/183] misc: update Gradle wrapper to 8.14.2 (#1304)

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b136486be8..bf3beeb7dd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 44bf6937cc4df84e10efbd200ebd9b89be8051dc Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Fri, 27 Jun 2025 11:41:09 -0700
Subject: [PATCH 120/183] chore: upgrade to Smithy 1.60.2 (#1307)

---
 .../aws/protocols/core/AwsHttpBindingProtocolGenerator.kt   | 6 +++++-
 gradle/libs.versions.toml                                   | 5 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGenerator.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGenerator.kt
index bd41afcade..595abc8d44 100644
--- a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGenerator.kt
+++ b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/AwsHttpBindingProtocolGenerator.kt
@@ -40,7 +40,11 @@ abstract class AwsHttpBindingProtocolGenerator : HttpBindingProtocolGenerator()
         // val targetedTest = TestMemberDelta(setOf("RestJsonComplexErrorWithNoMessage"), TestContainmentMode.RUN_TESTS)
 
         val ignoredTests = TestMemberDelta(
-            setOf(),
+            setOf(
+                // likely bug in Smithy's HTTP header traits spec
+                "RestJsonHttpEmptyPrefixHeadersRequestClient",
+                "HttpEmptyPrefixHeadersRequestClient",
+            ),
         )
 
         val requestTestBuilder = HttpProtocolUnitTestRequestGenerator.Builder()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 26f5ed8bd0..b71caf7347 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin-version = "2.1.0"
 dokka-version = "2.0.0"
 
-aws-kotlin-repo-tools-version = "0.4.25"
+aws-kotlin-repo-tools-version = "0.4.31"
 
 # libs
 coroutines-version = "1.9.0"
@@ -18,8 +18,7 @@ micrometer-version = "1.14.2"
 binary-compatibility-validator-version = "0.16.3"
 
 # codegen
-smithy-version = "1.54.0"
-smithy-gradle-version = "0.9.0"
+smithy-version = "1.60.2"
 
 # testing
 junit-version = "5.10.5"

From e86d816c6959c713376b739a5708fdb23939a49f Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 27 Jun 2025 18:44:40 +0000
Subject: [PATCH 121/183] chore: release 1.4.21

---
 CHANGELOG.md      | 2 ++
 gradle.properties | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fa12af9fa..844df4d0fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.4.21] - 06/27/2025
+
 ## [1.4.20] - 06/20/2025
 
 ### Fixes
diff --git a/gradle.properties b/gradle.properties
index 04181bb99e..73b2730f9e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.21-SNAPSHOT
+sdkVersion=1.4.21
 
 # codegen
-codegenVersion=0.34.21-SNAPSHOT
+codegenVersion=0.34.21
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From 4390455d08bf8481a6878559c2b67577ef9d7d77 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Fri, 27 Jun 2025 18:44:42 +0000
Subject: [PATCH 122/183] chore: bump snapshot version to 1.4.22-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 73b2730f9e..3e9ba90243 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.21
+sdkVersion=1.4.22-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.21
+codegenVersion=0.34.22-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From e479b3d24e4878efc40e706c6d201c62f3867c9a Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Tue, 1 Jul 2025 10:27:29 -0700
Subject: [PATCH 123/183] chore: bump aws-kotlin-repo-tools version (#1309)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b71caf7347..94f31d2cbc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin-version = "2.1.0"
 dokka-version = "2.0.0"
 
-aws-kotlin-repo-tools-version = "0.4.31"
+aws-kotlin-repo-tools-version = "0.4.32"
 
 # libs
 coroutines-version = "1.9.0"

From a2c37d5fa3960a62425f18ee1cf1b1373362cfad Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Wed, 2 Jul 2025 20:26:51 +0000
Subject: [PATCH 124/183] chore: release 1.4.22

---
 CHANGELOG.md      | 2 ++
 gradle.properties | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 844df4d0fa..489602997f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.4.22] - 07/02/2025
+
 ## [1.4.21] - 06/27/2025
 
 ## [1.4.20] - 06/20/2025
diff --git a/gradle.properties b/gradle.properties
index 3e9ba90243..980b66e8a6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.22-SNAPSHOT
+sdkVersion=1.4.22
 
 # codegen
-codegenVersion=0.34.22-SNAPSHOT
+codegenVersion=0.34.22
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From 444ff8a71ad8a6658264c44796eda736aa05405c Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Wed, 2 Jul 2025 20:26:53 +0000
Subject: [PATCH 125/183] chore: bump snapshot version to 1.4.23-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 980b66e8a6..60c016b59d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.22
+sdkVersion=1.4.23-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.22
+codegenVersion=0.34.23-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From f6de03d95358aa75553547c805419584478db2df Mon Sep 17 00:00:00 2001
From: Xinsong Cui <xicu@amazon.com>
Date: Tue, 15 Jul 2025 12:20:41 -0400
Subject: [PATCH 126/183] feat: add support for bedrock api key auth (#1317)

* add runtime type

* lint

* pr feedback, move env bearer token provider to smithy kotlin

* api

* add tests for env bearer token provider

* api

* remove unnecessary test
---
 .../kotlin/codegen/core/RuntimeTypes.kt       |  2 ++
 runtime/auth/http-auth/api/http-auth.api      |  6 ++++
 .../auth/EnvironmentBearerTokenProvider.kt    | 29 +++++++++++++++
 .../EnvironmentBearerTokenProviderTest.kt     | 35 +++++++++++++++++++
 4 files changed, 72 insertions(+)
 create mode 100644 runtime/auth/http-auth/common/src/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider.kt
 create mode 100644 runtime/auth/http-auth/common/test/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProviderTest.kt

diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
index 53fb49c71a..1cbf3b407b 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
@@ -374,6 +374,8 @@ object RuntimeTypes {
             val BearerTokenAuthScheme = symbol("BearerTokenAuthScheme")
             val BearerTokenProviderConfig = symbol("BearerTokenProviderConfig")
             val BearerTokenProvider = symbol("BearerTokenProvider")
+            val BearerToken = symbol("BearerToken")
+            val EnvironmentBearerTokenProvider = symbol("EnvironmentBearerTokenProvider")
 
             val reprioritizeAuthOptions = symbol("reprioritizeAuthOptions")
         }
diff --git a/runtime/auth/http-auth/api/http-auth.api b/runtime/auth/http-auth/api/http-auth.api
index 709166a395..d47a5a9c79 100644
--- a/runtime/auth/http-auth/api/http-auth.api
+++ b/runtime/auth/http-auth/api/http-auth.api
@@ -59,6 +59,12 @@ public final class aws/smithy/kotlin/runtime/http/auth/BearerTokenSigner : aws/s
 public abstract interface class aws/smithy/kotlin/runtime/http/auth/CloseableBearerTokenProvider : aws/smithy/kotlin/runtime/http/auth/BearerTokenProvider, java/io/Closeable {
 }
 
+public final class aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider : aws/smithy/kotlin/runtime/http/auth/BearerTokenProvider {
+	public fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;)V
+	public synthetic fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun resolve (Laws/smithy/kotlin/runtime/collections/Attributes;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
 public final class aws/smithy/kotlin/runtime/http/auth/ReprioritizeAuthOptionsKt {
 	public static final fun reprioritizeAuthOptions (Ljava/util/List;Ljava/util/List;)Ljava/util/List;
 }
diff --git a/runtime/auth/http-auth/common/src/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider.kt b/runtime/auth/http-auth/common/src/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider.kt
new file mode 100644
index 0000000000..ffe37b60b0
--- /dev/null
+++ b/runtime/auth/http-auth/common/src/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.http.auth
+
+import aws.smithy.kotlin.runtime.collections.Attributes
+import aws.smithy.kotlin.runtime.collections.emptyAttributes
+import aws.smithy.kotlin.runtime.time.Instant
+import aws.smithy.kotlin.runtime.util.PlatformProvider
+
+/**
+ * A [BearerTokenProvider] that extracts the bearer token from the target environment variable.
+ */
+public class EnvironmentBearerTokenProvider(
+    private val key: String,
+    private val platform: PlatformProvider = PlatformProvider.System,
+) : BearerTokenProvider {
+    override suspend fun resolve(attributes: Attributes): BearerToken {
+        val bearerToken = platform.getenv(key)
+            ?: error("$key environment variable is not set")
+
+        return object : BearerToken {
+            override val token: String = bearerToken
+            override val attributes: Attributes = emptyAttributes()
+            override val expiration: Instant? = null
+        }
+    }
+}
diff --git a/runtime/auth/http-auth/common/test/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProviderTest.kt b/runtime/auth/http-auth/common/test/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProviderTest.kt
new file mode 100644
index 0000000000..e98e8083d5
--- /dev/null
+++ b/runtime/auth/http-auth/common/test/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProviderTest.kt
@@ -0,0 +1,35 @@
+package aws.smithy.kotlin.runtime.http.auth
+
+import aws.smithy.kotlin.runtime.collections.emptyAttributes
+import aws.smithy.kotlin.runtime.util.TestPlatformProvider
+import kotlinx.coroutines.test.runTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+
+class EnvironmentBearerTokenProviderTest {
+    @Test
+    fun testResolveWithValidToken() = runTest {
+        val provider = EnvironmentBearerTokenProvider(
+            "TEST_TOKEN",
+            TestPlatformProvider(mutableMapOf("TEST_TOKEN" to "test-bearer-token")),
+        )
+
+        val token = provider.resolve()
+
+        assertEquals("test-bearer-token", token.token)
+    }
+
+    @Test
+    fun testResolveWithMissingToken() = runTest {
+        val provider = EnvironmentBearerTokenProvider(
+            "MISSING_TEST_TOKEN",
+            TestPlatformProvider(mutableMapOf()),
+        )
+
+        val exception = assertFailsWith<IllegalStateException> {
+            provider.resolve(emptyAttributes())
+        }
+        assertEquals("MISSING_TEST_TOKEN environment variable is not set", exception.message)
+    }
+}

From 1cae2de216010e98381736f551189cc58b1c0a3f Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Tue, 15 Jul 2025 16:50:11 +0000
Subject: [PATCH 127/183] chore: release 1.4.23

---
 CHANGELOG.md      | 2 ++
 gradle.properties | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 489602997f..ad34f18d2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.4.23] - 07/15/2025
+
 ## [1.4.22] - 07/02/2025
 
 ## [1.4.21] - 06/27/2025
diff --git a/gradle.properties b/gradle.properties
index 60c016b59d..f8d61323cd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.23-SNAPSHOT
+sdkVersion=1.4.23
 
 # codegen
-codegenVersion=0.34.23-SNAPSHOT
+codegenVersion=0.34.23
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From 8e00fc6b8eba8c7b492acbf62f9ae9c1f00e5a6c Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Tue, 15 Jul 2025 16:50:12 +0000
Subject: [PATCH 128/183] chore: bump snapshot version to 1.4.24-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f8d61323cd..aa80c53d95 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.23
+sdkVersion=1.4.24-SNAPSHOT
 
 # codegen
-codegenVersion=0.34.23
+codegenVersion=0.34.24-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From 287b4081fdd2d1e43ee8d888d9e91471185e54d1 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Thu, 17 Jul 2025 10:06:00 -0700
Subject: [PATCH 129/183] chore: v1.5-main merge (#1328)

---
 .brazil.json                                  |   1 +
 .../2ec4ad9a-f964-4cf1-be58-d0229493bb81.json |   5 +
 .../49af01b8-6fed-4add-ace0-9f027e83425a.json |   9 +
 .../d3ce7511-6fb2-4435-8f46-db724551b384.json |   5 +
 .../d4f09e32-8bcc-406e-96e0-2743280c13d9.json |   8 +
 .../db001c20-3788-4cfe-9ec2-284fd86a80bd.json |   8 +
 .../e6515649-dab5-4be9-b4b4-b289369960d5.json |   8 +
 .github/workflows/merge-main.yml              |   2 +-
 bom/build.gradle.kts                          |   3 -
 .../aws/customization/RegionSupport.kt        |  24 +-
 .../kotlin/codegen/aws/protocols/AwsQuery.kt  |  22 +-
 .../kotlin/codegen/aws/protocols/Ec2Query.kt  |   7 +-
 .../kotlin/codegen/aws/protocols/RestXml.kt   |   2 +-
 .../aws/customization/RegionSupportTest.kt    |  73 +++
 .../kotlin/codegen/test/ModelTestUtils.kt     |  12 +-
 .../smithy/kotlin/codegen/CodegenVisitor.kt   |   8 +-
 .../smithy/kotlin/codegen/KotlinSettings.kt   |  28 +-
 .../codegen/core/AbstractCodeWriterExt.kt     |   9 +
 .../kotlin/codegen/core/CodegenContext.kt     |   5 +
 .../kotlin/codegen/core/KotlinDelegator.kt    |  13 +-
 .../kotlin/codegen/core/KotlinDependency.kt   |   3 +-
 .../kotlin/codegen/core/RuntimeTypes.kt       |  24 +-
 .../rendering/ExceptionBaseClassGenerator.kt  |   7 +-
 .../codegen/rendering/GradleGenerator.kt      |   7 +-
 ... => DefaultEndpointDiscovererGenerator.kt} |  72 +--
 .../EndpointDiscovererInterfaceGenerator.kt   |  94 ++++
 .../discovery/EndpointDiscoveryIntegration.kt |  66 +--
 .../kotlin/codegen/KotlinSettingsTest.kt      |   6 +-
 .../codegen/core/KotlinDelegatorTest.kt       |   4 +-
 .../rendering/ExceptionGeneratorTest.kt       |   2 +-
 .../DefaultEndpointDiscovererGeneratorTest.kt |  78 ++++
 .../EndpointDiscovererGeneratorTest.kt        | 153 -------
 ...ndpointDiscovererInterfaceGeneratorTest.kt |  75 +++
 .../EndpointDiscoveryIntegrationTest.kt       |  24 +-
 .../discovery/EndpointDiscoveryTestUtils.kt   |  56 +++
 .../HttpStringValuesMapSerializerTest.kt      |   9 +-
 .../serde/SerializeStructGeneratorTest.kt     |   3 +-
 .../waiters/ServiceWaitersGeneratorTest.kt    |  16 +-
 gradle.properties                             |   2 +-
 gradle/libs.versions.toml                     |  16 +-
 .../aws-credentials/api/aws-credentials.api   |   4 +-
 .../api/aws-signing-common.api                |   7 -
 .../auth/awssigning/AwsSigningExceptions.kt   |  37 --
 .../awssigning/SigV4aSignatureCalculator.kt   |   4 +-
 .../auth/aws-signing-tests/build.gradle.kts   |   2 +-
 .../tests/SigningSuiteTestBaseJVM.kt          |   9 +-
 .../auth/http-auth-api/api/http-auth-api.api  |   2 +-
 .../http/auth/AwsHttpSignerTestBase.kt        |  61 ++-
 .../auth/identity-api/api/identity-api.api    |   1 +
 runtime/build.gradle.kts                      |   1 +
 .../telemetry-api/api/telemetry-api.api       |  20 +-
 .../awsprotocol/json/AwsJsonProtocolTest.kt   |  20 +-
 .../api/aws-xml-protocols.api                 |   6 +-
 .../xml/Ec2QueryErrorDeserializer.kt          |  10 +-
 .../xml/RestXmlErrorDeserializer.kt           |  14 +-
 .../xml/Ec2QueryErrorDeserializerTest.kt      |   6 +-
 .../xml/RestXmlErrorDeserializerTest.kt       |  11 +-
 .../api/http-client-engine-okhttp.api         |   2 +-
 ...t => ConnectionMonitoringEventListener.kt} |  38 +-
 .../http/engine/okhttp/EventListenerChain.kt  | 115 +++++
 .../http/engine/okhttp/OkHttpEngine.kt        |  65 ++-
 .../engine/okhttp/EventListenerChainTest.kt   | 281 ++++++++++++
 .../protocol/http-client/api/http-client.api  |  47 +-
 .../DiscoveredEndpointErrorInterceptor.kt     |   2 +-
 .../runtime/http/operation/HttpSerde.kt       |  81 +---
 .../http/operation/SdkHttpOperation.kt        |  30 --
 .../http/operation/SdkHttpOperationTest.kt    |   4 +-
 runtime/runtime-core/api/runtime-core.api     |  45 +-
 .../runtime/collections/ExpiringKeyedCache.kt |  42 ++
 ...dThroughCache.kt => PeriodicSweepCache.kt} |  26 +-
 .../runtime/smoketests/SmokeTestsFunctions.kt |  21 -
 ...CacheTest.kt => PeriodicSweepCacheTest.kt} |   8 +-
 runtime/serde/serde-xml/api/serde-xml.api     |  16 +-
 .../runtime/serde/xml/XmlDeserializer.kt      | 431 ------------------
 .../runtime/serde/xml/XmlStreamReader.kt      |  19 +
 runtime/smithy-client/api/smithy-client.api   |  76 ++-
 .../kotlin/runtime/client/Interceptor.kt      |   2 +
 .../runtime/client/region/RegionProvider.kt   |  17 +
 .../client/region/RegionProviderChain.kt      |  52 +++
 .../kotlin/runtime/client/util/Annotations.kt |  13 +
 .../client/region/RegionProviderChainTest.kt  |  47 ++
 .../runtime/client/util/AnnotationsJVM.kt     |   8 +
 .../runtime/client/util/AnnotationsNative.kt  |  10 +
 tests/codegen/waiter-tests/build.gradle.kts   |   2 +-
 84 files changed, 1525 insertions(+), 1159 deletions(-)
 create mode 100644 .changes/2ec4ad9a-f964-4cf1-be58-d0229493bb81.json
 create mode 100644 .changes/49af01b8-6fed-4add-ace0-9f027e83425a.json
 create mode 100644 .changes/d3ce7511-6fb2-4435-8f46-db724551b384.json
 create mode 100644 .changes/d4f09e32-8bcc-406e-96e0-2743280c13d9.json
 create mode 100644 .changes/db001c20-3788-4cfe-9ec2-284fd86a80bd.json
 create mode 100644 .changes/e6515649-dab5-4be9-b4b4-b289369960d5.json
 create mode 100644 codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/customization/RegionSupportTest.kt
 rename codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/{EndpointDiscovererGenerator.kt => DefaultEndpointDiscovererGenerator.kt} (55%)
 create mode 100644 codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererInterfaceGenerator.kt
 create mode 100644 codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/DefaultEndpointDiscovererGeneratorTest.kt
 delete mode 100644 codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererGeneratorTest.kt
 create mode 100644 codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererInterfaceGeneratorTest.kt
 create mode 100644 codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscoveryTestUtils.kt
 delete mode 100644 runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsSigningExceptions.kt
 rename runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/{ConnectionIdleMonitor.kt => ConnectionMonitoringEventListener.kt} (78%)
 create mode 100644 runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/EventListenerChain.kt
 create mode 100644 runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/test/aws/smithy/kotlin/runtime/http/engine/okhttp/EventListenerChainTest.kt
 create mode 100644 runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/ExpiringKeyedCache.kt
 rename runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/{ReadThroughCache.kt => PeriodicSweepCache.kt} (74%)
 rename runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/{ReadThroughCacheTest.kt => PeriodicSweepCacheTest.kt} (91%)
 delete mode 100644 runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlDeserializer.kt
 create mode 100644 runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/region/RegionProvider.kt
 create mode 100644 runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/region/RegionProviderChain.kt
 create mode 100644 runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/util/Annotations.kt
 create mode 100644 runtime/smithy-client/common/test/aws/smithy/kotlin/runtime/client/region/RegionProviderChainTest.kt
 create mode 100644 runtime/smithy-client/jvm/src/aws/smithy/kotlin/runtime/client/util/AnnotationsJVM.kt
 create mode 100644 runtime/smithy-client/native/src/aws/smithy/kotlin/runtime/client/util/AnnotationsNative.kt

diff --git a/.brazil.json b/.brazil.json
index 0908ffedb4..1a0b943fec 100644
--- a/.brazil.json
+++ b/.brazil.json
@@ -5,6 +5,7 @@
 
     "com.squareup.okhttp3:okhttp-coroutines:5.*": "OkHttp3Coroutines-5.x",
     "com.squareup.okhttp3:okhttp:5.*": "OkHttp3-5.x",
+    "com.squareup.okhttp3:okhttp-jvm:5.*": "OkHttp3-5.x",
     "com.squareup.okio:okio-jvm:3.*": "OkioJvm-3.x",
     "io.opentelemetry:opentelemetry-api:1.*": "Maven-io-opentelemetry_opentelemetry-api-1.x",
     "io.opentelemetry:opentelemetry-extension-kotlin:1.*": "Maven-io-opentelemetry_opentelemetry-extension-kotlin-1.x",
diff --git a/.changes/2ec4ad9a-f964-4cf1-be58-d0229493bb81.json b/.changes/2ec4ad9a-f964-4cf1-be58-d0229493bb81.json
new file mode 100644
index 0000000000..94684ac76b
--- /dev/null
+++ b/.changes/2ec4ad9a-f964-4cf1-be58-d0229493bb81.json
@@ -0,0 +1,5 @@
+{
+    "id": "2ec4ad9a-f964-4cf1-be58-d0229493bb81",
+    "type": "feature",
+    "description": "Upgrade to Kotlin 2.2.0"
+}
\ No newline at end of file
diff --git a/.changes/49af01b8-6fed-4add-ace0-9f027e83425a.json b/.changes/49af01b8-6fed-4add-ace0-9f027e83425a.json
new file mode 100644
index 0000000000..266a5b1a56
--- /dev/null
+++ b/.changes/49af01b8-6fed-4add-ace0-9f027e83425a.json
@@ -0,0 +1,9 @@
+{
+    "id": "49af01b8-6fed-4add-ace0-9f027e83425a",
+    "type": "feature",
+    "description": "⚠️ **IMPORTANT**: Refactor endpoint discoverer classes into interfaces so custom implementations may be provided",
+    "issues": [
+        "awslabs/aws-sdk-kotlin#1413"
+    ],
+    "requiresMinorVersionBump": true
+}
diff --git a/.changes/d3ce7511-6fb2-4435-8f46-db724551b384.json b/.changes/d3ce7511-6fb2-4435-8f46-db724551b384.json
new file mode 100644
index 0000000000..aa89d9167e
--- /dev/null
+++ b/.changes/d3ce7511-6fb2-4435-8f46-db724551b384.json
@@ -0,0 +1,5 @@
+{
+    "id": "d3ce7511-6fb2-4435-8f46-db724551b384",
+    "type": "misc",
+    "description": "Add telemetry provider configuration to `DefaultAwsSigner`"
+}
\ No newline at end of file
diff --git a/.changes/d4f09e32-8bcc-406e-96e0-2743280c13d9.json b/.changes/d4f09e32-8bcc-406e-96e0-2743280c13d9.json
new file mode 100644
index 0000000000..2d09a6ce5a
--- /dev/null
+++ b/.changes/d4f09e32-8bcc-406e-96e0-2743280c13d9.json
@@ -0,0 +1,8 @@
+{
+    "id": "d4f09e32-8bcc-406e-96e0-2743280c13d9",
+    "type": "bugfix",
+    "description": "Switch to always serialize defaults in requests. Previously fields were not serialized in requests if they weren't `@required` and hadn't been changed from the default value.",
+    "issues": [
+        "https://github.com/awslabs/aws-sdk-kotlin/issues/1608"
+    ]
+}
diff --git a/.changes/db001c20-3788-4cfe-9ec2-284fd86a80bd.json b/.changes/db001c20-3788-4cfe-9ec2-284fd86a80bd.json
new file mode 100644
index 0000000000..436c640085
--- /dev/null
+++ b/.changes/db001c20-3788-4cfe-9ec2-284fd86a80bd.json
@@ -0,0 +1,8 @@
+{
+    "id": "db001c20-3788-4cfe-9ec2-284fd86a80bd",
+    "type": "bugfix",
+    "description": "Reimplement idle connection monitoring using `okhttp3.EventListener` instead of now-internal `okhttp3.ConnectionListener`",
+    "issues": [
+        "https://github.com/smithy-lang/smithy-kotlin/issues/1311"
+    ]
+}
\ No newline at end of file
diff --git a/.changes/e6515649-dab5-4be9-b4b4-b289369960d5.json b/.changes/e6515649-dab5-4be9-b4b4-b289369960d5.json
new file mode 100644
index 0000000000..a4485b5bf8
--- /dev/null
+++ b/.changes/e6515649-dab5-4be9-b4b4-b289369960d5.json
@@ -0,0 +1,8 @@
+{
+    "id": "e6515649-dab5-4be9-b4b4-b289369960d5",
+    "type": "bugfix",
+    "description": "Favor `endpointUrl` instead of endpoint discovery if both are provided",
+    "issues": [
+        "awslabs/aws-sdk-kotlin#1413"
+    ]
+}
\ No newline at end of file
diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
index db1df3a142..ae4af7a055 100644
--- a/.github/workflows/merge-main.yml
+++ b/.github/workflows/merge-main.yml
@@ -12,4 +12,4 @@ jobs:
         uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@main
         with:
           ci-user-pat: ${{ secrets.CI_USER_PAT }}
-          exempt-branches: # Add any if required
\ No newline at end of file
+          exempt-branches: # Add any if required
diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts
index 51b05616c1..8af09dbf58 100644
--- a/bom/build.gradle.kts
+++ b/bom/build.gradle.kts
@@ -7,8 +7,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget
-import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
-import java.util.*
 
 plugins {
     `maven-publish`
@@ -52,7 +50,6 @@ fun createBomConstraintsAndVersionCatalog() {
 
 fun Project.artifactId(target: KotlinTarget): String = when (target) {
     is KotlinMetadataTarget -> name
-    is KotlinJsTarget -> "$name-js"
     else -> "$name-${target.targetName.lowercase()}"
 }
 
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/customization/RegionSupport.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/customization/RegionSupport.kt
index f144c54f9f..9b25eaaa29 100644
--- a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/customization/RegionSupport.kt
+++ b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/customization/RegionSupport.kt
@@ -40,7 +40,27 @@ class RegionSupport : KotlinIntegration {
             name = "region"
             symbol = KotlinTypes.String.toBuilder().nullable().build()
             documentation = """
-                The region to sign with and make requests to.
+                The AWS region to sign with and make requests to. When specified, this static region configuration
+                takes precedence over other region resolution methods. 
+                
+                The region resolution order is:
+                1. Static region (if specified)
+                2. Custom region provider (if configured)
+                3. Default region provider chain
+            """.trimIndent()
+        }
+
+        val RegionProviderProp: ConfigProperty = ConfigProperty {
+            name = "regionProvider"
+            symbol = RuntimeTypes.SmithyClient.Region.RegionProvider
+            documentation = """
+                An optional region provider that determines the AWS region for client operations. When specified, this provider
+                takes precedence over the default region provider chain, unless a static region is explicitly configured.
+              
+                The region resolution order is:
+                1. Static region (if specified)
+                2. Custom region provider (if configured)
+                3. Default region provider chain
             """.trimIndent()
         }
     }
@@ -57,7 +77,7 @@ class RegionSupport : KotlinIntegration {
         return supportsSigv4 || hasRegionBuiltin || isAwsSdk
     }
 
-    override fun additionalServiceConfigProps(ctx: CodegenContext): List<ConfigProperty> = listOf(RegionProp)
+    override fun additionalServiceConfigProps(ctx: CodegenContext): List<ConfigProperty> = listOf(RegionProp, RegionProviderProp)
 
     override fun customizeEndpointResolution(ctx: ProtocolGenerator.GenerationContext): EndpointCustomization =
         object : EndpointCustomization {
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/AwsQuery.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/AwsQuery.kt
index 48d47a7c18..853ed38a55 100644
--- a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/AwsQuery.kt
+++ b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/AwsQuery.kt
@@ -11,13 +11,23 @@ import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AbstractQueryFor
 import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AwsHttpBindingProtocolGenerator
 import software.amazon.smithy.kotlin.codegen.aws.protocols.core.QueryHttpBindingProtocolGenerator
 import software.amazon.smithy.kotlin.codegen.aws.protocols.formurl.QuerySerdeFormUrlDescriptorGenerator
-import software.amazon.smithy.kotlin.codegen.core.*
+import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
+import software.amazon.smithy.kotlin.codegen.core.RenderingContext
+import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
+import software.amazon.smithy.kotlin.codegen.core.withBlock
 import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
-import software.amazon.smithy.kotlin.codegen.model.*
-import software.amazon.smithy.kotlin.codegen.rendering.protocol.*
-import software.amazon.smithy.kotlin.codegen.rendering.serde.*
+import software.amazon.smithy.kotlin.codegen.model.buildSymbol
+import software.amazon.smithy.kotlin.codegen.model.getTrait
+import software.amazon.smithy.kotlin.codegen.model.hasTrait
+import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
+import software.amazon.smithy.kotlin.codegen.rendering.protocol.toRenderingContext
+import software.amazon.smithy.kotlin.codegen.rendering.serde.FormUrlSerdeDescriptorGenerator
+import software.amazon.smithy.kotlin.codegen.rendering.serde.StructuredDataParserGenerator
+import software.amazon.smithy.kotlin.codegen.rendering.serde.StructuredDataSerializerGenerator
+import software.amazon.smithy.kotlin.codegen.rendering.serde.XmlParserGenerator
 import software.amazon.smithy.model.shapes.*
-import software.amazon.smithy.model.traits.*
+import software.amazon.smithy.model.traits.XmlFlattenedTrait
+import software.amazon.smithy.model.traits.XmlNameTrait
 
 /**
  * Handles generating the aws.protocols#awsQuery protocol for services.
@@ -45,7 +55,7 @@ class AwsQuery : QueryHttpBindingProtocolGenerator() {
         writer: KotlinWriter,
     ) {
         writer.write("""checkNotNull(payload){ "unable to parse error from empty response" }""")
-        writer.write("#T(payload)", RuntimeTypes.AwsXmlProtocols.parseRestXmlErrorResponseNoSuspend)
+        writer.write("#T(payload)", RuntimeTypes.AwsXmlProtocols.parseRestXmlErrorResponse)
     }
 }
 
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/Ec2Query.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/Ec2Query.kt
index 10be8bfc6e..b84f22f442 100644
--- a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/Ec2Query.kt
+++ b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/Ec2Query.kt
@@ -10,7 +10,10 @@ import software.amazon.smithy.codegen.core.Symbol
 import software.amazon.smithy.kotlin.codegen.aws.protocols.core.AbstractQueryFormUrlSerializerGenerator
 import software.amazon.smithy.kotlin.codegen.aws.protocols.core.QueryHttpBindingProtocolGenerator
 import software.amazon.smithy.kotlin.codegen.aws.protocols.formurl.QuerySerdeFormUrlDescriptorGenerator
-import software.amazon.smithy.kotlin.codegen.core.*
+import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
+import software.amazon.smithy.kotlin.codegen.core.RenderingContext
+import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
+import software.amazon.smithy.kotlin.codegen.core.withBlock
 import software.amazon.smithy.kotlin.codegen.model.buildSymbol
 import software.amazon.smithy.kotlin.codegen.model.getTrait
 import software.amazon.smithy.kotlin.codegen.model.isNullable
@@ -39,7 +42,7 @@ class Ec2Query : QueryHttpBindingProtocolGenerator() {
         writer: KotlinWriter,
     ) {
         writer.write("""checkNotNull(payload){ "unable to parse error from empty response" }""")
-        writer.write("#T(payload)", RuntimeTypes.AwsXmlProtocols.parseEc2QueryErrorResponseNoSuspend)
+        writer.write("#T(payload)", RuntimeTypes.AwsXmlProtocols.parseEc2QueryErrorResponse)
     }
 }
 
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestXml.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestXml.kt
index 7c1f45b92c..c7c834c317 100644
--- a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestXml.kt
+++ b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/RestXml.kt
@@ -63,7 +63,7 @@ open class RestXml : AwsHttpBindingProtocolGenerator() {
         writer: KotlinWriter,
     ) {
         writer.write("""checkNotNull(payload){ "unable to parse error from empty response" }""")
-        writer.write("#T(payload)", RuntimeTypes.AwsXmlProtocols.parseRestXmlErrorResponseNoSuspend)
+        writer.write("#T(payload)", RuntimeTypes.AwsXmlProtocols.parseRestXmlErrorResponse)
     }
 }
 
diff --git a/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/customization/RegionSupportTest.kt b/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/customization/RegionSupportTest.kt
new file mode 100644
index 0000000000..2df3e519f0
--- /dev/null
+++ b/codegen/smithy-aws-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/aws/customization/RegionSupportTest.kt
@@ -0,0 +1,73 @@
+package software.amazon.smithy.kotlin.codegen.aws.customization
+
+import org.junit.jupiter.api.Test
+import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
+import software.amazon.smithy.kotlin.codegen.model.expectShape
+import software.amazon.smithy.kotlin.codegen.rendering.ServiceClientConfigGenerator
+import software.amazon.smithy.kotlin.codegen.test.*
+import software.amazon.smithy.model.shapes.ServiceShape
+
+class RegionSupportTest {
+    @Test
+    fun testRegionSupportProperties() {
+        val model = """
+            namespace com.test
+
+            use aws.protocols#awsJson1_1
+            use aws.api#service
+            use aws.auth#sigv4
+
+            @service(sdkId: "service with overrides", endpointPrefix: "service-with-overrides")
+            @sigv4(name: "example")
+            @awsJson1_1
+            service Example {
+                version: "1.0.0",
+                operations: [GetFoo]
+            }
+
+            operation GetFoo {}
+        """.toSmithyModel()
+
+        val serviceShape = model.expectShape<ServiceShape>("com.test#Example")
+
+        val testCtx = model.newTestContext(serviceName = "Example")
+        val writer = KotlinWriter("com.test")
+
+        val renderingCtx = testCtx.toRenderingContext(writer, serviceShape)
+            .copy(integrations = listOf(RegionSupport()))
+
+        ServiceClientConfigGenerator(serviceShape, detectDefaultProps = false).render(renderingCtx, renderingCtx.writer)
+        val contents = writer.toString()
+
+        val expectedProps = """
+            public val region: String? = builder.region
+            public val regionProvider: RegionProvider? = builder.regionProvider
+        """.formatForTest()
+        contents.shouldContainOnlyOnceWithDiff(expectedProps)
+
+        val expectedImpl = """
+            /**
+             * The AWS region to sign with and make requests to. When specified, this static region configuration
+             * takes precedence over other region resolution methods.
+             *
+             * The region resolution order is:
+             * 1. Static region (if specified)
+             * 2. Custom region provider (if configured)
+             * 3. Default region provider chain
+             */
+            public var region: String? = null
+    
+            /**
+             * An optional region provider that determines the AWS region for client operations. When specified, this provider
+             * takes precedence over the default region provider chain, unless a static region is explicitly configured.
+             *
+             * The region resolution order is:
+             * 1. Static region (if specified)
+             * 2. Custom region provider (if configured)
+             * 3. Default region provider chain
+             */
+            public var regionProvider: RegionProvider? = null
+        """.formatForTest(indent = "        ")
+        contents.shouldContainOnlyOnceWithDiff(expectedImpl)
+    }
+}
diff --git a/codegen/smithy-kotlin-codegen-testutils/src/main/kotlin/software/amazon/smithy/kotlin/codegen/test/ModelTestUtils.kt b/codegen/smithy-kotlin-codegen-testutils/src/main/kotlin/software/amazon/smithy/kotlin/codegen/test/ModelTestUtils.kt
index e857f91fee..4c421f7fa7 100644
--- a/codegen/smithy-kotlin-codegen-testutils/src/main/kotlin/software/amazon/smithy/kotlin/codegen/test/ModelTestUtils.kt
+++ b/codegen/smithy-kotlin-codegen-testutils/src/main/kotlin/software/amazon/smithy/kotlin/codegen/test/ModelTestUtils.kt
@@ -8,6 +8,7 @@ import software.amazon.smithy.build.MockManifest
 import software.amazon.smithy.codegen.core.SymbolProvider
 import software.amazon.smithy.kotlin.codegen.*
 import software.amazon.smithy.kotlin.codegen.core.CodegenContext
+import software.amazon.smithy.kotlin.codegen.core.GenerationContext
 import software.amazon.smithy.kotlin.codegen.core.KotlinDelegator
 import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
 import software.amazon.smithy.kotlin.codegen.model.OperationNormalizer
@@ -122,9 +123,11 @@ fun Model.newTestContext(
     val manifest = MockManifest()
     val provider: SymbolProvider = KotlinCodegenPlugin.createSymbolProvider(model = this, rootNamespace = packageName, serviceName = serviceName, settings = settings)
     val service = this.getShape(ShapeId.from("$packageName#$serviceName")).get().asServiceShape().get()
-    val delegator = KotlinDelegator(settings, this, manifest, provider, integrations)
 
-    val ctx = ProtocolGenerator.GenerationContext(
+    val codegenCtx = GenerationContext(this, provider, settings, generator, integrations)
+    val delegator = KotlinDelegator(codegenCtx, manifest, integrations)
+
+    val generationCtx = ProtocolGenerator.GenerationContext(
         settings,
         this,
         service,
@@ -133,7 +136,8 @@ fun Model.newTestContext(
         generator.protocol,
         delegator,
     )
-    return TestContext(ctx, manifest, generator)
+
+    return TestContext(generationCtx, manifest, generator)
 }
 
 fun TestContext.toCodegenContext() = object : CodegenContext {
@@ -173,7 +177,7 @@ fun Model.defaultSettings(
     sdkId: String = TestModelDefault.SDK_ID,
     generateDefaultBuildFiles: Boolean = false,
     nullabilityCheckMode: CheckMode = CheckMode.CLIENT_CAREFUL,
-    defaultValueSerializationMode: DefaultValueSerializationMode = DefaultValueSerializationMode.WHEN_DIFFERENT,
+    defaultValueSerializationMode: DefaultValueSerializationMode = DefaultValueSerializationMode.DEFAULT,
 ): KotlinSettings {
     val serviceId = if (serviceName == null) {
         this.inferService()
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/CodegenVisitor.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/CodegenVisitor.kt
index 4adf42b91f..012bd09c36 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/CodegenVisitor.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/CodegenVisitor.kt
@@ -87,12 +87,12 @@ class CodegenVisitor(context: PluginContext) : ShapeVisitor.Default<Unit>() {
             integration.decorateSymbolProvider(settings, model, provider)
         }
 
-        writers = KotlinDelegator(settings, model, fileManifest, symbolProvider, integrations)
-
         protocolGenerator = resolveProtocolGenerator(integrations, model, service, settings)
-        applicationProtocol = protocolGenerator?.applicationProtocol ?: ApplicationProtocol.createDefaultHttpApplicationProtocol()
-
         baseGenerationContext = GenerationContext(model, symbolProvider, settings, protocolGenerator, integrations)
+
+        writers = KotlinDelegator(baseGenerationContext, fileManifest, integrations)
+
+        applicationProtocol = protocolGenerator?.applicationProtocol ?: ApplicationProtocol.createDefaultHttpApplicationProtocol()
     }
 
     private fun resolveProtocolGenerator(
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettings.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettings.kt
index 3ee6e0633b..334285ffb3 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettings.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettings.kt
@@ -5,12 +5,7 @@
 
 package software.amazon.smithy.kotlin.codegen
 
-import software.amazon.smithy.aws.traits.protocols.AwsJson1_0Trait
-import software.amazon.smithy.aws.traits.protocols.AwsJson1_1Trait
-import software.amazon.smithy.aws.traits.protocols.AwsQueryTrait
-import software.amazon.smithy.aws.traits.protocols.Ec2QueryTrait
-import software.amazon.smithy.aws.traits.protocols.RestJson1Trait
-import software.amazon.smithy.aws.traits.protocols.RestXmlTrait
+import software.amazon.smithy.aws.traits.protocols.*
 import software.amazon.smithy.codegen.core.CodegenException
 import software.amazon.smithy.kotlin.codegen.lang.isValidPackageName
 import software.amazon.smithy.kotlin.codegen.utils.getOrNull
@@ -24,10 +19,10 @@ import software.amazon.smithy.model.shapes.ServiceShape
 import software.amazon.smithy.model.shapes.Shape
 import software.amazon.smithy.model.shapes.ShapeId
 import software.amazon.smithy.protocol.traits.Rpcv2CborTrait
-import java.util.Optional
+import java.util.*
 import java.util.logging.Logger
+import java.util.stream.Collectors
 import kotlin.IllegalArgumentException
-import kotlin.streams.toList
 
 // shapeId of service from which to generate an SDK
 private const val SERVICE = "service"
@@ -164,7 +159,7 @@ fun Model.inferService(): ShapeId {
     val services = shapes(ServiceShape::class.java)
         .map(Shape::getId)
         .sorted()
-        .toList()
+        .collect(Collectors.toList())
 
     return when {
         services.isEmpty() -> {
@@ -273,10 +268,15 @@ enum class DefaultValueSerializationMode(val value: String) {
 
     override fun toString(): String = value
     companion object {
+        /**
+         * The default value serialization mode, which is [ALWAYS]
+         */
+        val DEFAULT = ALWAYS
+
         fun fromValue(value: String): DefaultValueSerializationMode =
-            values().find {
-                it.value == value
-            } ?: throw IllegalArgumentException("$value is not a valid DefaultValueSerializationMode, expected one of ${values().map { it.value }}")
+            requireNotNull(entries.find { it.value.equals(value, ignoreCase = true) }) {
+                "$value is not a valid DefaultValueSerializationMode, expected one of ${values().map { it.value }}"
+            }
     }
 }
 
@@ -291,7 +291,7 @@ enum class DefaultValueSerializationMode(val value: String) {
 data class ApiSettings(
     val visibility: Visibility = Visibility.PUBLIC,
     val nullabilityCheckMode: CheckMode = CheckMode.CLIENT_CAREFUL,
-    val defaultValueSerializationMode: DefaultValueSerializationMode = DefaultValueSerializationMode.WHEN_DIFFERENT,
+    val defaultValueSerializationMode: DefaultValueSerializationMode = DefaultValueSerializationMode.DEFAULT,
     val enableEndpointAuthProvider: Boolean = false,
     val protocolResolutionPriority: Set<ShapeId> = DEFAULT_PROTOCOL_RESOLUTION_PRIORITY,
 ) {
@@ -315,7 +315,7 @@ data class ApiSettings(
                 node.get()
                     .getStringMemberOrDefault(
                         DEFAULT_VALUE_SERIALIZATION_MODE,
-                        DefaultValueSerializationMode.WHEN_DIFFERENT.value,
+                        DefaultValueSerializationMode.DEFAULT.value,
                     ),
             )
             val enableEndpointAuthProvider = node.get().getBooleanMemberOrDefault(ENABLE_ENDPOINT_AUTH_PROVIDER, false)
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/AbstractCodeWriterExt.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/AbstractCodeWriterExt.kt
index 2b943da042..186dcec017 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/AbstractCodeWriterExt.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/AbstractCodeWriterExt.kt
@@ -150,6 +150,15 @@ inline fun <W : AbstractCodeWriter<W>, reified V> AbstractCodeWriter<W>.getConte
  */
 inline fun <W : AbstractCodeWriter<W>, reified V> AbstractCodeWriter<W>.getContextValue(key: SectionKey<V>): V = getContextValue(key.name)
 
+/**
+ * Convenience function to set a typed value in the context
+ * @param key
+ */
+inline fun <W : AbstractCodeWriter<W>, reified V> AbstractCodeWriter<W>.putContextValue(
+    key: SectionKey<V>,
+    value: V,
+): W = putContext(key.name, value)
+
 /**
  * Convenience function to set context only if there is no value already associated with the given [key]
  */
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/CodegenContext.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/CodegenContext.kt
index 06d8b7497d..a3f714d741 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/CodegenContext.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/CodegenContext.kt
@@ -8,6 +8,7 @@ package software.amazon.smithy.kotlin.codegen.core
 import software.amazon.smithy.codegen.core.SymbolProvider
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
 import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
+import software.amazon.smithy.kotlin.codegen.integration.SectionKey
 import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
 import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes.Shape
@@ -16,6 +17,10 @@ import software.amazon.smithy.model.shapes.Shape
  * Common codegen properties required across different codegen contexts
  */
 interface CodegenContext {
+    companion object {
+        val Key = SectionKey<CodegenContext>("CodegenContext")
+    }
+
     val model: Model
     val symbolProvider: SymbolProvider
     val settings: KotlinSettings
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDelegator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDelegator.kt
index 9ae10da763..ea0b6459f1 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDelegator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDelegator.kt
@@ -6,11 +6,9 @@ package software.amazon.smithy.kotlin.codegen.core
 
 import software.amazon.smithy.build.FileManifest
 import software.amazon.smithy.codegen.core.*
-import software.amazon.smithy.kotlin.codegen.KotlinSettings
 import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
 import software.amazon.smithy.kotlin.codegen.model.SymbolProperty
 import software.amazon.smithy.kotlin.codegen.utils.namespaceToPath
-import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes.Shape
 import java.nio.file.Paths
 
@@ -21,13 +19,10 @@ const val DEFAULT_TEST_SOURCE_SET_ROOT = "./src/test/kotlin/"
  * Manages writers for Kotlin files.
  */
 class KotlinDelegator(
-    private val settings: KotlinSettings,
-    private val model: Model,
+    private val ctx: CodegenContext,
     val fileManifest: FileManifest,
-    private val symbolProvider: SymbolProvider,
     private val integrations: List<KotlinIntegration> = listOf(),
 ) {
-
     private val writers: MutableMap<String, KotlinWriter> = mutableMapOf()
 
     // Tracks dependencies for source not provided by codegen that may reside in the service source tree.
@@ -91,7 +86,7 @@ class KotlinDelegator(
         shape: Shape,
         block: (KotlinWriter) -> Unit,
     ) {
-        val symbol = symbolProvider.toSymbol(shape)
+        val symbol = ctx.symbolProvider.toSymbol(shape)
         useSymbolWriter(symbol, block)
     }
 
@@ -151,7 +146,9 @@ class KotlinDelegator(
         val needsNewline = writers.containsKey(formattedFilename)
         val writer = writers.getOrPut(formattedFilename) {
             val kotlinWriter = KotlinWriter(namespace)
-            if (settings.debug) kotlinWriter.enableStackTraceComments(true)
+            kotlinWriter.putContextValue(CodegenContext.Key, ctx)
+
+            if (ctx.settings.debug) kotlinWriter.enableStackTraceComments(true)
 
             // Register all integrations [SectionWriterBindings] on the writer.
             integrations.forEach { integration ->
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt
index b575efae60..f967a689e3 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt
@@ -37,7 +37,7 @@ private fun getDefaultRuntimeVersion(): String {
 // publishing info
 const val RUNTIME_GROUP: String = "aws.smithy.kotlin"
 val RUNTIME_VERSION: String = System.getProperty("smithy.kotlin.codegen.clientRuntimeVersion", getDefaultRuntimeVersion())
-val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "2.1.0")
+val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "2.2.0")
 
 enum class SourceSet {
     CommonMain,
@@ -134,6 +134,7 @@ data class KotlinDependency(
         // External third-party dependencies
         val KOTLIN_STDLIB = KotlinDependency(GradleConfiguration.Implementation, "kotlin", "org.jetbrains.kotlin", "kotlin-stdlib", KOTLIN_COMPILER_VERSION)
         val KOTLIN_TEST = KotlinDependency(GradleConfiguration.TestImplementation, "kotlin.test", "org.jetbrains.kotlin", "kotlin-test", KOTLIN_COMPILER_VERSION)
+        val KOTLIN_TEST_IMPL = KOTLIN_TEST.copy(config = GradleConfiguration.Implementation)
     }
 
     override fun getDependencies(): List<SymbolDependency> {
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
index 1cbf3b407b..80658e75cf 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
@@ -45,11 +45,11 @@ object RuntimeTypes {
     object HttpClient : RuntimeTypePackage(KotlinDependency.HTTP_CLIENT) {
         val SdkHttpClient = symbol("SdkHttpClient")
 
-        object Middleware : RuntimeTypePackage(KotlinDependency.HTTP, "middleware") {
+        object Middleware : RuntimeTypePackage(KotlinDependency.HTTP_CLIENT, "middleware") {
             val MutateHeadersMiddleware = symbol("MutateHeaders")
         }
 
-        object Operation : RuntimeTypePackage(KotlinDependency.HTTP, "operation") {
+        object Operation : RuntimeTypePackage(KotlinDependency.HTTP_CLIENT, "operation") {
             val AuthSchemeResolver = symbol("AuthSchemeResolver")
             val context = symbol("context")
             val EndpointResolver = symbol("EndpointResolver")
@@ -68,18 +68,19 @@ object RuntimeTypes {
             val setResolvedEndpoint = symbol("setResolvedEndpoint")
         }
 
-        object Config : RuntimeTypePackage(KotlinDependency.HTTP, "config") {
+        object Config : RuntimeTypePackage(KotlinDependency.HTTP_CLIENT, "config") {
             val HttpClientConfig = symbol("HttpClientConfig")
             val HttpEngineConfig = symbol("HttpEngineConfig")
         }
 
-        object Engine : RuntimeTypePackage(KotlinDependency.HTTP, "engine") {
+        object Engine : RuntimeTypePackage(KotlinDependency.HTTP_CLIENT, "engine") {
             val HttpClientEngine = symbol("HttpClientEngine")
             val manage = symbol("manage", "engine.internal", isExtension = true)
         }
 
-        object Interceptors : RuntimeTypePackage(KotlinDependency.HTTP, "interceptors") {
+        object Interceptors : RuntimeTypePackage(KotlinDependency.HTTP_CLIENT, "interceptors") {
             val ContinueInterceptor = symbol("ContinueInterceptor")
+            val DiscoveredEndpointErrorInterceptor = symbol("DiscoveredEndpointErrorInterceptor")
             val HttpInterceptor = symbol("HttpInterceptor")
             val HttpChecksumRequiredInterceptor = symbol("HttpChecksumRequiredInterceptor")
             val FlexibleChecksumsRequestInterceptor = symbol("FlexibleChecksumsRequestInterceptor")
@@ -97,7 +98,6 @@ object RuntimeTypes {
     }
 
     object Core : RuntimeTypePackage(KotlinDependency.CORE) {
-        val Clock = symbol("Clock", "time")
         val ExecutionContext = symbol("ExecutionContext", "operation")
         val ErrorMetadata = symbol("ErrorMetadata")
         val ServiceErrorMetadata = symbol("ServiceErrorMetadata")
@@ -126,11 +126,12 @@ object RuntimeTypes {
             val attributesOf = symbol("attributesOf")
             val AttributeKey = symbol("AttributeKey")
             val createOrAppend = symbol("createOrAppend")
+            val ExpiringKeyedCache = symbol("ExpiringKeyedCache")
             val get = symbol("get")
             val mutableMultiMapOf = symbol("mutableMultiMapOf")
+            val PeriodicSweepCache = symbol("PeriodicSweepCache")
             val putIfAbsent = symbol("putIfAbsent")
             val putIfAbsentNotNull = symbol("putIfAbsentNotNull")
-            val ReadThroughCache = symbol("ReadThroughCache")
             val toMutableAttributes = symbol("toMutableAttributes")
             val emptyAttributes = symbol("emptyAttributes")
         }
@@ -251,6 +252,10 @@ object RuntimeTypes {
                 val Url = symbol("Url")
             }
         }
+
+        object Region : RuntimeTypePackage(KotlinDependency.SMITHY_CLIENT, "region") {
+            val RegionProvider = symbol("RegionProvider")
+        }
     }
 
     object Serde : RuntimeTypePackage(KotlinDependency.SERDE) {
@@ -374,6 +379,7 @@ object RuntimeTypes {
             val BearerTokenAuthScheme = symbol("BearerTokenAuthScheme")
             val BearerTokenProviderConfig = symbol("BearerTokenProviderConfig")
             val BearerTokenProvider = symbol("BearerTokenProvider")
+
             val BearerToken = symbol("BearerToken")
             val EnvironmentBearerTokenProvider = symbol("EnvironmentBearerTokenProvider")
 
@@ -453,8 +459,8 @@ object RuntimeTypes {
         val RestJsonErrorDeserializer = symbol("RestJsonErrorDeserializer")
     }
     object AwsXmlProtocols : RuntimeTypePackage(KotlinDependency.AWS_XML_PROTOCOLS) {
-        val parseRestXmlErrorResponseNoSuspend = symbol("parseRestXmlErrorResponseNoSuspend")
-        val parseEc2QueryErrorResponseNoSuspend = symbol("parseEc2QueryErrorResponseNoSuspend")
+        val parseRestXmlErrorResponse = symbol("parseRestXmlErrorResponse")
+        val parseEc2QueryErrorResponse = symbol("parseEc2QueryErrorResponse")
     }
 
     object SmithyRpcV2Protocols : RuntimeTypePackage(KotlinDependency.SMITHY_RPCV2_PROTOCOLS) {
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ExceptionBaseClassGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ExceptionBaseClassGenerator.kt
index aa308c5343..73c789e823 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ExceptionBaseClassGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ExceptionBaseClassGenerator.kt
@@ -10,7 +10,6 @@ import software.amazon.smithy.codegen.core.Symbol
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
 import software.amazon.smithy.kotlin.codegen.core.*
 import software.amazon.smithy.kotlin.codegen.integration.SectionId
-import software.amazon.smithy.kotlin.codegen.integration.SectionKey
 import software.amazon.smithy.kotlin.codegen.model.buildSymbol
 import software.amazon.smithy.kotlin.codegen.model.namespace
 import software.amazon.smithy.model.knowledge.TopDownIndex
@@ -31,12 +30,10 @@ object ExceptionBaseClassGenerator {
     /**
      * Defines a section in which code can be added to the body of the base exception type.
      */
-    object ExceptionBaseClassSection : SectionId {
-        val CodegenContext: SectionKey<CodegenContext> = SectionKey("CodegenContext")
-    }
+    object ExceptionBaseClassSection : SectionId
 
     fun render(ctx: CodegenContext, writer: KotlinWriter) {
-        writer.declareSection(ExceptionBaseClassSection, mapOf(ExceptionBaseClassSection.CodegenContext to ctx)) {
+        writer.declareSection(ExceptionBaseClassSection) {
             ServiceExceptionBaseClassGenerator().render(ctx, writer)
         }
     }
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/GradleGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/GradleGenerator.kt
index 07f7541a06..d4123f0f03 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/GradleGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/GradleGenerator.kt
@@ -6,7 +6,10 @@ package software.amazon.smithy.kotlin.codegen.rendering
 
 import software.amazon.smithy.build.FileManifest
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
-import software.amazon.smithy.kotlin.codegen.core.*
+import software.amazon.smithy.kotlin.codegen.core.InlineCodeWriter
+import software.amazon.smithy.kotlin.codegen.core.InlineCodeWriterFormatter
+import software.amazon.smithy.kotlin.codegen.core.KOTLIN_COMPILER_VERSION
+import software.amazon.smithy.kotlin.codegen.core.KotlinDependency
 import software.amazon.smithy.utils.AbstractCodeWriter
 
 // Determines the jvmTarget version emitted to the build file
@@ -134,7 +137,7 @@ fun renderRootJvmPluginConfig(writer: GradleWriter) {
         """
             jvm {
                 compilations.all {
-                    kotlinOptions.jvmTarget = #S
+                    compilerOptions.jvmTarget = #S
                 }
                 testRuns["test"].executionTask.configure {
                     useJUnitPlatform()
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/DefaultEndpointDiscovererGenerator.kt
similarity index 55%
rename from codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererGenerator.kt
rename to codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/DefaultEndpointDiscovererGenerator.kt
index 73b6e434da..2d21de0577 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/DefaultEndpointDiscovererGenerator.kt
@@ -12,12 +12,11 @@ import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
 import software.amazon.smithy.kotlin.codegen.model.buildSymbol
 import software.amazon.smithy.kotlin.codegen.model.expectShape
 import software.amazon.smithy.kotlin.codegen.model.expectTrait
-import software.amazon.smithy.kotlin.codegen.rendering.endpoints.EndpointResolverAdapterGenerator
 import software.amazon.smithy.kotlin.codegen.rendering.endpoints.SdkEndpointBuiltinIntegration
 import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.model.shapes.ServiceShape
 
-class EndpointDiscovererGenerator(private val ctx: CodegenContext, private val delegator: KotlinDelegator) {
+class DefaultEndpointDiscovererGenerator(private val ctx: CodegenContext, private val delegator: KotlinDelegator) {
     private val symbol = symbolFor(ctx.settings)
     private val service = ctx.model.expectShape<ServiceShape>(ctx.settings.service)
     private val clientSymbol = ctx.symbolProvider.toSymbol(service)
@@ -30,58 +29,47 @@ class EndpointDiscovererGenerator(private val ctx: CodegenContext, private val d
     companion object {
         fun symbolFor(settings: KotlinSettings): Symbol = buildSymbol {
             val clientName = clientName(settings.sdkId)
-            name = "${clientName}EndpointDiscoverer"
+            name = "Default${clientName}EndpointDiscoverer"
             namespace = "${settings.pkg.name}.endpoints"
         }
     }
 
     fun render() {
         delegator.applyFileWriter(symbol) {
+            val service = clientName(ctx.settings.sdkId)
             dokka(
                 """
-                    A class which looks up specific endpoints for ${ctx.settings.sdkId} calls via the `$operationName`
-                    API. These unique endpoints are cached as appropriate to avoid unnecessary latency in subsequent
-                    calls.
+                    A class which looks up specific endpoints for $service calls via the `$operationName` API. These
+                    unique endpoints are cached as appropriate to avoid unnecessary latency in subsequent calls.
+                    @param cache An [ExpiringKeyedCache] implementation used to cache discovered hosts
                 """.trimIndent(),
             )
+
             withBlock(
-                "#L class #T {",
+                "#1L class #2T(#1L val cache: #3T<DiscoveryParams, #4T> = #5T(10.#6T)) : #7T {",
                 "}",
                 ctx.settings.api.visibility,
                 symbol,
+                RuntimeTypes.Core.Collections.ExpiringKeyedCache,
+                RuntimeTypes.Core.Net.Host,
+                RuntimeTypes.Core.Collections.PeriodicSweepCache,
+                KotlinTypes.Time.minutes,
+                EndpointDiscovererInterfaceGenerator.symbolFor(ctx.settings),
             ) {
-                write(
-                    "private val cache = #T<DiscoveryParams, #T>(10.#T, #T.System)",
-                    RuntimeTypes.Core.Collections.ReadThroughCache,
-                    RuntimeTypes.Core.Net.Host,
-                    KotlinTypes.Time.minutes,
-                    RuntimeTypes.Core.Clock,
-                )
-                write("")
                 renderAsEndpointResolver()
                 write("")
-                renderDiscoverHost()
-                write("")
                 renderInvalidate()
             }
-            write("")
-            write(
-                """private val discoveryParamsKey = #T<DiscoveryParams>("DiscoveryParams")""",
-                RuntimeTypes.Core.Collections.AttributeKey,
-            )
-            write("private data class DiscoveryParams(private val region: String?, private val identity: String)")
         }
     }
 
     private fun KotlinWriter.renderAsEndpointResolver() {
         withBlock(
-            "internal fun asEndpointResolver(client: #T, delegate: #T) = #T { request ->",
+            "override fun asEndpointResolver(client: #1T, delegate: #2T): #2T = #2T { request ->",
             "}",
             clientSymbol,
-            EndpointResolverAdapterGenerator.getSymbol(ctx.settings),
             RuntimeTypes.HttpClient.Operation.EndpointResolver,
         ) {
-            // Backported from https://github.com/smithy-lang/smithy-kotlin/pull/1221; replace when merging v1.5 to main
             withBlock("if (client.config.#L == null) {", "}", SdkEndpointBuiltinIntegration.EndpointUrlProp.propertyName) {
                 write("val identity = request.identity")
                 write(
@@ -90,7 +78,7 @@ class EndpointDiscovererGenerator(private val ctx: CodegenContext, private val d
                 )
                 write("")
                 write("val cacheKey = DiscoveryParams(client.config.region, identity.accessKeyId)")
-                write("request.context[discoveryParamsKey] = cacheKey")
+                write("request.context[DiscoveryParamsKey] = cacheKey")
                 write("val discoveredHost = cache.get(cacheKey) { discoverHost(client) }")
                 write("")
                 write("val originalEndpoint = delegate.resolve(request)")
@@ -99,6 +87,7 @@ class EndpointDiscovererGenerator(private val ctx: CodegenContext, private val d
                     write("originalEndpoint.headers,")
                     write("originalEndpoint.attributes,")
                 }
+
                 // If user manually specifies endpointUrl, skip endpoint discovery
                 closeAndOpenBlock("} else {")
                 write("delegate.resolve(request)")
@@ -106,34 +95,9 @@ class EndpointDiscovererGenerator(private val ctx: CodegenContext, private val d
         }
     }
 
-    private fun KotlinWriter.renderDiscoverHost() {
-        openBlock(
-            "private suspend fun discoverHost(client: #T): #T<#T> =",
-            clientSymbol,
-            RuntimeTypes.Core.Utils.ExpiringValue,
-            RuntimeTypes.Core.Net.Host,
-        )
-        // ASSUMPTION No services which use discovery include parameters to the EP operation (despite being
-        // possible according to the Smithy spec).
-        write("client.#L()", operationName)
-        indent()
-        write(".endpoints")
-        withBlock("?.map { ep -> #T(", ")}", RuntimeTypes.Core.Utils.ExpiringValue) {
-            write("#T.parse(ep.address!!),", RuntimeTypes.Core.Net.Host)
-            write("#T.now() + ep.cachePeriodInMinutes.#T,", RuntimeTypes.Core.Instant, KotlinTypes.Time.minutes)
-        }
-        write("?.firstOrNull()")
-        write(
-            """?: throw #T("Unable to discover any endpoints when invoking #L!")""",
-            RuntimeTypes.SmithyClient.Endpoints.EndpointProviderException,
-            operationName,
-        )
-        dedent(2)
-    }
-
     private fun KotlinWriter.renderInvalidate() {
-        withBlock("internal suspend fun invalidate(context: #T) {", "}", RuntimeTypes.Core.ExecutionContext) {
-            write("context.getOrNull(discoveryParamsKey)?.let { cache.invalidate(it) }")
+        withBlock("override public suspend fun invalidate(context: #T) {", "}", RuntimeTypes.Core.ExecutionContext) {
+            write("context.getOrNull(DiscoveryParamsKey)?.let { cache.invalidate(it) }")
         }
     }
 }
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererInterfaceGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererInterfaceGenerator.kt
new file mode 100644
index 0000000000..ddc70752db
--- /dev/null
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererInterfaceGenerator.kt
@@ -0,0 +1,94 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package software.amazon.smithy.kotlin.codegen.rendering.endpoints.discovery
+
+import software.amazon.smithy.aws.traits.clientendpointdiscovery.ClientEndpointDiscoveryTrait
+import software.amazon.smithy.codegen.core.Symbol
+import software.amazon.smithy.kotlin.codegen.KotlinSettings
+import software.amazon.smithy.kotlin.codegen.core.*
+import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
+import software.amazon.smithy.kotlin.codegen.model.buildSymbol
+import software.amazon.smithy.kotlin.codegen.model.expectShape
+import software.amazon.smithy.kotlin.codegen.model.expectTrait
+import software.amazon.smithy.model.shapes.OperationShape
+import software.amazon.smithy.model.shapes.ServiceShape
+
+class EndpointDiscovererInterfaceGenerator(private val ctx: CodegenContext, private val delegator: KotlinDelegator) {
+    private val symbol = symbolFor(ctx.settings)
+    private val service = ctx.model.expectShape<ServiceShape>(ctx.settings.service)
+    private val clientSymbol = ctx.symbolProvider.toSymbol(service)
+    private val operationName = run {
+        val epDiscoveryTrait = service.expectTrait<ClientEndpointDiscoveryTrait>()
+        val operation = ctx.model.expectShape<OperationShape>(epDiscoveryTrait.operation)
+        operation.defaultName()
+    }
+
+    companion object {
+        fun symbolFor(settings: KotlinSettings): Symbol = buildSymbol {
+            val clientName = clientName(settings.sdkId)
+            name = "${clientName}EndpointDiscoverer"
+            namespace = "${settings.pkg.name}.endpoints"
+        }
+    }
+
+    fun render() {
+        delegator.applyFileWriter(symbol) {
+            dokka("Represents the logic for automatically discovering endpoints for ${ctx.settings.sdkId} calls")
+            withBlock(
+                "#L interface #T {",
+                "}",
+                ctx.settings.api.visibility,
+                symbol,
+            ) {
+                write(
+                    "#1L fun asEndpointResolver(client: #2T, delegate: #3T): #3T",
+                    ctx.settings.api.visibility,
+                    clientSymbol,
+                    RuntimeTypes.HttpClient.Operation.EndpointResolver,
+                )
+                write("")
+                renderDiscoverHost()
+                write("")
+                write("public suspend fun invalidate(context: #T)", RuntimeTypes.Core.ExecutionContext)
+            }
+            write("")
+            write(
+                "#L data class DiscoveryParams(private val region: String?, private val identity: String)",
+                ctx.settings.api.visibility,
+            )
+            write(
+                """#1L val DiscoveryParamsKey: #2T<DiscoveryParams> = #2T("DiscoveryParams")""",
+                ctx.settings.api.visibility,
+                RuntimeTypes.Core.Collections.AttributeKey,
+            )
+        }
+    }
+
+    private fun KotlinWriter.renderDiscoverHost() {
+        openBlock(
+            "#L suspend fun discoverHost(client: #T): #T<#T> =",
+            ctx.settings.api.visibility,
+            clientSymbol,
+            RuntimeTypes.Core.Utils.ExpiringValue,
+            RuntimeTypes.Core.Net.Host,
+        )
+        // ASSUMPTION No services which use discovery include parameters to the EP operation (despite being
+        // possible according to the Smithy spec).
+        write("client.#L()", operationName)
+        indent()
+        write(".endpoints")
+        withBlock("?.map { ep -> #T(", ")}", RuntimeTypes.Core.Utils.ExpiringValue) {
+            write("#T.parse(ep.address!!),", RuntimeTypes.Core.Net.Host)
+            write("#T.now() + ep.cachePeriodInMinutes.#T,", RuntimeTypes.Core.Instant, KotlinTypes.Time.minutes)
+        }
+        write("?.firstOrNull()")
+        write(
+            """?: throw #T("Unable to discover any endpoints when invoking #L!")""",
+            RuntimeTypes.SmithyClient.Endpoints.EndpointProviderException,
+            operationName,
+        )
+        dedent(2)
+    }
+}
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscoveryIntegration.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscoveryIntegration.kt
index 62906af4d7..4e8a7446a1 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscoveryIntegration.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscoveryIntegration.kt
@@ -22,26 +22,38 @@ import software.amazon.smithy.model.shapes.OperationShape
 import software.amazon.smithy.model.shapes.ServiceShape
 
 class EndpointDiscoveryIntegration : KotlinIntegration {
-    override fun additionalServiceConfigProps(ctx: CodegenContext): List<ConfigProperty> {
-        val endpointDiscoveryOptional = ctx
+    companion object {
+        const val CLIENT_CONFIG_NAME = "endpointDiscoverer"
+        const val ORDER: Byte = 0 // doesn't depend on any other integrations
+
+        fun isEnabledFor(model: Model, settings: KotlinSettings) = model
+            .expectShape<ServiceShape>(settings.service)
+            .hasTrait<ClientEndpointDiscoveryTrait>()
+
+        fun isOptionalFor(ctx: CodegenContext) = ctx
             .model
             .operationShapes
             .none { it.getTrait<ClientDiscoveredEndpointTrait>()?.isRequired == true }
-        val discovererSymbol = EndpointDiscovererGenerator.symbolFor(ctx.settings)
+    }
+
+    override fun additionalServiceConfigProps(ctx: CodegenContext): List<ConfigProperty> {
+        val endpointDiscoveryOptional = isOptionalFor(ctx)
+        val interfaceSymbol = EndpointDiscovererInterfaceGenerator.symbolFor(ctx.settings)
         return super.additionalServiceConfigProps(ctx) + listOf(
             ConfigProperty {
-                name = "endpointDiscoverer"
+                name = CLIENT_CONFIG_NAME
 
                 if (endpointDiscoveryOptional) {
                     documentation = """
-                        The endpoint discoverer for this client, if applicable. By default, no endpoint
-                        discovery is provided. To use endpoint discovery, set this to a valid
-                        [${discovererSymbol.name}] instance.
+                        The endpoint discoverer for this client, if applicable. By default, no endpoint discovery is
+                        provided. To use endpoint discovery, set this to a valid [${interfaceSymbol.name}] instance.
                     """.trimIndent()
-                    symbol = discovererSymbol.asNullable()
+                    symbol = interfaceSymbol.asNullable()
                 } else {
+                    val defaultImplSymbol = DefaultEndpointDiscovererGenerator.symbolFor(ctx.settings)
                     documentation = "The endpoint discoverer for this client"
-                    useSymbolWithNullableBuilder(discovererSymbol, "${discovererSymbol.name}()")
+                    additionalImports = listOf(defaultImplSymbol)
+                    useSymbolWithNullableBuilder(interfaceSymbol, "${defaultImplSymbol.name}()")
                 }
             },
         )
@@ -50,10 +62,11 @@ class EndpointDiscoveryIntegration : KotlinIntegration {
     override fun customizeMiddleware(
         ctx: ProtocolGenerator.GenerationContext,
         resolved: List<ProtocolMiddleware>,
-    ): List<ProtocolMiddleware> = super.customizeMiddleware(ctx, resolved) + listOf(DiscoveredEndpointMiddleware)
+    ): List<ProtocolMiddleware> = resolved + DiscoveredEndpointErrorMiddleware
 
-    override fun enabledForService(model: Model, settings: KotlinSettings): Boolean =
-        model.expectShape<ServiceShape>(settings.service).hasTrait<ClientEndpointDiscoveryTrait>()
+    override fun enabledForService(model: Model, settings: KotlinSettings): Boolean = isEnabledFor(model, settings)
+
+    override val order = ORDER
 
     override val sectionWriters: List<SectionWriterBinding> = listOf(
         SectionWriterBinding(HttpProtocolClientGenerator.EndpointResolverAdapterBinding, ::renderEndpointResolver),
@@ -69,13 +82,15 @@ class EndpointDiscoveryIntegration : KotlinIntegration {
             null -> writer.write("#L", previousValue)
 
             true -> writer.write(
-                "execution.endpointResolver = config.endpointDiscoverer.asEndpointResolver(this@#L, #T(config))",
+                "execution.endpointResolver = config.#L.asEndpointResolver(this@#L, #T(config))",
+                CLIENT_CONFIG_NAME,
                 defaultClientName,
                 EndpointResolverAdapterGenerator.getSymbol(ctx.settings),
             )
 
             false -> writer.write(
-                "execution.endpointResolver = config.endpointDiscoverer?.asEndpointResolver(this@#1L, #2T(config)) ?: #2T(config)",
+                "execution.endpointResolver = config.#1L?.asEndpointResolver(this@#2L, #3T(config)) ?: #3T(config)",
+                CLIENT_CONFIG_NAME,
                 defaultClientName,
                 EndpointResolverAdapterGenerator.getSymbol(ctx.settings),
             )
@@ -83,30 +98,29 @@ class EndpointDiscoveryIntegration : KotlinIntegration {
     }
 
     override fun writeAdditionalFiles(ctx: CodegenContext, delegator: KotlinDelegator) {
-        EndpointDiscovererGenerator(ctx, delegator).render()
-        super.writeAdditionalFiles(ctx, delegator)
+        EndpointDiscovererInterfaceGenerator(ctx, delegator).render()
+
+        if (!isOptionalFor(ctx)) {
+            DefaultEndpointDiscovererGenerator(ctx, delegator).render()
+        }
     }
 }
 
-private object DiscoveredEndpointMiddleware : ProtocolMiddleware {
-    override val name: String = "DiscoveredEndpointMiddleware"
+private object DiscoveredEndpointErrorMiddleware : ProtocolMiddleware {
+    override val name: String = "DiscoveredEndpointErrorMiddleware"
 
     override fun isEnabledFor(ctx: ProtocolGenerator.GenerationContext, op: OperationShape): Boolean =
-        op.getTrait<ClientEndpointDiscoveryTrait>()?.optionalError?.getOrNull() != null &&
+        ctx.service.getTrait<ClientEndpointDiscoveryTrait>()?.optionalError?.getOrNull() != null &&
             op.hasTrait<ClientDiscoveredEndpointTrait>()
 
     override fun render(ctx: ProtocolGenerator.GenerationContext, op: OperationShape, writer: KotlinWriter) {
-        val interceptor = buildSymbol {
-            name = "DiscoveredEndpointErrorInterceptor"
-            namespace(KotlinDependency.HTTP_CLIENT, "aws.smithy.kotlin.runtime.http.interceptors")
-        }
-
         val errorShapeId = ctx.service.expectTrait<ClientEndpointDiscoveryTrait>().optionalError.get()
         val errorShape = ctx.model.expectShape(errorShapeId)
         val errorSymbol = ctx.symbolProvider.toSymbol(errorShape)
         writer.write(
-            "config.endpointDiscoverer?.let { op.interceptors.add(#T(#T, it::invalidate)) }",
-            interceptor,
+            "config.#L?.let { op.interceptors.add(#T(#T::class, it::invalidate)) }",
+            EndpointDiscoveryIntegration.CLIENT_CONFIG_NAME,
+            RuntimeTypes.HttpClient.Interceptors.DiscoveredEndpointErrorInterceptor,
             errorSymbol,
         )
     }
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettingsTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettingsTest.kt
index 2de132c9fa..7910b25cc1 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettingsTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettingsTest.kt
@@ -11,6 +11,7 @@ import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.ArgumentsProvider
 import org.junit.jupiter.params.provider.ArgumentsSource
 import org.junit.jupiter.params.provider.CsvSource
+import org.junit.jupiter.params.support.ParameterDeclarations
 import software.amazon.smithy.codegen.core.CodegenException
 import software.amazon.smithy.kotlin.codegen.test.TestModelDefault
 import software.amazon.smithy.kotlin.codegen.test.toSmithyModel
@@ -392,7 +393,10 @@ class TestProtocolSelectionArgumentProvider : ArgumentsProvider {
         private const val NO_CBOR = "awsJson1_0, awsJson1_1, restJson1, restXml, awsQuery, ec2Query"
     }
 
-    override fun provideArguments(context: ExtensionContext?): Stream<out Arguments> = Stream.of(
+    override fun provideArguments(
+        parameters: ParameterDeclarations?,
+        context: ExtensionContext?,
+    ): Stream<out Arguments> = Stream.of(
         Arguments.of(
             ALL_PROTOCOLS,
             "rpcv2Cbor, awsJson1_0",
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDelegatorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDelegatorTest.kt
index 162f32ac92..a5fb28e902 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDelegatorTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDelegatorTest.kt
@@ -97,7 +97,9 @@ class KotlinDelegatorTest {
             Node.parse(configContents).expectObjectNode(),
         )
         val manifest = MockManifest()
-        val delegator = KotlinDelegator(settings, model, manifest, KotlinSymbolProvider(model, settings))
+        val symbolProvider = KotlinSymbolProvider(model, settings)
+        val ctx = GenerationContext(model, symbolProvider, settings, protocolGenerator = null)
+        val delegator = KotlinDelegator(ctx, manifest)
 
         val generatedSymbol = buildSymbol {
             name = "Foo"
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ExceptionGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ExceptionGeneratorTest.kt
index a2272852fe..6356d3fbf6 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ExceptionGeneratorTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ExceptionGeneratorTest.kt
@@ -241,7 +241,7 @@ class ExceptionGeneratorTest {
                     get() = listOf(SectionWriterBinding(ExceptionBaseClassGenerator.ExceptionBaseClassSection, exceptionSectionWriter))
 
                 private val exceptionSectionWriter = SectionWriter { writer, _ ->
-                    val ctx = writer.getContextValue(ExceptionBaseClassGenerator.ExceptionBaseClassSection.CodegenContext)
+                    val ctx = writer.getContextValue(CodegenContext.Key)
                     ServiceExceptionBaseClassGenerator(exceptionBaseClassSymbol).render(ctx, writer)
                 }
             }
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/DefaultEndpointDiscovererGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/DefaultEndpointDiscovererGeneratorTest.kt
new file mode 100644
index 0000000000..d5e0a6e152
--- /dev/null
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/DefaultEndpointDiscovererGeneratorTest.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package software.amazon.smithy.kotlin.codegen.rendering.endpoints.discovery
+
+import org.junit.jupiter.api.Test
+import software.amazon.smithy.build.MockManifest
+import software.amazon.smithy.kotlin.codegen.test.formatForTest
+import software.amazon.smithy.kotlin.codegen.test.newTestContext
+import software.amazon.smithy.kotlin.codegen.test.shouldContainOnlyOnceWithDiff
+import software.amazon.smithy.kotlin.codegen.test.toCodegenContext
+
+class DefaultEndpointDiscovererGeneratorTest {
+    private val renderedCodegen: String = run {
+        val model = model()
+        val testCtx = model.newTestContext()
+        val delegator = testCtx.generationCtx.delegator
+        val generator = DefaultEndpointDiscovererGenerator(testCtx.toCodegenContext(), delegator)
+        generator.render()
+
+        delegator.flushWriters()
+        val testManifest = delegator.fileManifest as MockManifest
+        testManifest.expectFileString("/src/main/kotlin/com/test/endpoints/DefaultTestEndpointDiscoverer.kt")
+    }
+
+    @Test
+    fun testClass() {
+        renderedCodegen.shouldContainOnlyOnceWithDiff(
+            """
+                /**
+                 * A class which looks up specific endpoints for Test calls via the `getEndpoints` API. These
+                 * unique endpoints are cached as appropriate to avoid unnecessary latency in subsequent calls.
+                 * @param cache An [ExpiringKeyedCache] implementation used to cache discovered hosts
+                 */
+                public class DefaultTestEndpointDiscoverer(public val cache: ExpiringKeyedCache<DiscoveryParams, Host> = PeriodicSweepCache(10.minutes)) : TestEndpointDiscoverer {
+            """.trimIndent(),
+        )
+    }
+
+    @Test
+    fun testAsEndpointResolver() {
+        renderedCodegen.shouldContainOnlyOnceWithDiff(
+            """
+                override fun asEndpointResolver(client: TestClient, delegate: EndpointResolver): EndpointResolver = EndpointResolver { request ->
+                    if (client.config.endpointUrl == null) {
+                        val identity = request.identity
+                        require(identity is Credentials) { "Endpoint discovery requires AWS credentials" }
+                
+                        val cacheKey = DiscoveryParams(client.config.region, identity.accessKeyId)
+                        request.context[DiscoveryParamsKey] = cacheKey
+                        val discoveredHost = cache.get(cacheKey) { discoverHost(client) }
+                
+                        val originalEndpoint = delegate.resolve(request)
+                        Endpoint(
+                            originalEndpoint.uri.copy { host = discoveredHost },
+                            originalEndpoint.headers,
+                            originalEndpoint.attributes,
+                        )
+                    } else {
+                        delegate.resolve(request)
+                    }
+                }
+            """.formatForTest(),
+        )
+    }
+
+    @Test
+    fun testInvalidate() {
+        renderedCodegen.shouldContainOnlyOnceWithDiff(
+            """
+                override public suspend fun invalidate(context: ExecutionContext) {
+                    context.getOrNull(DiscoveryParamsKey)?.let { cache.invalidate(it) }
+                }
+            """.formatForTest(),
+        )
+    }
+}
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererGeneratorTest.kt
deleted file mode 100644
index 37b9e6a900..0000000000
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererGeneratorTest.kt
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-package software.amazon.smithy.kotlin.codegen.rendering.endpoints.discovery
-
-import org.junit.jupiter.api.Test
-import software.amazon.smithy.build.MockManifest
-import software.amazon.smithy.kotlin.codegen.test.*
-
-class EndpointDiscovererGeneratorTest {
-    @Test
-    fun testClass() {
-        val actual = render()
-
-        actual.shouldContainOnlyOnceWithDiff(
-            """
-            public class TestEndpointDiscoverer {
-                private val cache = ReadThroughCache<DiscoveryParams, Host>(10.minutes, Clock.System)
-            """.trimIndent(),
-        )
-
-        actual.shouldContainOnlyOnceWithDiff(
-            """
-                }
-                
-                private val discoveryParamsKey = AttributeKey<DiscoveryParams>("DiscoveryParams")
-                private data class DiscoveryParams(private val region: String?, private val identity: String)
-            """.trimIndent(),
-        )
-    }
-
-    @Test
-    fun testAsEndpointResolver() {
-        val actual = render()
-
-        actual.shouldContainOnlyOnceWithDiff(
-            """
-                internal fun asEndpointResolver(client: TestClient, delegate: EndpointResolverAdapter) = EndpointResolver { request ->
-                    if (client.config.endpointUrl == null) {
-                        val identity = request.identity
-                        require(identity is Credentials) { "Endpoint discovery requires AWS credentials" }
-                
-                        val cacheKey = DiscoveryParams(client.config.region, identity.accessKeyId)
-                        request.context[discoveryParamsKey] = cacheKey
-                        val discoveredHost = cache.get(cacheKey) { discoverHost(client) }
-                
-                        val originalEndpoint = delegate.resolve(request)
-                        Endpoint(
-                            originalEndpoint.uri.copy { host = discoveredHost },
-                            originalEndpoint.headers,
-                            originalEndpoint.attributes,
-                        )
-                    } else {
-                        delegate.resolve(request)
-                    }
-                }
-            """.formatForTest(),
-        )
-    }
-
-    @Test
-    fun testDiscoverHost() {
-        val actual = render()
-
-        actual.shouldContainOnlyOnceWithDiff(
-            """
-                private suspend fun discoverHost(client: TestClient): ExpiringValue<Host> =
-                    client.getEndpoints()
-                        .endpoints
-                        ?.map { ep -> ExpiringValue(
-                            Host.parse(ep.address!!),
-                            Instant.now() + ep.cachePeriodInMinutes.minutes,
-                        )}
-                        ?.firstOrNull()
-                        ?: throw EndpointProviderException("Unable to discover any endpoints when invoking getEndpoints!")
-            """.formatForTest(),
-        )
-    }
-
-    @Test
-    fun testInvalidate() {
-        val actual = render()
-
-        actual.shouldContainOnlyOnceWithDiff(
-            """
-                internal suspend fun invalidate(context: ExecutionContext) {
-                    context.getOrNull(discoveryParamsKey)?.let { cache.invalidate(it) }
-                }
-            """.formatForTest(),
-        )
-    }
-
-    private fun render(): String {
-        val model = model()
-        val testCtx = model.newTestContext()
-        val delegator = testCtx.generationCtx.delegator
-        val generator = EndpointDiscovererGenerator(testCtx.toCodegenContext(), delegator)
-        generator.render()
-
-        delegator.flushWriters()
-        val testManifest = delegator.fileManifest as MockManifest
-        return testManifest.expectFileString("/src/main/kotlin/com/test/endpoints/TestEndpointDiscoverer.kt")
-    }
-
-    private fun model() =
-        """
-            namespace com.test
-
-            use aws.protocols#awsJson1_1
-            use aws.api#service
-            use aws.auth#sigv4
-
-            @service(sdkId: "test")
-            @sigv4(name: "test")
-            @awsJson1_1
-            @aws.api#clientEndpointDiscovery(
-                operation: GetEndpoints,
-                error: BadEndpointError
-            )
-            service Test {
-                version: "1.0.0",
-                operations: [GetEndpoints]
-            }
-            
-            @error("client")
-            @httpError(421)
-            structure BadEndpointError { }
-
-            @http(method: "GET", uri: "/endpoints")
-            operation GetEndpoints {
-                input: GetEndpointsInput
-                output: GetEndpointsOutput
-            }
-            
-            @input
-            structure GetEndpointsInput { }
-            
-            @output
-            structure GetEndpointsOutput {
-                Endpoints: Endpoints
-            }
-            
-            list Endpoints {
-                member: Endpoint
-            }
-            
-            structure Endpoint {
-                Address: String
-                CachePeriodInMinutes: Long
-            }
-        """.toSmithyModel()
-}
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererInterfaceGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererInterfaceGeneratorTest.kt
new file mode 100644
index 0000000000..998fc8e577
--- /dev/null
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscovererInterfaceGeneratorTest.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package software.amazon.smithy.kotlin.codegen.rendering.endpoints.discovery
+
+import org.junit.jupiter.api.Test
+import software.amazon.smithy.build.MockManifest
+import software.amazon.smithy.kotlin.codegen.test.formatForTest
+import software.amazon.smithy.kotlin.codegen.test.newTestContext
+import software.amazon.smithy.kotlin.codegen.test.shouldContainOnlyOnceWithDiff
+import software.amazon.smithy.kotlin.codegen.test.toCodegenContext
+
+class EndpointDiscovererInterfaceGeneratorTest {
+    @Test
+    fun testInterface() {
+        val actual = render()
+
+        actual.shouldContainOnlyOnceWithDiff(
+            """
+                /**
+                 * Represents the logic for automatically discovering endpoints for Test calls
+                 */
+                public interface TestEndpointDiscoverer {
+                    public fun asEndpointResolver(client: TestClient, delegate: EndpointResolver): EndpointResolver
+            """.trimIndent(),
+        )
+
+        actual.shouldContainOnlyOnceWithDiff(
+            """
+                public suspend fun invalidate(context: ExecutionContext)
+            """.trimIndent(),
+        )
+
+        actual.shouldContainOnlyOnceWithDiff(
+            """
+                }
+                
+                public data class DiscoveryParams(private val region: String?, private val identity: String)
+                public val DiscoveryParamsKey: AttributeKey<DiscoveryParams> = AttributeKey("DiscoveryParams")
+            """.trimIndent(),
+        )
+    }
+
+    @Test
+    fun testDiscoverHost() {
+        val actual = render()
+
+        actual.shouldContainOnlyOnceWithDiff(
+            """
+                public suspend fun discoverHost(client: TestClient): ExpiringValue<Host> =
+                    client.getEndpoints()
+                        .endpoints
+                        ?.map { ep -> ExpiringValue(
+                            Host.parse(ep.address!!),
+                            Instant.now() + ep.cachePeriodInMinutes.minutes,
+                        )}
+                        ?.firstOrNull()
+                        ?: throw EndpointProviderException("Unable to discover any endpoints when invoking getEndpoints!")
+            """.formatForTest(),
+        )
+    }
+
+    private fun render(): String {
+        val model = model()
+        val testCtx = model.newTestContext()
+        val delegator = testCtx.generationCtx.delegator
+        val generator = EndpointDiscovererInterfaceGenerator(testCtx.toCodegenContext(), delegator)
+        generator.render()
+
+        delegator.flushWriters()
+        val testManifest = delegator.fileManifest as MockManifest
+        return testManifest.expectFileString("/src/main/kotlin/com/test/endpoints/TestEndpointDiscoverer.kt")
+    }
+}
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscoveryIntegrationTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscoveryIntegrationTest.kt
index 48fec68de5..1fdb3f3973 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscoveryIntegrationTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscoveryIntegrationTest.kt
@@ -36,7 +36,7 @@ class EndpointDiscoveryIntegrationTest {
         val contents = writer.toString()
 
         if (discoveryRequired) {
-            val configStr = "public val endpointDiscoverer: TestEndpointDiscoverer = builder.endpointDiscoverer ?: TestEndpointDiscoverer()"
+            val configStr = "public val endpointDiscoverer: TestEndpointDiscoverer = builder.endpointDiscoverer ?: DefaultTestEndpointDiscoverer()"
             contents.shouldContainOnlyOnceWithDiff(configStr)
 
             val builderStr = """
@@ -52,9 +52,8 @@ class EndpointDiscoveryIntegrationTest {
 
             val builderStr = """
                 /**
-                 * The endpoint discoverer for this client, if applicable. By default, no endpoint
-                 * discovery is provided. To use endpoint discovery, set this to a valid
-                 * [TestEndpointDiscoverer] instance.
+                 * The endpoint discoverer for this client, if applicable. By default, no endpoint discovery is
+                 * provided. To use endpoint discovery, set this to a valid [TestEndpointDiscoverer] instance.
                  */
                 public var endpointDiscoverer: TestEndpointDiscoverer? = null
             """.formatForTest("        ")
@@ -62,6 +61,23 @@ class EndpointDiscoveryIntegrationTest {
         }
     }
 
+    @Test
+    fun testDiscoveredEndpointErrorMiddleware() {
+        val model = model()
+        val ctx = model.newTestContext(integrations = listOf(EndpointDiscoveryIntegration()))
+        val generator = MockHttpProtocolGenerator(model)
+        generator.generateProtocolClient(ctx.generationCtx)
+
+        ctx.generationCtx.delegator.finalize()
+        ctx.generationCtx.delegator.flushWriters()
+
+        val actual = ctx.manifest.expectFileString("/src/main/kotlin/com/test/DefaultTestClient.kt")
+
+        val getFooMethod = actual.lines("    override suspend fun getFoo(input: GetFooRequest): GetFooResponse {", "    }")
+        val expectedInterceptor = "config.endpointDiscoverer?.let { op.interceptors.add(DiscoveredEndpointErrorInterceptor(BadEndpointError::class, it::invalidate)) }"
+        getFooMethod.shouldContainOnlyOnceWithDiff(expectedInterceptor)
+    }
+
     private fun model(discoveryRequired: Boolean = true) =
         """
             namespace com.test
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscoveryTestUtils.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscoveryTestUtils.kt
new file mode 100644
index 0000000000..55d58d6cc4
--- /dev/null
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/endpoints/discovery/EndpointDiscoveryTestUtils.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package software.amazon.smithy.kotlin.codegen.rendering.endpoints.discovery
+
+import software.amazon.smithy.kotlin.codegen.test.toSmithyModel
+
+fun model() =
+    // language=smithy
+    """
+        namespace com.test
+        
+        use aws.protocols#awsJson1_1
+        use aws.api#service
+        use aws.auth#sigv4
+        
+        @service(sdkId: "test")
+        @sigv4(name: "test")
+        @awsJson1_1
+        @aws.api#clientEndpointDiscovery(
+            operation: GetEndpoints,
+            error: BadEndpointError
+        )
+        service Test {
+            version: "1.0.0",
+            operations: [GetEndpoints]
+        }
+        
+        @error("client")
+        @httpError(421)
+        structure BadEndpointError { }
+        
+        @http(method: "GET", uri: "/endpoints")
+        operation GetEndpoints {
+            input: GetEndpointsInput
+            output: GetEndpointsOutput
+        }
+        
+        @input
+        structure GetEndpointsInput { }
+        
+        @output
+        structure GetEndpointsOutput {
+            Endpoints: Endpoints
+        }
+        
+        list Endpoints {
+            member: Endpoint
+        }
+        
+        structure Endpoint {
+            Address: String
+            CachePeriodInMinutes: Long
+        }
+    """.toSmithyModel()
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpStringValuesMapSerializerTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpStringValuesMapSerializerTest.kt
index 95138ad529..097db4b4c8 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpStringValuesMapSerializerTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpStringValuesMapSerializerTest.kt
@@ -53,7 +53,8 @@ class HttpStringValuesMapSerializerTest {
 
     @Test
     fun `it handles primitive header shapes when different mode`() {
-        val contents = getTestContents(defaultModel, "com.test#PrimitiveShapesOperation", HttpBinding.Location.HEADER)
+        val settings = defaultModel.defaultSettings(defaultValueSerializationMode = DefaultValueSerializationMode.WHEN_DIFFERENT)
+        val contents = getTestContents(defaultModel, "com.test#PrimitiveShapesOperation", HttpBinding.Location.HEADER, settings)
         contents.assertBalancedBracesAndParens()
 
         val expectedContents = """
@@ -68,7 +69,8 @@ class HttpStringValuesMapSerializerTest {
 
     @Test
     fun `it handles primitive query shapes when different mode`() {
-        val contents = getTestContents(defaultModel, "com.test#PrimitiveShapesOperation", HttpBinding.Location.QUERY)
+        val settings = defaultModel.defaultSettings(defaultValueSerializationMode = DefaultValueSerializationMode.WHEN_DIFFERENT)
+        val contents = getTestContents(defaultModel, "com.test#PrimitiveShapesOperation", HttpBinding.Location.QUERY, settings)
         contents.assertBalancedBracesAndParens()
 
         val expectedContents = """
@@ -129,7 +131,8 @@ class HttpStringValuesMapSerializerTest {
             }
         """.prependNamespaceAndService(operations = listOf("Foo")).toSmithyModel()
 
-        val contents = getTestContents(model, "com.test#Foo", HttpBinding.Location.HEADER)
+        val settings = defaultModel.defaultSettings(defaultValueSerializationMode = DefaultValueSerializationMode.WHEN_DIFFERENT)
+        val contents = getTestContents(model, "com.test#Foo", HttpBinding.Location.HEADER, settings)
         contents.assertBalancedBracesAndParens()
 
         val expectedContents = """
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGeneratorTest.kt
index 347da007cb..c0eae1f05b 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGeneratorTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/serde/SerializeStructGeneratorTest.kt
@@ -72,7 +72,8 @@ class SerializeStructGeneratorTest {
             }
         """.trimIndent()
 
-        val actual = codegenSerializerForShape(model, "com.test#Foo")
+        val settings = model.defaultSettings(defaultValueSerializationMode = DefaultValueSerializationMode.WHEN_DIFFERENT)
+        val actual = codegenSerializerForShape(model, "com.test#Foo", settings = settings)
         actual.shouldContainOnlyOnceWithDiff(expected)
     }
 
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/ServiceWaitersGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/ServiceWaitersGeneratorTest.kt
index 49ee90f484..038a2ff7da 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/ServiceWaitersGeneratorTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/waiters/ServiceWaitersGeneratorTest.kt
@@ -11,13 +11,10 @@ import software.amazon.smithy.build.MockManifest
 import software.amazon.smithy.codegen.core.SymbolProvider
 import software.amazon.smithy.kotlin.codegen.KotlinCodegenPlugin
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
-import software.amazon.smithy.kotlin.codegen.core.CodegenContext
+import software.amazon.smithy.kotlin.codegen.core.GenerationContext
 import software.amazon.smithy.kotlin.codegen.core.KotlinDelegator
-import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
 import software.amazon.smithy.kotlin.codegen.loadModelFromResource
-import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
 import software.amazon.smithy.kotlin.codegen.test.*
-import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.shapes.ShapeId
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -130,16 +127,9 @@ class ServiceWaitersGeneratorTest {
         val service = model.getShape(ShapeId.from(TestModelDefault.SERVICE_SHAPE_ID)).get().asServiceShape().get()
         val settings = KotlinSettings(service.id, KotlinSettings.PackageSettings(TestModelDefault.NAMESPACE, TestModelDefault.MODEL_VERSION), sdkId = service.id.name)
 
-        val ctx = object : CodegenContext {
-            override val model: Model = model
-            override val symbolProvider: SymbolProvider = provider
-            override val settings: KotlinSettings = settings
-            override val protocolGenerator: ProtocolGenerator? = null
-            override val integrations: List<KotlinIntegration> = listOf()
-        }
-
         val manifest = MockManifest()
-        val delegator = KotlinDelegator(settings, model, manifest, provider)
+        val ctx = GenerationContext(model, provider, settings, protocolGenerator = null)
+        val delegator = KotlinDelegator(ctx, manifest)
 
         val generator = ServiceWaitersGenerator()
         generator.writeAdditionalFiles(ctx, delegator)
diff --git a/gradle.properties b/gradle.properties
index aa80c53d95..8e71bdc0c8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,4 @@ codegenVersion=0.34.24-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
-org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
\ No newline at end of file
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 94f31d2cbc..3ef5eb2d53 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,27 +1,27 @@
 [versions]
-kotlin-version = "2.1.0"
+kotlin-version = "2.2.0"
 dokka-version = "2.0.0"
 
 aws-kotlin-repo-tools-version = "0.4.32"
 
 # libs
-coroutines-version = "1.9.0"
-atomicfu-version = "0.25.0"
-okhttp-version = "5.0.0-alpha.14"
+coroutines-version = "1.10.2"
+atomicfu-version = "0.29.0"
+okhttp-version = "5.1.0"
 okhttp4-version = "4.12.0"
-okio-version = "3.9.1"
+okio-version = "3.15.0"
 otel-version = "1.45.0"
 slf4j-version = "2.0.16"
 slf4j-v1x-version = "1.7.36"
-crt-kotlin-version = "0.9.1"
+crt-kotlin-version = "0.10.0"
 micrometer-version = "1.14.2"
-binary-compatibility-validator-version = "0.16.3"
+binary-compatibility-validator-version = "0.18.0"
 
 # codegen
 smithy-version = "1.60.2"
 
 # testing
-junit-version = "5.10.5"
+junit-version = "5.13.2"
 kotest-version = "5.9.1"
 kotlin-compile-testing-version = "0.7.0"
 kotlinx-benchmark-version = "0.4.12"
diff --git a/runtime/auth/aws-credentials/api/aws-credentials.api b/runtime/auth/aws-credentials/api/aws-credentials.api
index 15df96aff6..429f5eec3b 100644
--- a/runtime/auth/aws-credentials/api/aws-credentials.api
+++ b/runtime/auth/aws-credentials/api/aws-credentials.api
@@ -18,9 +18,9 @@ public abstract interface class aws/smithy/kotlin/runtime/auth/awscredentials/Cl
 public abstract interface class aws/smithy/kotlin/runtime/auth/awscredentials/Credentials : aws/smithy/kotlin/runtime/identity/Identity {
 	public static final field Companion Laws/smithy/kotlin/runtime/auth/awscredentials/Credentials$Companion;
 	public abstract fun getAccessKeyId ()Ljava/lang/String;
-	public abstract fun getProviderName ()Ljava/lang/String;
+	public fun getProviderName ()Ljava/lang/String;
 	public abstract fun getSecretAccessKey ()Ljava/lang/String;
-	public abstract fun getSessionToken ()Ljava/lang/String;
+	public fun getSessionToken ()Ljava/lang/String;
 }
 
 public final class aws/smithy/kotlin/runtime/auth/awscredentials/Credentials$Companion {
diff --git a/runtime/auth/aws-signing-common/api/aws-signing-common.api b/runtime/auth/aws-signing-common/api/aws-signing-common.api
index c9353509be..046afa8c53 100644
--- a/runtime/auth/aws-signing-common/api/aws-signing-common.api
+++ b/runtime/auth/aws-signing-common/api/aws-signing-common.api
@@ -199,13 +199,6 @@ public final class aws/smithy/kotlin/runtime/auth/awssigning/PresignerKt {
 	public static final fun presignRequest (Laws/smithy/kotlin/runtime/http/request/HttpRequestBuilder;Laws/smithy/kotlin/runtime/operation/ExecutionContext;Laws/smithy/kotlin/runtime/auth/awscredentials/CredentialsProvider;Laws/smithy/kotlin/runtime/http/operation/EndpointResolver;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class aws/smithy/kotlin/runtime/auth/awssigning/UnsupportedSigningAlgorithmException : aws/smithy/kotlin/runtime/ClientException {
-	public fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningAlgorithm;)V
-	public fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningAlgorithm;Ljava/lang/Throwable;)V
-	public synthetic fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningAlgorithm;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getSigningAlgorithm ()Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningAlgorithm;
-}
-
 public final class aws/smithy/kotlin/runtime/auth/awssigning/internal/AwsChunkedUtilKt {
 	public static final field AWS_CHUNKED_THRESHOLD I
 	public static final field CHUNK_SIZE_BYTES I
diff --git a/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsSigningExceptions.kt b/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsSigningExceptions.kt
deleted file mode 100644
index 8ff8c1e35f..0000000000
--- a/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsSigningExceptions.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-package aws.smithy.kotlin.runtime.auth.awssigning
-
-import aws.smithy.kotlin.runtime.ClientException
-import aws.smithy.kotlin.runtime.InternalApi
-
-/**
- * Is thrown when a signing algorithm is not supported by a signer
- *
- * See: [AwsSigningAlgorithm], [AwsSigner]
- *
- * @param message The message displayed by the exception
- * @param signingAlgorithm The unsupported signing algorithm
- * @param cause The cause of the exception
- */
-@InternalApi
-@Deprecated("This exception is no longer thrown. It will be removed in the next minor version, v1.5.x.")
-public class UnsupportedSigningAlgorithmException(
-    message: String,
-    public val signingAlgorithm: AwsSigningAlgorithm,
-    cause: Throwable? = null,
-) : ClientException(
-    message,
-    cause,
-) {
-    public constructor(
-        message: String,
-        signingAlgorithm: AwsSigningAlgorithm,
-    ) : this (
-        message,
-        signingAlgorithm,
-        null,
-    )
-}
diff --git a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SigV4aSignatureCalculator.kt b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SigV4aSignatureCalculator.kt
index 4f4239a2ce..c4fe4f5ca4 100644
--- a/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SigV4aSignatureCalculator.kt
+++ b/runtime/auth/aws-signing-default/common/src/aws/smithy/kotlin/runtime/auth/awssigning/SigV4aSignatureCalculator.kt
@@ -5,7 +5,7 @@
 package aws.smithy.kotlin.runtime.auth.awssigning
 
 import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
-import aws.smithy.kotlin.runtime.collections.ReadThroughCache
+import aws.smithy.kotlin.runtime.collections.PeriodicSweepCache
 import aws.smithy.kotlin.runtime.content.BigInteger
 import aws.smithy.kotlin.runtime.hashing.HashSupplier
 import aws.smithy.kotlin.runtime.hashing.Sha256
@@ -32,7 +32,7 @@ internal val N_MINUS_TWO = "FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9
  * @param sha256Provider the [HashSupplier] to use for computing SHA-256 hashes
  */
 internal class SigV4aSignatureCalculator(override val sha256Provider: HashSupplier = ::Sha256) : BaseSigV4SignatureCalculator(AwsSigningAlgorithm.SIGV4_ASYMMETRIC, sha256Provider) {
-    private val privateKeyCache = ReadThroughCache<Credentials, ByteArray>(
+    private val privateKeyCache = PeriodicSweepCache<Credentials, ByteArray>(
         minimumSweepPeriod = 1.hours, // note: Sweeps are effectively a no-op because expiration is [Instant.MAX_VALUE]
     )
 
diff --git a/runtime/auth/aws-signing-tests/build.gradle.kts b/runtime/auth/aws-signing-tests/build.gradle.kts
index 5810181041..667021303e 100644
--- a/runtime/auth/aws-signing-tests/build.gradle.kts
+++ b/runtime/auth/aws-signing-tests/build.gradle.kts
@@ -17,7 +17,6 @@ kotlin {
                 api(project(":runtime:auth:http-auth-aws"))
                 implementation(libs.kotlin.test)
                 implementation(libs.kotlinx.coroutines.test)
-                implementation(libs.junit.jupiter.params)
             }
         }
 
@@ -28,6 +27,7 @@ kotlin {
                 implementation(libs.ktor.http.cio)
                 implementation(libs.ktor.utils)
                 implementation(libs.kotlin.test.junit5)
+                implementation(libs.junit.jupiter.params)
                 implementation(libs.kotlinx.serialization.json)
             }
         }
diff --git a/runtime/auth/aws-signing-tests/jvm/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/SigningSuiteTestBaseJVM.kt b/runtime/auth/aws-signing-tests/jvm/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/SigningSuiteTestBaseJVM.kt
index b3c4202d26..70d48bfe45 100644
--- a/runtime/auth/aws-signing-tests/jvm/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/SigningSuiteTestBaseJVM.kt
+++ b/runtime/auth/aws-signing-tests/jvm/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/SigningSuiteTestBaseJVM.kt
@@ -11,7 +11,9 @@ import aws.smithy.kotlin.runtime.auth.awssigning.*
 import aws.smithy.kotlin.runtime.collections.Attributes
 import aws.smithy.kotlin.runtime.collections.ValuesMap
 import aws.smithy.kotlin.runtime.collections.get
-import aws.smithy.kotlin.runtime.http.*
+import aws.smithy.kotlin.runtime.http.HttpBody
+import aws.smithy.kotlin.runtime.http.HttpMethod
+import aws.smithy.kotlin.runtime.http.SdkHttpClient
 import aws.smithy.kotlin.runtime.http.auth.AwsHttpSigner
 import aws.smithy.kotlin.runtime.http.auth.SigV4AuthScheme
 import aws.smithy.kotlin.runtime.http.operation.*
@@ -24,9 +26,7 @@ import aws.smithy.kotlin.runtime.net.url.Url
 import aws.smithy.kotlin.runtime.operation.ExecutionContext
 import aws.smithy.kotlin.runtime.time.Instant
 import io.ktor.http.cio.*
-import io.ktor.util.*
 import io.ktor.utils.io.*
-import io.ktor.utils.io.core.*
 import kotlinx.coroutines.runBlocking
 import kotlinx.io.readByteArray
 import kotlinx.serialization.json.*
@@ -420,8 +420,7 @@ private fun buildOperation(
         serializeWith = object : HttpSerializer.NonStreaming<Unit> {
             override fun serialize(context: ExecutionContext, input: Unit): HttpRequestBuilder = serialized
         }
-        @Suppress("DEPRECATION")
-        deserializer = IdentityDeserializer
+        deserializeWith = HttpDeserializer.Identity
 
         context {
             operationName = "testSigningOperation"
diff --git a/runtime/auth/http-auth-api/api/http-auth-api.api b/runtime/auth/http-auth-api/api/http-auth-api.api
index 491aa48555..2f541fb6ef 100644
--- a/runtime/auth/http-auth-api/api/http-auth-api.api
+++ b/runtime/auth/http-auth-api/api/http-auth-api.api
@@ -1,7 +1,7 @@
 public abstract interface class aws/smithy/kotlin/runtime/http/auth/AuthScheme {
 	public abstract fun getSchemeId-DepwgT4 ()Ljava/lang/String;
 	public abstract fun getSigner ()Laws/smithy/kotlin/runtime/http/auth/HttpSigner;
-	public abstract fun identityProvider (Laws/smithy/kotlin/runtime/identity/IdentityProviderConfig;)Laws/smithy/kotlin/runtime/identity/IdentityProvider;
+	public fun identityProvider (Laws/smithy/kotlin/runtime/identity/IdentityProviderConfig;)Laws/smithy/kotlin/runtime/identity/IdentityProvider;
 }
 
 public final class aws/smithy/kotlin/runtime/http/auth/AuthScheme$DefaultImpls {
diff --git a/runtime/auth/http-auth-aws/common/test/aws/smithy/kotlin/runtime/http/auth/AwsHttpSignerTestBase.kt b/runtime/auth/http-auth-aws/common/test/aws/smithy/kotlin/runtime/http/auth/AwsHttpSignerTestBase.kt
index 7d10b35e14..75be7cbbf2 100644
--- a/runtime/auth/http-auth-aws/common/test/aws/smithy/kotlin/runtime/http/auth/AwsHttpSignerTestBase.kt
+++ b/runtime/auth/http-auth-aws/common/test/aws/smithy/kotlin/runtime/http/auth/AwsHttpSignerTestBase.kt
@@ -37,13 +37,11 @@ class DefaultAwsHttpSignerTest : AwsHttpSignerTestBase(DefaultAwsSigner)
  * Basic sanity tests. Signing (including `AwsHttpSigner`) is covered by the more exhaustive
  * test suite in the `aws-signing-tests` module.
  */
-@Suppress("HttpUrlsUsage")
 public abstract class AwsHttpSignerTestBase(
     private val signer: AwsSigner,
 ) {
     private val testCredentials = Credentials("AKID", "SECRET", "SESSION")
 
-    @Suppress("DEPRECATION")
     private fun buildOperation(
         requestBody: String = "{\"TableName\": \"foo\"}",
         streaming: Boolean = false,
@@ -51,29 +49,11 @@ public abstract class AwsHttpSignerTestBase(
         unsigned: Boolean = false,
     ): SdkHttpOperation<Unit, HttpResponse> {
         val operation: SdkHttpOperation<Unit, HttpResponse> = SdkHttpOperation.build {
-            serializer = object : HttpSerialize<Unit> {
-                override suspend fun serialize(context: ExecutionContext, input: Unit): HttpRequestBuilder =
-                    HttpRequestBuilder().apply {
-                        method = HttpMethod.POST
-                        url.scheme = Scheme.HTTP
-                        url.host = Host.Domain("demo.us-east-1.amazonaws.com")
-                        url.path.encoded = "/"
-                        headers.append("Host", "demo.us-east-1.amazonaws.com")
-                        headers.appendAll("x-amz-archive-description", listOf("test", "test"))
-                        body = when (streaming) {
-                            true -> {
-                                object : HttpBody.ChannelContent() {
-                                    override val contentLength: Long = requestBody.length.toLong()
-                                    override fun readFrom(): SdkByteReadChannel = SdkByteReadChannel(requestBody.encodeToByteArray())
-                                    override val isOneShot: Boolean = !replayable
-                                }
-                            }
-                            false -> HttpBody.fromBytes(requestBody.encodeToByteArray())
-                        }
-                        headers.append("Content-Length", body.contentLength?.toString() ?: "0")
-                    }
+            serializeWith = when (streaming) {
+                true -> StreamingSerializer(requestBody, replayable)
+                false -> NonStreamingSerializer(requestBody)
             }
-            deserializer = IdentityDeserializer
+            deserializeWith = HttpDeserializer.Identity
             operationName = "testSigningOperation"
             serviceName = "testService"
             context {
@@ -186,3 +166,36 @@ public abstract class AwsHttpSignerTestBase(
         assertEquals(expectedSig, signed.headers["Authorization"])
     }
 }
+
+private class NonStreamingSerializer(private val requestBody: String) : HttpSerializer.NonStreaming<Unit> {
+    override fun serialize(context: ExecutionContext, input: Unit) = HttpRequestBuilder().apply {
+        method = HttpMethod.POST
+        url.scheme = Scheme.HTTP
+        url.host = Host.Domain("demo.us-east-1.amazonaws.com")
+        url.path.encoded = "/"
+        body = HttpBody.fromBytes(requestBody.encodeToByteArray())
+        headers.append("Host", "demo.us-east-1.amazonaws.com")
+        headers.appendAll("x-amz-archive-description", listOf("test", "test"))
+        headers.append("Content-Length", body.contentLength?.toString() ?: "0")
+    }
+}
+
+private class StreamingSerializer(
+    private val requestBody: String,
+    private val replayable: Boolean,
+) : HttpSerializer.Streaming<Unit> {
+    override suspend fun serialize(context: ExecutionContext, input: Unit) = HttpRequestBuilder().apply {
+        method = HttpMethod.POST
+        url.scheme = Scheme.HTTP
+        url.host = Host.Domain("demo.us-east-1.amazonaws.com")
+        url.path.encoded = "/"
+        body = object : HttpBody.ChannelContent() {
+            override val contentLength: Long = requestBody.length.toLong()
+            override fun readFrom(): SdkByteReadChannel = SdkByteReadChannel(requestBody.encodeToByteArray())
+            override val isOneShot: Boolean = !replayable
+        }
+        headers.append("Host", "demo.us-east-1.amazonaws.com")
+        headers.appendAll("x-amz-archive-description", listOf("test", "test"))
+        headers.append("Content-Length", body.contentLength?.toString() ?: "0")
+    }
+}
diff --git a/runtime/auth/identity-api/api/identity-api.api b/runtime/auth/identity-api/api/identity-api.api
index 9b07562934..824dc99385 100644
--- a/runtime/auth/identity-api/api/identity-api.api
+++ b/runtime/auth/identity-api/api/identity-api.api
@@ -56,6 +56,7 @@ public final class aws/smithy/kotlin/runtime/identity/IdentityAttributesKt {
 
 public abstract interface class aws/smithy/kotlin/runtime/identity/IdentityProvider {
 	public abstract fun resolve (Laws/smithy/kotlin/runtime/collections/Attributes;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun resolve$default (Laws/smithy/kotlin/runtime/identity/IdentityProvider;Laws/smithy/kotlin/runtime/collections/Attributes;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
 public final class aws/smithy/kotlin/runtime/identity/IdentityProvider$DefaultImpls {
diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts
index 4aa9e06b3b..9da74f02a8 100644
--- a/runtime/build.gradle.kts
+++ b/runtime/build.gradle.kts
@@ -69,6 +69,7 @@ subprojects {
             freeCompilerArgs.add("-Xexpect-actual-classes")
         }
     }
+
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile> {
         compilerOptions {
             freeCompilerArgs.add("-Xexpect-actual-classes")
diff --git a/runtime/observability/telemetry-api/api/telemetry-api.api b/runtime/observability/telemetry-api/api/telemetry-api.api
index 470061210b..5e1f6b8684 100644
--- a/runtime/observability/telemetry-api/api/telemetry-api.api
+++ b/runtime/observability/telemetry-api/api/telemetry-api.api
@@ -176,11 +176,16 @@ public abstract interface class aws/smithy/kotlin/runtime/telemetry/logging/Logg
 	public static final field Companion Laws/smithy/kotlin/runtime/telemetry/logging/Logger$Companion;
 	public abstract fun atLevel (Laws/smithy/kotlin/runtime/telemetry/logging/LogLevel;)Laws/smithy/kotlin/runtime/telemetry/logging/LogRecordBuilder;
 	public abstract fun debug (Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;)V
+	public static synthetic fun debug$default (Laws/smithy/kotlin/runtime/telemetry/logging/Logger;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 	public abstract fun error (Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;)V
+	public static synthetic fun error$default (Laws/smithy/kotlin/runtime/telemetry/logging/Logger;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 	public abstract fun info (Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;)V
+	public static synthetic fun info$default (Laws/smithy/kotlin/runtime/telemetry/logging/Logger;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 	public abstract fun isEnabledFor (Laws/smithy/kotlin/runtime/telemetry/logging/LogLevel;)Z
 	public abstract fun trace (Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;)V
+	public static synthetic fun trace$default (Laws/smithy/kotlin/runtime/telemetry/logging/Logger;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 	public abstract fun warn (Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;)V
+	public static synthetic fun warn$default (Laws/smithy/kotlin/runtime/telemetry/logging/Logger;Ljava/lang/Throwable;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 }
 
 public final class aws/smithy/kotlin/runtime/telemetry/logging/Logger$Companion {
@@ -266,6 +271,7 @@ public abstract class aws/smithy/kotlin/runtime/telemetry/metrics/AbstractUpDown
 
 public abstract interface class aws/smithy/kotlin/runtime/telemetry/metrics/AsyncMeasurement {
 	public abstract fun record (Ljava/lang/Number;Laws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/context/Context;)V
+	public static synthetic fun record$default (Laws/smithy/kotlin/runtime/telemetry/metrics/AsyncMeasurement;Ljava/lang/Number;Laws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/context/Context;ILjava/lang/Object;)V
 }
 
 public final class aws/smithy/kotlin/runtime/telemetry/metrics/AsyncMeasurement$DefaultImpls {
@@ -284,6 +290,7 @@ public final class aws/smithy/kotlin/runtime/telemetry/metrics/AsyncMeasurementH
 public abstract interface class aws/smithy/kotlin/runtime/telemetry/metrics/Histogram {
 	public static final field Companion Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram$Companion;
 	public abstract fun record (Ljava/lang/Number;Laws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/context/Context;)V
+	public static synthetic fun record$default (Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;Ljava/lang/Number;Laws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/context/Context;ILjava/lang/Object;)V
 }
 
 public final class aws/smithy/kotlin/runtime/telemetry/metrics/Histogram$Companion {
@@ -307,12 +314,19 @@ public final class aws/smithy/kotlin/runtime/telemetry/metrics/HistogramKt {
 public abstract interface class aws/smithy/kotlin/runtime/telemetry/metrics/Meter {
 	public static final field Companion Laws/smithy/kotlin/runtime/telemetry/metrics/Meter$Companion;
 	public abstract fun createAsyncUpDownCounter (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Ljava/lang/String;Ljava/lang/String;)Laws/smithy/kotlin/runtime/telemetry/metrics/AsyncMeasurementHandle;
+	public static synthetic fun createAsyncUpDownCounter$default (Laws/smithy/kotlin/runtime/telemetry/metrics/Meter;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/telemetry/metrics/AsyncMeasurementHandle;
 	public abstract fun createDoubleGauge (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Ljava/lang/String;Ljava/lang/String;)Laws/smithy/kotlin/runtime/telemetry/metrics/AsyncMeasurementHandle;
+	public static synthetic fun createDoubleGauge$default (Laws/smithy/kotlin/runtime/telemetry/metrics/Meter;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/telemetry/metrics/AsyncMeasurementHandle;
 	public abstract fun createDoubleHistogram (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;
+	public static synthetic fun createDoubleHistogram$default (Laws/smithy/kotlin/runtime/telemetry/metrics/Meter;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;
 	public abstract fun createLongGauge (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Ljava/lang/String;Ljava/lang/String;)Laws/smithy/kotlin/runtime/telemetry/metrics/AsyncMeasurementHandle;
+	public static synthetic fun createLongGauge$default (Laws/smithy/kotlin/runtime/telemetry/metrics/Meter;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/telemetry/metrics/AsyncMeasurementHandle;
 	public abstract fun createLongHistogram (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;
+	public static synthetic fun createLongHistogram$default (Laws/smithy/kotlin/runtime/telemetry/metrics/Meter;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/telemetry/metrics/Histogram;
 	public abstract fun createMonotonicCounter (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Laws/smithy/kotlin/runtime/telemetry/metrics/MonotonicCounter;
+	public static synthetic fun createMonotonicCounter$default (Laws/smithy/kotlin/runtime/telemetry/metrics/Meter;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/telemetry/metrics/MonotonicCounter;
 	public abstract fun createUpDownCounter (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Laws/smithy/kotlin/runtime/telemetry/metrics/UpDownCounter;
+	public static synthetic fun createUpDownCounter$default (Laws/smithy/kotlin/runtime/telemetry/metrics/Meter;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/telemetry/metrics/UpDownCounter;
 }
 
 public final class aws/smithy/kotlin/runtime/telemetry/metrics/Meter$Companion {
@@ -341,6 +355,7 @@ public final class aws/smithy/kotlin/runtime/telemetry/metrics/MeterProvider$Com
 public abstract interface class aws/smithy/kotlin/runtime/telemetry/metrics/MonotonicCounter {
 	public static final field Companion Laws/smithy/kotlin/runtime/telemetry/metrics/MonotonicCounter$Companion;
 	public abstract fun add (JLaws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/context/Context;)V
+	public static synthetic fun add$default (Laws/smithy/kotlin/runtime/telemetry/metrics/MonotonicCounter;JLaws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/context/Context;ILjava/lang/Object;)V
 }
 
 public final class aws/smithy/kotlin/runtime/telemetry/metrics/MonotonicCounter$Companion {
@@ -354,6 +369,7 @@ public final class aws/smithy/kotlin/runtime/telemetry/metrics/MonotonicCounter$
 public abstract interface class aws/smithy/kotlin/runtime/telemetry/metrics/UpDownCounter {
 	public static final field Companion Laws/smithy/kotlin/runtime/telemetry/metrics/UpDownCounter$Companion;
 	public abstract fun add (JLaws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/context/Context;)V
+	public static synthetic fun add$default (Laws/smithy/kotlin/runtime/telemetry/metrics/UpDownCounter;JLaws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/context/Context;ILjava/lang/Object;)V
 }
 
 public final class aws/smithy/kotlin/runtime/telemetry/metrics/UpDownCounter$Companion {
@@ -427,9 +443,10 @@ public final class aws/smithy/kotlin/runtime/telemetry/trace/SpanStatus : java/l
 
 public abstract interface class aws/smithy/kotlin/runtime/telemetry/trace/TraceSpan : aws/smithy/kotlin/runtime/telemetry/context/Scope {
 	public static final field Companion Laws/smithy/kotlin/runtime/telemetry/trace/TraceSpan$Companion;
-	public abstract fun asContextElement ()Lkotlin/coroutines/CoroutineContext;
+	public fun asContextElement ()Lkotlin/coroutines/CoroutineContext;
 	public abstract fun close ()V
 	public abstract fun emitEvent (Ljava/lang/String;Laws/smithy/kotlin/runtime/collections/Attributes;)V
+	public static synthetic fun emitEvent$default (Laws/smithy/kotlin/runtime/telemetry/trace/TraceSpan;Ljava/lang/String;Laws/smithy/kotlin/runtime/collections/Attributes;ILjava/lang/Object;)V
 	public abstract fun getSpanContext ()Laws/smithy/kotlin/runtime/telemetry/trace/SpanContext;
 	public abstract fun mergeAttributes (Laws/smithy/kotlin/runtime/collections/Attributes;)V
 	public abstract fun set (Laws/smithy/kotlin/runtime/collections/AttributeKey;Ljava/lang/Object;)V
@@ -468,6 +485,7 @@ public final class aws/smithy/kotlin/runtime/telemetry/trace/TraceSpanExtKt {
 public abstract interface class aws/smithy/kotlin/runtime/telemetry/trace/Tracer {
 	public static final field Companion Laws/smithy/kotlin/runtime/telemetry/trace/Tracer$Companion;
 	public abstract fun createSpan (Ljava/lang/String;Laws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/trace/SpanKind;Laws/smithy/kotlin/runtime/telemetry/context/Context;)Laws/smithy/kotlin/runtime/telemetry/trace/TraceSpan;
+	public static synthetic fun createSpan$default (Laws/smithy/kotlin/runtime/telemetry/trace/Tracer;Ljava/lang/String;Laws/smithy/kotlin/runtime/collections/Attributes;Laws/smithy/kotlin/runtime/telemetry/trace/SpanKind;Laws/smithy/kotlin/runtime/telemetry/context/Context;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/telemetry/trace/TraceSpan;
 }
 
 public final class aws/smithy/kotlin/runtime/telemetry/trace/Tracer$Companion {
diff --git a/runtime/protocol/aws-json-protocols/common/test/aws/smithy/kotlin/runtime/awsprotocol/json/AwsJsonProtocolTest.kt b/runtime/protocol/aws-json-protocols/common/test/aws/smithy/kotlin/runtime/awsprotocol/json/AwsJsonProtocolTest.kt
index ac53fc26a8..172d831283 100644
--- a/runtime/protocol/aws-json-protocols/common/test/aws/smithy/kotlin/runtime/awsprotocol/json/AwsJsonProtocolTest.kt
+++ b/runtime/protocol/aws-json-protocols/common/test/aws/smithy/kotlin/runtime/awsprotocol/json/AwsJsonProtocolTest.kt
@@ -6,8 +6,10 @@
 package aws.smithy.kotlin.runtime.awsprotocol.json
 
 import aws.smithy.kotlin.runtime.collections.get
-import aws.smithy.kotlin.runtime.http.*
+import aws.smithy.kotlin.runtime.http.HttpBody
+import aws.smithy.kotlin.runtime.http.SdkHttpClient
 import aws.smithy.kotlin.runtime.http.operation.*
+import aws.smithy.kotlin.runtime.http.readAll
 import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.http.response.HttpResponse
 import aws.smithy.kotlin.runtime.httptest.TestEngine
@@ -20,10 +22,9 @@ class AwsJsonProtocolTest {
 
     @Test
     fun testSetJsonProtocolHeaders() = runTest {
-        @Suppress("DEPRECATION")
         val op = SdkHttpOperation.build<Unit, HttpResponse> {
-            serializer = UnitSerializer
-            deserializer = IdentityDeserializer
+            serializeWith = HttpSerializer.Unit
+            deserializeWith = HttpDeserializer.Identity
             operationName = "Bar"
             serviceName = "Foo"
         }
@@ -42,10 +43,9 @@ class AwsJsonProtocolTest {
 
     @Test
     fun testEmptyBody() = runTest {
-        @Suppress("DEPRECATION")
         val op = SdkHttpOperation.build<Unit, HttpResponse> {
-            serializer = UnitSerializer
-            deserializer = IdentityDeserializer
+            serializeWith = HttpSerializer.Unit
+            deserializeWith = HttpDeserializer.Identity
             operationName = "Bar"
             serviceName = "Foo"
         }
@@ -63,14 +63,14 @@ class AwsJsonProtocolTest {
     fun testDoesNotOverride() = runTest {
         @Suppress("DEPRECATION")
         val op = SdkHttpOperation.build<Unit, HttpResponse> {
-            serializer = object : HttpSerialize<Unit> {
-                override suspend fun serialize(context: ExecutionContext, input: Unit): HttpRequestBuilder =
+            serializeWith = object : HttpSerializer.NonStreaming<Unit> {
+                override fun serialize(context: ExecutionContext, input: Unit): HttpRequestBuilder =
                     HttpRequestBuilder().apply {
                         headers["Content-Type"] = "application/xml"
                         body = HttpBody.fromBytes("foo".encodeToByteArray())
                     }
             }
-            deserializer = IdentityDeserializer
+            deserializeWith = HttpDeserializer.Identity
             operationName = "Bar"
             serviceName = "Foo"
         }
diff --git a/runtime/protocol/aws-xml-protocols/api/aws-xml-protocols.api b/runtime/protocol/aws-xml-protocols/api/aws-xml-protocols.api
index 7325432724..ab7db70f5a 100644
--- a/runtime/protocol/aws-xml-protocols/api/aws-xml-protocols.api
+++ b/runtime/protocol/aws-xml-protocols/api/aws-xml-protocols.api
@@ -1,10 +1,8 @@
 public final class aws/smithy/kotlin/runtime/awsprotocol/xml/Ec2QueryErrorDeserializerKt {
-	public static final fun parseEc2QueryErrorResponse ([BLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun parseEc2QueryErrorResponseNoSuspend ([B)Laws/smithy/kotlin/runtime/awsprotocol/ErrorDetails;
+	public static final fun parseEc2QueryErrorResponse ([B)Laws/smithy/kotlin/runtime/awsprotocol/ErrorDetails;
 }
 
 public final class aws/smithy/kotlin/runtime/awsprotocol/xml/RestXmlErrorDeserializerKt {
-	public static final fun parseRestXmlErrorResponse ([BLkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static final fun parseRestXmlErrorResponseNoSuspend ([B)Laws/smithy/kotlin/runtime/awsprotocol/ErrorDetails;
+	public static final fun parseRestXmlErrorResponse ([B)Laws/smithy/kotlin/runtime/awsprotocol/ErrorDetails;
 }
 
diff --git a/runtime/protocol/aws-xml-protocols/common/src/aws/smithy/kotlin/runtime/awsprotocol/xml/Ec2QueryErrorDeserializer.kt b/runtime/protocol/aws-xml-protocols/common/src/aws/smithy/kotlin/runtime/awsprotocol/xml/Ec2QueryErrorDeserializer.kt
index 63391e1b12..2bd349177c 100644
--- a/runtime/protocol/aws-xml-protocols/common/src/aws/smithy/kotlin/runtime/awsprotocol/xml/Ec2QueryErrorDeserializer.kt
+++ b/runtime/protocol/aws-xml-protocols/common/src/aws/smithy/kotlin/runtime/awsprotocol/xml/Ec2QueryErrorDeserializer.kt
@@ -7,18 +7,16 @@ package aws.smithy.kotlin.runtime.awsprotocol.xml
 import aws.smithy.kotlin.runtime.InternalApi
 import aws.smithy.kotlin.runtime.awsprotocol.ErrorDetails
 import aws.smithy.kotlin.runtime.serde.getOrDeserializeErr
-import aws.smithy.kotlin.runtime.serde.xml.*
+import aws.smithy.kotlin.runtime.serde.xml.XmlTagReader
+import aws.smithy.kotlin.runtime.serde.xml.data
+import aws.smithy.kotlin.runtime.serde.xml.xmlTagReader
 
 internal data class Ec2QueryErrorResponse(val errors: List<Ec2QueryError>, val requestId: String?)
 
 internal data class Ec2QueryError(val code: String?, val message: String?)
 
-@Deprecated("use parseEc2QueryErrorResponseNoSuspend")
 @InternalApi
-public suspend fun parseEc2QueryErrorResponse(payload: ByteArray): ErrorDetails =
-    parseEc2QueryErrorResponseNoSuspend(payload)
-
-public fun parseEc2QueryErrorResponseNoSuspend(payload: ByteArray): ErrorDetails {
+public fun parseEc2QueryErrorResponse(payload: ByteArray): ErrorDetails {
     val response = Ec2QueryErrorResponseDeserializer.deserialize(xmlTagReader(payload))
     val firstError = response.errors.firstOrNull()
     return ErrorDetails(firstError?.code, firstError?.message, response.requestId)
diff --git a/runtime/protocol/aws-xml-protocols/common/src/aws/smithy/kotlin/runtime/awsprotocol/xml/RestXmlErrorDeserializer.kt b/runtime/protocol/aws-xml-protocols/common/src/aws/smithy/kotlin/runtime/awsprotocol/xml/RestXmlErrorDeserializer.kt
index 99925c0dc1..74a9448146 100644
--- a/runtime/protocol/aws-xml-protocols/common/src/aws/smithy/kotlin/runtime/awsprotocol/xml/RestXmlErrorDeserializer.kt
+++ b/runtime/protocol/aws-xml-protocols/common/src/aws/smithy/kotlin/runtime/awsprotocol/xml/RestXmlErrorDeserializer.kt
@@ -6,7 +6,7 @@ package aws.smithy.kotlin.runtime.awsprotocol.xml
 
 import aws.smithy.kotlin.runtime.InternalApi
 import aws.smithy.kotlin.runtime.awsprotocol.ErrorDetails
-import aws.smithy.kotlin.runtime.serde.*
+import aws.smithy.kotlin.runtime.serde.getOrDeserializeErr
 import aws.smithy.kotlin.runtime.serde.xml.XmlTagReader
 import aws.smithy.kotlin.runtime.serde.xml.data
 import aws.smithy.kotlin.runtime.serde.xml.xmlTagReader
@@ -26,18 +26,8 @@ internal data class XmlError(
     override val message: String?,
 ) : RestXmlErrorDetails
 
-/**
- * Deserializes rest XML protocol errors as specified by:
- * https://awslabs.github.io/smithy/1.0/spec/aws/aws-restxml-protocol.html#error-response-serialization
- *
- * Returns parsed data in normalized form or throws [DeserializationException] if response cannot be parsed.
- */
-@Deprecated("use parseRestXmlErrorResponseNoSuspend")
 @InternalApi
-public suspend fun parseRestXmlErrorResponse(payload: ByteArray): ErrorDetails =
-    parseRestXmlErrorResponseNoSuspend(payload)
-
-public fun parseRestXmlErrorResponseNoSuspend(payload: ByteArray): ErrorDetails {
+public fun parseRestXmlErrorResponse(payload: ByteArray): ErrorDetails {
     val details = XmlErrorDeserializer.deserialize(xmlTagReader(payload))
     return ErrorDetails(details.code, details.message, details.requestId)
 }
diff --git a/runtime/protocol/aws-xml-protocols/common/test/aws/smithy/kotlin/runtime/awsprotocol/xml/Ec2QueryErrorDeserializerTest.kt b/runtime/protocol/aws-xml-protocols/common/test/aws/smithy/kotlin/runtime/awsprotocol/xml/Ec2QueryErrorDeserializerTest.kt
index 6dfb531a5a..d2b4a6972e 100644
--- a/runtime/protocol/aws-xml-protocols/common/test/aws/smithy/kotlin/runtime/awsprotocol/xml/Ec2QueryErrorDeserializerTest.kt
+++ b/runtime/protocol/aws-xml-protocols/common/test/aws/smithy/kotlin/runtime/awsprotocol/xml/Ec2QueryErrorDeserializerTest.kt
@@ -26,7 +26,7 @@ class Ec2QueryErrorDeserializerTest {
                 <RequestId>foo-request</RequestId>
             </Response>
         """.trimIndent().encodeToByteArray()
-        val actual = parseEc2QueryErrorResponseNoSuspend(payload)
+        val actual = parseEc2QueryErrorResponse(payload)
         assertEquals("InvalidGreeting", actual.code)
         assertEquals("Hi", actual.message)
         assertEquals("foo-request", actual.requestId)
@@ -61,7 +61,7 @@ class Ec2QueryErrorDeserializerTest {
 
         for (payload in tests) {
             assertFailsWith<DeserializationException> {
-                parseEc2QueryErrorResponseNoSuspend(payload)
+                parseEc2QueryErrorResponse(payload)
             }
         }
     }
@@ -90,7 +90,7 @@ class Ec2QueryErrorDeserializerTest {
         ).map { it.trimIndent().encodeToByteArray() }
 
         for (payload in tests) {
-            val actual = parseEc2QueryErrorResponseNoSuspend(payload)
+            val actual = parseEc2QueryErrorResponse(payload)
             assertNull(actual.code)
             assertNull(actual.message)
             assertEquals("foo-request", actual.requestId)
diff --git a/runtime/protocol/aws-xml-protocols/common/test/aws/smithy/kotlin/runtime/awsprotocol/xml/RestXmlErrorDeserializerTest.kt b/runtime/protocol/aws-xml-protocols/common/test/aws/smithy/kotlin/runtime/awsprotocol/xml/RestXmlErrorDeserializerTest.kt
index 9b94c7c31c..1f08e7bd3c 100644
--- a/runtime/protocol/aws-xml-protocols/common/test/aws/smithy/kotlin/runtime/awsprotocol/xml/RestXmlErrorDeserializerTest.kt
+++ b/runtime/protocol/aws-xml-protocols/common/test/aws/smithy/kotlin/runtime/awsprotocol/xml/RestXmlErrorDeserializerTest.kt
@@ -6,7 +6,10 @@ package aws.smithy.kotlin.runtime.awsprotocol.xml
 
 import aws.smithy.kotlin.runtime.serde.DeserializationException
 import kotlinx.coroutines.test.runTest
-import kotlin.test.*
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertNull
 
 class RestXmlErrorDeserializerTest {
 
@@ -36,7 +39,7 @@ class RestXmlErrorDeserializerTest {
         )
 
         for (payload in tests) {
-            val actual = parseRestXmlErrorResponseNoSuspend(payload)
+            val actual = parseRestXmlErrorResponse(payload)
             assertEquals("InvalidGreeting", actual.code)
             assertEquals("Hi", actual.message)
             assertEquals("foo-id", actual.requestId)
@@ -70,7 +73,7 @@ class RestXmlErrorDeserializerTest {
 
         for (payload in tests) {
             assertFailsWith<DeserializationException> {
-                parseRestXmlErrorResponseNoSuspend(payload)
+                parseRestXmlErrorResponse(payload)
             }
         }
     }
@@ -92,7 +95,7 @@ class RestXmlErrorDeserializerTest {
         )
 
         for (payload in tests) {
-            val error = parseRestXmlErrorResponseNoSuspend(payload)
+            val error = parseRestXmlErrorResponse(payload)
             assertEquals("foo-id", error.requestId)
             assertNull(error.code)
             assertNull(error.message)
diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp/api/http-client-engine-okhttp.api b/runtime/protocol/http-client-engines/http-client-engine-okhttp/api/http-client-engine-okhttp.api
index 25c2339550..77e6120478 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-okhttp/api/http-client-engine-okhttp.api
+++ b/runtime/protocol/http-client-engines/http-client-engine-okhttp/api/http-client-engine-okhttp.api
@@ -87,7 +87,7 @@ public final class aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngineConf
 }
 
 public final class aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngineKt {
-	public static final fun buildClient (Laws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngineConfig;Laws/smithy/kotlin/runtime/http/engine/internal/HttpClientMetrics;)Lokhttp3/OkHttpClient;
+	public static final fun buildClient (Laws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngineConfig;Laws/smithy/kotlin/runtime/http/engine/internal/HttpClientMetrics;[Lokhttp3/EventListener;)Lokhttp3/OkHttpClient;
 }
 
 public final class aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpHeadersAdapter : aws/smithy/kotlin/runtime/http/Headers {
diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/ConnectionIdleMonitor.kt b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/ConnectionMonitoringEventListener.kt
similarity index 78%
rename from runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/ConnectionIdleMonitor.kt
rename to runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/ConnectionMonitoringEventListener.kt
index 3f4c366f70..131466e66e 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/ConnectionIdleMonitor.kt
+++ b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/ConnectionMonitoringEventListener.kt
@@ -4,12 +4,10 @@
  */
 package aws.smithy.kotlin.runtime.http.engine.okhttp
 
+import aws.smithy.kotlin.runtime.io.Closeable
 import aws.smithy.kotlin.runtime.telemetry.logging.logger
 import kotlinx.coroutines.*
-import okhttp3.Call
-import okhttp3.Connection
-import okhttp3.ConnectionListener
-import okhttp3.ExperimentalOkHttpApi
+import okhttp3.*
 import okhttp3.internal.closeQuietly
 import okio.IOException
 import okio.buffer
@@ -22,12 +20,20 @@ import kotlin.coroutines.coroutineContext
 import kotlin.time.Duration
 import kotlin.time.measureTime
 
-@OptIn(ExperimentalOkHttpApi::class)
-internal class ConnectionIdleMonitor(val pollInterval: Duration) : ConnectionListener() {
+/**
+ * An [okhttp3.EventListener] implementation that monitors connections for remote closure.
+ * This replaces the functionality previously provided by the now-internal [okhttp3.ConnectionListener].
+ */
+internal class ConnectionMonitoringEventListener(private val pollInterval: Duration) :
+    EventListener(),
+    Closeable {
     private val monitorScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
     private val monitors = ConcurrentHashMap<Connection, Job>()
 
-    fun close(): Unit = runBlocking {
+    /**
+     * Close all active connection monitors.
+     */
+    override fun close(): Unit = runBlocking {
         val monitorJob = requireNotNull(monitorScope.coroutineContext[Job]) {
             "Connection idle monitor scope cannot be cancelled because it does not have a job: $this"
         }
@@ -40,13 +46,16 @@ internal class ConnectionIdleMonitor(val pollInterval: Duration) : ConnectionLis
             ?.callContext
             ?: Dispatchers.IO
 
-    override fun connectionAcquired(connection: Connection, call: Call) {
+    // Cancel monitoring when a connection is acquired
+    override fun connectionAcquired(call: Call, connection: Connection) {
+        super.connectionAcquired(call, connection)
+
         // Non-locking map access is okay here because this code will only execute synchronously as part of a
         // `connectionAcquired` event and will be complete before any future `connectionReleased` event could fire for
         // the same connection.
         monitors.remove(connection)?.let { monitor ->
             val context = call.callContext()
-            val logger = context.logger<ConnectionIdleMonitor>()
+            val logger = context.logger<ConnectionMonitoringEventListener>()
             logger.trace { "Cancel monitoring for $connection" }
 
             // Use `runBlocking` because this _must_ finish before OkHttp goes to use the connection
@@ -58,13 +67,18 @@ internal class ConnectionIdleMonitor(val pollInterval: Duration) : ConnectionLis
         }
     }
 
-    override fun connectionReleased(connection: Connection, call: Call) {
+    // Start monitoring when a connection is released
+    override fun connectionReleased(call: Call, connection: Connection) {
+        super.connectionReleased(call, connection)
+
         val connId = System.identityHashCode(connection)
         val callContext = call.callContext()
+
+        // Start monitoring
         val monitor = monitorScope.launch(CoroutineName("okhttp-conn-monitor-for-$connId")) {
             doMonitor(connection, callContext)
         }
-        callContext.logger<ConnectionIdleMonitor>().trace { "Launched coroutine $monitor to monitor $connection" }
+        callContext.logger<ConnectionMonitoringEventListener>().trace { "Launched coroutine $monitor to monitor $connection" }
 
         // Non-locking map access is okay here because this code will only execute synchronously as part of a
         // `connectionReleased` event and will be complete before any future `connectionAcquired` event could fire for
@@ -73,7 +87,7 @@ internal class ConnectionIdleMonitor(val pollInterval: Duration) : ConnectionLis
     }
 
     private suspend fun doMonitor(conn: Connection, callContext: CoroutineContext) {
-        val logger = callContext.logger<ConnectionIdleMonitor>()
+        val logger = callContext.logger<ConnectionMonitoringEventListener>()
 
         val socket = conn.socket()
         val source = try {
diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/EventListenerChain.kt b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/EventListenerChain.kt
new file mode 100644
index 0000000000..c18bd331f3
--- /dev/null
+++ b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/EventListenerChain.kt
@@ -0,0 +1,115 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.http.engine.okhttp
+
+import aws.smithy.kotlin.runtime.io.closeIfCloseable
+import okhttp3.*
+import java.io.IOException
+import java.net.InetAddress
+import java.net.InetSocketAddress
+import java.net.Proxy
+
+/**
+ * An [okhttp3.EventListener] that delegates to a chain of EventListeners.
+ * Start events are sent in forward order, terminal events are sent in reverse order
+ */
+internal class EventListenerChain(
+    private val listeners: List<EventListener>,
+) : EventListener() {
+    private val reverseListeners = listeners.reversed()
+
+    fun close() {
+        listeners.forEach {
+            it.closeIfCloseable()
+        }
+    }
+
+    override fun callStart(call: Call): Unit =
+        listeners.forEach { it.callStart(call) }
+
+    override fun dnsStart(call: Call, domainName: String): Unit =
+        listeners.forEach { it.dnsStart(call, domainName) }
+
+    override fun dnsEnd(call: Call, domainName: String, inetAddressList: List<InetAddress>): Unit =
+        reverseListeners.forEach { it.dnsEnd(call, domainName, inetAddressList) }
+
+    override fun proxySelectStart(call: Call, url: HttpUrl): Unit =
+        listeners.forEach { it.proxySelectStart(call, url) }
+
+    override fun proxySelectEnd(call: Call, url: HttpUrl, proxies: List<Proxy>): Unit =
+        reverseListeners.forEach { it.proxySelectEnd(call, url, proxies) }
+
+    override fun connectStart(call: Call, inetSocketAddress: InetSocketAddress, proxy: Proxy): Unit =
+        listeners.forEach { it.connectStart(call, inetSocketAddress, proxy) }
+
+    override fun secureConnectStart(call: Call): Unit =
+        listeners.forEach { it.secureConnectStart(call) }
+
+    override fun secureConnectEnd(call: Call, handshake: Handshake?): Unit =
+        reverseListeners.forEach { it.secureConnectEnd(call, handshake) }
+
+    override fun connectEnd(call: Call, inetSocketAddress: InetSocketAddress, proxy: Proxy, protocol: Protocol?): Unit =
+        reverseListeners.forEach { it.connectEnd(call, inetSocketAddress, proxy, protocol) }
+
+    override fun connectFailed(call: Call, inetSocketAddress: InetSocketAddress, proxy: Proxy, protocol: Protocol?, ioe: IOException): Unit =
+        reverseListeners.forEach { it.connectFailed(call, inetSocketAddress, proxy, protocol, ioe) }
+
+    override fun connectionAcquired(call: Call, connection: Connection): Unit =
+        listeners.forEach { it.connectionAcquired(call, connection) }
+
+    override fun connectionReleased(call: Call, connection: Connection): Unit =
+        reverseListeners.forEach { it.connectionReleased(call, connection) }
+
+    override fun requestHeadersStart(call: Call): Unit =
+        listeners.forEach { it.requestHeadersStart(call) }
+
+    override fun requestHeadersEnd(call: Call, request: Request): Unit =
+        reverseListeners.forEach { it.requestHeadersEnd(call, request) }
+
+    override fun requestBodyStart(call: Call): Unit =
+        listeners.forEach { it.requestBodyStart(call) }
+
+    override fun requestBodyEnd(call: Call, byteCount: Long): Unit =
+        reverseListeners.forEach { it.requestBodyEnd(call, byteCount) }
+
+    override fun requestFailed(call: Call, ioe: IOException): Unit =
+        reverseListeners.forEach { it.requestFailed(call, ioe) }
+
+    override fun responseHeadersStart(call: Call): Unit =
+        listeners.forEach { it.responseHeadersStart(call) }
+
+    override fun responseHeadersEnd(call: Call, response: Response): Unit =
+        reverseListeners.forEach { it.responseHeadersEnd(call, response) }
+
+    override fun responseBodyStart(call: Call): Unit =
+        listeners.forEach { it.responseBodyStart(call) }
+
+    override fun responseBodyEnd(call: Call, byteCount: Long): Unit =
+        reverseListeners.forEach { it.responseBodyEnd(call, byteCount) }
+
+    override fun responseFailed(call: Call, ioe: IOException): Unit =
+        reverseListeners.forEach { it.responseFailed(call, ioe) }
+
+    override fun callEnd(call: Call): Unit =
+        reverseListeners.forEach { it.callEnd(call) }
+
+    override fun callFailed(call: Call, ioe: IOException): Unit =
+        reverseListeners.forEach { it.callFailed(call, ioe) }
+
+    override fun canceled(call: Call): Unit =
+        reverseListeners.forEach { it.canceled(call) }
+
+    override fun satisfactionFailure(call: Call, response: Response): Unit =
+        reverseListeners.forEach { it.satisfactionFailure(call, response) }
+
+    override fun cacheConditionalHit(call: Call, cachedResponse: Response): Unit =
+        listeners.forEach { it.cacheConditionalHit(call, cachedResponse) }
+
+    override fun cacheHit(call: Call, response: Response): Unit =
+        listeners.forEach { it.cacheHit(call, response) }
+
+    override fun cacheMiss(call: Call): Unit =
+        listeners.forEach { it.cacheMiss(call) }
+}
diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngine.kt b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngine.kt
index a20387d0a0..297e015eed 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngine.kt
+++ b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngine.kt
@@ -8,9 +8,13 @@ package aws.smithy.kotlin.runtime.http.engine.okhttp
 import aws.smithy.kotlin.runtime.InternalApi
 import aws.smithy.kotlin.runtime.http.HttpCall
 import aws.smithy.kotlin.runtime.http.config.EngineFactory
-import aws.smithy.kotlin.runtime.http.engine.*
+import aws.smithy.kotlin.runtime.http.engine.AlpnId
+import aws.smithy.kotlin.runtime.http.engine.HttpClientEngineBase
+import aws.smithy.kotlin.runtime.http.engine.TlsContext
+import aws.smithy.kotlin.runtime.http.engine.callContext
 import aws.smithy.kotlin.runtime.http.engine.internal.HttpClientMetrics
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
+import aws.smithy.kotlin.runtime.io.closeIfCloseable
 import aws.smithy.kotlin.runtime.net.TlsVersion
 import aws.smithy.kotlin.runtime.operation.ExecutionContext
 import aws.smithy.kotlin.runtime.time.Instant
@@ -18,7 +22,6 @@ import aws.smithy.kotlin.runtime.time.fromEpochMilliseconds
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.job
 import okhttp3.*
-import okhttp3.ConnectionPool
 import okhttp3.coroutines.executeAsync
 import java.util.concurrent.TimeUnit
 import kotlin.time.toJavaDuration
@@ -44,9 +47,14 @@ public class OkHttpEngine(
         override val engineConstructor: (OkHttpEngineConfig.Builder.() -> Unit) -> OkHttpEngine = ::invoke
     }
 
+    // Create a single shared connection monitoring listener if idle polling is enabled
+    private val connectionMonitoringListener: EventListener? =
+        config.connectionIdlePollingInterval?.let {
+            ConnectionMonitoringEventListener(it)
+        }
+
     private val metrics = HttpClientMetrics(TELEMETRY_SCOPE, config.telemetryProvider)
-    private val connectionIdleMonitor = config.connectionIdlePollingInterval?.let { ConnectionIdleMonitor(it) }
-    private val client = config.buildClientWithConnectionListener(metrics, connectionIdleMonitor)
+    private val client = config.buildClient(metrics, connectionMonitoringListener)
 
     @OptIn(ExperimentalCoroutinesApi::class)
     override suspend fun roundTrip(context: ExecutionContext, request: HttpRequest): HttpCall {
@@ -73,16 +81,20 @@ public class OkHttpEngine(
     }
 
     override fun shutdown() {
-        connectionIdleMonitor?.close()
+        connectionMonitoringListener?.closeIfCloseable()
         client.connectionPool.evictAll()
         client.dispatcher.executorService.shutdown()
         metrics.close()
     }
 }
 
-private fun OkHttpEngineConfig.buildClientFromConfig(
+/**
+ * Convert SDK version of HTTP configuration to OkHttp specific configuration and return the configured client
+ */
+@InternalApi
+public fun OkHttpEngineConfig.buildClient(
     metrics: HttpClientMetrics,
-    poolOverride: ConnectionPool? = null,
+    vararg clientScopedEventListeners: EventListener?,
 ): OkHttpClient {
     val config = this
 
@@ -102,7 +114,7 @@ private fun OkHttpEngineConfig.buildClientFromConfig(
         writeTimeout(config.socketWriteTimeout.toJavaDuration())
 
         // use our own pool configured with the timeout settings taken from config
-        val pool = poolOverride ?: ConnectionPool(
+        val pool = ConnectionPool(
             maxIdleConnections = 5, // The default from the no-arg ConnectionPool() constructor
             keepAliveDuration = config.connectionIdleTimeout.inWholeMilliseconds,
             TimeUnit.MILLISECONDS,
@@ -116,7 +128,14 @@ private fun OkHttpEngineConfig.buildClientFromConfig(
         dispatcher(dispatcher)
 
         // Log events coming from okhttp. Allocate a new listener per-call to facilitate dedicated trace spans.
-        eventListenerFactory { call -> HttpEngineEventListener(pool, config.hostResolver, dispatcher, metrics, call) }
+        eventListenerFactory { call ->
+            EventListenerChain(
+                listOfNotNull(
+                    HttpEngineEventListener(pool, config.hostResolver, dispatcher, metrics, call),
+                    *clientScopedEventListeners,
+                ),
+            )
+        }
 
         // map protocols
         if (config.tlsContext.alpn.isNotEmpty()) {
@@ -140,34 +159,6 @@ private fun OkHttpEngineConfig.buildClientFromConfig(
     }.build()
 }
 
-/**
- * Convert SDK version of HTTP configuration to OkHttp specific configuration and return the configured client
- */
-// Used by OkHttp4Engine - OkHttp4 does NOT have `connectionListener`
-// TODO - Refactor in next minor version - Move this to OkHttp4Engine and make it private
-@InternalApi
-public fun OkHttpEngineConfig.buildClient(
-    metrics: HttpClientMetrics,
-): OkHttpClient = this.buildClientFromConfig(metrics)
-
-/**
- * Convert SDK version of HTTP configuration to OkHttp specific configuration and return the configured client
- */
-// Used by OkHttpEngine - OkHttp5 does have `connectionListener`
-@OptIn(ExperimentalOkHttpApi::class)
-private fun OkHttpEngineConfig.buildClientWithConnectionListener(
-    metrics: HttpClientMetrics,
-    connectionListener: ConnectionIdleMonitor?,
-): OkHttpClient = this.buildClientFromConfig(
-    metrics,
-    ConnectionPool(
-        maxIdleConnections = 5, // The default from the no-arg ConnectionPool() constructor
-        keepAliveDuration = this.connectionIdleTimeout.inWholeMilliseconds,
-        timeUnit = TimeUnit.MILLISECONDS,
-        connectionListener = connectionListener ?: ConnectionListener.NONE,
-    ),
-)
-
 private fun minTlsConnectionSpec(tlsContext: TlsContext): ConnectionSpec {
     val minVersion = tlsContext.minVersion ?: TlsVersion.TLS_1_2
     val okHttpTlsVersions = SdkTlsVersion
diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/test/aws/smithy/kotlin/runtime/http/engine/okhttp/EventListenerChainTest.kt b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/test/aws/smithy/kotlin/runtime/http/engine/okhttp/EventListenerChainTest.kt
new file mode 100644
index 0000000000..c9acb07cef
--- /dev/null
+++ b/runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/test/aws/smithy/kotlin/runtime/http/engine/okhttp/EventListenerChainTest.kt
@@ -0,0 +1,281 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.http.engine.okhttp
+
+import okhttp3.*
+import java.io.Closeable
+import java.io.IOException
+import java.net.InetAddress
+import java.net.InetSocketAddress
+import java.net.Proxy
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class EventListenerChainTest {
+    @Test
+    fun testForwardEvents() {
+        val eventOrder = mutableListOf<String>()
+
+        val listener1 = TestEventListener("listener1", eventOrder)
+        val listener2 = TestEventListener("listener2", eventOrder)
+
+        val chain = EventListenerChain(listOf(listener1, listener2))
+
+        val call = createMockCall()
+
+        // Test forward events
+        chain.callStart(call)
+        chain.dnsStart(call, "example.com")
+        chain.proxySelectStart(call, createHttpUrl())
+
+        // Verify forward events were called in order (listener1 first, then listener2)
+        assertEquals("listener1:callStart", eventOrder[0])
+        assertEquals("listener2:callStart", eventOrder[1])
+        assertEquals("listener1:dnsStart", eventOrder[2])
+        assertEquals("listener2:dnsStart", eventOrder[3])
+        assertEquals("listener1:proxySelectStart", eventOrder[4])
+        assertEquals("listener2:proxySelectStart", eventOrder[5])
+    }
+
+    @Test
+    fun testReverseEvents() {
+        val eventOrder = mutableListOf<String>()
+
+        val listener1 = TestEventListener("listener1", eventOrder)
+        val listener2 = TestEventListener("listener2", eventOrder)
+
+        val chain = EventListenerChain(listOf(listener1, listener2))
+
+        val call = createMockCall()
+
+        // Test reverse events
+        chain.dnsEnd(call, "example.com", listOf())
+        chain.proxySelectEnd(call, createHttpUrl(), listOf())
+        chain.callEnd(call)
+
+        // Verify reverse events were called in reverse order (listener2 first, then listener1)
+        assertEquals("listener2:dnsEnd", eventOrder[0])
+        assertEquals("listener1:dnsEnd", eventOrder[1])
+        assertEquals("listener2:proxySelectEnd", eventOrder[2])
+        assertEquals("listener1:proxySelectEnd", eventOrder[3])
+        assertEquals("listener2:callEnd", eventOrder[4])
+        assertEquals("listener1:callEnd", eventOrder[5])
+    }
+
+    @Test
+    fun testClose() {
+        val eventOrder = mutableListOf<String>()
+
+        val listener1 = TestEventListener("listener1", eventOrder)
+        val listener2 = TestEventListener("listener2", eventOrder)
+
+        val chain = EventListenerChain(listOf(listener1, listener2))
+
+        // Close the chain
+        chain.close()
+
+        // Verify all listeners were closed
+        assertTrue(listener1.closed)
+        assertTrue(listener2.closed)
+    }
+
+    @Test
+    fun testMixedEvents() {
+        val eventOrder = mutableListOf<String>()
+
+        val listener1 = TestEventListener("listener1", eventOrder)
+        val listener2 = TestEventListener("listener2", eventOrder)
+
+        val chain = EventListenerChain(listOf(listener1, listener2))
+
+        val call = createMockCall()
+
+        // Test mixed forward and reverse events
+        chain.callStart(call)
+        chain.dnsStart(call, "example.com")
+        chain.dnsEnd(call, "example.com", listOf())
+
+        // Verify the order of events
+        assertEquals("listener1:callStart", eventOrder[0]) // listener1 first (forward)
+        assertEquals("listener2:callStart", eventOrder[1]) // listener2 second (forward)
+        assertEquals("listener1:dnsStart", eventOrder[2]) // listener1 first (forward)
+        assertEquals("listener2:dnsStart", eventOrder[3]) // listener2 second (forward)
+        assertEquals("listener2:dnsEnd", eventOrder[4]) // listener2 first (reverse)
+        assertEquals("listener1:dnsEnd", eventOrder[5]) // listener1 second (reverse)
+
+        // Clear event order
+        eventOrder.clear()
+
+        // Test more events to verify the sequence
+        chain.requestHeadersStart(call) // forward event
+        chain.requestHeadersEnd(call, Request.Builder().url("https://example.com").build()) // reverse event
+        chain.responseHeadersStart(call) // forward event
+        chain.responseHeadersEnd(
+            call,
+            Response.Builder()
+                .request(Request.Builder().url("https://example.com").build())
+                .protocol(Protocol.HTTP_2)
+                .code(200)
+                .message("OK")
+                .build(),
+        ) // reverse event
+
+        // Verify the sequence of events
+        assertEquals("listener1:requestHeadersStart", eventOrder[0]) // listener1 first (forward)
+        assertEquals("listener2:requestHeadersStart", eventOrder[1]) // listener2 second (forward)
+        assertEquals("listener2:requestHeadersEnd", eventOrder[2]) // listener2 first (reverse)
+        assertEquals("listener1:requestHeadersEnd", eventOrder[3]) // listener1 second (reverse)
+        assertEquals("listener1:responseHeadersStart", eventOrder[4]) // listener1 first (forward)
+        assertEquals("listener2:responseHeadersStart", eventOrder[5]) // listener2 second (forward)
+        assertEquals("listener2:responseHeadersEnd", eventOrder[6]) // listener2 first (reverse)
+        assertEquals("listener1:responseHeadersEnd", eventOrder[7]) // listener1 second (reverse)
+    }
+
+    // A test EventListener that records the order of calls
+    private class TestEventListener(val name: String, val eventOrder: MutableList<String>) :
+        EventListener(),
+        Closeable {
+        var closed = false
+
+        override fun callStart(call: Call) {
+            eventOrder.add("$name:callStart")
+        }
+
+        override fun dnsStart(call: Call, domainName: String) {
+            eventOrder.add("$name:dnsStart")
+        }
+
+        override fun dnsEnd(call: Call, domainName: String, inetAddressList: List<InetAddress>) {
+            eventOrder.add("$name:dnsEnd")
+        }
+
+        override fun proxySelectStart(call: Call, url: HttpUrl) {
+            eventOrder.add("$name:proxySelectStart")
+        }
+
+        override fun proxySelectEnd(call: Call, url: HttpUrl, proxies: List<Proxy>) {
+            eventOrder.add("$name:proxySelectEnd")
+        }
+
+        override fun connectStart(call: Call, inetSocketAddress: InetSocketAddress, proxy: Proxy) {
+            eventOrder.add("$name:connectStart")
+        }
+
+        override fun secureConnectStart(call: Call) {
+            eventOrder.add("$name:secureConnectStart")
+        }
+
+        override fun secureConnectEnd(call: Call, handshake: Handshake?) {
+            eventOrder.add("$name:secureConnectEnd")
+        }
+
+        override fun connectEnd(call: Call, inetSocketAddress: InetSocketAddress, proxy: Proxy, protocol: Protocol?) {
+            eventOrder.add("$name:connectEnd")
+        }
+
+        override fun connectFailed(call: Call, inetSocketAddress: InetSocketAddress, proxy: Proxy, protocol: Protocol?, ioe: IOException) {
+            eventOrder.add("$name:connectFailed")
+        }
+
+        override fun connectionAcquired(call: Call, connection: Connection) {
+            eventOrder.add("$name:connectionAcquired")
+        }
+
+        override fun connectionReleased(call: Call, connection: Connection) {
+            eventOrder.add("$name:connectionReleased")
+        }
+
+        override fun requestHeadersStart(call: Call) {
+            eventOrder.add("$name:requestHeadersStart")
+        }
+
+        override fun requestHeadersEnd(call: Call, request: Request) {
+            eventOrder.add("$name:requestHeadersEnd")
+        }
+
+        override fun requestBodyStart(call: Call) {
+            eventOrder.add("$name:requestBodyStart")
+        }
+
+        override fun requestBodyEnd(call: Call, byteCount: Long) {
+            eventOrder.add("$name:requestBodyEnd")
+        }
+
+        override fun requestFailed(call: Call, ioe: IOException) {
+            eventOrder.add("$name:requestFailed")
+        }
+
+        override fun responseHeadersStart(call: Call) {
+            eventOrder.add("$name:responseHeadersStart")
+        }
+
+        override fun responseHeadersEnd(call: Call, response: Response) {
+            eventOrder.add("$name:responseHeadersEnd")
+        }
+
+        override fun responseBodyStart(call: Call) {
+            eventOrder.add("$name:responseBodyStart")
+        }
+
+        override fun responseBodyEnd(call: Call, byteCount: Long) {
+            eventOrder.add("$name:responseBodyEnd")
+        }
+
+        override fun responseFailed(call: Call, ioe: IOException) {
+            eventOrder.add("$name:responseFailed")
+        }
+
+        override fun callEnd(call: Call) {
+            eventOrder.add("$name:callEnd")
+        }
+
+        override fun callFailed(call: Call, ioe: IOException) {
+            eventOrder.add("$name:callFailed")
+        }
+
+        override fun canceled(call: Call) {
+            eventOrder.add("$name:canceled")
+        }
+
+        override fun satisfactionFailure(call: Call, response: Response) {
+            eventOrder.add("$name:satisfactionFailure")
+        }
+
+        override fun cacheConditionalHit(call: Call, cachedResponse: Response) {
+            eventOrder.add("$name:cacheConditionalHit")
+        }
+
+        override fun cacheHit(call: Call, response: Response) {
+            eventOrder.add("$name:cacheHit")
+        }
+
+        override fun cacheMiss(call: Call) {
+            eventOrder.add("$name:cacheMiss")
+        }
+
+        override fun close() {
+            closed = true
+        }
+    }
+
+    // Helper methods to create mock objects
+    private fun createMockCall(): Call = object : Call {
+        override fun cancel() {}
+        override fun clone(): Call = this
+        override fun enqueue(responseCallback: Callback) {}
+        override fun execute(): Response = throw UnsupportedOperationException()
+        override fun isCanceled(): Boolean = false
+        override fun isExecuted(): Boolean = false
+        override fun request(): Request = Request.Builder().url("https://example.com").build()
+        override fun timeout(): okio.Timeout = okio.Timeout()
+    }
+
+    private fun createHttpUrl(): HttpUrl = HttpUrl.Builder()
+        .scheme("https")
+        .host("example.com")
+        .build()
+}
diff --git a/runtime/protocol/http-client/api/http-client.api b/runtime/protocol/http-client/api/http-client.api
index 9a752b6788..1d8deaa751 100644
--- a/runtime/protocol/http-client/api/http-client.api
+++ b/runtime/protocol/http-client/api/http-client.api
@@ -29,6 +29,8 @@ public abstract interface class aws/smithy/kotlin/runtime/http/config/HttpEngine
 	public abstract fun getHttpClient ()Laws/smithy/kotlin/runtime/http/engine/HttpClientEngine;
 	public abstract fun httpClient (Laws/smithy/kotlin/runtime/http/config/EngineFactory;Lkotlin/jvm/functions/Function1;)V
 	public abstract fun httpClient (Lkotlin/jvm/functions/Function1;)V
+	public static synthetic fun httpClient$default (Laws/smithy/kotlin/runtime/http/config/HttpEngineConfig$Builder;Laws/smithy/kotlin/runtime/http/config/EngineFactory;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+	public static synthetic fun httpClient$default (Laws/smithy/kotlin/runtime/http/config/HttpEngineConfig$Builder;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 	public abstract fun setHttpClient (Laws/smithy/kotlin/runtime/http/engine/HttpClientEngine;)V
 }
 
@@ -309,7 +311,7 @@ public final class aws/smithy/kotlin/runtime/http/interceptors/ContinueIntercept
 }
 
 public final class aws/smithy/kotlin/runtime/http/interceptors/DiscoveredEndpointErrorInterceptor : aws/smithy/kotlin/runtime/client/Interceptor {
-	public fun <init> (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function1;)V
+	public fun <init> (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function2;)V
 	public fun modifyBeforeAttemptCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun modifyBeforeCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun modifyBeforeDeserialization (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -495,11 +497,13 @@ public abstract interface class aws/smithy/kotlin/runtime/http/operation/Endpoin
 	public abstract fun resolve (Laws/smithy/kotlin/runtime/http/operation/ResolveEndpointRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public abstract interface class aws/smithy/kotlin/runtime/http/operation/HttpDeserialize {
-	public abstract fun deserialize (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Laws/smithy/kotlin/runtime/http/HttpCall;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+public abstract interface class aws/smithy/kotlin/runtime/http/operation/HttpDeserializer {
+	public static final field Companion Laws/smithy/kotlin/runtime/http/operation/HttpDeserializer$Companion;
 }
 
-public abstract interface class aws/smithy/kotlin/runtime/http/operation/HttpDeserializer {
+public final class aws/smithy/kotlin/runtime/http/operation/HttpDeserializer$Companion {
+	public final fun getIdentity ()Laws/smithy/kotlin/runtime/http/operation/HttpDeserializer;
+	public final fun getUnit ()Laws/smithy/kotlin/runtime/http/operation/HttpDeserializer;
 }
 
 public abstract interface class aws/smithy/kotlin/runtime/http/operation/HttpDeserializer$NonStreaming : aws/smithy/kotlin/runtime/http/operation/HttpDeserializer {
@@ -523,11 +527,12 @@ public final class aws/smithy/kotlin/runtime/http/operation/HttpOperationContext
 	public final fun getSdkInvocationId ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 }
 
-public abstract interface class aws/smithy/kotlin/runtime/http/operation/HttpSerialize {
-	public abstract fun serialize (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+public abstract interface class aws/smithy/kotlin/runtime/http/operation/HttpSerializer {
+	public static final field Companion Laws/smithy/kotlin/runtime/http/operation/HttpSerializer$Companion;
 }
 
-public abstract interface class aws/smithy/kotlin/runtime/http/operation/HttpSerializer {
+public final class aws/smithy/kotlin/runtime/http/operation/HttpSerializer$Companion {
+	public final fun getUnit ()Laws/smithy/kotlin/runtime/http/operation/HttpSerializer;
 }
 
 public abstract interface class aws/smithy/kotlin/runtime/http/operation/HttpSerializer$NonStreaming : aws/smithy/kotlin/runtime/http/operation/HttpSerializer {
@@ -538,13 +543,8 @@ public abstract interface class aws/smithy/kotlin/runtime/http/operation/HttpSer
 	public abstract fun serialize (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
-public final class aws/smithy/kotlin/runtime/http/operation/IdentityDeserializer : aws/smithy/kotlin/runtime/http/operation/HttpDeserialize {
-	public static final field INSTANCE Laws/smithy/kotlin/runtime/http/operation/IdentityDeserializer;
-	public fun deserialize (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Laws/smithy/kotlin/runtime/http/HttpCall;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
 public abstract interface class aws/smithy/kotlin/runtime/http/operation/InitializeMiddleware : aws/smithy/kotlin/runtime/io/middleware/Middleware {
-	public abstract fun install (Laws/smithy/kotlin/runtime/http/operation/SdkHttpOperation;)V
+	public fun install (Laws/smithy/kotlin/runtime/http/operation/SdkHttpOperation;)V
 }
 
 public final class aws/smithy/kotlin/runtime/http/operation/InitializeMiddleware$DefaultImpls {
@@ -556,7 +556,7 @@ public abstract interface class aws/smithy/kotlin/runtime/http/operation/InlineM
 }
 
 public abstract interface class aws/smithy/kotlin/runtime/http/operation/ModifyRequestMiddleware : aws/smithy/kotlin/runtime/io/middleware/ModifyRequest {
-	public abstract fun install (Laws/smithy/kotlin/runtime/http/operation/SdkHttpOperation;)V
+	public fun install (Laws/smithy/kotlin/runtime/http/operation/SdkHttpOperation;)V
 }
 
 public final class aws/smithy/kotlin/runtime/http/operation/ModifyRequestMiddleware$DefaultImpls {
@@ -564,7 +564,7 @@ public final class aws/smithy/kotlin/runtime/http/operation/ModifyRequestMiddlew
 }
 
 public abstract interface class aws/smithy/kotlin/runtime/http/operation/MutateMiddleware : aws/smithy/kotlin/runtime/io/middleware/Middleware {
-	public abstract fun install (Laws/smithy/kotlin/runtime/http/operation/SdkHttpOperation;)V
+	public fun install (Laws/smithy/kotlin/runtime/http/operation/SdkHttpOperation;)V
 }
 
 public final class aws/smithy/kotlin/runtime/http/operation/MutateMiddleware$DefaultImpls {
@@ -633,7 +633,7 @@ public final class aws/smithy/kotlin/runtime/http/operation/OperationTelemetryKt
 }
 
 public abstract interface class aws/smithy/kotlin/runtime/http/operation/ReceiveMiddleware : aws/smithy/kotlin/runtime/io/middleware/Middleware {
-	public abstract fun install (Laws/smithy/kotlin/runtime/http/operation/SdkHttpOperation;)V
+	public fun install (Laws/smithy/kotlin/runtime/http/operation/SdkHttpOperation;)V
 }
 
 public final class aws/smithy/kotlin/runtime/http/operation/ReceiveMiddleware$DefaultImpls {
@@ -675,20 +675,16 @@ public final class aws/smithy/kotlin/runtime/http/operation/SdkHttpOperationBuil
 	public final fun build ()Laws/smithy/kotlin/runtime/http/operation/SdkHttpOperation;
 	public final fun getContext ()Laws/smithy/kotlin/runtime/operation/ExecutionContext;
 	public final fun getDeserializeWith ()Laws/smithy/kotlin/runtime/http/operation/HttpDeserializer;
-	public final fun getDeserializer ()Laws/smithy/kotlin/runtime/http/operation/HttpDeserialize;
 	public final fun getExecution ()Laws/smithy/kotlin/runtime/http/operation/SdkOperationExecution;
 	public final fun getHostPrefix ()Ljava/lang/String;
 	public final fun getOperationName ()Ljava/lang/String;
 	public final fun getSerializeWith ()Laws/smithy/kotlin/runtime/http/operation/HttpSerializer;
-	public final fun getSerializer ()Laws/smithy/kotlin/runtime/http/operation/HttpSerialize;
 	public final fun getServiceName ()Ljava/lang/String;
 	public final fun getTelemetry ()Laws/smithy/kotlin/runtime/http/operation/SdkOperationTelemetry;
 	public final fun setDeserializeWith (Laws/smithy/kotlin/runtime/http/operation/HttpDeserializer;)V
-	public final fun setDeserializer (Laws/smithy/kotlin/runtime/http/operation/HttpDeserialize;)V
 	public final fun setHostPrefix (Ljava/lang/String;)V
 	public final fun setOperationName (Ljava/lang/String;)V
 	public final fun setSerializeWith (Laws/smithy/kotlin/runtime/http/operation/HttpSerializer;)V
-	public final fun setSerializer (Laws/smithy/kotlin/runtime/http/operation/HttpSerialize;)V
 	public final fun setServiceName (Ljava/lang/String;)V
 }
 
@@ -731,14 +727,3 @@ public final class aws/smithy/kotlin/runtime/http/operation/SdkOperationTelemetr
 	public final fun setSpanName (Ljava/lang/String;)V
 }
 
-public final class aws/smithy/kotlin/runtime/http/operation/UnitDeserializer : aws/smithy/kotlin/runtime/http/operation/HttpDeserialize {
-	public static final field INSTANCE Laws/smithy/kotlin/runtime/http/operation/UnitDeserializer;
-	public fun deserialize (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Laws/smithy/kotlin/runtime/http/HttpCall;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
-public final class aws/smithy/kotlin/runtime/http/operation/UnitSerializer : aws/smithy/kotlin/runtime/http/operation/HttpSerialize {
-	public static final field INSTANCE Laws/smithy/kotlin/runtime/http/operation/UnitSerializer;
-	public synthetic fun serialize (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public fun serialize (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Lkotlin/Unit;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-}
-
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/DiscoveredEndpointErrorInterceptor.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/DiscoveredEndpointErrorInterceptor.kt
index ce1ef41857..adb4babd48 100644
--- a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/DiscoveredEndpointErrorInterceptor.kt
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/interceptors/DiscoveredEndpointErrorInterceptor.kt
@@ -23,7 +23,7 @@ import kotlin.reflect.KClass
 @InternalApi
 public class DiscoveredEndpointErrorInterceptor(
     private val errorType: KClass<out ServiceException>,
-    private val invalidate: (ExecutionContext) -> Unit,
+    private val invalidate: suspend (ExecutionContext) -> Unit,
 ) : HttpInterceptor {
     override suspend fun modifyBeforeAttemptCompletion(
         context: ResponseInterceptorContext<Any, Any, HttpRequest, HttpResponse?>,
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/HttpSerde.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/HttpSerde.kt
index 5e50a3cca9..b50a05d037 100644
--- a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/HttpSerde.kt
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/HttpSerde.kt
@@ -15,6 +15,13 @@ import aws.smithy.kotlin.runtime.operation.ExecutionContext
  */
 @InternalApi
 public sealed interface HttpSerializer<T> {
+    @InternalApi
+    public companion object {
+        public val Unit: HttpSerializer<Unit> = object : NonStreaming<Unit> {
+            override fun serialize(context: ExecutionContext, input: Unit): HttpRequestBuilder =
+                HttpRequestBuilder()
+        }
+    }
 
     /**
      * Serializer for streaming operations that need full control over serialization of the body
@@ -38,6 +45,17 @@ public sealed interface HttpSerializer<T> {
  */
 @InternalApi
 public sealed interface HttpDeserializer<T> {
+    @InternalApi
+    public companion object {
+        public val Identity: HttpDeserializer<HttpResponse> = object : NonStreaming<HttpResponse> {
+            override fun deserialize(context: ExecutionContext, call: HttpCall, payload: ByteArray?): HttpResponse =
+                call.response
+        }
+
+        public val Unit: HttpDeserializer<Unit> = object : NonStreaming<Unit> {
+            override fun deserialize(context: ExecutionContext, call: HttpCall, payload: ByteArray?) { }
+        }
+    }
 
     /**
      * Deserializer for streaming operations that need full control over deserialization of the body
@@ -56,66 +74,3 @@ public sealed interface HttpDeserializer<T> {
         public fun deserialize(context: ExecutionContext, call: HttpCall, payload: ByteArray?): T
     }
 }
-
-/**
- * Implemented by types that know how to serialize to the HTTP protocol.
- */
-@Deprecated("use HttpSerializer.Streaming")
-@InternalApi
-public fun interface HttpSerialize<T> {
-    public suspend fun serialize(context: ExecutionContext, input: T): HttpRequestBuilder
-}
-
-@Suppress("DEPRECATION")
-private class LegacyHttpSerializeAdapter<T>(val serializer: HttpSerialize<T>) : HttpSerializer.Streaming<T> {
-    override suspend fun serialize(context: ExecutionContext, input: T): HttpRequestBuilder =
-        serializer.serialize(context, input)
-}
-
-@Suppress("DEPRECATION")
-internal fun <T> HttpSerialize<T>.intoSerializer(): HttpSerializer<T> = LegacyHttpSerializeAdapter(this)
-
-/**
- * Implemented by types that know how to deserialize from the HTTP protocol.
- */
-@Deprecated("use HttpDeserializer.Streaming")
-@InternalApi
-public fun interface HttpDeserialize<T> {
-    public suspend fun deserialize(context: ExecutionContext, call: HttpCall): T
-}
-
-@Suppress("DEPRECATION")
-private class LegacyHttpDeserializeAdapter<T>(val deserializer: HttpDeserialize<T>) : HttpDeserializer.Streaming<T> {
-    override suspend fun deserialize(context: ExecutionContext, call: HttpCall): T =
-        deserializer.deserialize(context, call)
-}
-
-@Suppress("DEPRECATION")
-internal fun <T> HttpDeserialize<T>.intoDeserializer(): HttpDeserializer<T> = LegacyHttpDeserializeAdapter(this)
-
-/**
- * Convenience deserialize implementation for a type with no output type
- */
-@Suppress("DEPRECATION")
-@InternalApi
-public object UnitDeserializer : HttpDeserialize<Unit> {
-    override suspend fun deserialize(context: ExecutionContext, call: HttpCall) {}
-}
-
-/**
- * Convenience serialize implementation for a type with no input type
- */
-@Suppress("DEPRECATION")
-@InternalApi
-public object UnitSerializer : HttpSerialize<Unit> {
-    override suspend fun serialize(context: ExecutionContext, input: Unit): HttpRequestBuilder = HttpRequestBuilder()
-}
-
-/**
- * Convenience deserialize implementation that returns the response without modification
- */
-@Suppress("DEPRECATION")
-@InternalApi
-public object IdentityDeserializer : HttpDeserialize<HttpResponse> {
-    override suspend fun deserialize(context: ExecutionContext, call: HttpCall): HttpResponse = call.response
-}
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/SdkHttpOperation.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/SdkHttpOperation.kt
index 775da6c891..abb3b8cc46 100644
--- a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/SdkHttpOperation.kt
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/SdkHttpOperation.kt
@@ -36,17 +36,6 @@ public class SdkHttpOperation<I, O> internal constructor(
     internal val typeInfo: OperationTypeInfo,
     internal val telemetry: SdkOperationTelemetry,
 ) {
-
-    @Suppress("DEPRECATION")
-    internal constructor(
-        execution: SdkOperationExecution<I, O>,
-        context: ExecutionContext,
-        serializer: HttpSerialize<I>,
-        deserializer: HttpDeserialize<O>,
-        typeInfo: OperationTypeInfo,
-        telemetry: SdkOperationTelemetry,
-    ) : this(execution, context, serializer.intoSerializer(), deserializer.intoDeserializer(), typeInfo, telemetry)
-
     init {
         context[HttpOperationContext.SdkInvocationId] = Uuid.random().toString()
     }
@@ -142,27 +131,8 @@ public class SdkHttpOperationBuilder<I, O>(
     private val outputType: KClass<*>,
 ) {
     public val telemetry: SdkOperationTelemetry = SdkOperationTelemetry()
-
-    @Suppress("DEPRECATION")
-    @Deprecated("use serializeWith")
-    public var serializer: HttpSerialize<I>? = null
-        set(value) {
-            field = value
-            serializeWith = value?.intoSerializer()
-        }
-
     public var serializeWith: HttpSerializer<I>? = null
-
-    @Suppress("DEPRECATION")
-    @Deprecated("use deserializeWith")
-    public var deserializer: HttpDeserialize<O>? = null
-        set(value) {
-            field = value
-            deserializeWith = value?.intoDeserializer()
-        }
-
     public var deserializeWith: HttpDeserializer<O>? = null
-
     public val execution: SdkOperationExecution<I, O> = SdkOperationExecution()
     public val context: ExecutionContext = ExecutionContext()
 
diff --git a/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/operation/SdkHttpOperationTest.kt b/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/operation/SdkHttpOperationTest.kt
index 22e36d1cf1..e564bedcc2 100644
--- a/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/operation/SdkHttpOperationTest.kt
+++ b/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/operation/SdkHttpOperationTest.kt
@@ -36,8 +36,8 @@ class SdkHttpOperationTest {
         val ex = assertFailsWith<IllegalArgumentException> {
             @Suppress("DEPRECATION")
             SdkHttpOperation.build<Unit, Unit> {
-                serializer = UnitSerializer
-                deserializer = UnitDeserializer
+                serializeWith = HttpSerializer.Unit
+                deserializeWith = HttpDeserializer.Unit
             }
         }
 
diff --git a/runtime/runtime-core/api/runtime-core.api b/runtime/runtime-core/api/runtime-core.api
index fa4c1d2d2e..91855f6e4d 100644
--- a/runtime/runtime-core/api/runtime-core.api
+++ b/runtime/runtime-core/api/runtime-core.api
@@ -177,6 +177,12 @@ public final class aws/smithy/kotlin/runtime/collections/CollectionExtKt {
 	public static final fun createOrAppend (Ljava/util/List;Ljava/lang/Object;)Ljava/util/List;
 }
 
+public abstract interface class aws/smithy/kotlin/runtime/collections/ExpiringKeyedCache {
+	public abstract fun get (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun getSize ()I
+	public abstract fun invalidate (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
 public final class aws/smithy/kotlin/runtime/collections/LruCache {
 	public fun <init> (I)V
 	public final fun get (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -188,9 +194,9 @@ public final class aws/smithy/kotlin/runtime/collections/LruCache {
 }
 
 public abstract interface class aws/smithy/kotlin/runtime/collections/MultiMap : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker {
-	public abstract fun contains (Ljava/lang/Object;Ljava/lang/Object;)Z
+	public fun contains (Ljava/lang/Object;Ljava/lang/Object;)Z
 	public abstract fun getEntryValues ()Lkotlin/sequences/Sequence;
-	public abstract fun toMutableMultiMap ()Laws/smithy/kotlin/runtime/collections/MutableMultiMap;
+	public fun toMutableMultiMap ()Laws/smithy/kotlin/runtime/collections/MutableMultiMap;
 }
 
 public final class aws/smithy/kotlin/runtime/collections/MultiMap$DefaultImpls {
@@ -213,15 +219,15 @@ public abstract interface class aws/smithy/kotlin/runtime/collections/MutableMul
 	public abstract fun add (Ljava/lang/Object;Ljava/lang/Object;)Z
 	public abstract fun addAll (Ljava/lang/Object;ILjava/util/Collection;)Z
 	public abstract fun addAll (Ljava/lang/Object;Ljava/util/Collection;)Z
-	public abstract fun addAll (Ljava/util/Map;)V
-	public abstract fun contains (Ljava/lang/Object;Ljava/lang/Object;)Z
+	public fun addAll (Ljava/util/Map;)V
+	public fun contains (Ljava/lang/Object;Ljava/lang/Object;)Z
 	public abstract fun getEntryValues ()Lkotlin/sequences/Sequence;
-	public abstract fun put (Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/List;
+	public fun put (Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/List;
 	public abstract fun removeAll (Ljava/lang/Object;Ljava/util/Collection;)Ljava/lang/Boolean;
 	public abstract fun removeAt (Ljava/lang/Object;I)Ljava/lang/Object;
 	public abstract fun removeElement (Ljava/lang/Object;Ljava/lang/Object;)Z
 	public abstract fun retainAll (Ljava/lang/Object;Ljava/util/Collection;)Ljava/lang/Boolean;
-	public abstract fun toMultiMap ()Laws/smithy/kotlin/runtime/collections/MultiMap;
+	public fun toMultiMap ()Laws/smithy/kotlin/runtime/collections/MultiMap;
 }
 
 public final class aws/smithy/kotlin/runtime/collections/MutableMultiMap$DefaultImpls {
@@ -235,12 +241,12 @@ public final class aws/smithy/kotlin/runtime/collections/MutableMultiMapKt {
 	public static final fun mutableMultiMapOf ([Lkotlin/Pair;)Laws/smithy/kotlin/runtime/collections/MutableMultiMap;
 }
 
-public final class aws/smithy/kotlin/runtime/collections/ReadThroughCache {
+public final class aws/smithy/kotlin/runtime/collections/PeriodicSweepCache : aws/smithy/kotlin/runtime/collections/ExpiringKeyedCache {
 	public synthetic fun <init> (JLaws/smithy/kotlin/runtime/time/Clock;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun <init> (JLaws/smithy/kotlin/runtime/time/Clock;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun get (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun getSize ()I
-	public final fun invalidate (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun get (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun getSize ()I
+	public fun invalidate (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
 public final class aws/smithy/kotlin/runtime/collections/StackKt {
@@ -254,10 +260,10 @@ public final class aws/smithy/kotlin/runtime/collections/StackKt {
 
 public abstract interface class aws/smithy/kotlin/runtime/collections/ValuesMap {
 	public abstract fun contains (Ljava/lang/String;)Z
-	public abstract fun contains (Ljava/lang/String;Ljava/lang/Object;)Z
+	public fun contains (Ljava/lang/String;Ljava/lang/Object;)Z
 	public abstract fun entries ()Ljava/util/Set;
-	public abstract fun forEach (Lkotlin/jvm/functions/Function2;)V
-	public abstract fun get (Ljava/lang/String;)Ljava/lang/Object;
+	public fun forEach (Lkotlin/jvm/functions/Function2;)V
+	public fun get (Ljava/lang/String;)Ljava/lang/Object;
 	public abstract fun getAll (Ljava/lang/String;)Ljava/util/List;
 	public abstract fun getCaseInsensitiveName ()Z
 	public abstract fun isEmpty ()Z
@@ -707,6 +713,7 @@ public abstract interface class aws/smithy/kotlin/runtime/hashing/HashFunction {
 	public abstract fun getDigestSizeBytes ()I
 	public abstract fun reset ()V
 	public abstract fun update ([BII)V
+	public static synthetic fun update$default (Laws/smithy/kotlin/runtime/hashing/HashFunction;[BIIILjava/lang/Object;)V
 }
 
 public final class aws/smithy/kotlin/runtime/hashing/HashFunction$DefaultImpls {
@@ -903,6 +910,7 @@ public abstract interface class aws/smithy/kotlin/runtime/io/SdkBufferedSink : a
 	public abstract fun outputStream ()Ljava/io/OutputStream;
 	public abstract fun write (Laws/smithy/kotlin/runtime/io/SdkSource;J)V
 	public abstract fun write ([BII)V
+	public static synthetic fun write$default (Laws/smithy/kotlin/runtime/io/SdkBufferedSink;[BIIILjava/lang/Object;)V
 	public abstract fun writeAll (Laws/smithy/kotlin/runtime/io/SdkSource;)J
 	public abstract fun writeByte (B)V
 	public abstract fun writeInt (I)V
@@ -912,6 +920,7 @@ public abstract interface class aws/smithy/kotlin/runtime/io/SdkBufferedSink : a
 	public abstract fun writeShort (S)V
 	public abstract fun writeShortLe (S)V
 	public abstract fun writeUtf8 (Ljava/lang/String;II)V
+	public static synthetic fun writeUtf8$default (Laws/smithy/kotlin/runtime/io/SdkBufferedSink;Ljava/lang/String;IIILjava/lang/Object;)V
 }
 
 public final class aws/smithy/kotlin/runtime/io/SdkBufferedSink$DefaultImpls {
@@ -925,6 +934,7 @@ public abstract interface class aws/smithy/kotlin/runtime/io/SdkBufferedSource :
 	public abstract fun inputStream ()Ljava/io/InputStream;
 	public abstract fun peek ()Laws/smithy/kotlin/runtime/io/SdkBufferedSource;
 	public abstract fun read ([BII)I
+	public static synthetic fun read$default (Laws/smithy/kotlin/runtime/io/SdkBufferedSource;[BIIILjava/lang/Object;)I
 	public abstract fun readAll (Laws/smithy/kotlin/runtime/io/SdkSink;)J
 	public abstract fun readByte ()B
 	public abstract fun readByteArray ()[B
@@ -947,7 +957,7 @@ public final class aws/smithy/kotlin/runtime/io/SdkBufferedSource$DefaultImpls {
 }
 
 public abstract interface class aws/smithy/kotlin/runtime/io/SdkByteChannel : aws/smithy/kotlin/runtime/io/SdkByteReadChannel, aws/smithy/kotlin/runtime/io/SdkByteWriteChannel {
-	public abstract fun close ()V
+	public fun close ()V
 }
 
 public final class aws/smithy/kotlin/runtime/io/SdkByteChannel$DefaultImpls {
@@ -994,6 +1004,7 @@ public abstract interface class aws/smithy/kotlin/runtime/io/SdkByteWriteChannel
 	public abstract fun getTotalBytesWritten ()J
 	public abstract fun isClosedForWrite ()Z
 	public abstract fun write (Laws/smithy/kotlin/runtime/io/SdkBuffer;JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun write$default (Laws/smithy/kotlin/runtime/io/SdkByteWriteChannel;Laws/smithy/kotlin/runtime/io/SdkBuffer;JLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
 public final class aws/smithy/kotlin/runtime/io/SdkByteWriteChannel$DefaultImpls {
@@ -1217,6 +1228,7 @@ public final class aws/smithy/kotlin/runtime/net/HostKt {
 public abstract interface class aws/smithy/kotlin/runtime/net/HostResolver {
 	public static final field Companion Laws/smithy/kotlin/runtime/net/HostResolver$Companion;
 	public abstract fun purgeCache (Laws/smithy/kotlin/runtime/net/HostAddress;)V
+	public static synthetic fun purgeCache$default (Laws/smithy/kotlin/runtime/net/HostResolver;Laws/smithy/kotlin/runtime/net/HostAddress;ILjava/lang/Object;)V
 	public abstract fun reportFailure (Laws/smithy/kotlin/runtime/net/HostAddress;)V
 	public abstract fun resolve (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
@@ -2094,7 +2106,6 @@ public final class aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctionsJVMKt
 
 public final class aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctionsKt {
 	public static final fun getDefaultPrinter ()Ljava/lang/Appendable;
-	public static final fun printExceptionStackTrace (Ljava/lang/Exception;)V
 }
 
 public final class aws/smithy/kotlin/runtime/text/Scanner {
@@ -2150,8 +2161,8 @@ public final class aws/smithy/kotlin/runtime/text/encoding/Encodable$Companion {
 public abstract interface class aws/smithy/kotlin/runtime/text/encoding/Encoding {
 	public static final field Companion Laws/smithy/kotlin/runtime/text/encoding/Encoding$Companion;
 	public abstract fun decode (Ljava/lang/String;)Ljava/lang/String;
-	public abstract fun encodableFromDecoded (Ljava/lang/String;)Laws/smithy/kotlin/runtime/text/encoding/Encodable;
-	public abstract fun encodableFromEncoded (Ljava/lang/String;)Laws/smithy/kotlin/runtime/text/encoding/Encodable;
+	public fun encodableFromDecoded (Ljava/lang/String;)Laws/smithy/kotlin/runtime/text/encoding/Encodable;
+	public fun encodableFromEncoded (Ljava/lang/String;)Laws/smithy/kotlin/runtime/text/encoding/Encodable;
 	public abstract fun encode (Ljava/lang/String;)Ljava/lang/String;
 	public abstract fun getName ()Ljava/lang/String;
 }
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/ExpiringKeyedCache.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/ExpiringKeyedCache.kt
new file mode 100644
index 0000000000..b4588d9280
--- /dev/null
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/ExpiringKeyedCache.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.collections
+
+import aws.smithy.kotlin.runtime.util.ExpiringValue
+
+/**
+ * A multi-value cache which supports retrieval and invalidation via a key paired with each value. The [get] and
+ * [invalidate] methods are `suspend` functions to allow for cross-context synchronization and potentially-expensive
+ * value lookup.
+ *
+ * Values in the cache _may_ expire and are retrieved as [ExpiringValue]. When a value is absent/expired in the cache,
+ * invoking [get] will cause a lookup to occur via the function's `valueLookup` parameter.
+ *
+ * @param K The type of the keys of this cache
+ * @param V The type of the values of this cache
+ */
+public interface ExpiringKeyedCache<K, V> {
+    /**
+     * The number of values currently stored in the cache
+     */
+    public val size: Int
+
+    /**
+     * Gets the value associated with this key from the cache. If the cache does not contain the given key,
+     * implementations are expected to invoke [valueLookup], although they _may_ perform other actions such as throw
+     * exceptions, fall back to other caches, etc.
+     * @param key The key for which to look up a value
+     * @param valueLookup A possibly-suspending function which returns the read-through value associated with a given
+     * key. This function is invoked when the cache does not contain the given [key] or when the value is expired.
+     */
+    public suspend fun get(key: K, valueLookup: suspend (K) -> ExpiringValue<V>): V
+
+    /**
+     * Invalidates the value (if any) for the given key, removing it from the cache regardless. This method has no
+     * effect if the given key is not present in the cache.
+     * @param key The key for which to invalidate a value
+     */
+    public suspend fun invalidate(key: K)
+}
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/ReadThroughCache.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/PeriodicSweepCache.kt
similarity index 74%
rename from runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/ReadThroughCache.kt
rename to runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/PeriodicSweepCache.kt
index 529a57d450..0940aaec2d 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/ReadThroughCache.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/collections/PeriodicSweepCache.kt
@@ -12,8 +12,9 @@ import kotlinx.coroutines.sync.withLock
 import kotlin.time.Duration
 
 /**
- * An object which caches values and allows retrieving them by key. The values expire after a time. If a value is
- * expired or absent from the cache, it will be read from a `valueLookup` parameter passed to [get] and then cached.
+ * A cache which allows retrieving values by a key. Looking up a value for a key which does not exist in the cache (or
+ * where the value has expired) are resolved by calling [valueLookup]. The expiry for a value is included in the result
+ * returned from [valueLookup].
  *
  * A sweep operation will run prior to a [get] or [invalidate] that happens after [minimumSweepPeriod] has elapsed from
  * the last sweep (or from the initialization of the cache). This sweep will search for and remove expired entries from
@@ -29,10 +30,10 @@ import kotlin.time.Duration
  * @param clock The [Clock] to use for measuring time. Defaults to [Clock.System].
  */
 @InternalApi
-public class ReadThroughCache<K, V>(
+public class PeriodicSweepCache<K, V>(
     private val minimumSweepPeriod: Duration,
     private val clock: Clock = Clock.System,
-) {
+) : ExpiringKeyedCache<K, V> {
     private val map = mutableMapOf<K, ExpiringValue<V>>()
     private val mutex = Mutex()
     private var nextSweep = clock.now() + minimumSweepPeriod
@@ -44,7 +45,7 @@ public class ReadThroughCache<K, V>(
      * @param valueLookup A possibly-suspending function which returns the read-through value associated with a given
      * key. This function is invoked when the cache, for a given key, does not contain a value or the value is expired.
      */
-    public suspend fun get(key: K, valueLookup: suspend (K) -> ExpiringValue<V>): V = mutex.withLock {
+    override suspend fun get(key: K, valueLookup: suspend (K) -> ExpiringValue<V>): V = mutex.withLock {
         if (clock.now() > nextSweep) sweep()
 
         val current = map[key]
@@ -59,20 +60,29 @@ public class ReadThroughCache<K, V>(
      * Invalidates the value (if any) for the given key, removing it from the cache regardless of its expiry.
      * @param key The key for which to invalidate a value.
      */
-    public suspend fun invalidate(key: K): Unit = mutex.withLock {
+    override suspend fun invalidate(key: K): Unit = mutex.withLock {
         map.remove(key)
         if (clock.now() > nextSweep) sweep()
     }
 
+    /**
+     * Indicates whether this value is expired according to its [ExpiringValue.expiresAt] property and the cache's
+     * [clock]
+     */
     private val ExpiringValue<*>.isExpired: Boolean
         get() = clock.now() >= expiresAt
 
     /**
-     * Gets the number of values currently stored in the cache.
+     * Gets the number of values currently stored in the cache. Note that this property is non-volatile and may reflect
+     * stale information in highly-concurrent scenarios.
      */
-    public val size: Int
+    override val size: Int
         get() = map.size
 
+    /**
+     * Sweeps the cache to remove expired entries and schedule the next sweep. This method _must_ be invoked under mutex
+     * lock.
+     */
     private fun sweep() {
         val iterator = map.iterator()
         while (iterator.hasNext()) {
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctions.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctions.kt
index 3da3bb8c23..9cab81bdbc 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctions.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/smoketests/SmokeTestsFunctions.kt
@@ -2,27 +2,6 @@ package aws.smithy.kotlin.runtime.smoketests
 
 public expect fun exitProcess(status: Int): Nothing
 
-/**
- * Prints an exceptions stack trace using test anything protocol (TAP) format e.g.
- *
- * #java.lang.ArithmeticException: / by zero
- * #	at FileKt.main(File.kt:3)
- * #	at FileKt.main(File.kt)
- * #	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
- * #	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
- * #	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
- * #	at java.base/java.lang.reflect.Method.invoke(Unknown Source)
- * #	at executors.JavaRunnerExecutor$Companion.main(JavaRunnerExecutor.kt:27)
- * #	at executors.JavaRunnerExecutor.main(JavaRunnerExecutor.kt)
- */
-@Deprecated(
-    message = "No longer used, target for removal in 1.5",
-    replaceWith = ReplaceWith("println(exception.stackTraceToString().prependIndent(\"#\"))"),
-    level = DeprecationLevel.WARNING,
-)
-public fun printExceptionStackTrace(exception: Exception): Unit =
-    println(exception.stackTraceToString().split("\n").joinToString("\n") { "#$it" })
-
 public class SmokeTestsException(message: String) : Exception(message)
 
 /**
diff --git a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/ReadThroughCacheTest.kt b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/PeriodicSweepCacheTest.kt
similarity index 91%
rename from runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/ReadThroughCacheTest.kt
rename to runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/PeriodicSweepCacheTest.kt
index 4d85ece15f..f070669c1f 100644
--- a/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/ReadThroughCacheTest.kt
+++ b/runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/collections/PeriodicSweepCacheTest.kt
@@ -12,13 +12,13 @@ import kotlin.test.assertEquals
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
-class ReadThroughCacheTest {
+class PeriodicSweepCacheTest {
     @Test
-    fun testReadThrough() = runTest {
+    fun testGet() = runTest {
         val clock = ManualClock()
         var counter = 0
         fun uncachedValue() = ExpiringValue(counter++, clock.now() + 2.seconds)
-        val cache = ReadThroughCache<String, Int>(1.minutes, clock)
+        val cache = PeriodicSweepCache<String, Int>(1.minutes, clock)
 
         // Basic read through
         assertEquals(0, cache.get("a") { uncachedValue() })
@@ -41,7 +41,7 @@ class ReadThroughCacheTest {
         val clock = ManualClock()
         var counter = 0
         fun uncachedValue() = ExpiringValue(counter++, clock.now() + 2.seconds)
-        val cache = ReadThroughCache<String, Int>(4.seconds, clock)
+        val cache = PeriodicSweepCache<String, Int>(4.seconds, clock)
 
         // Pre-populate values
         assertEquals(0, cache.get("a") { uncachedValue() })
diff --git a/runtime/serde/serde-xml/api/serde-xml.api b/runtime/serde/serde-xml/api/serde-xml.api
index 736408bd97..eabc8febb8 100644
--- a/runtime/serde/serde-xml/api/serde-xml.api
+++ b/runtime/serde/serde-xml/api/serde-xml.api
@@ -47,16 +47,6 @@ public final class aws/smithy/kotlin/runtime/serde/xml/XmlCollectionValueNamespa
 	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }
 
-public final class aws/smithy/kotlin/runtime/serde/xml/XmlDeserializer : aws/smithy/kotlin/runtime/serde/Deserializer {
-	public fun <init> (Laws/smithy/kotlin/runtime/serde/xml/XmlStreamReader;Z)V
-	public synthetic fun <init> (Laws/smithy/kotlin/runtime/serde/xml/XmlStreamReader;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> ([BZ)V
-	public synthetic fun <init> ([BZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun deserializeList (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;)Laws/smithy/kotlin/runtime/serde/Deserializer$ElementIterator;
-	public fun deserializeMap (Laws/smithy/kotlin/runtime/serde/SdkFieldDescriptor;)Laws/smithy/kotlin/runtime/serde/Deserializer$EntryIterator;
-	public fun deserializeStruct (Laws/smithy/kotlin/runtime/serde/SdkObjectDescriptor;)Laws/smithy/kotlin/runtime/serde/Deserializer$FieldIterator;
-}
-
 public final class aws/smithy/kotlin/runtime/serde/xml/XmlError : aws/smithy/kotlin/runtime/serde/FieldTrait {
 	public static final field INSTANCE Laws/smithy/kotlin/runtime/serde/xml/XmlError;
 	public final fun getErrorTag ()Laws/smithy/kotlin/runtime/serde/xml/XmlToken$QualifiedName;
@@ -155,8 +145,10 @@ public abstract interface class aws/smithy/kotlin/runtime/serde/xml/XmlStreamRea
 	public abstract fun getLastToken ()Laws/smithy/kotlin/runtime/serde/xml/XmlToken;
 	public abstract fun nextToken ()Laws/smithy/kotlin/runtime/serde/xml/XmlToken;
 	public abstract fun peek (I)Laws/smithy/kotlin/runtime/serde/xml/XmlToken;
+	public static synthetic fun peek$default (Laws/smithy/kotlin/runtime/serde/xml/XmlStreamReader;IILjava/lang/Object;)Laws/smithy/kotlin/runtime/serde/xml/XmlToken;
 	public abstract fun skipNext ()V
 	public abstract fun subTreeReader (Laws/smithy/kotlin/runtime/serde/xml/XmlStreamReader$SubtreeStartDepth;)Laws/smithy/kotlin/runtime/serde/xml/XmlStreamReader;
+	public static synthetic fun subTreeReader$default (Laws/smithy/kotlin/runtime/serde/xml/XmlStreamReader;Laws/smithy/kotlin/runtime/serde/xml/XmlStreamReader$SubtreeStartDepth;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/serde/xml/XmlStreamReader;
 }
 
 public final class aws/smithy/kotlin/runtime/serde/xml/XmlStreamReader$DefaultImpls {
@@ -178,13 +170,17 @@ public final class aws/smithy/kotlin/runtime/serde/xml/XmlStreamReaderKt {
 
 public abstract interface class aws/smithy/kotlin/runtime/serde/xml/XmlStreamWriter {
 	public abstract fun attribute (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Laws/smithy/kotlin/runtime/serde/xml/XmlStreamWriter;
+	public static synthetic fun attribute$default (Laws/smithy/kotlin/runtime/serde/xml/XmlStreamWriter;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/serde/xml/XmlStreamWriter;
 	public abstract fun endDocument ()V
 	public abstract fun endTag (Ljava/lang/String;Ljava/lang/String;)Laws/smithy/kotlin/runtime/serde/xml/XmlStreamWriter;
+	public static synthetic fun endTag$default (Laws/smithy/kotlin/runtime/serde/xml/XmlStreamWriter;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/serde/xml/XmlStreamWriter;
 	public abstract fun getBytes ()[B
 	public abstract fun getText ()Ljava/lang/String;
 	public abstract fun namespacePrefix (Ljava/lang/String;Ljava/lang/String;)V
+	public static synthetic fun namespacePrefix$default (Laws/smithy/kotlin/runtime/serde/xml/XmlStreamWriter;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
 	public abstract fun startDocument ()V
 	public abstract fun startTag (Ljava/lang/String;Ljava/lang/String;)Laws/smithy/kotlin/runtime/serde/xml/XmlStreamWriter;
+	public static synthetic fun startTag$default (Laws/smithy/kotlin/runtime/serde/xml/XmlStreamWriter;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/serde/xml/XmlStreamWriter;
 	public abstract fun text (Ljava/lang/String;)Laws/smithy/kotlin/runtime/serde/xml/XmlStreamWriter;
 }
 
diff --git a/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlDeserializer.kt b/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlDeserializer.kt
deleted file mode 100644
index b950e888b6..0000000000
--- a/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlDeserializer.kt
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package aws.smithy.kotlin.runtime.serde.xml
-
-import aws.smithy.kotlin.runtime.InternalApi
-import aws.smithy.kotlin.runtime.content.BigDecimal
-import aws.smithy.kotlin.runtime.content.BigInteger
-import aws.smithy.kotlin.runtime.content.Document
-import aws.smithy.kotlin.runtime.serde.*
-import aws.smithy.kotlin.runtime.text.encoding.decodeBase64Bytes
-import aws.smithy.kotlin.runtime.time.Instant
-import aws.smithy.kotlin.runtime.time.TimestampFormat
-
-private const val FIRST_FIELD_INDEX: Int = 0
-
-// Represents aspects of SdkFieldDescriptor that are particular to the Xml format
-internal sealed class FieldLocation {
-    // specifies the mapping to a sdk field index
-    abstract val fieldIndex: Int
-
-    data class Text(override val fieldIndex: Int) : FieldLocation() // Xml nodes have only one associated Text element
-    data class Attribute(override val fieldIndex: Int, val names: Set<XmlToken.QualifiedName>) : FieldLocation()
-}
-
-/**
- * Provides a deserializer for XML documents
- *
- * @param reader underlying [XmlStreamReader] from which tokens are read
- * @param validateRootElement Flag indicating if the root XML document [XmlToken.BeginElement] should be validated against
- * the descriptor passed to [deserializeStruct]. This only affects the root element, not nested struct elements. Some
- * restXml based services DO NOT always send documents with a root element name that matches the shape ID name
- * (S3 in particular). This means there is nothing in the model that gives you enough information to validate the tag.
- */
-@Deprecated("XmlDeserializer is deprecated and will be removed in a future release")
-@InternalApi
-public class XmlDeserializer(
-    private val reader: XmlStreamReader,
-    private val validateRootElement: Boolean = false,
-) : Deserializer {
-
-    public constructor(input: ByteArray, validateRootElement: Boolean = false) : this(xmlStreamReader(input), validateRootElement)
-
-    private var firstStructCall = true
-
-    override fun deserializeStruct(descriptor: SdkObjectDescriptor): Deserializer.FieldIterator {
-        if (firstStructCall) {
-            if (!descriptor.hasTrait<XmlSerialName>()) throw DeserializationException("Top-level struct $descriptor requires a XmlSerialName trait but has none.")
-
-            firstStructCall = false
-
-            reader.nextToken() // Matching field descriptors to children tags so consume the start element of top-level struct
-
-            val structToken = if (descriptor.hasTrait<XmlError>()) {
-                reader.seek<XmlToken.BeginElement> { it.name == descriptor.expectTrait<XmlError>().errorTag }
-            } else {
-                reader.seek<XmlToken.BeginElement>()
-            } ?: throw DeserializationException("Could not find a begin element for new struct")
-
-            if (validateRootElement) {
-                descriptor.requireNameMatch(structToken.name.tag)
-            }
-        }
-
-        // Consume any remaining terminating tokens from previous deserialization
-        reader.seek<XmlToken.BeginElement>()
-
-        // Because attributes set on the root node of the struct, we must read the values before creating the subtree
-        val attribFields = reader.tokenAttributesToFieldLocations(descriptor)
-        val parentToken = if (reader.lastToken is XmlToken.BeginElement) {
-            reader.lastToken as XmlToken.BeginElement
-        } else {
-            throw DeserializationException("Expected last parsed token to be ${XmlToken.BeginElement::class} but was ${reader.lastToken}")
-        }
-
-        val unwrapped = descriptor.hasTrait<XmlUnwrappedOutput>()
-        return XmlStructDeserializer(descriptor, reader.subTreeReader(XmlStreamReader.SubtreeStartDepth.CURRENT), parentToken, attribFields, unwrapped)
-    }
-
-    override fun deserializeList(descriptor: SdkFieldDescriptor): Deserializer.ElementIterator {
-        val depth = when (descriptor.hasTrait<Flattened>()) {
-            true -> XmlStreamReader.SubtreeStartDepth.CURRENT
-            else -> XmlStreamReader.SubtreeStartDepth.CHILD
-        }
-
-        return XmlListDeserializer(reader.subTreeReader(depth), descriptor)
-    }
-
-    override fun deserializeMap(descriptor: SdkFieldDescriptor): Deserializer.EntryIterator {
-        val depth = when (descriptor.hasTrait<Flattened>()) {
-            true -> XmlStreamReader.SubtreeStartDepth.CURRENT
-            else -> XmlStreamReader.SubtreeStartDepth.CHILD
-        }
-
-        return XmlMapDeserializer(reader.subTreeReader(depth), descriptor)
-    }
-}
-
-/**
- * Deserializes specific XML structures into forms that can produce Maps
- *
- * @param reader underlying [XmlStreamReader] from which tokens are read
- * @param descriptor associated [SdkFieldDescriptor] which represents the expected Map
- * @param primitiveDeserializer used to deserialize primitive values
- */
-internal class XmlMapDeserializer(
-    private val reader: XmlStreamReader,
-    private val descriptor: SdkFieldDescriptor,
-    private val primitiveDeserializer: PrimitiveDeserializer = XmlPrimitiveDeserializer(reader, descriptor),
-) : PrimitiveDeserializer by primitiveDeserializer,
-    Deserializer.EntryIterator {
-    private val mapTrait = descriptor.findTrait<XmlMapName>() ?: XmlMapName.Default
-
-    override fun hasNextEntry(): Boolean {
-        val compareTo = when (descriptor.hasTrait<Flattened>()) {
-            true -> descriptor.findTrait<XmlSerialName>()?.name ?: mapTrait.key // Prefer seeking to XmlSerialName if the trait exists
-            false -> mapTrait.entry
-        }
-
-        // Seek to either the XML serial name, entry, or key token depending on the flatness of the map and if the name trait is present
-        val nextEntryToken = when (descriptor.hasTrait<Flattened>()) {
-            true -> reader.peekSeek<XmlToken.BeginElement> { it.name.local == compareTo }
-            false -> reader.seek<XmlToken.BeginElement> { it.name.local == compareTo }
-        }
-
-        return nextEntryToken != null
-    }
-
-    override fun key(): String {
-        // Seek to the key begin token
-        reader.seek<XmlToken.BeginElement> { it.name.local == mapTrait.key }
-            ?: error("Unable to find key $mapTrait.key in $descriptor")
-
-        val keyValueToken = reader.takeNextAs<XmlToken.Text>()
-        reader.nextToken() // Consume the end wrapper
-
-        return keyValueToken.value ?: throw DeserializationException("Key unspecified in $descriptor")
-    }
-
-    override fun nextHasValue(): Boolean {
-        // Expect a begin and value (or another begin) token if Map entry has a value
-        val peekBeginToken = reader.peek(1) ?: throw DeserializationException("Unexpected termination of token stream in $descriptor")
-        val peekValueToken = reader.peek(2) ?: throw DeserializationException("Unexpected termination of token stream in $descriptor")
-
-        return peekBeginToken !is XmlToken.EndElement && peekValueToken !is XmlToken.EndElement
-    }
-}
-
-/**
- * Deserializes specific XML structures into forms that can produce Lists
- *
- * @param reader underlying [XmlStreamReader] from which tokens are read
- * @param descriptor associated [SdkFieldDescriptor] which represents the expected Map
- * @param primitiveDeserializer used to deserialize primitive values
- */
-internal class XmlListDeserializer(
-    private val reader: XmlStreamReader,
-    private val descriptor: SdkFieldDescriptor,
-    private val primitiveDeserializer: PrimitiveDeserializer = XmlPrimitiveDeserializer(reader, descriptor),
-) : PrimitiveDeserializer by primitiveDeserializer,
-    Deserializer.ElementIterator {
-    private var firstCall = true
-    private val flattened = descriptor.hasTrait<Flattened>()
-    private val elementName = (descriptor.findTrait<XmlCollectionName>() ?: XmlCollectionName.Default).element
-
-    override fun hasNextElement(): Boolean {
-        if (!flattened && firstCall) {
-            val nextToken = reader.peek()
-            val matchedListDescriptor = nextToken is XmlToken.BeginElement && descriptor.nameMatches(nextToken.name.tag)
-            val hasChildren = if (nextToken == null) false else nextToken.depth >= reader.lastToken!!.depth
-
-            if (!matchedListDescriptor && !hasChildren) return false
-
-            // Discard the wrapper and move to the first element in the list
-            if (matchedListDescriptor) reader.nextToken()
-
-            firstCall = false
-        }
-
-        if (flattened) {
-            // Because our subtree is not CHILD, we cannot rely on the subtree boundary to determine end of collection.
-            // Rather, we search for either the next begin token matching the (flat) list member name which should
-            // be immediately after the current token
-
-            // peek at the next token if there is one, in the case of a list of structs, the next token is actually
-            // the end of the current flat list element in which case we need to peek twice
-            val next = when (val peeked = reader.peek()) {
-                is XmlToken.EndElement -> {
-                    if (peeked.name.local == descriptor.serialName.name) {
-                        // consume the end token
-                        reader.nextToken()
-                        reader.peek()
-                    } else {
-                        peeked
-                    }
-                }
-                else -> peeked
-            }
-
-            val tokens = listOfNotNull(reader.lastToken, next)
-
-            // Iterate over the token stream until begin token matching name is found or end element matching list is found.
-            return tokens
-                .filterIsInstance<XmlToken.BeginElement>()
-                .any { it.name.local == descriptor.serialName.name }
-        } else {
-            // If we can find another begin token w/ the element name, we have more elements to process
-            return reader.seek<XmlToken.BeginElement> { it.name.local == elementName }.isNotTerminal()
-        }
-    }
-
-    override fun nextHasValue(): Boolean = reader.peek() !is XmlToken.EndElement
-}
-
-/**
- * Deserializes specific XML structures into forms that can produce structures
- *
- * @param objDescriptor associated [SdkObjectDescriptor] which represents the expected structure
- * @param reader underlying [XmlStreamReader] from which tokens are read
- * @param parentToken initial token of associated structure
- * @param parsedFieldLocations list of [FieldLocation] representing values able to be loaded into deserialized instances
- */
-private class XmlStructDeserializer(
-    private val objDescriptor: SdkObjectDescriptor,
-    reader: XmlStreamReader,
-    private val parentToken: XmlToken.BeginElement,
-    private val parsedFieldLocations: MutableList<FieldLocation> = mutableListOf(),
-    private val unwrapped: Boolean,
-) : Deserializer.FieldIterator {
-    // Used to track direct deserialization or further nesting between calls to findNextFieldIndex() and deserialize<Type>()
-    private var reentryFlag: Boolean = false
-
-    private val reader: XmlStreamReader = if (unwrapped) reader else reader.subTreeReader(XmlStreamReader.SubtreeStartDepth.CHILD)
-
-    override fun findNextFieldIndex(): Int? {
-        if (unwrapped) {
-            return if (reader.peek() is XmlToken.Text) FIRST_FIELD_INDEX else null
-        }
-        if (inNestedMode()) {
-            // Returning from a nested struct call.  Nested deserializer consumed
-            // tokens so clear them here to avoid processing stale state
-            parsedFieldLocations.clear()
-        }
-
-        if (parsedFieldLocations.isEmpty()) {
-            val matchedFieldLocations = when (val token = reader.nextToken()) {
-                null, is XmlToken.EndDocument -> return null
-                is XmlToken.EndElement -> return findNextFieldIndex()
-                is XmlToken.BeginElement -> {
-                    val nextToken = reader.peek() ?: return null
-                    val objectFields = objDescriptor.fields
-                    val memberFields = objectFields.filter { field -> objDescriptor.fieldTokenMatcher(field, token) }
-                    val matchingFields = memberFields.mapNotNull { it.findFieldLocation(token, nextToken) }
-                    matchingFields
-                }
-                else -> return findNextFieldIndex()
-            }
-
-            // Sorting ensures attribs are processed before text, as processing the Text token pushes the parser on to the next token.
-            parsedFieldLocations.addAll(matchedFieldLocations.sortedBy { it is FieldLocation.Text })
-        }
-
-        return parsedFieldLocations.firstOrNull()?.fieldIndex ?: Deserializer.FieldIterator.UNKNOWN_FIELD
-    }
-
-    private fun <T> deserializeValue(transform: ((String) -> T)): T {
-        if (unwrapped) {
-            val value = reader.takeNextAs<XmlToken.Text>().value ?: ""
-            return transform(value)
-        }
-        // Set and validate mode
-        reentryFlag = false
-        if (parsedFieldLocations.isEmpty()) throw DeserializationException("matchedFields is empty, was findNextFieldIndex() called?")
-
-        // Take the first FieldLocation and attempt to parse it into the value specified by the descriptor.
-        return when (val nextField = parsedFieldLocations.removeFirst()) {
-            is FieldLocation.Text -> {
-                val value = when (val peekToken = reader.peek()) {
-                    is XmlToken.Text -> reader.takeNextAs<XmlToken.Text>().value ?: ""
-                    is XmlToken.EndElement -> ""
-                    else -> throw DeserializationException("Unexpected token $peekToken")
-                }
-                transform(value)
-            }
-            is FieldLocation.Attribute -> {
-                transform(
-                    nextField
-                        .names
-                        .mapNotNull { parentToken.attributes[it] }
-                        .firstOrNull() ?: throw DeserializationException("Expected attrib value ${nextField.names.first()} not found in ${parentToken.name}"),
-                )
-            }
-        }
-    }
-
-    override fun skipValue() = reader.skipNext()
-
-    override fun deserializeByte(): Byte = deserializeValue { it.toIntOrNull()?.toByte() ?: throw DeserializationException("Unable to deserialize $it") }
-
-    override fun deserializeInt(): Int = deserializeValue { it.toIntOrNull() ?: throw DeserializationException("Unable to deserialize $it") }
-
-    override fun deserializeShort(): Short = deserializeValue { it.toIntOrNull()?.toShort() ?: throw DeserializationException("Unable to deserialize $it") }
-
-    override fun deserializeLong(): Long = deserializeValue { it.toLongOrNull() ?: throw DeserializationException("Unable to deserialize $it") }
-
-    override fun deserializeFloat(): Float = deserializeValue { it.toFloatOrNull() ?: throw DeserializationException("Unable to deserialize $it") }
-
-    override fun deserializeDouble(): Double = deserializeValue { it.toDoubleOrNull() ?: throw DeserializationException("Unable to deserialize $it") }
-
-    override fun deserializeBigInteger(): BigInteger = deserializeValue {
-        runCatching { BigInteger(it) }
-            .getOrElse { throw DeserializationException("Unable to deserialize $it as BigInteger") }
-    }
-
-    override fun deserializeBigDecimal(): BigDecimal = deserializeValue {
-        runCatching { BigDecimal(it) }
-            .getOrElse { throw DeserializationException("Unable to deserialize $it as BigDecimal") }
-    }
-
-    override fun deserializeString(): String = deserializeValue { it }
-
-    override fun deserializeBoolean(): Boolean = deserializeValue { it.toBoolean() }
-
-    override fun deserializeDocument(): Document = throw DeserializationException("cannot deserialize unsupported Document type in xml")
-
-    override fun deserializeByteArray(): ByteArray = deserializeString().decodeBase64Bytes()
-
-    override fun deserializeInstant(format: TimestampFormat): Instant = when (format) {
-        TimestampFormat.EPOCH_SECONDS -> deserializeString().let { Instant.fromEpochSeconds(it) }
-        TimestampFormat.ISO_8601 -> deserializeString().let { Instant.fromIso8601(it) }
-        TimestampFormat.RFC_5322 -> deserializeString().let { Instant.fromRfc5322(it) }
-        else -> throw DeserializationException("unknown timestamp format: $format")
-    }
-
-    override fun deserializeNull(): Nothing? {
-        reader.takeNextAs<XmlToken.EndElement>()
-        return null
-    }
-
-    // A struct deserializer can be called in two "modes":
-    // 1. to deserialize a value.  This calls findNextFieldIndex() followed by deserialize<SomePrimitiveType>()
-    // 2. to deserialize a nested container. This calls findNextFieldIndex() followed by a call to another deserialize<Struct/List/Map>()
-    // Because state is built in findNextFieldIndex() that is intended to be used directly in deserialize<SomePrimitiveType>() (mode 1)
-    // and there is no explicit way that this type knows which mode is in use, the state built must be cleared.
-    // this is done by flipping a bit between the two calls.  If the bit has not been flipped on any call to findNextFieldIndex()
-    // it is determined that the nested mode was used and any existing state should be cleared.
-    // if the state is not cleared, deserialization goes into an infinite loop because the deserializer sees pending fields to pull from the stream
-    // which are never consumed by the (missing) call to deserialize<SomePrimitiveType>()
-    private fun inNestedMode(): Boolean = when (reentryFlag) {
-        true -> true
-        false -> {
-            reentryFlag = true
-            false
-        }
-    }
-}
-
-// Extract the attributes from the last-read token and match them to [FieldLocation] on the [SdkObjectDescriptor].
-private fun XmlStreamReader.tokenAttributesToFieldLocations(descriptor: SdkObjectDescriptor): MutableList<FieldLocation> =
-    if (descriptor.hasXmlAttributes && lastToken is XmlToken.BeginElement) {
-        val attribFields = descriptor.fields.filter { it.hasTrait<XmlAttribute>() }
-        val matchedAttribFields = attribFields.filter { it.findFieldLocation(lastToken as XmlToken.BeginElement, peek() ?: throw DeserializationException("Unexpected end of tokens")) != null }
-        matchedAttribFields.map { FieldLocation.Attribute(it.index, it.toQualifiedNames()) }
-            .toMutableList()
-    } else {
-        mutableListOf()
-    }
-
-// Returns a [FieldLocation] if the field maps to the current token
-private fun SdkFieldDescriptor.findFieldLocation(
-    currentToken: XmlToken.BeginElement,
-    nextToken: XmlToken,
-): FieldLocation? = when (val property = toFieldLocation()) {
-    is FieldLocation.Text -> {
-        when {
-            nextToken is XmlToken.Text -> property
-            nextToken is XmlToken.BeginElement -> property
-            // The following allows for struct primitives to remain unvisited if no value
-            // but causes nested deserializers to be called even if they contain no value
-            nextToken is XmlToken.EndElement && currentToken.name == nextToken.name -> property
-            else -> null
-        }
-    }
-    is FieldLocation.Attribute -> {
-        val foundMatch = property.names.any { currentToken.attributes[it]?.isNotBlank() == true }
-        if (foundMatch) property else null
-    }
-}
-
-// Produce a [FieldLocation] type based on presence of traits of field
-// A field without an attribute trait is assumed to be a text token
-private fun SdkFieldDescriptor.toFieldLocation(): FieldLocation =
-    when (findTrait<XmlAttribute>()) {
-        null -> FieldLocation.Text(index) // Assume a text value if no attributes defined.
-        else -> FieldLocation.Attribute(index, toQualifiedNames())
-    }
-
-// Matches fields and tokens with matching qualified name
-private fun SdkObjectDescriptor.fieldTokenMatcher(fieldDescriptor: SdkFieldDescriptor, beginElement: XmlToken.BeginElement): Boolean {
-    if (fieldDescriptor.kind == SerialKind.List && fieldDescriptor.hasTrait<Flattened>()) {
-        val fieldName = fieldDescriptor.findTrait<XmlCollectionName>() ?: XmlCollectionName.Default
-        val tokenQname = beginElement.name
-
-        // It may be that we are matching a flattened list element or matching a list itself.  In the latter
-        // case the following predicate will not work, so if we fail to match the member
-        // try again (below) to match against the container.
-        if (fieldName.element == tokenQname.local) return true
-    }
-
-    return fieldDescriptor.nameMatches(beginElement.name.tag)
-}
-
-/**
- * Return the next token of the specified type or throw [DeserializationException] if incorrect type.
- */
-internal inline fun <reified TExpected : XmlToken> XmlStreamReader.takeNextAs(): TExpected {
-    val token = this.nextToken() ?: throw DeserializationException("Expected ${TExpected::class} but instead found null")
-    requireToken<TExpected>(token)
-    return token as TExpected
-}
-
-/**
- * Require that the given token be of type [TExpected] or else throw an exception
- */
-internal inline fun <reified TExpected> requireToken(token: XmlToken) {
-    if (token::class != TExpected::class) {
-        throw DeserializationException("Expected ${TExpected::class}; found ${token::class} ($token)")
-    }
-}
diff --git a/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlStreamReader.kt b/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlStreamReader.kt
index a43250b267..760f52a833 100644
--- a/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlStreamReader.kt
+++ b/runtime/serde/serde-xml/common/src/aws/smithy/kotlin/runtime/serde/xml/XmlStreamReader.kt
@@ -6,6 +6,7 @@
 package aws.smithy.kotlin.runtime.serde.xml
 
 import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.serde.DeserializationException
 import aws.smithy.kotlin.runtime.serde.xml.deserialization.LexingXmlStreamReader
 import aws.smithy.kotlin.runtime.serde.xml.deserialization.StringTextStream
 import aws.smithy.kotlin.runtime.serde.xml.deserialization.XmlLexer
@@ -114,6 +115,24 @@ public inline fun <reified T : XmlToken> XmlStreamReader.peekSeek(selectionPredi
     return null
 }
 
+/**
+ * Return the next token of the specified type or throw [DeserializationException] if incorrect type.
+ */
+internal inline fun <reified TExpected : XmlToken> XmlStreamReader.takeNextAs(): TExpected {
+    val token = this.nextToken() ?: throw DeserializationException("Expected ${TExpected::class} but instead found null")
+    requireToken<TExpected>(token)
+    return token as TExpected
+}
+
+/**
+ * Require that the given token be of type [TExpected] or else throw an exception
+ */
+private inline fun <reified TExpected> requireToken(token: XmlToken) {
+    if (token::class != TExpected::class) {
+        throw DeserializationException("Expected ${TExpected::class}; found ${token::class} ($token)")
+    }
+}
+
 /**
  * Creates an [XmlStreamReader] instance
  */
diff --git a/runtime/smithy-client/api/smithy-client.api b/runtime/smithy-client/api/smithy-client.api
index b6132b26b8..823ff0467d 100644
--- a/runtime/smithy-client/api/smithy-client.api
+++ b/runtime/smithy-client/api/smithy-client.api
@@ -30,47 +30,25 @@ public final class aws/smithy/kotlin/runtime/client/IdempotencyTokenProvider$Com
 }
 
 public abstract interface class aws/smithy/kotlin/runtime/client/Interceptor {
-	public abstract fun modifyBeforeAttemptCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun modifyBeforeCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun modifyBeforeDeserialization (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun modifyBeforeRetryLoop (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun modifyBeforeSerialization (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun modifyBeforeSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun modifyBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public abstract fun readAfterAttempt (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
-	public abstract fun readAfterDeserialization (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
-	public abstract fun readAfterExecution (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
-	public abstract fun readAfterSerialization (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
-	public abstract fun readAfterSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
-	public abstract fun readAfterTransmit (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;)V
-	public abstract fun readBeforeAttempt (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
-	public abstract fun readBeforeDeserialization (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;)V
-	public abstract fun readBeforeExecution (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;)V
-	public abstract fun readBeforeSerialization (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;)V
-	public abstract fun readBeforeSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
-	public abstract fun readBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
-}
-
-public final class aws/smithy/kotlin/runtime/client/Interceptor$DefaultImpls {
-	public static fun modifyBeforeAttemptCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun modifyBeforeCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun modifyBeforeDeserialization (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun modifyBeforeRetryLoop (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun modifyBeforeSerialization (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun modifyBeforeSigning (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun modifyBeforeTransmit (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public static fun readAfterAttempt (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
-	public static fun readAfterDeserialization (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
-	public static fun readAfterExecution (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
-	public static fun readAfterSerialization (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
-	public static fun readAfterSigning (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
-	public static fun readAfterTransmit (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;)V
-	public static fun readBeforeAttempt (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
-	public static fun readBeforeDeserialization (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;)V
-	public static fun readBeforeExecution (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;)V
-	public static fun readBeforeSerialization (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;)V
-	public static fun readBeforeSigning (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
-	public static fun readBeforeTransmit (Laws/smithy/kotlin/runtime/client/Interceptor;Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
+	public fun modifyBeforeAttemptCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun modifyBeforeCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun modifyBeforeDeserialization (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun modifyBeforeRetryLoop (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun modifyBeforeSerialization (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun modifyBeforeSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun modifyBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun readAfterAttempt (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
+	public fun readAfterDeserialization (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
+	public fun readAfterExecution (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
+	public fun readAfterSerialization (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
+	public fun readAfterSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
+	public fun readAfterTransmit (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;)V
+	public fun readBeforeAttempt (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
+	public fun readBeforeDeserialization (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;)V
+	public fun readBeforeExecution (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;)V
+	public fun readBeforeSerialization (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;)V
+	public fun readBeforeSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
+	public fun readBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
 }
 
 public abstract class aws/smithy/kotlin/runtime/client/LogMode {
@@ -187,7 +165,7 @@ public abstract interface class aws/smithy/kotlin/runtime/client/SdkClientConfig
 
 public abstract interface class aws/smithy/kotlin/runtime/client/SdkClientFactory {
 	public abstract fun builder ()Laws/smithy/kotlin/runtime/client/SdkClient$Builder;
-	public abstract fun invoke (Lkotlin/jvm/functions/Function1;)Laws/smithy/kotlin/runtime/client/SdkClient;
+	public fun invoke (Lkotlin/jvm/functions/Function1;)Laws/smithy/kotlin/runtime/client/SdkClient;
 }
 
 public final class aws/smithy/kotlin/runtime/client/SdkClientFactory$DefaultImpls {
@@ -225,7 +203,7 @@ public abstract interface class aws/smithy/kotlin/runtime/client/config/Compress
 
 public abstract interface class aws/smithy/kotlin/runtime/client/config/CompressionClientConfig$Builder {
 	public abstract fun getRequestCompression ()Laws/smithy/kotlin/runtime/client/config/RequestCompressionConfig$Builder;
-	public abstract fun requestCompression (Lkotlin/jvm/functions/Function1;)V
+	public fun requestCompression (Lkotlin/jvm/functions/Function1;)V
 }
 
 public final class aws/smithy/kotlin/runtime/client/config/CompressionClientConfig$Builder$DefaultImpls {
@@ -353,3 +331,15 @@ public final class aws/smithy/kotlin/runtime/client/endpoints/functions/Url {
 	public fun toString ()Ljava/lang/String;
 }
 
+public abstract interface class aws/smithy/kotlin/runtime/client/region/RegionProvider {
+	public abstract fun getRegion (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public class aws/smithy/kotlin/runtime/client/region/RegionProviderChain : aws/smithy/kotlin/runtime/client/region/RegionProvider {
+	public fun <init> (Ljava/util/List;)V
+	public fun <init> ([Laws/smithy/kotlin/runtime/client/region/RegionProvider;)V
+	protected final fun getProviders ()[Laws/smithy/kotlin/runtime/client/region/RegionProvider;
+	public fun getRegion (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun toString ()Ljava/lang/String;
+}
+
diff --git a/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/Interceptor.kt b/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/Interceptor.kt
index 8d2b5c68bc..4fab16b9a7 100644
--- a/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/Interceptor.kt
+++ b/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/Interceptor.kt
@@ -5,6 +5,7 @@
 
 package aws.smithy.kotlin.runtime.client
 
+import aws.smithy.kotlin.runtime.client.util.MpJvmDefaultWithoutCompatibility
 import aws.smithy.kotlin.runtime.operation.ExecutionContext
 
 /**
@@ -20,6 +21,7 @@ import aws.smithy.kotlin.runtime.operation.ExecutionContext
  * **MUST** not modify state even if it is possible to do so (it is not always possible or performant to provide an
  * immutable view of every type).
  */
+@MpJvmDefaultWithoutCompatibility
 public interface Interceptor<
     Input,
     Output,
diff --git a/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/region/RegionProvider.kt b/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/region/RegionProvider.kt
new file mode 100644
index 0000000000..9e82ec4509
--- /dev/null
+++ b/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/region/RegionProvider.kt
@@ -0,0 +1,17 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.client.region
+
+/**
+ * Interface for providing AWS region information. Implementations are free to use any strategy for
+ * providing region information
+ */
+public interface RegionProvider {
+    /**
+     * Return the region name to use. If region information is not available, implementations should return null
+     */
+    public suspend fun getRegion(): String?
+}
diff --git a/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/region/RegionProviderChain.kt b/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/region/RegionProviderChain.kt
new file mode 100644
index 0000000000..0df388d11f
--- /dev/null
+++ b/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/region/RegionProviderChain.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.client.region
+
+import aws.smithy.kotlin.runtime.telemetry.logging.logger
+import aws.smithy.kotlin.runtime.util.asyncLazy
+import kotlin.coroutines.coroutineContext
+
+/**
+ * Composite [RegionProvider] that delegates to a chain of providers.
+ * [providers] are consulted in the order given and the first region found is returned
+ *
+ * @param providers the list of providers to delegate to
+ */
+public open class RegionProviderChain(
+    protected vararg val providers: RegionProvider,
+) : RegionProvider {
+
+    public constructor(providers: List<RegionProvider>) : this(*providers.toTypedArray())
+
+    private val resolvedRegion = asyncLazy(::resolveRegion)
+
+    init {
+        require(providers.isNotEmpty()) { "at least one provider must be in the chain" }
+    }
+
+    override fun toString(): String =
+        (listOf(this) + providers).map { it::class.simpleName }.joinToString(" -> ")
+
+    override suspend fun getRegion(): String? = resolvedRegion.get()
+
+    private suspend fun resolveRegion(): String? {
+        val logger = coroutineContext.logger<RegionProviderChain>()
+        for (provider in providers) {
+            try {
+                val region = provider.getRegion()
+                if (region != null) {
+                    logger.debug { "resolved region ($region) from $provider " }
+                    return region
+                }
+                logger.debug { "failed to resolve region from $provider" }
+            } catch (ex: Exception) {
+                logger.debug { "unable to load region from $provider: ${ex.message}" }
+            }
+        }
+
+        return null
+    }
+}
diff --git a/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/util/Annotations.kt b/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/util/Annotations.kt
new file mode 100644
index 0000000000..f7b9449ebc
--- /dev/null
+++ b/runtime/smithy-client/common/src/aws/smithy/kotlin/runtime/client/util/Annotations.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.client.util
+
+/**
+ * A KMP-compatible variant of [kotlin.jvm.JvmDefaultWithoutCompatibility]
+ */
+@Retention(AnnotationRetention.SOURCE)
+@Target(AnnotationTarget.CLASS)
+public expect annotation class MpJvmDefaultWithoutCompatibility()
diff --git a/runtime/smithy-client/common/test/aws/smithy/kotlin/runtime/client/region/RegionProviderChainTest.kt b/runtime/smithy-client/common/test/aws/smithy/kotlin/runtime/client/region/RegionProviderChainTest.kt
new file mode 100644
index 0000000000..361336ac2d
--- /dev/null
+++ b/runtime/smithy-client/common/test/aws/smithy/kotlin/runtime/client/region/RegionProviderChainTest.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.client.region
+
+import kotlinx.coroutines.test.runTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFails
+
+class RegionProviderChainTest {
+    @Test
+    fun testNoProviders() {
+        assertFails("at least one provider") {
+            RegionProviderChain()
+        }
+    }
+    data class TestProvider(val region: String? = null) : RegionProvider {
+        override suspend fun getRegion(): String? = region
+    }
+
+    @Test
+    fun testChain() = runTest {
+        val chain = RegionProviderChain(
+            TestProvider(null),
+            TestProvider("us-east-1"),
+            TestProvider("us-east-2"),
+        )
+
+        assertEquals("us-east-1", chain.getRegion())
+    }
+
+    @Test
+    fun testChainList() = runTest {
+        val providers = listOf<RegionProvider>(
+            TestProvider(null),
+            TestProvider("us-east-1"),
+            TestProvider("us-east-2"),
+        )
+
+        val chain = RegionProviderChain(providers)
+
+        assertEquals("us-east-1", chain.getRegion())
+    }
+}
diff --git a/runtime/smithy-client/jvm/src/aws/smithy/kotlin/runtime/client/util/AnnotationsJVM.kt b/runtime/smithy-client/jvm/src/aws/smithy/kotlin/runtime/client/util/AnnotationsJVM.kt
new file mode 100644
index 0000000000..db7512a9df
--- /dev/null
+++ b/runtime/smithy-client/jvm/src/aws/smithy/kotlin/runtime/client/util/AnnotationsJVM.kt
@@ -0,0 +1,8 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.client.util
+
+public actual typealias MpJvmDefaultWithoutCompatibility = kotlin.jvm.JvmDefaultWithoutCompatibility
diff --git a/runtime/smithy-client/native/src/aws/smithy/kotlin/runtime/client/util/AnnotationsNative.kt b/runtime/smithy-client/native/src/aws/smithy/kotlin/runtime/client/util/AnnotationsNative.kt
new file mode 100644
index 0000000000..118ea69bda
--- /dev/null
+++ b/runtime/smithy-client/native/src/aws/smithy/kotlin/runtime/client/util/AnnotationsNative.kt
@@ -0,0 +1,10 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package aws.smithy.kotlin.runtime.client.util
+
+public actual annotation class MpJvmDefaultWithoutCompatibility {
+    // No-op on non-JVM platforms
+}
diff --git a/tests/codegen/waiter-tests/build.gradle.kts b/tests/codegen/waiter-tests/build.gradle.kts
index 72b244a6c9..992a4d471e 100644
--- a/tests/codegen/waiter-tests/build.gradle.kts
+++ b/tests/codegen/waiter-tests/build.gradle.kts
@@ -38,7 +38,7 @@ kotlin.sourceSets.getByName("main") {
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     dependsOn(tasks.generateSmithyProjections)
-    kotlinOptions {
+    compilerOptions {
         // generated code has warnings unfortunately
         allWarningsAsErrors = false
     }

From 00195427f13bed685e47944dcb9864c74c35900e Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 17 Jul 2025 17:09:59 +0000
Subject: [PATCH 130/183] chore: release 1.5.0

---
 .changes/2ec4ad9a-f964-4cf1-be58-d0229493bb81.json |  5 -----
 .changes/49af01b8-6fed-4add-ace0-9f027e83425a.json |  9 ---------
 .changes/d3ce7511-6fb2-4435-8f46-db724551b384.json |  5 -----
 .changes/d4f09e32-8bcc-406e-96e0-2743280c13d9.json |  8 --------
 .changes/db001c20-3788-4cfe-9ec2-284fd86a80bd.json |  8 --------
 .changes/e6515649-dab5-4be9-b4b4-b289369960d5.json |  8 --------
 CHANGELOG.md                                       | 14 ++++++++++++++
 gradle.properties                                  |  6 +++---
 8 files changed, 17 insertions(+), 46 deletions(-)
 delete mode 100644 .changes/2ec4ad9a-f964-4cf1-be58-d0229493bb81.json
 delete mode 100644 .changes/49af01b8-6fed-4add-ace0-9f027e83425a.json
 delete mode 100644 .changes/d3ce7511-6fb2-4435-8f46-db724551b384.json
 delete mode 100644 .changes/d4f09e32-8bcc-406e-96e0-2743280c13d9.json
 delete mode 100644 .changes/db001c20-3788-4cfe-9ec2-284fd86a80bd.json
 delete mode 100644 .changes/e6515649-dab5-4be9-b4b4-b289369960d5.json

diff --git a/.changes/2ec4ad9a-f964-4cf1-be58-d0229493bb81.json b/.changes/2ec4ad9a-f964-4cf1-be58-d0229493bb81.json
deleted file mode 100644
index 94684ac76b..0000000000
--- a/.changes/2ec4ad9a-f964-4cf1-be58-d0229493bb81.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "2ec4ad9a-f964-4cf1-be58-d0229493bb81",
-    "type": "feature",
-    "description": "Upgrade to Kotlin 2.2.0"
-}
\ No newline at end of file
diff --git a/.changes/49af01b8-6fed-4add-ace0-9f027e83425a.json b/.changes/49af01b8-6fed-4add-ace0-9f027e83425a.json
deleted file mode 100644
index 266a5b1a56..0000000000
--- a/.changes/49af01b8-6fed-4add-ace0-9f027e83425a.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "id": "49af01b8-6fed-4add-ace0-9f027e83425a",
-    "type": "feature",
-    "description": "⚠️ **IMPORTANT**: Refactor endpoint discoverer classes into interfaces so custom implementations may be provided",
-    "issues": [
-        "awslabs/aws-sdk-kotlin#1413"
-    ],
-    "requiresMinorVersionBump": true
-}
diff --git a/.changes/d3ce7511-6fb2-4435-8f46-db724551b384.json b/.changes/d3ce7511-6fb2-4435-8f46-db724551b384.json
deleted file mode 100644
index aa89d9167e..0000000000
--- a/.changes/d3ce7511-6fb2-4435-8f46-db724551b384.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "id": "d3ce7511-6fb2-4435-8f46-db724551b384",
-    "type": "misc",
-    "description": "Add telemetry provider configuration to `DefaultAwsSigner`"
-}
\ No newline at end of file
diff --git a/.changes/d4f09e32-8bcc-406e-96e0-2743280c13d9.json b/.changes/d4f09e32-8bcc-406e-96e0-2743280c13d9.json
deleted file mode 100644
index 2d09a6ce5a..0000000000
--- a/.changes/d4f09e32-8bcc-406e-96e0-2743280c13d9.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "id": "d4f09e32-8bcc-406e-96e0-2743280c13d9",
-    "type": "bugfix",
-    "description": "Switch to always serialize defaults in requests. Previously fields were not serialized in requests if they weren't `@required` and hadn't been changed from the default value.",
-    "issues": [
-        "https://github.com/awslabs/aws-sdk-kotlin/issues/1608"
-    ]
-}
diff --git a/.changes/db001c20-3788-4cfe-9ec2-284fd86a80bd.json b/.changes/db001c20-3788-4cfe-9ec2-284fd86a80bd.json
deleted file mode 100644
index 436c640085..0000000000
--- a/.changes/db001c20-3788-4cfe-9ec2-284fd86a80bd.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "id": "db001c20-3788-4cfe-9ec2-284fd86a80bd",
-    "type": "bugfix",
-    "description": "Reimplement idle connection monitoring using `okhttp3.EventListener` instead of now-internal `okhttp3.ConnectionListener`",
-    "issues": [
-        "https://github.com/smithy-lang/smithy-kotlin/issues/1311"
-    ]
-}
\ No newline at end of file
diff --git a/.changes/e6515649-dab5-4be9-b4b4-b289369960d5.json b/.changes/e6515649-dab5-4be9-b4b4-b289369960d5.json
deleted file mode 100644
index a4485b5bf8..0000000000
--- a/.changes/e6515649-dab5-4be9-b4b4-b289369960d5.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "id": "e6515649-dab5-4be9-b4b4-b289369960d5",
-    "type": "bugfix",
-    "description": "Favor `endpointUrl` instead of endpoint discovery if both are provided",
-    "issues": [
-        "awslabs/aws-sdk-kotlin#1413"
-    ]
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad34f18d2e..91d31600d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.5.0] - 07/17/2025
+
+### Features
+* Upgrade to Kotlin 2.2.0
+* [#1413](https://github.com/awslabs/aws-sdk-kotlin/issues/1413) ⚠️ **IMPORTANT**: Refactor endpoint discoverer classes into interfaces so custom implementations may be provided
+
+### Fixes
+* [#1311](https://github.com/smithy-lang/smithy-kotlin/issues/1311) Reimplement idle connection monitoring using `okhttp3.EventListener` instead of now-internal `okhttp3.ConnectionListener`
+* [#1608](https://github.com/awslabs/aws-sdk-kotlin/issues/1608) Switch to always serialize defaults in requests. Previously fields were not serialized in requests if they weren't `@required` and hadn't been changed from the default value.
+* [#1413](https://github.com/awslabs/aws-sdk-kotlin/issues/1413) Favor `endpointUrl` instead of endpoint discovery if both are provided
+
+### Miscellaneous
+* Add telemetry provider configuration to `DefaultAwsSigner`
+
 ## [1.4.23] - 07/15/2025
 
 ## [1.4.22] - 07/02/2025
diff --git a/gradle.properties b/gradle.properties
index 8e71bdc0c8..de47ca3dd2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,11 +13,11 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.4.24-SNAPSHOT
+sdkVersion=1.5.0
 
 # codegen
-codegenVersion=0.34.24-SNAPSHOT
+codegenVersion=0.35.0
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
-org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
\ No newline at end of file

From 238b479dced2054aeb3b30a739f49a2a39e5db20 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 17 Jul 2025 17:10:01 +0000
Subject: [PATCH 131/183] chore: bump snapshot version to 1.5.1-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index de47ca3dd2..7f5698cd77 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.5.0
+sdkVersion=1.5.1-SNAPSHOT
 
 # codegen
-codegenVersion=0.35.0
+codegenVersion=0.35.1-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From 93649e1152e0e6e0e55dd39a711c4e6266ddcc2d Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Thu, 17 Jul 2025 11:38:28 -0700
Subject: [PATCH 132/183] fix: correct the Brazil mapping for aws-crt-kotlin
 0.10.* (#1334)

---
 .brazil.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.brazil.json b/.brazil.json
index 1a0b943fec..987379aec3 100644
--- a/.brazil.json
+++ b/.brazil.json
@@ -10,6 +10,7 @@
     "io.opentelemetry:opentelemetry-api:1.*": "Maven-io-opentelemetry_opentelemetry-api-1.x",
     "io.opentelemetry:opentelemetry-extension-kotlin:1.*": "Maven-io-opentelemetry_opentelemetry-extension-kotlin-1.x",
     "org.slf4j:slf4j-api:2.*": "Maven-org-slf4j_slf4j-api-2.x",
+    "aws.sdk.kotlin.crt:aws-crt-kotlin:0.10.*": "AwsCrtKotlin-0.10.x",
     "aws.sdk.kotlin.crt:aws-crt-kotlin:0.9.*": "AwsCrtKotlin-0.9.x",
     "aws.sdk.kotlin.crt:aws-crt-kotlin:0.8.*": "AwsCrtKotlin-0.8.x",
     "com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x",

From 3dfc9b3505763274bf632134f25249b369874a91 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 17 Jul 2025 18:41:13 +0000
Subject: [PATCH 133/183] chore: release 1.5.1

---
 CHANGELOG.md      | 2 ++
 gradle.properties | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91d31600d7..eb355ef808 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.5.1] - 07/17/2025
+
 ## [1.5.0] - 07/17/2025
 
 ### Features
diff --git a/gradle.properties b/gradle.properties
index 7f5698cd77..244d3a2273 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.5.1-SNAPSHOT
+sdkVersion=1.5.1
 
 # codegen
-codegenVersion=0.35.1-SNAPSHOT
+codegenVersion=0.35.1
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From b5d177cb678f771c2f50c16fa1695e36fb38fe10 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 17 Jul 2025 18:41:14 +0000
Subject: [PATCH 134/183] chore: bump snapshot version to 1.5.2-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 244d3a2273..9bb3537255 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.5.1
+sdkVersion=1.5.2-SNAPSHOT
 
 # codegen
-codegenVersion=0.35.1
+codegenVersion=0.35.2-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From 9362fa1ba1a74296ec855f0013c52ce9a963a4ac Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Wed, 23 Jul 2025 16:11:54 -0400
Subject: [PATCH 135/183] misc: add documentation for OkHttp4Engine when using
 Android with R8 / ProGuard (#1340)

---
 .../3ba693b2-e45f-4343-bd4e-883ab42acfe7.json |  8 ++++++
 .../http-client-engine-okhttp4/README.md      | 27 +++++++++++--------
 2 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 .changes/3ba693b2-e45f-4343-bd4e-883ab42acfe7.json

diff --git a/.changes/3ba693b2-e45f-4343-bd4e-883ab42acfe7.json b/.changes/3ba693b2-e45f-4343-bd4e-883ab42acfe7.json
new file mode 100644
index 0000000000..f50ce7d98d
--- /dev/null
+++ b/.changes/3ba693b2-e45f-4343-bd4e-883ab42acfe7.json
@@ -0,0 +1,8 @@
+{
+    "id": "3ba693b2-e45f-4343-bd4e-883ab42acfe7",
+    "type": "misc",
+    "description": "Add documentation for OkHttp4Engine when using Android with R8 / ProGuard",
+    "issues": [
+        "https://github.com/smithy-lang/smithy-kotlin/issues/1339"
+    ]
+}
\ No newline at end of file
diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp4/README.md b/runtime/protocol/http-client-engines/http-client-engine-okhttp4/README.md
index 0f7077a217..4a88948043 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-okhttp4/README.md
+++ b/runtime/protocol/http-client-engines/http-client-engine-okhttp4/README.md
@@ -1,19 +1,13 @@
 # OkHttp4 Engine
 
-The AWS SDK for Kotlin depends on OkHttp **5.0.0-alpha.x**, which despite being in alpha, is claimed to be production stable and safe for consumption:
+The AWS SDK for Kotlin depends on a stable version of OkHttp **5.x**.
 
-> Although this release is labeled alpha, the only unstable thing in it is our new APIs. 
-> This release has many critical bug fixes and is safe to run in production. 
-> We’re eager to stabilize our new APIs so we can get out of alpha.
-> 
-> https://square.github.io/okhttp/changelogs/changelog/#version-500-alpha12
-
-This `OkHttp4Engine` is intended to be used for applications which still depend on okhttp3 **4.x** and can't upgrade to the newest alpha version.
+This `OkHttp4Engine` is intended to be used by applications which still depend on okhttp3 **4.x** and can't upgrade to the next major version.
 
 ## Configuration
 
 ### Gradle
-Because the SDK's default HTTP engine depends on okhttp3 **5.0.0-alpha.X**, consumers will need to force Gradle to resolve to **4.x** to prevent the alpha dependency from being introduced transitively. Here is a sample configuration:
+Because the SDK's default HTTP engine depends on okhttp3 **5.x**, consumers will need to force Gradle to resolve to **4.x** to prevent the newer dependency from being introduced transitively. Here is a sample configuration:
 ```kts
 dependencies {
     implementation("aws.sdk.kotlin:s3:$SDK_VERSION") // and any other AWS SDK clients... 
@@ -25,7 +19,7 @@ configurations.all {
         // Force resolve to OkHttp 4.x
         force("com.squareup.okhttp3:okhttp:4.12.0") // or whichever version you are using... 
     }
-    exclude(group = "com.squareup.okhttp3", module = "okhttp-coroutines") // Exclude dependency on okhttp-coroutines, which is introduced in 5.0.0-alpha.X 
+    exclude(group = "com.squareup.okhttp3", module = "okhttp-coroutines") // Exclude dependency on okhttp-coroutines, which was introduced in 5.0.0-alpha.X 
 }
 ```
 
@@ -88,4 +82,15 @@ Caused by: java.lang.ClassNotFoundException: okhttp3.coroutines.ExecuteAsyncKt
 
 It likely means you failed to configure the SDK client to use the `OkHttpEngine4`. 
 Please double-check all of your SDK client configurations to ensure `httpClient = OkHttpEngine4()` is configured,
-and if the problem persists, [open an issue](https://github.com/smithy-lang/smithy-kotlin/issues/new/choose).
\ No newline at end of file
+and if the problem persists, [open an issue](https://github.com/smithy-lang/smithy-kotlin/issues/new/choose).
+
+### Android R8 / ProGuard Configuration
+If you're using the OkHttp4Engine in an Android application with R8 or Proguard for code minification, and you see an error similar to the following:
+```
+ERROR: R8: Missing class okhttp3.coroutines.ExecuteAsyncKt (referenced from: java.lang.Object aws.smithy.kotlin.runtime.http.engine.okhttp.OkHttpEngine.roundTrip(aws.smithy.kotlin.runtime.operation.ExecutionContext, aws.smithy.kotlin.runtime.http.request.HttpRequest, kotlin.coroutines.Continuation))
+```
+
+You'll need to add the following rule to either `proguard-rules.pro` or `consumer-rules.pro`, depending on your project structure:
+```
+-dontwarn okhttp3.coroutines.ExecuteAsyncKt
+```
\ No newline at end of file

From c980f101bfe018cd849ae41a5d4b8c5a62ac39a6 Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Thu, 24 Jul 2025 09:22:10 -0400
Subject: [PATCH 136/183] fix typo: OkHttpEngine4 -> OkHttp4Engine (#1341)

---
 .../http-client-engine-okhttp4/README.md                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/protocol/http-client-engines/http-client-engine-okhttp4/README.md b/runtime/protocol/http-client-engines/http-client-engine-okhttp4/README.md
index 4a88948043..7d3e12bba3 100644
--- a/runtime/protocol/http-client-engines/http-client-engine-okhttp4/README.md
+++ b/runtime/protocol/http-client-engines/http-client-engine-okhttp4/README.md
@@ -80,8 +80,8 @@ Caused by: java.lang.ClassNotFoundException: okhttp3.coroutines.ExecuteAsyncKt
 	... 9 more
 ```
 
-It likely means you failed to configure the SDK client to use the `OkHttpEngine4`. 
-Please double-check all of your SDK client configurations to ensure `httpClient = OkHttpEngine4()` is configured,
+It likely means you failed to configure the SDK client to use the `OkHttp4Engine`. 
+Please double-check all of your SDK client configurations to ensure `httpClient = OkHttp4Engine()` is configured,
 and if the problem persists, [open an issue](https://github.com/smithy-lang/smithy-kotlin/issues/new/choose).
 
 ### Android R8 / ProGuard Configuration
@@ -93,4 +93,4 @@ ERROR: R8: Missing class okhttp3.coroutines.ExecuteAsyncKt (referenced from: jav
 You'll need to add the following rule to either `proguard-rules.pro` or `consumer-rules.pro`, depending on your project structure:
 ```
 -dontwarn okhttp3.coroutines.ExecuteAsyncKt
-```
\ No newline at end of file
+```

From ee5f4269378c1b016df2ea9afc24f855d099d08e Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Thu, 24 Jul 2025 13:25:34 -0500
Subject: [PATCH 137/183] feat: migrate to jreleaser (#1322)

---
 build.gradle.kts          | 10 ++++++++--
 gradle/libs.versions.toml |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index bdec55641a..38e335ffd4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,8 +2,8 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+import aws.sdk.kotlin.gradle.dsl.configureJReleaser
 import aws.sdk.kotlin.gradle.dsl.configureLinting
-import aws.sdk.kotlin.gradle.dsl.configureNexus
 import aws.sdk.kotlin.gradle.util.typedProp
 
 buildscript {
@@ -14,6 +14,12 @@ buildscript {
         classpath(libs.kotlinx.atomicfu.plugin)
         // Add our custom gradle build logic to buildscript classpath
         classpath(libs.aws.kotlin.repo.tools.build.support)
+        /*
+        Enforce jackson to a version supported both by dokka and jreleaser:
+        https://github.com/Kotlin/dokka/issues/3472#issuecomment-1929712374
+        https://github.com/Kotlin/dokka/issues/3194#issuecomment-1929382630
+         */
+        classpath(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.15.3"))
     }
 }
 
@@ -79,7 +85,7 @@ dependencies {
 }
 
 // Publishing
-configureNexus()
+configureJReleaser()
 
 // Code Style
 val lintPaths = listOf(
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3ef5eb2d53..09822866b9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin-version = "2.2.0"
 dokka-version = "2.0.0"
 
-aws-kotlin-repo-tools-version = "0.4.32"
+aws-kotlin-repo-tools-version = "0.4.34"
 
 # libs
 coroutines-version = "1.10.2"

From 5fe9106750c574cefe33428de8e428f470377bc6 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 24 Jul 2025 21:04:25 +0000
Subject: [PATCH 138/183] chore: release 1.5.2

---
 .changes/3ba693b2-e45f-4343-bd4e-883ab42acfe7.json | 8 --------
 CHANGELOG.md                                       | 5 +++++
 gradle.properties                                  | 4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 .changes/3ba693b2-e45f-4343-bd4e-883ab42acfe7.json

diff --git a/.changes/3ba693b2-e45f-4343-bd4e-883ab42acfe7.json b/.changes/3ba693b2-e45f-4343-bd4e-883ab42acfe7.json
deleted file mode 100644
index f50ce7d98d..0000000000
--- a/.changes/3ba693b2-e45f-4343-bd4e-883ab42acfe7.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "id": "3ba693b2-e45f-4343-bd4e-883ab42acfe7",
-    "type": "misc",
-    "description": "Add documentation for OkHttp4Engine when using Android with R8 / ProGuard",
-    "issues": [
-        "https://github.com/smithy-lang/smithy-kotlin/issues/1339"
-    ]
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb355ef808..2457fcae54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.5.2] - 07/24/2025
+
+### Miscellaneous
+* [#1339](https://github.com/smithy-lang/smithy-kotlin/issues/1339) Add documentation for OkHttp4Engine when using Android with R8 / ProGuard
+
 ## [1.5.1] - 07/17/2025
 
 ## [1.5.0] - 07/17/2025
diff --git a/gradle.properties b/gradle.properties
index 9bb3537255..60ff2e58b7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.5.2-SNAPSHOT
+sdkVersion=1.5.2
 
 # codegen
-codegenVersion=0.35.2-SNAPSHOT
+codegenVersion=0.35.2
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From 503817ce5d591229dd2547b0828717a429e6eda2 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 24 Jul 2025 21:04:27 +0000
Subject: [PATCH 139/183] chore: bump snapshot version to 1.5.3-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 60ff2e58b7..1418472093 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.5.2
+sdkVersion=1.5.3-SNAPSHOT
 
 # codegen
-codegenVersion=0.35.2
+codegenVersion=0.35.3-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From 252bdadbb6e046d7249527beb6ba2b0fabb11dd4 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Mon, 28 Jul 2025 12:52:42 -0700
Subject: [PATCH 140/183] feat: add support for call timeout and attempt
 timeout (#1343)

---
 .../02bc36ae-952e-40ec-a0c2-38a8c8673508.json |   8 ++
 .../kotlin/codegen/core/RuntimeTypes.kt       |   1 +
 .../rendering/ServiceClientConfigGenerator.kt |   3 +
 .../protocol/HttpProtocolClientGenerator.kt   |   7 +-
 .../rendering/util/RuntimeConfigProperty.kt   |  26 +++++
 .../ServiceClientConfigGeneratorTest.kt       |  26 ++++-
 .../protocol/http-client/api/http-client.api  |  26 +++++
 .../runtime/http/config/TimeoutConfig.kt      |  39 +++++++
 .../runtime/http/engine/HttpClientEngine.kt   |  21 +++-
 .../http/middleware/RetryMiddleware.kt        |   6 +-
 .../http/operation/HttpOperationContext.kt    |   9 ++
 .../http/operation/SdkOperationExecution.kt   |  12 +-
 .../kotlin/runtime/http/operation/Timeouts.kt |  71 ++++++++++++
 .../operation/SdkOperationExecutionTest.kt    | 108 ++++++++++++++++--
 14 files changed, 339 insertions(+), 24 deletions(-)
 create mode 100644 .changes/02bc36ae-952e-40ec-a0c2-38a8c8673508.json
 create mode 100644 runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/config/TimeoutConfig.kt
 create mode 100644 runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/Timeouts.kt

diff --git a/.changes/02bc36ae-952e-40ec-a0c2-38a8c8673508.json b/.changes/02bc36ae-952e-40ec-a0c2-38a8c8673508.json
new file mode 100644
index 0000000000..a3c5eb005a
--- /dev/null
+++ b/.changes/02bc36ae-952e-40ec-a0c2-38a8c8673508.json
@@ -0,0 +1,8 @@
+{
+    "id": "02bc36ae-952e-40ec-a0c2-38a8c8673508",
+    "type": "feature",
+    "description": "Enable configuration of timeouts for calls and attempt",
+    "issues": [
+        "https://github.com/smithy-lang/smithy-kotlin/issues/1320"
+    ]
+}
\ No newline at end of file
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
index 80658e75cf..d5122a2f48 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/RuntimeTypes.kt
@@ -71,6 +71,7 @@ object RuntimeTypes {
         object Config : RuntimeTypePackage(KotlinDependency.HTTP_CLIENT, "config") {
             val HttpClientConfig = symbol("HttpClientConfig")
             val HttpEngineConfig = symbol("HttpEngineConfig")
+            val TimeoutConfig = symbol("TimeoutConfig")
         }
 
         object Engine : RuntimeTypePackage(KotlinDependency.HTTP_CLIENT, "engine") {
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGenerator.kt
index 421f841f13..592b413f9a 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGenerator.kt
@@ -57,6 +57,9 @@ class ServiceClientConfigGenerator(
         add(RuntimeConfigProperty.RetryStrategy)
         add(RuntimeConfigProperty.TelemetryProvider)
 
+        add(RuntimeConfigProperty.AttemptTimeout)
+        add(RuntimeConfigProperty.CallTimeout)
+
         if (shape.hasTrait<ClientContextParamsTrait>()) {
             addAll(clientContextConfigProps(shape.expectTrait()))
         }
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolClientGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolClientGenerator.kt
index f12ab07a26..0b7c3f7e0a 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolClientGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/protocol/HttpProtocolClientGenerator.kt
@@ -9,8 +9,11 @@ import software.amazon.smithy.kotlin.codegen.core.*
 import software.amazon.smithy.kotlin.codegen.integration.SectionId
 import software.amazon.smithy.kotlin.codegen.integration.SectionKey
 import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
-import software.amazon.smithy.kotlin.codegen.model.*
+import software.amazon.smithy.kotlin.codegen.model.getTrait
+import software.amazon.smithy.kotlin.codegen.model.hasIdempotentTokenMember
+import software.amazon.smithy.kotlin.codegen.model.hasStreamingMember
 import software.amazon.smithy.kotlin.codegen.model.knowledge.AuthIndex
+import software.amazon.smithy.kotlin.codegen.model.operationSignature
 import software.amazon.smithy.kotlin.codegen.rendering.auth.AuthSchemeProviderAdapterGenerator
 import software.amazon.smithy.kotlin.codegen.rendering.auth.IdentityProviderConfigGenerator
 import software.amazon.smithy.kotlin.codegen.rendering.endpoints.EndpointResolverAdapterGenerator
@@ -342,6 +345,8 @@ open class HttpProtocolClientGenerator(
             "}",
             RuntimeTypes.Core.ExecutionContext,
         ) {
+            putIfAbsent(RuntimeTypes.HttpClient.Operation.HttpOperationContext, "AttemptTimeout", nullable = true)
+            putIfAbsent(RuntimeTypes.HttpClient.Operation.HttpOperationContext, "CallTimeout", nullable = true)
             putIfAbsent(RuntimeTypes.SmithyClient.SdkClientOption, "ClientName")
             putIfAbsent(RuntimeTypes.SmithyClient.SdkClientOption, "LogMode")
             if (ctx.service.hasIdempotentTokenMember(ctx.model)) {
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/util/RuntimeConfigProperty.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/util/RuntimeConfigProperty.kt
index 0108838d9c..36dbb1c671 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/util/RuntimeConfigProperty.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/util/RuntimeConfigProperty.kt
@@ -10,6 +10,7 @@ import software.amazon.smithy.codegen.core.Symbol
 import software.amazon.smithy.codegen.core.SymbolReference
 import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
 import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
+import software.amazon.smithy.kotlin.codegen.model.asNullable
 import software.amazon.smithy.kotlin.codegen.model.buildSymbol
 
 /**
@@ -185,6 +186,31 @@ object RuntimeConfigProperty {
             The ordered preference of [AuthScheme] that this client will use. 
         """.trimIndent()
     }
+
+    val AttemptTimeout = ConfigProperty {
+        name = "attemptTimeout"
+        symbol = KotlinTypes.Time.Duration.asNullable()
+        baseClass = RuntimeTypes.HttpClient.Config.TimeoutConfig
+        useNestedBuilderBaseClass()
+
+        documentation = """
+            The maximum amount of time to wait for any single attempt of a request within the retry loop. By default,
+            the value is `null` indicating no timeout is enforced. Attempt timeouts may be retried if allowed by the
+            current retry policy and retry capacity.
+        """.trimIndent()
+    }
+
+    val CallTimeout = ConfigProperty {
+        name = "callTimeout"
+        symbol = KotlinTypes.Time.Duration.asNullable()
+        baseClass = RuntimeTypes.HttpClient.Config.TimeoutConfig
+        useNestedBuilderBaseClass()
+
+        documentation = """
+            The maximum amount of time to wait for completion of a call, including any retries after the first attempt.
+            By default, the value is `null` indicating no timeout is enforced. Call timeouts are not retried.
+        """.trimIndent()
+    }
 }
 
 internal val Symbol.nestedBuilder: Symbol
diff --git a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGeneratorTest.kt b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGeneratorTest.kt
index 7f1521ee02..cb73290a86 100644
--- a/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGeneratorTest.kt
+++ b/codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/rendering/ServiceClientConfigGeneratorTest.kt
@@ -8,7 +8,10 @@ package software.amazon.smithy.kotlin.codegen.rendering
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.shouldContain
 import software.amazon.smithy.codegen.core.SymbolReference
-import software.amazon.smithy.kotlin.codegen.core.*
+import software.amazon.smithy.kotlin.codegen.core.CodegenContext
+import software.amazon.smithy.kotlin.codegen.core.KotlinDependency
+import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
+import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
 import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
 import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
 import software.amazon.smithy.kotlin.codegen.loadModelFromResource
@@ -42,14 +45,16 @@ class ServiceClientConfigGeneratorTest {
         contents.assertBalancedBracesAndParens()
 
         val expectedCtor = """
-public class Config private constructor(builder: Builder) : HttpAuthConfig, HttpClientConfig, HttpEngineConfig by builder.buildHttpEngineConfig(), IdempotencyTokenConfig, RetryClientConfig, RetryStrategyClientConfig by builder.buildRetryStrategyClientConfig(), SdkClientConfig, TelemetryConfig {
+public class Config private constructor(builder: Builder) : HttpAuthConfig, HttpClientConfig, HttpEngineConfig by builder.buildHttpEngineConfig(), IdempotencyTokenConfig, RetryClientConfig, RetryStrategyClientConfig by builder.buildRetryStrategyClientConfig(), SdkClientConfig, TelemetryConfig, TimeoutConfig {
 """
         contents.shouldContainWithDiff(expectedCtor)
 
         val expectedProps = """
     override val clientName: String = builder.clientName
+    override val attemptTimeout: Duration? = builder.attemptTimeout
     override val authSchemePreference: kotlin.collections.List<aws.smithy.kotlin.runtime.auth.AuthSchemeId>? = builder.authSchemePreference
     override val authSchemes: kotlin.collections.List<aws.smithy.kotlin.runtime.http.auth.AuthScheme> = builder.authSchemes
+    override val callTimeout: Duration? = builder.callTimeout
     public val endpointProvider: TestEndpointProvider = requireNotNull(builder.endpointProvider) { "endpointProvider is a required configuration property" }
     override val idempotencyTokenProvider: IdempotencyTokenProvider = builder.idempotencyTokenProvider ?: IdempotencyTokenProvider.Default
     override val interceptors: kotlin.collections.List<aws.smithy.kotlin.runtime.http.interceptors.HttpInterceptor> = builder.interceptors
@@ -60,12 +65,19 @@ public class Config private constructor(builder: Builder) : HttpAuthConfig, Http
         contents.shouldContainWithDiff(expectedProps)
 
         val expectedBuilder = """
-    public class Builder : HttpAuthConfig.Builder, HttpClientConfig.Builder, HttpEngineConfig.Builder by HttpEngineConfigImpl.BuilderImpl(), IdempotencyTokenConfig.Builder, RetryClientConfig.Builder, RetryStrategyClientConfig.Builder by RetryStrategyClientConfigImpl.BuilderImpl(), SdkClientConfig.Builder<Config>, TelemetryConfig.Builder {
+    public class Builder : HttpAuthConfig.Builder, HttpClientConfig.Builder, HttpEngineConfig.Builder by HttpEngineConfigImpl.BuilderImpl(), IdempotencyTokenConfig.Builder, RetryClientConfig.Builder, RetryStrategyClientConfig.Builder by RetryStrategyClientConfigImpl.BuilderImpl(), SdkClientConfig.Builder<Config>, TelemetryConfig.Builder, TimeoutConfig.Builder {
         /**
          * A reader-friendly name for the client.
          */
         override var clientName: String = "Test"
 
+        /**
+         * The maximum amount of time to wait for any single attempt of a request within the retry loop. By default,
+         * the value is `null` indicating no timeout is enforced. Attempt timeouts may be retried if allowed by the
+         * current retry policy and retry capacity.
+         */
+        override var attemptTimeout: Duration? = null
+
         /**
          * The ordered preference of [AuthScheme] that this client will use.
          */
@@ -79,6 +91,12 @@ public class Config private constructor(builder: Builder) : HttpAuthConfig, Http
          */
         override var authSchemes: kotlin.collections.List<aws.smithy.kotlin.runtime.http.auth.AuthScheme> = emptyList()
 
+        /**
+         * The maximum amount of time to wait for completion of a call, including any retries after the first attempt.
+         * By default, the value is `null` indicating no timeout is enforced. Call timeouts are not retried.
+         */
+        override var callTimeout: Duration? = null
+
         /**
          * The endpoint provider used to determine where to make service requests. **This is an advanced config
          * option.**
@@ -245,8 +263,10 @@ public class Config private constructor(builder: Builder) {
         // Expect logMode config value to override default to LogMode.Request
         val expectedConfigValues = """
     override val clientName: String = builder.clientName
+    override val attemptTimeout: Duration? = builder.attemptTimeout
     override val authSchemePreference: kotlin.collections.List<aws.smithy.kotlin.runtime.auth.AuthSchemeId>? = builder.authSchemePreference
     override val authSchemes: kotlin.collections.List<aws.smithy.kotlin.runtime.http.auth.AuthScheme> = builder.authSchemes
+    override val callTimeout: Duration? = builder.callTimeout
     public val customProp: Int? = builder.customProp
     public val endpointProvider: TestEndpointProvider = requireNotNull(builder.endpointProvider) { "endpointProvider is a required configuration property" }
     override val idempotencyTokenProvider: IdempotencyTokenProvider = builder.idempotencyTokenProvider ?: IdempotencyTokenProvider.Default
diff --git a/runtime/protocol/http-client/api/http-client.api b/runtime/protocol/http-client/api/http-client.api
index 1d8deaa751..ecfd153135 100644
--- a/runtime/protocol/http-client/api/http-client.api
+++ b/runtime/protocol/http-client/api/http-client.api
@@ -42,6 +42,18 @@ public final class aws/smithy/kotlin/runtime/http/config/HttpEngineConfig$Builde
 public abstract interface annotation class aws/smithy/kotlin/runtime/http/config/HttpEngineConfigDsl : java/lang/annotation/Annotation {
 }
 
+public abstract interface class aws/smithy/kotlin/runtime/http/config/TimeoutConfig {
+	public abstract fun getAttemptTimeout-FghU774 ()Lkotlin/time/Duration;
+	public abstract fun getCallTimeout-FghU774 ()Lkotlin/time/Duration;
+}
+
+public abstract interface class aws/smithy/kotlin/runtime/http/config/TimeoutConfig$Builder {
+	public abstract fun getAttemptTimeout-FghU774 ()Lkotlin/time/Duration;
+	public abstract fun getCallTimeout-FghU774 ()Lkotlin/time/Duration;
+	public abstract fun setAttemptTimeout-BwNAW2A (Lkotlin/time/Duration;)V
+	public abstract fun setCallTimeout-BwNAW2A (Lkotlin/time/Duration;)V
+}
+
 public final class aws/smithy/kotlin/runtime/http/engine/AlpnId : java/lang/Enum {
 	public static final field H2_PRIOR_KNOWLEDGE Laws/smithy/kotlin/runtime/http/engine/AlpnId;
 	public static final field HTTP1_1 Laws/smithy/kotlin/runtime/http/engine/AlpnId;
@@ -489,10 +501,22 @@ public final class aws/smithy/kotlin/runtime/http/middleware/MutateHeaders : aws
 	public final fun setIfMissing (Ljava/lang/String;Ljava/lang/String;)V
 }
 
+public final class aws/smithy/kotlin/runtime/http/operation/AttemptTimeoutException : aws/smithy/kotlin/runtime/http/operation/ClientTimeoutException {
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+}
+
 public abstract interface class aws/smithy/kotlin/runtime/http/operation/AuthSchemeResolver {
 	public abstract fun resolve (Laws/smithy/kotlin/runtime/http/operation/OperationRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
+public final class aws/smithy/kotlin/runtime/http/operation/CallTimeoutException : aws/smithy/kotlin/runtime/http/operation/ClientTimeoutException {
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+}
+
+public abstract class aws/smithy/kotlin/runtime/http/operation/ClientTimeoutException : aws/smithy/kotlin/runtime/ClientException {
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;Z)V
+}
+
 public abstract interface class aws/smithy/kotlin/runtime/http/operation/EndpointResolver {
 	public abstract fun resolve (Laws/smithy/kotlin/runtime/http/operation/ResolveEndpointRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
@@ -516,6 +540,8 @@ public abstract interface class aws/smithy/kotlin/runtime/http/operation/HttpDes
 
 public final class aws/smithy/kotlin/runtime/http/operation/HttpOperationContext {
 	public static final field INSTANCE Laws/smithy/kotlin/runtime/http/operation/HttpOperationContext;
+	public final fun getAttemptTimeout ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
+	public final fun getCallTimeout ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 	public final fun getClockSkew ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 	public final fun getClockSkewApproximateSigningTime ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
 	public final fun getDefaultChecksumAlgorithm ()Laws/smithy/kotlin/runtime/collections/AttributeKey;
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/config/TimeoutConfig.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/config/TimeoutConfig.kt
new file mode 100644
index 0000000000..25bc7db84d
--- /dev/null
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/config/TimeoutConfig.kt
@@ -0,0 +1,39 @@
+package aws.smithy.kotlin.runtime.http.config
+
+import kotlin.time.Duration
+
+/**
+ * Defines optional timeout configuration for clients.
+ */
+public interface TimeoutConfig {
+    /**
+     * The maximum amount of time to wait for any single attempt of a request within the retry loop. By default, the
+     * value is `null` indicating no timeout is enforced. Attempt timeouts may be retried if allowed by the current
+     * retry policy and retry capacity.
+     */
+    public val attemptTimeout: Duration?
+
+    /**
+     * The maximum amount of time to wait for completion of a call, including any retries after the first attempt. By
+     * default, the value is `null` indicating no timeout is enforced. Call timeouts are not retried.
+     */
+    public val callTimeout: Duration?
+
+    /**
+     * A mutable instance used to set timeout configuration for clients.
+     */
+    public interface Builder {
+        /**
+         * The maximum amount of time to wait for any single attempt of a request within the retry loop. By default, the
+         * value is `null` indicating no timeout is enforced. Attempt timeouts may be retried if allowed by the current
+         * retry policy and retry capacity.
+         */
+        public var attemptTimeout: Duration?
+
+        /**
+         * The maximum amount of time to wait for completion of a call, including any retries after the first attempt.
+         * By default, the value is `null` indicating no timeout is enforced. Call timeouts are not retried.
+         */
+        public var callTimeout: Duration?
+    }
+}
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/engine/HttpClientEngine.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/engine/HttpClientEngine.kt
index 854ee44b67..48ee017edd 100644
--- a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/engine/HttpClientEngine.kt
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/engine/HttpClientEngine.kt
@@ -13,6 +13,7 @@ import aws.smithy.kotlin.runtime.operation.ExecutionContext
 import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.*
 import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
 
 /**
  * Functionality a real HTTP client must provide.
@@ -39,12 +40,24 @@ public interface CloseableHttpClientEngine :
     Closeable
 
 /**
- * Base class that SDK [HttpClientEngine]s SHOULD inherit from rather than implementing directly.
+ * Base class that SDK [HttpClientEngine]s SHOULD inherit from rather than implementing directly. This class's
+ * [CoroutineContext] will include [SupervisorJob] because the failure of individual requests should not affect other
+ * requests or the overall engine.
  */
 @InternalApi
-public abstract class HttpClientEngineBase(engineName: String) : CloseableHttpClientEngine {
-    // why SupervisorJob? because failure of individual requests should not affect other requests or the overall engine
-    override val coroutineContext: CoroutineContext = SupervisorJob() + CoroutineName("http-client-engine-$engineName-context")
+public abstract class HttpClientEngineBase private constructor(
+    override val coroutineContext: CoroutineContext,
+) : CloseableHttpClientEngine {
+    public constructor(engineName: String) : this(engineName, EmptyCoroutineContext)
+
+    /**
+     * Initializes a new [HttpClientEngineBase]. This internal overload allows setting a base [CoroutineContext] which
+     * is useful in tests using `runTest` (otherwise the base context will be empty and so will default to using
+     * [Dispatchers.Default]).
+     */
+    internal constructor(engineName: String, baseContext: CoroutineContext) :
+        this(baseContext + SupervisorJob() + CoroutineName("http-client-engine-$engineName-context"))
+
     private val closed = atomic(false)
 
     final override fun close() {
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/middleware/RetryMiddleware.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/middleware/RetryMiddleware.kt
index 7b8144c82e..cb865caa10 100644
--- a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/middleware/RetryMiddleware.kt
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/middleware/RetryMiddleware.kt
@@ -9,7 +9,6 @@ import aws.smithy.kotlin.runtime.businessmetrics.SmithyBusinessMetric
 import aws.smithy.kotlin.runtime.businessmetrics.emitBusinessMetric
 import aws.smithy.kotlin.runtime.http.interceptors.InterceptorExecutor
 import aws.smithy.kotlin.runtime.http.operation.*
-import aws.smithy.kotlin.runtime.http.operation.deepCopy
 import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.http.request.immutableView
 import aws.smithy.kotlin.runtime.http.request.toBuilder
@@ -84,7 +83,10 @@ internal class RetryMiddleware<I, O>(
     ): Result<O> {
         val result = interceptors.readBeforeAttempt(request.subject.immutableView())
             .mapCatching {
-                next.call(request)
+                val attemptTimeout = request.context.getOrNull(HttpOperationContext.AttemptTimeout)
+                scopedTimeout(TimeoutScope.Attempt(attempt), attemptTimeout) {
+                    next.call(request)
+                }
             }
 
         // get the http call for this attempt (if we made it that far)
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/HttpOperationContext.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/HttpOperationContext.kt
index 56444dca98..9078b50aaa 100644
--- a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/HttpOperationContext.kt
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/HttpOperationContext.kt
@@ -19,6 +19,15 @@ import kotlin.time.Duration
  */
 @InternalApi
 public object HttpOperationContext {
+    /**
+     * The amount of time to wait for a single attempt to complete
+     */
+    public val AttemptTimeout: AttributeKey<Duration> = AttributeKey("aws.smithy.kotlin#AttemptDuration")
+
+    /**
+     * The amount of time to wait for a call to complete, including any retries
+     */
+    public val CallTimeout: AttributeKey<Duration> = AttributeKey("aws.smithy.kotlin#CallDuration")
 
     /**
      * A prefix to prepend the resolved hostname with.
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/SdkOperationExecution.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/SdkOperationExecution.kt
index d30c7c546b..2384e508b3 100644
--- a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/SdkOperationExecution.kt
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/SdkOperationExecution.kt
@@ -15,10 +15,13 @@ import aws.smithy.kotlin.runtime.client.logMode
 import aws.smithy.kotlin.runtime.collections.attributesOf
 import aws.smithy.kotlin.runtime.collections.emptyAttributes
 import aws.smithy.kotlin.runtime.collections.merge
-import aws.smithy.kotlin.runtime.http.*
+import aws.smithy.kotlin.runtime.http.HttpCall
+import aws.smithy.kotlin.runtime.http.HttpHandler
 import aws.smithy.kotlin.runtime.http.auth.SignHttpRequest
+import aws.smithy.kotlin.runtime.http.complete
 import aws.smithy.kotlin.runtime.http.interceptors.InterceptorExecutor
 import aws.smithy.kotlin.runtime.http.middleware.RetryMiddleware
+import aws.smithy.kotlin.runtime.http.readAll
 import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.http.request.dumpRequest
 import aws.smithy.kotlin.runtime.http.request.immutableView
@@ -193,8 +196,6 @@ private fun <I, O> HttpDeserializer<O>.decorate(
     interceptors: InterceptorExecutor<I, O>,
 ): Handler<SdkHttpRequest, O> = DeserializeHandler(inner, this, interceptors)
 
-// internal glue used to marry one phase to another
-
 /**
  * Outermost handler that wraps the entire middleware pipeline and handles interceptor hooks related
  * to the start/end of an operation
@@ -207,7 +208,10 @@ private class OperationHandler<Input, Output>(
         coroutineContext.trace<OperationHandler<*, *>> { "operation started" }
         val result = interceptors.readBeforeExecution(request.subject)
             .mapCatching {
-                inner.call(request)
+                val callTimeout = request.context.getOrNull(HttpOperationContext.CallTimeout)
+                scopedTimeout(TimeoutScope.Call, callTimeout) {
+                    inner.call(request)
+                }
             }
             .let {
                 interceptors.modifyBeforeCompletion(it)
diff --git a/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/Timeouts.kt b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/Timeouts.kt
new file mode 100644
index 0000000000..a805e45017
--- /dev/null
+++ b/runtime/protocol/http-client/common/src/aws/smithy/kotlin/runtime/http/operation/Timeouts.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.smithy.kotlin.runtime.http.operation
+
+import aws.smithy.kotlin.runtime.ClientException
+import aws.smithy.kotlin.runtime.ErrorMetadata
+import kotlinx.coroutines.TimeoutCancellationException
+import kotlinx.coroutines.withTimeout
+import kotlin.time.Duration
+
+internal sealed interface TimeoutScope {
+    val description: String
+
+    data object Call : TimeoutScope {
+        override val description = "Call"
+    }
+
+    data class Attempt(val attempt: Int) : TimeoutScope {
+        override val description = "Attempt #$attempt"
+    }
+}
+
+/**
+ * Indicates that a client-side configured timeout was exceeded (e.g., call timeout, attempt timeout, etc.)
+ */
+public abstract class ClientTimeoutException(
+    message: String,
+    cause: Throwable,
+    retryable: Boolean,
+) : ClientException(message, cause) {
+    init {
+        sdkErrorMetadata.attributes[ErrorMetadata.Retryable] = retryable
+    }
+}
+
+/**
+ * Indicates that a single attempt took longer than allowed to complete
+ */
+public class AttemptTimeoutException(message: String, cause: Throwable) : ClientTimeoutException(message, cause, true)
+
+/**
+ * Indicates that a call (including any retry attempts) took longer than allowed to complete
+ */
+public class CallTimeoutException(message: String, cause: Throwable) : ClientTimeoutException(message, cause, false)
+
+internal suspend inline fun <T> scopedTimeout(
+    scope: TimeoutScope,
+    duration: Duration?,
+    crossinline block: suspend () -> T,
+): T = when (duration) {
+    null -> block()
+    else ->
+        try {
+            withTimeout(duration) { block() }
+        } catch (e: TimeoutCancellationException) {
+            val message = buildString {
+                append(scope.description)
+                append(" exceeded configured timeout of ")
+                append(duration)
+            }
+
+            val exceptionType: (String, Throwable) -> Throwable = when (scope) {
+                is TimeoutScope.Attempt -> ::AttemptTimeoutException
+                TimeoutScope.Call -> ::CallTimeoutException
+            }
+
+            throw exceptionType(message, e)
+        }
+}
diff --git a/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/operation/SdkOperationExecutionTest.kt b/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/operation/SdkOperationExecutionTest.kt
index 5b521d8bbf..e0fc1b0289 100644
--- a/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/operation/SdkOperationExecutionTest.kt
+++ b/runtime/protocol/http-client/common/test/aws/smithy/kotlin/runtime/http/operation/SdkOperationExecutionTest.kt
@@ -6,12 +6,11 @@
 package aws.smithy.kotlin.runtime.http.operation
 
 import aws.smithy.kotlin.runtime.auth.AuthSchemeId
-import aws.smithy.kotlin.runtime.http.Headers
-import aws.smithy.kotlin.runtime.http.HttpBody
-import aws.smithy.kotlin.runtime.http.HttpCall
-import aws.smithy.kotlin.runtime.http.HttpStatusCode
-import aws.smithy.kotlin.runtime.http.SdkHttpClient
-import aws.smithy.kotlin.runtime.http.auth.*
+import aws.smithy.kotlin.runtime.http.*
+import aws.smithy.kotlin.runtime.http.auth.AnonymousIdentityProvider
+import aws.smithy.kotlin.runtime.http.auth.AuthScheme
+import aws.smithy.kotlin.runtime.http.auth.HttpSigner
+import aws.smithy.kotlin.runtime.http.auth.SignHttpRequest
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngineBase
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngineConfig
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
@@ -20,13 +19,73 @@ import aws.smithy.kotlin.runtime.http.response.HttpResponse
 import aws.smithy.kotlin.runtime.identity.asIdentityProviderConfig
 import aws.smithy.kotlin.runtime.operation.ExecutionContext
 import aws.smithy.kotlin.runtime.time.Instant
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.test.runTest
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
+import kotlin.coroutines.CoroutineContext
+import kotlin.test.*
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 
 class SdkOperationExecutionTest {
+    @Test
+    fun testAttemptTimeoutWithLongCall(): Unit = runTest {
+        val serialized = HttpRequestBuilder()
+        val op = newTestOperation<Unit, Unit>(serialized, Unit).apply {
+            context[HttpOperationContext.AttemptTimeout] = 200.milliseconds
+        }
+
+        val engine = DelayingHttpEngine(listOf(300.milliseconds, 300.milliseconds, 100.milliseconds))
+        val client = SdkHttpClient(engine)
+
+        val result = op.roundTrip(client, Unit)
+        assertEquals(Unit, result)
+        assertEquals(3, engine.callCount)
+    }
+
+    @Test
+    fun testAttemptTimeoutWithShortCall(): Unit = runTest {
+        val serialized = HttpRequestBuilder()
+        val op = newTestOperation<Unit, Unit>(serialized, Unit).apply {
+            context[HttpOperationContext.AttemptTimeout] = 300.milliseconds
+        }
+
+        val engine = DelayingHttpEngine(200.milliseconds)
+        val client = SdkHttpClient(engine)
+
+        val result = op.roundTrip(client, Unit)
+        assertEquals(Unit, result)
+        assertEquals(1, engine.callCount)
+    }
+
+    @Test
+    fun testCallTimeoutWithLongCall(): Unit = runTest {
+        val serialized = HttpRequestBuilder()
+        val op = newTestOperation<Unit, Unit>(serialized, Unit).apply {
+            context[HttpOperationContext.CallTimeout] = 200.milliseconds
+        }
+
+        val engine = DelayingHttpEngine(300.milliseconds)
+        val client = SdkHttpClient(engine)
+
+        assertFailsWith<CallTimeoutException> { op.roundTrip(client, Unit) }
+        assertEquals(1, engine.callCount)
+    }
+
+    @Test
+    fun testCallTimeoutWithShortCall(): Unit = runTest {
+        val serialized = HttpRequestBuilder()
+        val op = newTestOperation<Unit, Unit>(serialized, Unit).apply {
+            context[HttpOperationContext.CallTimeout] = 300.milliseconds
+        }
+
+        val engine = DelayingHttpEngine(200.milliseconds)
+        val client = SdkHttpClient(engine)
+
+        val result = op.roundTrip(client, Unit)
+        assertEquals(Unit, result)
+        assertEquals(1, engine.callCount)
+    }
 
     @Test
     fun testOperationMiddlewareOrder() = runTest {
@@ -106,3 +165,32 @@ class SdkOperationExecutionTest {
         assertEquals(expectedOrder, actualOrder)
     }
 }
+
+private fun CoroutineScope.DelayingHttpEngine(duration: Duration) =
+    DelayingHttpEngine(coroutineContext, listOf(duration))
+
+private fun CoroutineScope.DelayingHttpEngine(durations: List<Duration>) =
+    DelayingHttpEngine(coroutineContext, durations)
+
+private class DelayingHttpEngine(
+    testContext: CoroutineContext,
+    durations: List<Duration>,
+) : HttpClientEngineBase("test engine", testContext) {
+    private val durations = run {
+        val terminator = durations.last()
+        val initial = durations.dropLast(1)
+        initial.asSequence() + generateSequence { terminator }
+    }.iterator()
+
+    var callCount = 0
+        private set
+
+    override val config: HttpClientEngineConfig = HttpClientEngineConfig.Default
+
+    override suspend fun roundTrip(context: ExecutionContext, request: HttpRequest): HttpCall {
+        callCount++
+        delay(durations.next())
+        val resp = HttpResponse(HttpStatusCode.OK, Headers.Empty, HttpBody.Empty)
+        return HttpCall(request, resp, Instant.now(), Instant.now())
+    }
+}

From a35e445bc6200031b9721d8352de868ae84b54a5 Mon Sep 17 00:00:00 2001
From: 0marperez <60363173+0marperez@users.noreply.github.com>
Date: Mon, 28 Jul 2025 15:04:01 -0500
Subject: [PATCH 141/183] misc: repo tools v0.4.35 (#1344)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 09822866b9..ee8da2ad5c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin-version = "2.2.0"
 dokka-version = "2.0.0"
 
-aws-kotlin-repo-tools-version = "0.4.34"
+aws-kotlin-repo-tools-version = "0.4.35"
 
 # libs
 coroutines-version = "1.10.2"

From 0e0662ba88f534873c8c283565d5ad9d1fb33197 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Mon, 28 Jul 2025 20:08:13 +0000
Subject: [PATCH 142/183] chore: release 1.5.3

---
 .changes/02bc36ae-952e-40ec-a0c2-38a8c8673508.json | 8 --------
 CHANGELOG.md                                       | 5 +++++
 gradle.properties                                  | 4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 .changes/02bc36ae-952e-40ec-a0c2-38a8c8673508.json

diff --git a/.changes/02bc36ae-952e-40ec-a0c2-38a8c8673508.json b/.changes/02bc36ae-952e-40ec-a0c2-38a8c8673508.json
deleted file mode 100644
index a3c5eb005a..0000000000
--- a/.changes/02bc36ae-952e-40ec-a0c2-38a8c8673508.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "id": "02bc36ae-952e-40ec-a0c2-38a8c8673508",
-    "type": "feature",
-    "description": "Enable configuration of timeouts for calls and attempt",
-    "issues": [
-        "https://github.com/smithy-lang/smithy-kotlin/issues/1320"
-    ]
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2457fcae54..06450764f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.5.3] - 07/28/2025
+
+### Features
+* [#1320](https://github.com/smithy-lang/smithy-kotlin/issues/1320) Enable configuration of timeouts for calls and attempt
+
 ## [1.5.2] - 07/24/2025
 
 ### Miscellaneous
diff --git a/gradle.properties b/gradle.properties
index 1418472093..3c44b96b8e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.5.3-SNAPSHOT
+sdkVersion=1.5.3
 
 # codegen
-codegenVersion=0.35.3-SNAPSHOT
+codegenVersion=0.35.3
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From 74772d99edee5da6828a5b4d0f7f272d4c019245 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Mon, 28 Jul 2025 20:08:15 +0000
Subject: [PATCH 143/183] chore: bump snapshot version to 1.5.4-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 3c44b96b8e..c8fd215814 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.5.3
+sdkVersion=1.5.4-SNAPSHOT
 
 # codegen
-codegenVersion=0.35.3
+codegenVersion=0.35.4-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From 57fdb54cb1f9ab62629f077ded3cb2d18f5ae1ce Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Wed, 30 Jul 2025 10:14:52 -0700
Subject: [PATCH 144/183] fix: skip unnecessary null checks in `equals()`
 methods for generated structures (#1346)

---
 .../codegen/rendering/StructureGenerator.kt   | 40 +++++++++++++------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/StructureGenerator.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/StructureGenerator.kt
index 5d90f376d2..476050b017 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/StructureGenerator.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/StructureGenerator.kt
@@ -6,7 +6,10 @@ package software.amazon.smithy.kotlin.codegen.rendering
 
 import software.amazon.smithy.codegen.core.CodegenException
 import software.amazon.smithy.codegen.core.Symbol
-import software.amazon.smithy.kotlin.codegen.core.*
+import software.amazon.smithy.kotlin.codegen.core.RenderingContext
+import software.amazon.smithy.kotlin.codegen.core.RuntimeTypes
+import software.amazon.smithy.kotlin.codegen.core.defaultName
+import software.amazon.smithy.kotlin.codegen.core.withBlock
 import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
 import software.amazon.smithy.kotlin.codegen.model.*
 import software.amazon.smithy.kotlin.codegen.rendering.serde.ClientErrorCorrection
@@ -192,20 +195,31 @@ class StructureGenerator(
 
             for (memberShape in sortedMembers) {
                 val target = model.expectShape(memberShape.target)
-                val memberName = memberNameSymbolIndex[memberShape]!!.first
+                val (memberName, memberSymbol) = memberNameSymbolIndex.getValue(memberShape)
                 if (target is BlobShape && !target.hasTrait<StreamingTrait>()) {
-                    openBlock("if (#1L != null) {", memberName)
-                        .write("if (other.#1L == null) return false", memberName)
-                        .write("if (!#1L.contentEquals(other.#1L)) return false", memberName)
-                        .closeBlock("} else if (other.#1L != null) return false", memberName)
+                    if (memberSymbol.isNullable) {
+                        openBlock("if (#1L != null) {", memberName)
+                            .write("if (other.#1L == null) return false", memberName)
+                            .write("if (!#1L.contentEquals(other.#1L)) return false", memberName)
+                            .closeBlock("} else if (other.#1L != null) return false", memberName)
+                    } else {
+                        write("if (!#1L.contentEquals(other.#1L)) return false", memberName)
+                    }
                 } else if (target is ListShape && target.member.targetOrSelf(model).isBlobShape) {
-                    openBlock("if (#L != null) {", memberName)
-                        .write("if (other.#L == null) return false", memberName)
-                        .write("if (#1L.size != other.#1L.size) return false", memberName)
-                        .openBlock("for (i in #L.indices) {", memberName)
-                        .write("if (!#1L[i].contentEquals(other.#1L[i])) return false", memberName)
-                        .closeBlock("}")
-                        .closeBlock("} else if (other.#1L != null) return false", memberName)
+                    if (memberSymbol.isNullable) {
+                        openBlock("if (#L != null) {", memberName)
+                            .write("if (other.#L == null) return false", memberName)
+                            .write("if (#1L.size != other.#1L.size) return false", memberName)
+                            .openBlock("for (i in #L.indices) {", memberName)
+                            .write("if (!#1L[i].contentEquals(other.#1L[i])) return false", memberName)
+                            .closeBlock("}")
+                            .closeBlock("} else if (other.#1L != null) return false", memberName)
+                    } else {
+                        write("if (#1L.size != other.#1L.size) return false", memberName)
+                            .openBlock("for (i in #L.indices) {", memberName)
+                            .write("if (!#1L[i].contentEquals(other.#1L[i])) return false", memberName)
+                            .closeBlock("}")
+                    }
                 } else if (target is DoubleShape || target is FloatShape) {
                     // NaNs must be compared using .equals()
                     write("if (!(#1L?.equals(other.#1L) ?: (other.#1L == null))) return false", memberName)

From 673e58668e8084970cf16394da5aed2f19b2a6c3 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:24:45 -0700
Subject: [PATCH 145/183] chore: add config for enabling Dependabot version
 updates (#1347)

---
 .github/dependabot.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..968d241bfe
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: gradle
+    directory: /
+    schedule:
+      interval: daily # means every _weekday_ (Monday through Friday)

From de43b9a757b83aae54b92dfd6c659159e95ea576 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Mon, 4 Aug 2025 09:31:35 -0700
Subject: [PATCH 146/183] chore: migrate to pull_request_target for some
 workflows that require GH token permissions (#1354)

---
 .github/workflows/artifact-size-metrics.yml  | 4 ++--
 .github/workflows/changelog-verification.yml | 2 +-
 .github/workflows/kat-transform.yml          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/artifact-size-metrics.yml b/.github/workflows/artifact-size-metrics.yml
index d690d87916..ba636cc4c2 100644
--- a/.github/workflows/artifact-size-metrics.yml
+++ b/.github/workflows/artifact-size-metrics.yml
@@ -1,6 +1,6 @@
 name: Artifact Size Metrics
 on:
-  pull_request:
+  pull_request_target:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
     branches:
       - main
@@ -40,7 +40,7 @@ jobs:
       - name: Put Artifact Size Metrics in CloudWatch
         run: ./gradlew putArtifactSizeMetricsInCloudWatch -Prelease=${{ github.event.release.tag_name }}
   size-check:
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request_target'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Sources
diff --git a/.github/workflows/changelog-verification.yml b/.github/workflows/changelog-verification.yml
index 457764177f..98c291c2c4 100644
--- a/.github/workflows/changelog-verification.yml
+++ b/.github/workflows/changelog-verification.yml
@@ -4,7 +4,7 @@ permissions:
   id-token: write
 
 on:
-  pull_request:
+  pull_request_target:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
     branches:
       - main
diff --git a/.github/workflows/kat-transform.yml b/.github/workflows/kat-transform.yml
index bcf6c933c1..efef4d546a 100644
--- a/.github/workflows/kat-transform.yml
+++ b/.github/workflows/kat-transform.yml
@@ -1,7 +1,7 @@
 name: Kat Transform
 
 on:
-  pull_request:
+  pull_request_target:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
     branches:
       - main

From 5da39c257f8bdafb0020fa1bfedccee6688be462 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Mon, 4 Aug 2025 10:12:32 -0700
Subject: [PATCH 147/183] chore: skip changelog verification for Dependabot PRs
 (#1355)

---
 .github/workflows/changelog-verification.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/changelog-verification.yml b/.github/workflows/changelog-verification.yml
index 98c291c2c4..995c03843c 100644
--- a/.github/workflows/changelog-verification.yml
+++ b/.github/workflows/changelog-verification.yml
@@ -13,6 +13,7 @@ on:
 jobs:
   changelog-verification:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login != 'dependabot[bot]' # no changelogs for Dependabot version bumps
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4

From 95958f117f9f2bd76d3c2b6617066af27ff0459f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Aug 2025 10:46:59 -0700
Subject: [PATCH 148/183] chore(deps): bump dev.zacsweers.kctfork:core from
 0.7.0 to 0.8.0 (#1353)

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ee8da2ad5c..3efaf95f92 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,7 +23,7 @@ smithy-version = "1.60.2"
 # testing
 junit-version = "5.13.2"
 kotest-version = "5.9.1"
-kotlin-compile-testing-version = "0.7.0"
+kotlin-compile-testing-version = "0.8.0"
 kotlinx-benchmark-version = "0.4.12"
 kotlinx-serialization-version = "1.7.3"
 docker-java-version = "3.4.0"

From d18bd8bfb534c147f377cd69644d45b890acff1a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Aug 2025 10:49:21 -0700
Subject: [PATCH 149/183] chore(deps): bump io.micrometer:micrometer-core from
 1.14.2 to 1.15.2 (#1351)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3efaf95f92..d2b9dba04c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ otel-version = "1.45.0"
 slf4j-version = "2.0.16"
 slf4j-v1x-version = "1.7.36"
 crt-kotlin-version = "0.10.0"
-micrometer-version = "1.14.2"
+micrometer-version = "1.15.2"
 binary-compatibility-validator-version = "0.18.0"
 
 # codegen

From 1fdd38b0a59b24ed2a8d08e930796c34eb7477ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Aug 2025 10:50:20 -0700
Subject: [PATCH 150/183] chore(deps): bump ktor-version from 3.1.1 to 3.2.3
 (#1349)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d2b9dba04c..4c4e4cc82b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ kotlin-compile-testing-version = "0.8.0"
 kotlinx-benchmark-version = "0.4.12"
 kotlinx-serialization-version = "1.7.3"
 docker-java-version = "3.4.0"
-ktor-version = "3.1.1"
+ktor-version = "3.2.3"
 kaml-version = "0.55.0"
 jsoup-version = "1.19.1"
 

From 7e72b402c7d6af305adad34677c0dbd346a6b7ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Aug 2025 11:28:28 -0700
Subject: [PATCH 151/183] chore(deps): bump
 org.jetbrains.kotlinx.binary-compatibility-validator from 0.18.0 to 0.18.1
 (#1350)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4c4e4cc82b..b14dd6a0a4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ slf4j-version = "2.0.16"
 slf4j-v1x-version = "1.7.36"
 crt-kotlin-version = "0.10.0"
 micrometer-version = "1.15.2"
-binary-compatibility-validator-version = "0.18.0"
+binary-compatibility-validator-version = "0.18.1"
 
 # codegen
 smithy-version = "1.60.2"

From d66d2511a5c232b5ff85578772d826b282c12a3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Aug 2025 11:28:37 -0700
Subject: [PATCH 152/183] chore(deps): bump kotlinx-benchmark-version from
 0.4.12 to 0.4.14 (#1352)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b14dd6a0a4..c0b61c0328 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -24,7 +24,7 @@ smithy-version = "1.60.2"
 junit-version = "5.13.2"
 kotest-version = "5.9.1"
 kotlin-compile-testing-version = "0.8.0"
-kotlinx-benchmark-version = "0.4.12"
+kotlinx-benchmark-version = "0.4.14"
 kotlinx-serialization-version = "1.7.3"
 docker-java-version = "3.4.0"
 ktor-version = "3.2.3"

From 718be05b9772c2efb3a8d077538bedea7a817fe3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Aug 2025 10:20:01 -0700
Subject: [PATCH 153/183] chore(deps): bump smithy-version from 1.60.2 to
 1.61.0 (#1360)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c0b61c0328..59bc49267f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ micrometer-version = "1.15.2"
 binary-compatibility-validator-version = "0.18.1"
 
 # codegen
-smithy-version = "1.60.2"
+smithy-version = "1.61.0"
 
 # testing
 junit-version = "5.13.2"

From 81fd1397485302076dccd7de1f555ab2e0fe180b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Aug 2025 10:20:17 -0700
Subject: [PATCH 154/183] chore(deps): bump junit-version from 5.13.2 to 5.13.4
 (#1359)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 59bc49267f..aaea0c535b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ binary-compatibility-validator-version = "0.18.1"
 smithy-version = "1.61.0"
 
 # testing
-junit-version = "5.13.2"
+junit-version = "5.13.4"
 kotest-version = "5.9.1"
 kotlin-compile-testing-version = "0.8.0"
 kotlinx-benchmark-version = "0.4.14"

From d61d2dcfa266f3693e9e537d3a3d77a63b83d068 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Tue, 5 Aug 2025 12:47:51 -0700
Subject: [PATCH 155/183] chore: remove manual resolution of transitive Docker
 dependencies (#1362)

---
 .../http-client-engines/test-suite/build.gradle.kts         | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/runtime/protocol/http-client-engines/test-suite/build.gradle.kts b/runtime/protocol/http-client-engines/test-suite/build.gradle.kts
index ece9d6e102..928a1d5b15 100644
--- a/runtime/protocol/http-client-engines/test-suite/build.gradle.kts
+++ b/runtime/protocol/http-client-engines/test-suite/build.gradle.kts
@@ -45,12 +45,6 @@ kotlin {
         jvmTest {
             dependencies {
                 implementation(libs.docker.core)
-                // FIXME docker-java has a ton of dependencies with vulnerabilities, and they don't seem motivated to fix them.
-                // So we must override their dependencies with the latest patched versions. https://github.com/docker-java/docker-java/issues/1974
-                implementation("com.fasterxml.jackson.core:jackson-databind:2.12.7.1") // https://github.com/docker-java/docker-java/issues/2177
-                implementation("org.apache.commons:commons-compress:1.26.0") // https://github.com/docker-java/docker-java/pull/2256
-                implementation("org.bouncycastle:bcpkix-jdk18on:1.78") // https://github.com/docker-java/docker-java/pull/2326
-
                 implementation(libs.docker.transport.zerodep)
 
                 implementation(project(":runtime:observability:telemetry-defaults"))

From 6a8e67dd629a94c24a1a20337995982fc93768df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Aug 2025 12:48:31 -0700
Subject: [PATCH 156/183] chore(deps): bump com.squareup.okio:okio from 3.15.0
 to 3.16.0 (#1356)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index aaea0c535b..0a9b496c0a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ coroutines-version = "1.10.2"
 atomicfu-version = "0.29.0"
 okhttp-version = "5.1.0"
 okhttp4-version = "4.12.0"
-okio-version = "3.15.0"
+okio-version = "3.16.0"
 otel-version = "1.45.0"
 slf4j-version = "2.0.16"
 slf4j-v1x-version = "1.7.36"

From 5af711e7b6242491c3d46e1a27e99982c2ed91ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Aug 2025 14:11:40 -0700
Subject: [PATCH 157/183] chore(deps): bump com.fasterxml.jackson:jackson-bom
 from 2.15.3 to 2.19.2 (#1363)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 38e335ffd4..7e5c097678 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,7 +19,7 @@ buildscript {
         https://github.com/Kotlin/dokka/issues/3472#issuecomment-1929712374
         https://github.com/Kotlin/dokka/issues/3194#issuecomment-1929382630
          */
-        classpath(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.15.3"))
+        classpath(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.19.2"))
     }
 }
 

From 2be96f03957a462d3beeba138f79967278d8c2f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Aug 2025 08:04:24 -0700
Subject: [PATCH 158/183] chore(deps): bump org.jsoup:jsoup from 1.19.1 to
 1.21.1 (#1365)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
---
 .../kotlin/codegen/lang/DocumentationPreprocessor.kt       | 7 ++++++-
 gradle/libs.versions.toml                                  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/lang/DocumentationPreprocessor.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/lang/DocumentationPreprocessor.kt
index 9baf5790b9..04518e7032 100644
--- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/lang/DocumentationPreprocessor.kt
+++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/lang/DocumentationPreprocessor.kt
@@ -57,13 +57,18 @@ class DocumentationPreprocessor : KotlinIntegration {
             .applyWithin("<pre>", "</pre>", String::escapeHtml)
         val parsed = Jsoup.parse(sanitized)
 
+        fun Node.emptyOrBlank(): Boolean = when {
+            this is TextNode -> isBlank
+            else -> childNodes().all { it.emptyOrBlank() }
+        }
+
         parsed.body().filterDescendants(
             // Jsoup will preserve newlines between elements as blank text nodes. These have zero bearing on the content
             // of the document to begin with and only serve to complicate traversal.
             { it is TextNode && it.isBlank },
             // Some docs contain empty definition terms, which we render as section headers. An empty section header
             // (literal "## \n" is invalid markdown according to dokka.
-            { it.nodeName() == "dt" && it.childNodes().isEmpty() },
+            { it.nodeName() == "dt" && it.emptyOrBlank() },
         )
 
         return parsed
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0a9b496c0a..c3eb68579b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -29,7 +29,7 @@ kotlinx-serialization-version = "1.7.3"
 docker-java-version = "3.4.0"
 ktor-version = "3.2.3"
 kaml-version = "0.55.0"
-jsoup-version = "1.19.1"
+jsoup-version = "1.21.1"
 
 [libraries]
 aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" }

From 45eee55b2e408e07f98c73c138dcc7aefb79f454 Mon Sep 17 00:00:00 2001
From: Xinsong Cui <xicu@amazon.com>
Date: Thu, 7 Aug 2025 16:14:40 -0400
Subject: [PATCH 159/183] feat: emit bearer business metric (#1348)

---
 runtime/auth/http-auth/api/http-auth.api      |  2 +
 .../auth/EnvironmentBearerTokenProvider.kt    | 24 ++++++---
 .../EnvironmentBearerTokenProviderTest.kt     | 53 ++++++++++++++++---
 runtime/runtime-core/api/runtime-core.api     |  1 +
 .../businessmetrics/BusinessMetricsUtils.kt   |  1 +
 5 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/runtime/auth/http-auth/api/http-auth.api b/runtime/auth/http-auth/api/http-auth.api
index d47a5a9c79..bbdec31e71 100644
--- a/runtime/auth/http-auth/api/http-auth.api
+++ b/runtime/auth/http-auth/api/http-auth.api
@@ -62,6 +62,8 @@ public abstract interface class aws/smithy/kotlin/runtime/http/auth/CloseableBea
 public final class aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider : aws/smithy/kotlin/runtime/http/auth/BearerTokenProvider {
 	public fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;)V
 	public synthetic fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun resolve (Laws/smithy/kotlin/runtime/collections/Attributes;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
diff --git a/runtime/auth/http-auth/common/src/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider.kt b/runtime/auth/http-auth/common/src/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider.kt
index ffe37b60b0..4863f0c6e7 100644
--- a/runtime/auth/http-auth/common/src/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider.kt
+++ b/runtime/auth/http-auth/common/src/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider.kt
@@ -4,25 +4,37 @@
  */
 package aws.smithy.kotlin.runtime.http.auth
 
+import aws.smithy.kotlin.runtime.businessmetrics.SmithyBusinessMetric
+import aws.smithy.kotlin.runtime.businessmetrics.emitBusinessMetric
 import aws.smithy.kotlin.runtime.collections.Attributes
-import aws.smithy.kotlin.runtime.collections.emptyAttributes
+import aws.smithy.kotlin.runtime.collections.mutableAttributes
 import aws.smithy.kotlin.runtime.time.Instant
 import aws.smithy.kotlin.runtime.util.PlatformProvider
 
 /**
- * A [BearerTokenProvider] that extracts the bearer token from the target environment variable.
+ * A [BearerTokenProvider] that extracts the bearer token from JVM system properties or environment variables.
  */
 public class EnvironmentBearerTokenProvider(
-    private val key: String,
+    private val sysPropKey: String,
+    private val envKey: String,
     private val platform: PlatformProvider = PlatformProvider.System,
 ) : BearerTokenProvider {
+    @Deprecated("This constructor does not support a parameter for a system property key and will be removed in version 1.6.x")
+    public constructor(
+        envKey: String,
+        platform: PlatformProvider = PlatformProvider.System,
+    ) : this("", envKey, platform)
+
     override suspend fun resolve(attributes: Attributes): BearerToken {
-        val bearerToken = platform.getenv(key)
-            ?: error("$key environment variable is not set")
+        val bearerToken = sysPropKey.takeUnless(String::isBlank)?.let(platform::getProperty)
+            ?: platform.getenv(envKey)
+        if (bearerToken.isNullOrBlank()) throw IllegalStateException("""Missing values for system property "$sysPropKey" and environment variable "$envKey"""")
 
         return object : BearerToken {
             override val token: String = bearerToken
-            override val attributes: Attributes = emptyAttributes()
+            override val attributes: Attributes = mutableAttributes().apply {
+                emitBusinessMetric(SmithyBusinessMetric.BEARER_SERVICE_ENV_VARS)
+            }
             override val expiration: Instant? = null
         }
     }
diff --git a/runtime/auth/http-auth/common/test/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProviderTest.kt b/runtime/auth/http-auth/common/test/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProviderTest.kt
index e98e8083d5..c4f6161eff 100644
--- a/runtime/auth/http-auth/common/test/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProviderTest.kt
+++ b/runtime/auth/http-auth/common/test/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProviderTest.kt
@@ -1,6 +1,5 @@
 package aws.smithy.kotlin.runtime.http.auth
 
-import aws.smithy.kotlin.runtime.collections.emptyAttributes
 import aws.smithy.kotlin.runtime.util.TestPlatformProvider
 import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
@@ -9,27 +8,65 @@ import kotlin.test.assertFailsWith
 
 class EnvironmentBearerTokenProviderTest {
     @Test
-    fun testResolveWithValidToken() = runTest {
+    fun testResolveFromEnvVar() = runTest {
         val provider = EnvironmentBearerTokenProvider(
-            "TEST_TOKEN",
-            TestPlatformProvider(mutableMapOf("TEST_TOKEN" to "test-bearer-token")),
+            "TEST_SYS_PROPS_TOKEN",
+            "TEST_ENV_TOKEN",
+            TestPlatformProvider(
+                env = mapOf("TEST_ENV_TOKEN" to "test-env-bearer-token"),
+            ),
         )
 
         val token = provider.resolve()
 
-        assertEquals("test-bearer-token", token.token)
+        assertEquals("test-env-bearer-token", token.token)
+    }
+
+    @Test
+    fun testResolveFromSysProps() = runTest {
+        val provider = EnvironmentBearerTokenProvider(
+            "TEST_SYS_PROPS_TOKEN",
+            "TEST_ENV_TOKEN",
+            TestPlatformProvider(
+                props = mapOf("TEST_SYS_PROPS_TOKEN" to "test-sys-props-bearer-token"),
+            ),
+        )
+
+        val token = provider.resolve()
+
+        assertEquals("test-sys-props-bearer-token", token.token)
+    }
+
+    @Test
+    fun testResolutionOrder() = runTest {
+        val provider = EnvironmentBearerTokenProvider(
+            "TEST_SYS_PROPS_TOKEN",
+            "TEST_ENV_TOKEN",
+            TestPlatformProvider(
+                props = mapOf("TEST_SYS_PROPS_TOKEN" to "test-sys-props-bearer-token"),
+                env = mapOf("TEST_ENV_TOKEN" to "test-env-bearer-token"),
+            ),
+        )
+
+        val token = provider.resolve()
+
+        assertEquals("test-sys-props-bearer-token", token.token)
     }
 
     @Test
     fun testResolveWithMissingToken() = runTest {
         val provider = EnvironmentBearerTokenProvider(
             "MISSING_TEST_TOKEN",
-            TestPlatformProvider(mutableMapOf()),
+            "MISSING_TEST_TOKEN",
+            TestPlatformProvider(
+                env = mapOf("TEST_TOKEN" to "test-env-bearer-token"),
+                props = mapOf("TEST_TOKEN" to "test-sys-props-bearer-token"),
+            ),
         )
 
         val exception = assertFailsWith<IllegalStateException> {
-            provider.resolve(emptyAttributes())
+            provider.resolve()
         }
-        assertEquals("MISSING_TEST_TOKEN environment variable is not set", exception.message)
+        assertEquals("Missing values for system property \"MISSING_TEST_TOKEN\" and environment variable \"MISSING_TEST_TOKEN\"", exception.message)
     }
 }
diff --git a/runtime/runtime-core/api/runtime-core.api b/runtime/runtime-core/api/runtime-core.api
index 91855f6e4d..fcc7f6727a 100644
--- a/runtime/runtime-core/api/runtime-core.api
+++ b/runtime/runtime-core/api/runtime-core.api
@@ -107,6 +107,7 @@ public final class aws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetri
 	public static final field ACCOUNT_ID_MODE_DISABLED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field ACCOUNT_ID_MODE_PREFERRED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field ACCOUNT_ID_MODE_REQUIRED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
+	public static final field BEARER_SERVICE_ENV_VARS Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field FLEXIBLE_CHECKSUMS_REQ_CRC32 Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field FLEXIBLE_CHECKSUMS_REQ_CRC32C Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field FLEXIBLE_CHECKSUMS_REQ_SHA1 Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
diff --git a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt
index 13a88aea29..3b3d4e9072 100644
--- a/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt
+++ b/runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt
@@ -102,6 +102,7 @@ public enum class SmithyBusinessMetric(public override val identifier: String) :
     FLEXIBLE_CHECKSUMS_REQ_WHEN_REQUIRED("a"),
     FLEXIBLE_CHECKSUMS_RES_WHEN_SUPPORTED("b"),
     FLEXIBLE_CHECKSUMS_RES_WHEN_REQUIRED("c"),
+    BEARER_SERVICE_ENV_VARS("3"),
     ;
 
     override fun toString(): String = identifier

From ae505ee53dc3ccd1eb7b84e4182d4ce5d24ab11c Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Thu, 7 Aug 2025 14:26:04 -0700
Subject: [PATCH 160/183] Revert "chore(deps): bump
 com.fasterxml.jackson:jackson-bom from 2.153 to 2.19.2 (#1363)" (#1373)

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7e5c097678..38e335ffd4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,7 +19,7 @@ buildscript {
         https://github.com/Kotlin/dokka/issues/3472#issuecomment-1929712374
         https://github.com/Kotlin/dokka/issues/3194#issuecomment-1929382630
          */
-        classpath(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.19.2"))
+        classpath(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.15.3"))
     }
 }
 

From f35bfe2b3af70ad396c3eb21c929bcfd1112fc1a Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 7 Aug 2025 21:44:18 +0000
Subject: [PATCH 161/183] chore: release 1.5.4

---
 CHANGELOG.md      | 2 ++
 gradle.properties | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06450764f6..871d547b0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.5.4] - 08/07/2025
+
 ## [1.5.3] - 07/28/2025
 
 ### Features
diff --git a/gradle.properties b/gradle.properties
index c8fd215814..c80b2b6994 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.5.4-SNAPSHOT
+sdkVersion=1.5.4
 
 # codegen
-codegenVersion=0.35.4-SNAPSHOT
+codegenVersion=0.35.4
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From 6663a3409bf44c5f19aecadc09eb26d4f8693a24 Mon Sep 17 00:00:00 2001
From: aws-sdk-kotlin-ci <aws-kotlin-sdk-automation@amazon.com>
Date: Thu, 7 Aug 2025 21:44:20 +0000
Subject: [PATCH 162/183] chore: bump snapshot version to 1.5.5-SNAPSHOT

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index c80b2b6994..4bf8bf52ed 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.5.4
+sdkVersion=1.5.5-SNAPSHOT
 
 # codegen
-codegenVersion=0.35.4
+codegenVersion=0.35.5-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

From 42d5b2eb2041a029d4975340b6076900f2d454f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 14:20:40 -0700
Subject: [PATCH 163/183] chore(deps): bump slf4j-version from 1.7.36 to 2.0.17
 (#1369)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c3eb68579b..7a85cf8a7a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ okhttp-version = "5.1.0"
 okhttp4-version = "4.12.0"
 okio-version = "3.16.0"
 otel-version = "1.45.0"
-slf4j-version = "2.0.16"
+slf4j-version = "2.0.17"
 slf4j-v1x-version = "1.7.36"
 crt-kotlin-version = "0.10.0"
 micrometer-version = "1.15.2"

From 1285977a3b6b8e6574240bf5eed9718fd23c3bcc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 14:21:12 -0700
Subject: [PATCH 164/183] chore(deps): bump
 org.jetbrains.kotlinx:kotlinx-serialization-json from 1.7.3 to 1.9.0 (#1366)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7a85cf8a7a..604055213f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -25,7 +25,7 @@ junit-version = "5.13.4"
 kotest-version = "5.9.1"
 kotlin-compile-testing-version = "0.8.0"
 kotlinx-benchmark-version = "0.4.14"
-kotlinx-serialization-version = "1.7.3"
+kotlinx-serialization-version = "1.9.0"
 docker-java-version = "3.4.0"
 ktor-version = "3.2.3"
 kaml-version = "0.55.0"

From 0eae86763891f97f7f37b145548148869aace7c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Aug 2025 08:23:29 -0700
Subject: [PATCH 165/183] chore(deps): bump otel-version from 1.45.0 to 1.52.0
 (#1368)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 604055213f..de1931fda7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ atomicfu-version = "0.29.0"
 okhttp-version = "5.1.0"
 okhttp4-version = "4.12.0"
 okio-version = "3.16.0"
-otel-version = "1.45.0"
+otel-version = "1.52.0"
 slf4j-version = "2.0.17"
 slf4j-v1x-version = "1.7.36"
 crt-kotlin-version = "0.10.0"

From 8db1eda3b2a6b4c999e215cd23d52976767967eb Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Wed, 13 Aug 2025 14:01:09 -0400
Subject: [PATCH 166/183] fix: add Jsoup 1.x rule, upgrade to latest version of
 docker-java (#1378)

---
 .brazil.json                                 | 2 +-
 .github/workflows/artifact-size-metrics.yml  | 3 +--
 .github/workflows/changelog-verification.yml | 2 +-
 .github/workflows/kat-transform.yml          | 2 +-
 gradle/libs.versions.toml                    | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.brazil.json b/.brazil.json
index 987379aec3..a347a892a7 100644
--- a/.brazil.json
+++ b/.brazil.json
@@ -25,7 +25,7 @@
     "software.amazon.smithy:smithy-waiters:1.*": "Maven-software-amazon-smithy_smithy-waiters-1.x",
     "software.amazon.smithy:smithy-rules-engine:1.*": "Maven-software-amazon-smithy_smithy-rules-engine-1.x",
     "software.amazon.smithy:smithy-smoke-test-traits:1.*": "Maven-software-amazon-smithy_smithy-smoke-test-traits-1.x",
-    "org.jsoup:jsoup:1.19.*": "Maven-jsoup-1.19.x"
+    "org.jsoup:jsoup:1.*": "Maven-jsoup-1.x"
   },
   "packageHandlingRules": {
     "versioning": {
diff --git a/.github/workflows/artifact-size-metrics.yml b/.github/workflows/artifact-size-metrics.yml
index ba636cc4c2..dce41ed803 100644
--- a/.github/workflows/artifact-size-metrics.yml
+++ b/.github/workflows/artifact-size-metrics.yml
@@ -1,6 +1,6 @@
 name: Artifact Size Metrics
 on:
-  pull_request_target:
+  pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
     branches:
       - main
@@ -40,7 +40,6 @@ jobs:
       - name: Put Artifact Size Metrics in CloudWatch
         run: ./gradlew putArtifactSizeMetricsInCloudWatch -Prelease=${{ github.event.release.tag_name }}
   size-check:
-    if: github.event_name == 'pull_request_target'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Sources
diff --git a/.github/workflows/changelog-verification.yml b/.github/workflows/changelog-verification.yml
index 995c03843c..5b1f51331f 100644
--- a/.github/workflows/changelog-verification.yml
+++ b/.github/workflows/changelog-verification.yml
@@ -4,7 +4,7 @@ permissions:
   id-token: write
 
 on:
-  pull_request_target:
+  pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
     branches:
       - main
diff --git a/.github/workflows/kat-transform.yml b/.github/workflows/kat-transform.yml
index efef4d546a..bcf6c933c1 100644
--- a/.github/workflows/kat-transform.yml
+++ b/.github/workflows/kat-transform.yml
@@ -1,7 +1,7 @@
 name: Kat Transform
 
 on:
-  pull_request_target:
+  pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
     branches:
       - main
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index de1931fda7..482c35ed16 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ kotest-version = "5.9.1"
 kotlin-compile-testing-version = "0.8.0"
 kotlinx-benchmark-version = "0.4.14"
 kotlinx-serialization-version = "1.9.0"
-docker-java-version = "3.4.0"
+docker-java-version = "3.5.3"
 ktor-version = "3.2.3"
 kaml-version = "0.55.0"
 jsoup-version = "1.21.1"

From 944d1e7b7bfed370323b8457cb2f2458a3b2765a Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Wed, 13 Aug 2025 22:08:10 +0000
Subject: [PATCH 167/183] switch back to `pull_request` from
 `pull_request_target`

---
 .github/workflows/artifact-size-metrics.yml  | 2 +-
 .github/workflows/changelog-verification.yml | 4 ++--
 .github/workflows/kat-transform.yml          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/artifact-size-metrics.yml b/.github/workflows/artifact-size-metrics.yml
index d8204c008d..95d46319c9 100644
--- a/.github/workflows/artifact-size-metrics.yml
+++ b/.github/workflows/artifact-size-metrics.yml
@@ -1,6 +1,6 @@
 name: Artifact Size Metrics
 on:
-  pull_request_target:
+  pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
     branches:
       - main
diff --git a/.github/workflows/changelog-verification.yml b/.github/workflows/changelog-verification.yml
index 995c03843c..03e5ffc91f 100644
--- a/.github/workflows/changelog-verification.yml
+++ b/.github/workflows/changelog-verification.yml
@@ -4,7 +4,7 @@ permissions:
   id-token: write
 
 on:
-  pull_request_target:
+  pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
     branches:
       - main
@@ -22,4 +22,4 @@ jobs:
           aws-region: us-west-2
 
       - name: Verify changelog
-        uses: awslabs/aws-kotlin-repo-tools/.github/actions/changelog-verification@main
\ No newline at end of file
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/changelog-verification@main
diff --git a/.github/workflows/kat-transform.yml b/.github/workflows/kat-transform.yml
index 9ed7e3ecca..b4efd9e5a9 100644
--- a/.github/workflows/kat-transform.yml
+++ b/.github/workflows/kat-transform.yml
@@ -1,7 +1,7 @@
 name: Kat Transform
 
 on:
-  pull_request_target:
+  pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
     branches:
       - main

From 0785874d43c3b86a142bf26770433e14498ab978 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Wed, 13 Aug 2025 22:30:43 +0000
Subject: [PATCH 168/183] restore accidentally-deleted FIXME

---
 .github/workflows/continuous-integration.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 98928c8e52..e673aa6ab5 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -184,7 +184,8 @@ jobs:
         working-directory: ./smithy-kotlin
         shell: bash
         run: |
-          echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
+          # FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
+          # echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
           ./gradlew apiCheck
           ./gradlew test jvmTest
       - name: Save Test Reports

From 112d0fd0fba593cf55b5eee383af7122bbe181eb Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Wed, 13 Aug 2025 22:55:10 +0000
Subject: [PATCH 169/183] remember to build CRT Docker images before CI

---
 .github/workflows/continuous-integration.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index e673aa6ab5..26e7804489 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -180,6 +180,10 @@ jobs:
         with:
           working-directory: 'smithy-kotlin'
 
+      - name: Configure CRT Docker Images
+        run: |
+          ./aws-crt-kotlin/docker-images/build-all.sh
+
       - name: Test
         working-directory: ./smithy-kotlin
         shell: bash

From a4867eee0aadb9cea1f50c331f5ad465efc06911 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Thu, 14 Aug 2025 16:59:44 +0000
Subject: [PATCH 170/183] swap to using `build` target in `all-platforms` tests

---
 .github/workflows/continuous-integration.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 26e7804489..071c346ba4 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -191,7 +191,7 @@ jobs:
           # FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
           # echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
           ./gradlew apiCheck
-          ./gradlew test jvmTest
+          ./gradlew build
       - name: Save Test Reports
         if: failure()
         uses: actions/upload-artifact@v4

From 3d49d153bd60eafa3438754cf5c1c67e50b6f4cb Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Thu, 14 Aug 2025 17:17:30 +0000
Subject: [PATCH 171/183] remove redundant `apiCheck` target since that's
 included in `build`

---
 .github/workflows/continuous-integration.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 071c346ba4..ec8bb4c54c 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -190,7 +190,6 @@ jobs:
         run: |
           # FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
           # echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
-          ./gradlew apiCheck
           ./gradlew build
       - name: Save Test Reports
         if: failure()

From 3038f861dcf891af5e1b91934c3279b3448ab812 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Thu, 14 Aug 2025 19:37:33 +0000
Subject: [PATCH 172/183] disable Mac Docker builds; add debugging logs

---
 .github/workflows/continuous-integration.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index ec8bb4c54c..dea4575f75 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -181,9 +181,24 @@ jobs:
           working-directory: 'smithy-kotlin'
 
       - name: Configure CRT Docker Images
+        if: ${{ matrix.os != 'macos-latest' }}
         run: |
           ./aws-crt-kotlin/docker-images/build-all.sh
 
+      - name: Sanity checks
+        shell: bash
+        run: |
+          echo "Dumping current directory:"
+          ls .
+
+          echo ""
+          echo "Dumping parent directory:"
+          ls ..
+
+          echo ""
+          echo "Dumping grandparent directory:"
+          ls ../..
+
       - name: Test
         working-directory: ./smithy-kotlin
         shell: bash

From d475af14f3b1d632ba3bab588ad455c2a271a754 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Thu, 14 Aug 2025 19:43:56 +0000
Subject: [PATCH 173/183] getting Git statuses for each child dir

---
 .github/workflows/continuous-integration.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index dea4575f75..351a18682c 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -188,16 +188,13 @@ jobs:
       - name: Sanity checks
         shell: bash
         run: |
-          echo "Dumping current directory:"
-          ls .
-
-          echo ""
-          echo "Dumping parent directory:"
-          ls ..
-
-          echo ""
-          echo "Dumping grandparent directory:"
-          ls ../..
+          for dir in *; do
+            pushd "$dir"
+            echo "Git status for $dir:"
+            git status
+            echo ""
+            popd
+          done
 
       - name: Test
         working-directory: ./smithy-kotlin

From 39eccfa9e770815e8eed5fbf864316d65c9732a9 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Thu, 14 Aug 2025 19:52:26 +0000
Subject: [PATCH 174/183] more debugging logs

---
 .github/workflows/continuous-integration.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 351a18682c..e2ac1927a7 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -190,9 +190,16 @@ jobs:
         run: |
           for dir in *; do
             pushd "$dir"
+            echo "===================================="
+            echo "Status checks for $dir"
+            echo "===================================="
             echo "Git status for $dir:"
             git status
-            echo ""
+            echo "Git hash:"
+            git rev-prase HEAD
+            echo "Dry run task list:"
+            ./gradlew build --dry-run
+            echo " "
             popd
           done
 

From 918c57dc2aad367c3078f7c6a888427fe4f01bdc Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Fri, 15 Aug 2025 21:20:53 +0000
Subject: [PATCH 175/183] spleling

---
 .github/workflows/continuous-integration.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index e2ac1927a7..1efc755b74 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -196,7 +196,7 @@ jobs:
             echo "Git status for $dir:"
             git status
             echo "Git hash:"
-            git rev-prase HEAD
+            git rev-parse HEAD
             echo "Dry run task list:"
             ./gradlew build --dry-run
             echo " "

From a8654e7fb694c9957c7946f1b81580364b023ff6 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Tue, 19 Aug 2025 16:16:03 +0000
Subject: [PATCH 176/183] compensate for sparse checkout

---
 .github/workflows/continuous-integration.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 1efc755b74..9f72373e53 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -198,7 +198,7 @@ jobs:
             echo "Git hash:"
             git rev-parse HEAD
             echo "Dry run task list:"
-            ./gradlew build --dry-run
+            ./gradlew build --dry-run || true
             echo " "
             popd
           done

From d1ca39161e69e83435d1d129e47878cf27103947 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Tue, 19 Aug 2025 16:44:24 +0000
Subject: [PATCH 177/183] dump directories

---
 .github/workflows/continuous-integration.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 9f72373e53..77d3391aec 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -197,6 +197,8 @@ jobs:
             git status
             echo "Git hash:"
             git rev-parse HEAD
+            echo "File listing:"
+            ls -alsh
             echo "Dry run task list:"
             ./gradlew build --dry-run || true
             echo " "

From 6c088864c75ba16dd2df4f480e0621ca7f0773a2 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Tue, 19 Aug 2025 18:16:42 +0000
Subject: [PATCH 178/183] use bash to configure docker images

---
 .github/workflows/continuous-integration.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 77d3391aec..4bed2db73b 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -181,6 +181,7 @@ jobs:
           working-directory: 'smithy-kotlin'
 
       - name: Configure CRT Docker Images
+        shell: bash
         if: ${{ matrix.os != 'macos-latest' }}
         run: |
           ./aws-crt-kotlin/docker-images/build-all.sh

From 81299bba746abf59d420f1c492b9c406573429c9 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Tue, 19 Aug 2025 18:26:20 +0000
Subject: [PATCH 179/183] fork docker image creation for Linux and Windows

---
 .github/workflows/continuous-integration.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 4bed2db73b..bbcc491aed 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -180,11 +180,17 @@ jobs:
         with:
           working-directory: 'smithy-kotlin'
 
-      - name: Configure CRT Docker Images
+      - name: Configure Linux CRT Docker Images
         shell: bash
-        if: ${{ matrix.os != 'macos-latest' }}
+        if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
-          ./aws-crt-kotlin/docker-images/build-all.sh
+          ./aws-crt-kotlin/docker-images/build-images.sh linux-x64 linux-arm64
+
+      - name: Configure Windows CRT Docker Images
+        shell: bash
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+          ./aws-crt-kotlin/docker-images/build-images.sh mingw-x64
 
       - name: Sanity checks
         shell: bash

From 86bcee349b784d53e25c5bec8fa7ca84df3cf635 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Tue, 19 Aug 2025 18:37:17 +0000
Subject: [PATCH 180/183] disable docker images on Windows, install MSYS2

---
 .github/workflows/continuous-integration.yml | 22 ++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index bbcc491aed..4329168054 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -186,11 +186,14 @@ jobs:
         run: |
           ./aws-crt-kotlin/docker-images/build-images.sh linux-x64 linux-arm64
 
-      - name: Configure Windows CRT Docker Images
-        shell: bash
+      - name: Set up MSYS2
         if: ${{ matrix.os == 'windows-latest' }}
-        run: |
-          ./aws-crt-kotlin/docker-images/build-images.sh mingw-x64
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          install: >-
+            mingw-w64-x86_64-cmake
+            mingw-w64-x86_64-gcc
 
       - name: Sanity checks
         shell: bash
@@ -213,12 +216,23 @@ jobs:
           done
 
       - name: Test
+        if: ${{ matrix.os != 'windows-latest' }}
         working-directory: ./smithy-kotlin
         shell: bash
         run: |
           # FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
           # echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
           ./gradlew build
+
+      - name: Test on Windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        working-directory: ./smithy-kotlin
+        shell: msys2 {0}
+        run: |
+          # FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
+          # echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
+          ./gradlew build -Paws.crt.disableContainerTargets=mingw_x64
+
       - name: Save Test Reports
         if: failure()
         uses: actions/upload-artifact@v4

From c243d2caeef59d371e2e461d588c89d527943255 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Tue, 19 Aug 2025 18:58:54 +0000
Subject: [PATCH 181/183] dump debug info about native platform enablement

---
 runtime/build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts
index 731a30b8c9..7d47de4f94 100644
--- a/runtime/build.gradle.kts
+++ b/runtime/build.gradle.kts
@@ -3,9 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import aws.sdk.kotlin.gradle.dsl.configurePublishing
-import aws.sdk.kotlin.gradle.kmp.configureKmpTargets
-import aws.sdk.kotlin.gradle.kmp.kotlin
-import aws.sdk.kotlin.gradle.kmp.needsKmpConfigured
+import aws.sdk.kotlin.gradle.kmp.*
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest
 
@@ -33,6 +31,8 @@ subprojects {
         plugin(libraries.plugins.aws.kotlin.repo.tools.kmp.get().pluginId)
     }
 
+    println("Project $name: hasNative=$hasNative, NATIVE_ENABLED=$NATIVE_ENABLED")
+
     configurePublishing("smithy-kotlin", "smithy-lang")
     kotlin {
         explicitApi()

From 17ff94f11eda29b3c3fc14926eb189cf94d7a755 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Tue, 19 Aug 2025 20:11:27 +0000
Subject: [PATCH 182/183] configure KMP properly; handle duplicate resources

---
 runtime/build.gradle.kts | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts
index 7d47de4f94..9651d1b698 100644
--- a/runtime/build.gradle.kts
+++ b/runtime/build.gradle.kts
@@ -15,9 +15,6 @@ plugins {
 
 val sdkVersion: String by project
 
-// Apply KMP configuration from build plugin
-configureKmpTargets()
-
 // capture locally - scope issue with custom KMP plugin
 val libraries = libs
 
@@ -33,6 +30,9 @@ subprojects {
 
     println("Project $name: hasNative=$hasNative, NATIVE_ENABLED=$NATIVE_ENABLED")
 
+    // Apply KMP configuration from build plugin
+    configureKmpTargets()
+
     configurePublishing("smithy-kotlin", "smithy-lang")
     kotlin {
         explicitApi()
@@ -64,7 +64,11 @@ subprojects {
     kotlin.sourceSets.all {
         // Allow subprojects to use internal APIs
         // See https://kotlinlang.org/docs/reference/opt-in-requirements.html#opting-in-to-using-api
-        listOf("kotlin.RequiresOptIn", "kotlinx.cinterop.ExperimentalForeignApi").forEach { languageSettings.optIn(it) }
+        languageSettings.optIn("kotlin.RequiresOptIn")
+
+        if (!name.contains("metadata", ignoreCase = true)) {
+            languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi")
+        }
     }
 
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
@@ -118,6 +122,15 @@ subprojects {
     tasks.withType<KotlinNativeSimulatorTest> {
         enabled = false
     }
+
+    tasks.withType<ProcessResources> {
+        // FIXME this shouldn't be necessary but without it the following message is observed:
+        //  Execution failed for task ':runtime:auth:aws-signing-tests:metadataCommonMainProcessResources'.
+        //  > Entry aws-signing-test-suite/README.md is a duplicate but no duplicate handling strategy has been set.
+        //  Please refer to https://docs.gradle.org/8.14.2/dsl/org.gradle.api.tasks.Copy.html#org.gradle.api.tasks.Copy:duplicatesStrategy
+        //  for details.
+        duplicatesStrategy = DuplicatesStrategy.WARN
+    }
 }
 
 // configureIosSimulatorTasks()

From d25f39240b8cce0b1e630fad29abc5f3cb083416 Mon Sep 17 00:00:00 2001
From: Ian Botsford <83236726+ianbotsf@users.noreply.github.com>
Date: Tue, 19 Aug 2025 21:27:42 +0000
Subject: [PATCH 183/183] use latest version of repo tools which includes a KMP
 project config fix

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fc98abad61..87763f8e84 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin-version = "2.2.0"
 dokka-version = "2.0.0"
 
-aws-kotlin-repo-tools-version = "0.4.30-kn"
+aws-kotlin-repo-tools-version = "0.4.38"
 
 # libs
 coroutines-version = "1.10.2"