Split request body channel on the client's scope

ktorio · Dec 25, 2024 · 4719f74 · 4719f74
1 parent 8631e50
commit 4719f74
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/...r-client-plugins/ktor-client-logging/common/src/io/ktor/client/plugins/logging/Logging.kt b/...r-client-plugins/ktor-client-logging/common/src/io/ktor/client/plugins/logging/Logging.kt
@@ -184,7 +184,7 @@ public val Logging: ClientPlugin<LoggingConfig> = createClientPlugin("Logging",
                 null
             }
             is OutgoingContent.ReadChannelContent -> {
-                val (origChannel, newChannel) = content.readFrom().split(GlobalScope)
+                val (origChannel, newChannel) = content.readFrom().split(client)
                 logRequestBody(content, content.contentLength, headers, method, newChannel)
                 LoggedContent(content, origChannel)
             }
@@ -193,7 +193,7 @@ public val Logging: ClientPlugin<LoggingConfig> = createClientPlugin("Logging",
                 content.writeTo(channel)
                 channel.close()
 
-                val (origChannel, newChannel) = channel.split(GlobalScope)
+                val (origChannel, newChannel) = channel.split(client)
                 logRequestBody(content, content.contentLength, headers, method, newChannel)
                 LoggedContent(content, origChannel)
             }

diff --git a/...ient-plugins/ktor-client-logging/jvm/test/io/ktor/client/plugins/logging/NewFormatTest.kt b/...ient-plugins/ktor-client-logging/jvm/test/io/ktor/client/plugins/logging/NewFormatTest.kt
@@ -673,9 +673,6 @@ class NewFormatTest {
             .assertNoMoreLogs()
     }
 
-    // TODO: Test cancellation while logging the request (GlobalScope splitting)
-    // TODO: Test consumption of request body
-
     @Test
     fun bodyPostBinaryReadChannel() = testWithLevel(LogLevel.BODY, handle = { respondWithLength() }) { client ->
         client.post("/") {