KTOR-7806 Logging: Format log like OkHttp client does

CHANGELOG.md

@@ -1,3 +1,16 @@
+# 3.0.3
+> Published 18 December 2024
+
+### Bugfixes
+* "Module not found" errors when executing browserProductionWebpack task since 3.0.2 ([KTOR-7912](https://youtrack.jetbrains.com/issue/KTOR-7912))
+* Darwin: "IllegalStateException: Content-Length mismatch" on requesting gzipped content ([KTOR-7943](https://youtrack.jetbrains.com/issue/KTOR-7943))
+* JS/WASM fails with "IllegalStateException: Content-Length mismatch" on requesting gzipped content ([KTOR-7934](https://youtrack.jetbrains.com/issue/KTOR-7934))
+* FormFieldLimit is overwritten by default arg ([KTOR-7946](https://youtrack.jetbrains.com/issue/KTOR-7946))
+* A Performance issue reading with ByteReadChannel.readUTF8LineTo request body ([KTOR-7941](https://youtrack.jetbrains.com/issue/KTOR-7941))
+* Installing HttpCache before ContentEncoding prevents response body to be decoded ([KTOR-7830](https://youtrack.jetbrains.com/issue/KTOR-7830))
+* TestApplication.stop() doesn't stop the application anymore ([KTOR-7682](https://youtrack.jetbrains.com/issue/KTOR-7682))
+* File is not commited after closing writeChannel() of the file ([KTOR-7845](https://youtrack.jetbrains.com/issue/KTOR-7845))
+
 # 3.0.2
 > Published 3 December 2024
 

gradle/libs.versions.toml

@@ -3,15 +3,15 @@
 kotlin = "2.0.21"
 kotlinx-html = "0.11.0"
 kotlinx-datetime = "0.6.1"
-kotlinx-io = "0.5.4"
+kotlinx-io = "0.6.0"
 coroutines = "1.9.0"
 atomicfu = "0.26.1"
 serialization = "1.7.3"
-binaryCompatibilityValidator = "0.16.3"
+binaryCompatibilityValidator = "0.17.0"
 dokka = "1.9.20"
 kover = "0.9.0"
 ktlint = "4.5.0"
-kotlinx-browser = "0.2"
+kotlinx-browser = "0.3"
 
 # Used for test server in buildSrc
 ktor = "3.1.0-eap-1190"
@@ -40,21 +40,21 @@ jackson = "2.18.2"
 
 junit = "5.11.4"
 slf4j = "2.0.16"
-logback = "1.5.12"
+logback = "1.5.15"
 
 dropwizard = "4.2.29"
 micrometer = "1.14.1"
 
 jansi = "2.4.1"
 typesafe = "1.4.3"
 
-mockk = "1.13.13"
+mockk = "1.13.14"
 
 java-jwt = "4.4.0"
 
 jwks-rsa = "0.22.1"
 mustache = "0.9.14"
-freemarker = "2.3.33"
+freemarker = "2.3.34"
 pebble = "3.2.2"
 velocity = "2.4.1"
 velocity-tools = "3.1"
@@ -70,8 +70,8 @@ ws = "8.18.0"
 xmlutil = "0.90.3"
 yamlkt = "0.13.0"
 
-swagger-codegen = "3.0.64"
-swagger-codegen-generators = "1.0.54"
+swagger-codegen = "3.0.66"
+swagger-codegen-generators = "1.0.55"
 swagger-parser = "2.1.24"
 
 puppeteer = "21.5.0"

ktor-client/ktor-client-core/common/src/io/ktor/client/plugins/internal/ByteChannelReplay.kt

@@ -23,14 +23,16 @@ internal class ByteChannelReplay(private val origin: ByteReadChannel) {
         if (copyTask == null) {
             copyTask = CopyFromSourceTask()
             if (!content.compareAndSet(null, copyTask)) {
-                copyTask = content.value
+                // second thread, read from copy
+                copyTask = content.value!!
             } else {
+                // first thread, read from origin
                 return copyTask.start()
             }
         }
 
         return GlobalScope.writer {
-            val body = copyTask!!.awaitImpatiently()
+            val body = copyTask.awaitImpatiently()
             channel.writeFully(body)
         }.channel
     }
@@ -44,12 +46,9 @@ internal class ByteChannelReplay(private val origin: ByteReadChannel) {
     private inner class CopyFromSourceTask(
         val savedResponse: CompletableDeferred<ByteArray> = CompletableDeferred()
     ) {
-        lateinit var writerJob: WriterJob
+        private val writerJob: WriterJob by lazy { receiveBody() }
 
-        fun start(): ByteReadChannel {
-            writerJob = receiveBody()
-            return writerJob.channel
-        }
+        fun start() = writerJob.channel
 
         @OptIn(DelicateCoroutinesApi::class)
         fun receiveBody(): WriterJob = GlobalScope.writer(Dispatchers.Unconfined) {

ktor-client/ktor-client-core/common/test/ByteChannelReplayTest.kt

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+import io.ktor.client.plugins.internal.*
+import io.ktor.utils.io.*
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.yield
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+internal class ByteChannelReplayTest {
+
+    private val size = 1024 * 1024 + 1
+    private val expectedByte = 'A'.code.toByte()
+    private val expected = ByteArray(size).apply { fill(expectedByte) }
+    private lateinit var channelReplay: ByteChannelReplay
+
+    @BeforeTest
+    fun setup() {
+        channelReplay = ByteChannelReplay(ByteReadChannel(expected))
+    }
+
+    @Test
+    fun readFirst() = runTest {
+        val first = channelReplay.replay()
+        assertRead(first)
+        val second = channelReplay.replay()
+        assertRead(second)
+    }
+
+    @Test
+    fun readSecond() = runTest {
+        val first = channelReplay.replay()
+        val second = channelReplay.replay()
+        assertRead(second)
+        assertTrue(first.isClosedForRead)
+    }
+
+    @Test
+    fun readABunch() = runTest {
+        val jobs = (0..10).map {
+            launch {
+                val readChannel = channelReplay.replay()
+                yield()
+                try {
+                    assertRead(readChannel)
+                } catch (e: Exception) {
+                    assertEquals("Save body abandoned", e.message)
+                }
+            }
+        }
+        joinAll(*jobs.toTypedArray())
+    }
+
+    private suspend fun assertRead(readChannel: ByteReadChannel) {
+        repeat(size) { i ->
+            assertEquals(expectedByte, readChannel.readByte(), "Incorrect byte at index $i")
+        }
+        assertTrue(readChannel.isClosedForRead || readChannel.exhausted())
+    }
+}

ktor-client/ktor-client-plugins/ktor-client-logging/build.gradle.kts

@@ -22,6 +22,7 @@ kotlin.sourceSets {
     jvmTest {
         dependencies {
             api(project(":ktor-shared:ktor-serialization:ktor-serialization-jackson"))
+            api(project(":ktor-client:ktor-client-plugins:ktor-client-encoding"))
         }
     }
 }