fix: preserve logging conext for streaming body signing

ianbotsf · ianbotsf · commit fdc26596ff51 · 2025-11-25T00:55:59.000Z
diff --git a/.changes/15fd2749-fec2-4e7a-9639-3683fa5e94ed.json b/.changes/15fd2749-fec2-4e7a-9639-3683fa5e94ed.json
@@ -0,0 +1,5 @@
+{
+    "id": "15fd2749-fec2-4e7a-9639-3683fa5e94ed",
+    "type": "bugfix",
+    "description": "Preserve logging context for streaming payload signing"
+}
diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/eventstream/EventStreamSerializerGenerator.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/eventstream/EventStreamSerializerGenerator.kt
@@ -11,7 +11,10 @@ import software.amazon.smithy.kotlin.codegen.core.*
 import software.amazon.smithy.kotlin.codegen.lang.KotlinTypes
 import software.amazon.smithy.kotlin.codegen.model.*
 import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
-import software.amazon.smithy.kotlin.codegen.rendering.serde.*
+import software.amazon.smithy.kotlin.codegen.rendering.serde.StructuredDataSerializerGenerator
+import software.amazon.smithy.kotlin.codegen.rendering.serde.bodySerializer
+import software.amazon.smithy.kotlin.codegen.rendering.serde.bodySerializerName
+import software.amazon.smithy.kotlin.codegen.rendering.serde.serializerName
 import software.amazon.smithy.kotlin.codegen.utils.getOrNull
 import software.amazon.smithy.model.shapes.*
 import software.amazon.smithy.model.traits.EventHeaderTrait
@@ -110,7 +113,7 @@ class EventStreamSerializerGenerator(
         }
 
         writer.write("")
-        writer.write("return messages.#T(context)", RuntimeTypes.AwsEventStream.asEventStreamHttpBody)
+        writer.write("return messages.#T()", RuntimeTypes.AwsEventStream.asEventStreamHttpBody)
     }
 
     private fun encodeEventStreamMessage(
diff --git a/runtime/auth/aws-signing-common/api/aws-signing-common.api b/runtime/auth/aws-signing-common/api/aws-signing-common.api
@@ -22,6 +22,8 @@ public final class aws/smithy/kotlin/runtime/auth/awssigning/AwsChunkedByteReadC
 public final class aws/smithy/kotlin/runtime/auth/awssigning/AwsChunkedSource : aws/smithy/kotlin/runtime/io/SdkSource {
 	public fun <init> (Laws/smithy/kotlin/runtime/io/SdkSource;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/SdkSource;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
+	public fun <init> (Laws/smithy/kotlin/runtime/io/SdkSource;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig;[BLaws/smithy/kotlin/runtime/http/DeferredHeaders;Lkotlin/coroutines/CoroutineContext;)V
+	public synthetic fun <init> (Laws/smithy/kotlin/runtime/io/SdkSource;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig;[BLaws/smithy/kotlin/runtime/http/DeferredHeaders;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun close ()V
 	public fun read (Laws/smithy/kotlin/runtime/io/SdkBuffer;J)J
 }
@@ -205,6 +207,7 @@ public final class aws/smithy/kotlin/runtime/auth/awssigning/internal/AwsChunked
 	public static final fun getUseAwsChunkedEncoding (Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig;)Z
 	public static final fun isEligibleForAwsChunkedStreaming (Laws/smithy/kotlin/runtime/http/HttpBody;)Z
 	public static final fun setAwsChunkedBody (Laws/smithy/kotlin/runtime/http/request/HttpRequestBuilder;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig;[BLaws/smithy/kotlin/runtime/http/DeferredHeaders;)V
+	public static final fun setAwsChunkedBody (Laws/smithy/kotlin/runtime/http/request/HttpRequestBuilder;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigner;Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningConfig;[BLaws/smithy/kotlin/runtime/http/DeferredHeaders;Lkotlin/coroutines/CoroutineContext;)V
 	public static final fun setAwsChunkedHeaders (Laws/smithy/kotlin/runtime/http/request/HttpRequestBuilder;)V
 }
 
diff --git a/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsChunkedSource.kt b/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/AwsChunkedSource.kt
@@ -5,12 +5,15 @@
 package aws.smithy.kotlin.runtime.auth.awssigning
 
 import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.PlannedRemoval
 import aws.smithy.kotlin.runtime.auth.awssigning.internal.AwsChunkedReader
 import aws.smithy.kotlin.runtime.http.DeferredHeaders
 import aws.smithy.kotlin.runtime.io.SdkBuffer
 import aws.smithy.kotlin.runtime.io.SdkSource
 import aws.smithy.kotlin.runtime.io.buffer
 import kotlinx.coroutines.runBlocking
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
 
 /**
  * aws-chunked content encoding.
@@ -31,7 +34,25 @@ public class AwsChunkedSource(
     signingConfig: AwsSigningConfig,
     previousSignature: ByteArray,
     trailingHeaders: DeferredHeaders = DeferredHeaders.Empty,
+    private val coroutineContext: CoroutineContext,
 ) : SdkSource {
+    @Deprecated(
+        "This overload causes `runBlocking` to be called without a CoroutineContext which leads to forgetting " +
+                "logging context. This overload will be removed in minor version 1.7.",
+        ReplaceWith(
+            "AwsChunkedSource(delegate, signer, signingConfig, previousSignature, trailingHeaders, coroutineContext)",
+            "kotlin.coroutines.coroutineContext",
+        ),
+    )
+    @PlannedRemoval(major = 1, minor = 7)
+    public constructor(
+        delegate: SdkSource,
+        signer: AwsSigner,
+        signingConfig: AwsSigningConfig,
+        previousSignature: ByteArray,
+        trailingHeaders: DeferredHeaders = DeferredHeaders.Empty,
+    ) : this(delegate, signer, signingConfig, previousSignature, trailingHeaders, EmptyCoroutineContext)
+
     private val chunkReader = AwsChunkedReader(
         delegate.asStream(),
         signer,
@@ -43,7 +64,7 @@ public class AwsChunkedSource(
     override fun read(sink: SdkBuffer, limit: Long): Long {
         require(limit >= 0L) { "Invalid limit ($limit) must be >= 0L" }
         // COROUTINE SAFETY: runBlocking is allowed here because SdkSource is a synchronous blocking interface
-        val isChunkValid = runBlocking {
+        val isChunkValid = runBlocking(coroutineContext) {
             chunkReader.ensureValidChunk()
         }
         if (!isChunkValid) return -1L
diff --git a/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/internal/AwsChunkedUtil.kt b/runtime/auth/aws-signing-common/common/src/aws/smithy/kotlin/runtime/auth/awssigning/internal/AwsChunkedUtil.kt
@@ -7,10 +7,13 @@ package aws.smithy.kotlin.runtime.auth.awssigning.internal
 
 import aws.smithy.kotlin.runtime.ClientException
 import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.PlannedRemoval
 import aws.smithy.kotlin.runtime.auth.awssigning.*
 import aws.smithy.kotlin.runtime.http.*
 import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.io.SdkBuffer
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
 
 /**
  * Chunk size used by Transfer-Encoding `aws-chunked`
@@ -76,8 +79,34 @@ public fun HttpRequestBuilder.setAwsChunkedHeaders() {
 /**
  * Update the HTTP body to use aws-chunked content encoding
  */
+@Deprecated(
+    "This overload causes `runBlocking` to be called without a CoroutineContext which leads to forgetting logging " +
+            "context. This overload will be removed in minor version 1.7.",
+    ReplaceWith(
+        "AwsChunkedSource(delegate, signer, signingConfig, previousSignature, trailingHeaders, coroutineContext)",
+        "kotlin.coroutines.coroutineContext",
+    ),
+)
+@PlannedRemoval(major = 1, minor = 7)
 @InternalApi
-public fun HttpRequestBuilder.setAwsChunkedBody(signer: AwsSigner, signingConfig: AwsSigningConfig, signature: ByteArray, trailingHeaders: DeferredHeaders) {
+public fun HttpRequestBuilder.setAwsChunkedBody(
+    signer: AwsSigner,
+    signingConfig: AwsSigningConfig,
+    signature: ByteArray,
+    trailingHeaders: DeferredHeaders,
+): Unit = setAwsChunkedBody(signer, signingConfig, signature, trailingHeaders, EmptyCoroutineContext)
+
+/**
+ * Update the HTTP body to use aws-chunked content encoding
+ */
+@InternalApi
+public fun HttpRequestBuilder.setAwsChunkedBody(
+    signer: AwsSigner,
+    signingConfig: AwsSigningConfig,
+    signature: ByteArray,
+    trailingHeaders: DeferredHeaders,
+    coroutineContext: CoroutineContext,
+) {
     body = when (body) {
         is HttpBody.ChannelContent -> AwsChunkedByteReadChannel(
             checkNotNull(body.toSdkByteReadChannel()),
@@ -93,6 +122,7 @@ public fun HttpRequestBuilder.setAwsChunkedBody(signer: AwsSigner, signingConfig
             signingConfig,
             signature,
             trailingHeaders,
+            coroutineContext,
         ).toHttpBody(-1)
 
         else -> throw ClientException("HttpBody type is not supported")
diff --git a/runtime/auth/aws-signing-tests/common/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/AwsChunkedByteReadChannelTestBase.kt b/runtime/auth/aws-signing-tests/common/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/AwsChunkedByteReadChannelTestBase.kt
@@ -5,18 +5,42 @@
 
 package aws.smithy.kotlin.runtime.auth.awssigning.tests
 
-import aws.smithy.kotlin.runtime.auth.awssigning.*
+import aws.smithy.kotlin.runtime.auth.awssigning.AwsChunkedByteReadChannel
+import aws.smithy.kotlin.runtime.auth.awssigning.AwsSigner
+import aws.smithy.kotlin.runtime.auth.awssigning.AwsSigningConfig
 import aws.smithy.kotlin.runtime.auth.awssigning.internal.CHUNK_SIZE_BYTES
+import aws.smithy.kotlin.runtime.http.DeferredHeaders
 import aws.smithy.kotlin.runtime.io.*
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.TestResult
 import kotlinx.coroutines.test.runTest
 import kotlin.random.Random
-import kotlin.test.*
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 import kotlin.time.Duration.Companion.milliseconds
 
-abstract class AwsChunkedByteReadChannelTestBase : AwsChunkedTestBase(AwsChunkedReaderFactory.Channel) {
+private val chunkedChannelFactory = object : AwsChunkedReaderFactory {
+    override fun create(
+        data: ByteArray,
+        signer: AwsSigner,
+        signingConfig: AwsSigningConfig,
+        previousSignature: ByteArray,
+        trailingHeaders: DeferredHeaders,
+    ): AwsChunkedTestReader {
+
+        val ch = SdkByteReadChannel(data)
+        val chunked = AwsChunkedByteReadChannel(ch, signer, signingConfig, previousSignature, trailingHeaders)
+        return object : AwsChunkedTestReader {
+            override fun isClosedForRead(): Boolean = chunked.isClosedForRead
+            override suspend fun read(sink: SdkBuffer, limit: Long): Long = chunked.read(sink, limit)
+            override fun close() = Unit
+        }
+    }
+}
+
+abstract class AwsChunkedByteReadChannelTestBase : AwsChunkedTestBase(chunkedChannelFactory) {
     @Test
     fun testSlowProducerMultipleChunksPartialLast(): TestResult = runTest {
         val numChunks = 6
diff --git a/runtime/auth/aws-signing-tests/common/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/AwsChunkedSourceTestBase.kt b/runtime/auth/aws-signing-tests/common/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/AwsChunkedSourceTestBase.kt
@@ -4,22 +4,44 @@
  */
 
 package aws.smithy.kotlin.runtime.auth.awssigning.tests
+
 import aws.smithy.kotlin.runtime.auth.awssigning.AwsChunkedSource
+import aws.smithy.kotlin.runtime.auth.awssigning.AwsSigner
+import aws.smithy.kotlin.runtime.auth.awssigning.AwsSigningConfig
+import aws.smithy.kotlin.runtime.http.DeferredHeaders
 import aws.smithy.kotlin.runtime.io.SdkBuffer
 import aws.smithy.kotlin.runtime.io.source
+import kotlinx.coroutines.Dispatchers
 
-val AwsChunkedReaderFactory.Companion.Source: AwsChunkedReaderFactory
-    get() = AwsChunkedReaderFactory { data, signer, signingConfig, previousSignature, trailingHeaders ->
+private val chunkedSourceFactory = object : AwsChunkedReaderFactory {
+    override fun create(
+        data: ByteArray,
+        signer: AwsSigner,
+        signingConfig: AwsSigningConfig,
+        previousSignature: ByteArray,
+        trailingHeaders: DeferredHeaders
+    ): AwsChunkedTestReader {
         val source = data.source()
-        val chunked = AwsChunkedSource(source, signer, signingConfig, previousSignature, trailingHeaders)
-        object : AwsChunkedTestReader {
+        val chunked = AwsChunkedSource(
+            source,
+            signer,
+            signingConfig,
+            previousSignature,
+            trailingHeaders,
+            Dispatchers.IO, // Cannot use default TestDispatcher because it doesn't support parallelism and causes hangs
+        )
+        return object : AwsChunkedTestReader {
             override fun isClosedForRead(): Boolean {
                 val sink = SdkBuffer()
                 val rc = chunked.read(sink, Long.MAX_VALUE)
                 return rc == -1L
             }
             override suspend fun read(sink: SdkBuffer, limit: Long): Long = chunked.read(sink, limit)
+            override fun close() {
+                source.close()
+            }
         }
     }
+}
 
-public abstract class AwsChunkedSourceTestBase : AwsChunkedTestBase(AwsChunkedReaderFactory.Source)
+abstract class AwsChunkedSourceTestBase : AwsChunkedTestBase(chunkedSourceFactory)
diff --git a/runtime/auth/aws-signing-tests/common/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/AwsChunkedTestBase.kt b/runtime/auth/aws-signing-tests/common/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/AwsChunkedTestBase.kt
@@ -5,11 +5,15 @@
 
 package aws.smithy.kotlin.runtime.auth.awssigning.tests
 
-import aws.smithy.kotlin.runtime.auth.awssigning.*
+import aws.smithy.kotlin.runtime.auth.awssigning.AwsSignatureType
+import aws.smithy.kotlin.runtime.auth.awssigning.AwsSigner
+import aws.smithy.kotlin.runtime.auth.awssigning.AwsSigningConfig
+import aws.smithy.kotlin.runtime.auth.awssigning.HashSpecification
 import aws.smithy.kotlin.runtime.auth.awssigning.internal.CHUNK_SIZE_BYTES
 import aws.smithy.kotlin.runtime.http.DeferredHeaders
 import aws.smithy.kotlin.runtime.http.toHeaders
-import aws.smithy.kotlin.runtime.io.*
+import aws.smithy.kotlin.runtime.io.Closeable
+import aws.smithy.kotlin.runtime.io.SdkBuffer
 import aws.smithy.kotlin.runtime.time.Instant
 import kotlinx.coroutines.test.TestResult
 import kotlinx.coroutines.test.runTest
@@ -18,40 +22,22 @@ import kotlin.random.Random
 import kotlin.test.*
 import kotlin.time.Duration.Companion.seconds
 
-interface AwsChunkedTestReader {
+interface AwsChunkedTestReader : Closeable {
     // This may modify the chunked reader state and cause loss of data!
     fun isClosedForRead(): Boolean
     suspend fun read(sink: SdkBuffer, limit: Long): Long
 }
 
-fun interface AwsChunkedReaderFactory {
-    companion object {
-        val Channel = AwsChunkedReaderFactory { data, signer, signingConfig, previousSignature, trailingHeaders ->
-            val ch = SdkByteReadChannel(data)
-            val chunked = AwsChunkedByteReadChannel(ch, signer, signingConfig, previousSignature, trailingHeaders)
-            object : AwsChunkedTestReader {
-                override fun isClosedForRead(): Boolean = chunked.isClosedForRead
-                override suspend fun read(sink: SdkBuffer, limit: Long): Long = chunked.read(sink, limit)
-            }
-        }
-    }
-
+interface AwsChunkedReaderFactory {
     fun create(
         data: ByteArray,
         signer: AwsSigner,
         signingConfig: AwsSigningConfig,
         previousSignature: ByteArray,
-        trailingHeaders: DeferredHeaders,
+        trailingHeaders: DeferredHeaders = DeferredHeaders.Empty,
     ): AwsChunkedTestReader
 }
 
-fun AwsChunkedReaderFactory.create(
-    data: ByteArray,
-    signer: AwsSigner,
-    signingConfig: AwsSigningConfig,
-    previousSignature: ByteArray,
-): AwsChunkedTestReader = create(data, signer, signingConfig, previousSignature, DeferredHeaders.Empty)
-
 private val CHUNK_SIGNATURE_REGEX = Regex("chunk-signature=[a-zA-Z0-9]{64}") // alphanumeric, length of 64
 private val CHUNK_SIZE_REGEX = Regex("[0-9a-f]+;chunk-signature=") // hexadecimal, any length, immediately followed by the chunk signature
 private val UNSIGNED_CHUNK_SIZE_REGEX = Regex("[0-9a-f]+\r\n")
diff --git a/runtime/auth/http-auth-aws/common/src/aws/smithy/kotlin/runtime/http/auth/AwsHttpSigner.kt b/runtime/auth/http-auth-aws/common/src/aws/smithy/kotlin/runtime/http/auth/AwsHttpSigner.kt
@@ -19,6 +19,7 @@ import aws.smithy.kotlin.runtime.http.operation.HttpOperationContext
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
 import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.time.Instant
+import kotlin.coroutines.coroutineContext
 import kotlin.time.Duration
 
 /**
@@ -195,6 +196,7 @@ public class AwsHttpSigner(private val config: Config) : HttpSigner {
                 signingConfig,
                 signingResult.signature,
                 request.trailingHeaders.build(),
+                coroutineContext,
             )
         }
     }
diff --git a/runtime/protocol/aws-event-stream/api/aws-event-stream.api b/runtime/protocol/aws-event-stream/api/aws-event-stream.api
@@ -12,6 +12,7 @@ public final class aws/smithy/kotlin/runtime/awsprotocol/eventstream/FrameDecode
 }
 
 public final class aws/smithy/kotlin/runtime/awsprotocol/eventstream/FrameEncoderKt {
+	public static final fun asEventStreamHttpBody (Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun asEventStreamHttpBody (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun encode (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
 }
diff --git a/runtime/protocol/aws-event-stream/common/src/aws/smithy/kotlin/runtime/awsprotocol/eventstream/FrameEncoder.kt b/runtime/protocol/aws-event-stream/common/src/aws/smithy/kotlin/runtime/awsprotocol/eventstream/FrameEncoder.kt
@@ -6,6 +6,7 @@
 package aws.smithy.kotlin.runtime.awsprotocol.eventstream
 
 import aws.smithy.kotlin.runtime.InternalApi
+import aws.smithy.kotlin.runtime.PlannedRemoval
 import aws.smithy.kotlin.runtime.http.HttpBody
 import aws.smithy.kotlin.runtime.io.SdkBuffer
 import aws.smithy.kotlin.runtime.io.SdkByteChannel
@@ -15,6 +16,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import kotlin.coroutines.coroutineContext
 
 /**
  * Transform the stream of messages into a stream of raw bytes. Each
@@ -31,10 +33,22 @@ public fun Flow<Message>.encode(): Flow<SdkBuffer> = map {
  * Transform a stream of encoded messages into an [HttpBody].
  * @param scope parent scope to launch a coroutine in that consumes the flow and populates a [SdkByteReadChannel]
  */
+@Deprecated(
+    "This overload takes a `CoroutineScope` argument which is now ignored. This overload will be removed in minor version 1.7.",
+    ReplaceWith("asEventStreamHttpBody()"),
+)
+@PlannedRemoval(major = 1, minor = 7)
 @InternalApi
-public suspend fun Flow<SdkBuffer>.asEventStreamHttpBody(scope: CoroutineScope): HttpBody {
+public suspend fun Flow<SdkBuffer>.asEventStreamHttpBody(scope: CoroutineScope): HttpBody = asEventStreamHttpBody()
+
+/**
+ * Transform a stream of encoded messages into an [HttpBody].
+ */
+@InternalApi
+public suspend fun Flow<SdkBuffer>.asEventStreamHttpBody(): HttpBody {
     val encodedMessages = this
     val ch = SdkByteChannel(true)
+    val ctx = coroutineContext
 
     return object : HttpBody.ChannelContent() {
         override val contentLength: Long? = null
@@ -47,7 +61,7 @@ public suspend fun Flow<SdkBuffer>.asEventStreamHttpBody(scope: CoroutineScope):
             // Although rare, nothing stops downstream consumers from invoking readFrom() more than once.
             // Only launch background collection task on first call
             if (job == null) {
-                job = scope.launch {
+                job = CoroutineScope(ctx).launch {
                     encodedMessages.collect {
                         ch.write(it)
                     }
diff --git a/runtime/protocol/aws-event-stream/common/test/aws/smithy/kotlin/runtime/awsprotocol/eventstream/FrameEncoderTest.kt b/runtime/protocol/aws-event-stream/common/test/aws/smithy/kotlin/runtime/awsprotocol/eventstream/FrameEncoderTest.kt
@@ -50,7 +50,7 @@ class FrameEncoderTest {
             "baz",
         ).map { SdkBuffer().apply { writeUtf8(it) } }
 
-        val body = messages.asEventStreamHttpBody(this)
+        val body = messages.asEventStreamHttpBody()
         val actual = body.readAll()
         val expected = "foobarbaz"
         assertEquals(expected, actual?.decodeToString())

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import aws.smithy.kotlin.runtime.http.operation.HttpOperationContext`
`19`	`19`	`import aws.smithy.kotlin.runtime.http.request.HttpRequest`
`20`	`20`	`import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder`
`21`	`21`	`import aws.smithy.kotlin.runtime.time.Instant`
	`22`	`+import kotlin.coroutines.coroutineContext`
`22`	`23`	`import kotlin.time.Duration`
`23`	`24`
`24`	`25`	`/**`
`@@ -195,6 +196,7 @@ public class AwsHttpSigner(private val config: Config) : HttpSigner {`
`195`	`196`	`signingConfig,`
`196`	`197`	`signingResult.signature,`
`197`	`198`	`request.trailingHeaders.build(),`
	`199`	`+ coroutineContext,`
`198`	`200`	`)`
`199`	`201`	`}`
`200`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public final class aws/smithy/kotlin/runtime/awsprotocol/eventstream/FrameDecode`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public final class aws/smithy/kotlin/runtime/awsprotocol/eventstream/FrameEncoderKt {`
	`15`	`+ public static final fun asEventStreamHttpBody (Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;`
`15`	`16`	`public static final fun asEventStreamHttpBody (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;`
`16`	`17`	`public static final fun encode (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;`
`17`	`18`	`}`