fix logs in kotlin app

m.zharinova · m.zharinova · commit 2b3b86b20f09 · 2025-05-02T18:47:49.000+05:00
diff --git a/.kotlin/errors/errors-1746001177744.log b/.kotlin/errors/errors-1746001177744.log
@@ -0,0 +1,4 @@
+kotlin version: 2.0.21
+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
+    1. Kotlin compile daemon is ready
+
diff --git a/buildSrc/src/main/kotlin/sb-ot-demo.java-compile.gradle.kts b/buildSrc/src/main/kotlin/sb-ot-demo.java-compile.gradle.kts
@@ -1,20 +1,18 @@
+/*
+ * Copyright (c) 2020-2025. Ivan Vakhrushev and others.
+ * https://github.com/mfvanek/spring-boot-open-telemetry-demo
+ *
+ * Licensed under the Apache License 2.0
+ */
+
 import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.check
-import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.checkstyleMain
-import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.checkstyleTest
-import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.implementation
-import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.jacoco
 import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.jacocoTestCoverageVerification
 import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.jacocoTestReport
 import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.java
 import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.osdetector
-import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.pmdMain
-import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.pmdTest
-import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.spotbugsMain
-import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.spotbugsTest
 import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.test
 import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.testImplementation
 import gradle.kotlin.dsl.accessors._82e33fab8c067a1df5c2e280e32692b4.testRuntimeOnly
-import net.ltgt.gradle.errorprone.errorprone
 
 plugins {
     id("java")
diff --git a/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/Application.kt b/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/Application.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2020-2025. Ivan Vakhrushev and others.
+ * https://github.com/mfvanek/spring-boot-open-telemetry-demo
+ *
+ * Licensed under the Apache License 2.0
+ */
+
 package io.github.mfvanek.spring.boot3.kotlin.test
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
diff --git a/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/HomeController.kt b/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/HomeController.kt
@@ -4,6 +4,7 @@
  *
  * Licensed under the Apache License 2.0
  */
+
 package io.github.mfvanek.spring.boot3.kotlin.test
 
 import org.springframework.web.bind.annotation.GetMapping
diff --git a/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/RedirectController.kt b/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/RedirectController.kt
@@ -4,14 +4,15 @@
  *
  * Licensed under the Apache License 2.0
  */
+
 package io.github.mfvanek.spring.boot3.kotlin.test
 
+import java.net.URI
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RestController
-import java.net.URI
 
 @RestController
 class RedirectController {
diff --git a/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/TimeController.kt b/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/TimeController.kt
@@ -33,7 +33,7 @@ class TimeController(
         val nowFromRemote = publicApiService.getZonedTime()
         val now = nowFromRemote ?: LocalDateTime.now(clock)
         kafkaSendingService.sendNotification("Current time = $now")
-            .thenRun { logger.info("Awaiting acknowledgement from Kafka") }
+            .thenRun { logger.info{"Awaiting acknowledgement from Kafka"} }
             .get()
         return now
     }
diff --git a/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/config/ClockConfig.kt b/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/config/ClockConfig.kt
@@ -4,6 +4,7 @@
  *
  * Licensed under the Apache License 2.0
  */
+
 package io.github.mfvanek.spring.boot3.kotlin.test.config
 
 import org.springframework.context.annotation.Bean
diff --git a/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/config/OpenTelemetryConfig.kt b/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/config/OpenTelemetryConfig.kt
@@ -4,6 +4,7 @@
  *
  * Licensed under the Apache License 2.0
  */
+
 package io.github.mfvanek.spring.boot3.kotlin.test.config
 
 import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter
diff --git a/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/config/SecurityConfig.kt b/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/config/SecurityConfig.kt
@@ -4,6 +4,7 @@
  *
  * Licensed under the Apache License 2.0
  */
+
 package io.github.mfvanek.spring.boot3.kotlin.test.config
 
 import org.springframework.context.annotation.Bean
diff --git a/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/config/WebClientConfig.kt b/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/config/WebClientConfig.kt
@@ -4,6 +4,7 @@
  *
  * Licensed under the Apache License 2.0
  */
+
 package io.github.mfvanek.spring.boot3.kotlin.test.config
 
 import org.springframework.beans.factory.annotation.Value
@@ -18,6 +19,6 @@ class WebClientConfig {
 
     @Bean
     fun webClient(builder: WebClient.Builder): WebClient = builder
-            .baseUrl(external)
-            .build()
+        .baseUrl(external)
+        .build()
 }
diff --git a/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/service/KafkaReadingService.kt b/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/service/KafkaReadingService.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2020-2025. Ivan Vakhrushev and others.
+ * https://github.com/mfvanek/spring-boot-open-telemetry-demo
+ *
+ * Licensed under the Apache License 2.0
+ */
+
 package io.github.mfvanek.spring.boot3.kotlin.test.service
 
 import io.github.oshai.kotlinlogging.KotlinLogging
diff --git a/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/service/KafkaSendingService.kt b/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/service/KafkaSendingService.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2020-2025. Ivan Vakhrushev and others.
+ * https://github.com/mfvanek/spring-boot-open-telemetry-demo
+ *
+ * Licensed under the Apache License 2.0
+ */
+
 package io.github.mfvanek.spring.boot3.kotlin.test.service
 
 import io.github.oshai.kotlinlogging.KotlinLogging
diff --git a/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/service/PublicApiService.kt b/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/service/PublicApiService.kt
@@ -59,7 +59,7 @@ class PublicApiService(
             .doBeforeRetry { retrySignal: Retry.RetrySignal ->
                 withLoggingContext("instance_timezone" to zoneName) {
                     logger.info {
-                        "Retrying request to '/$zoneName', attempt ${retrySignal.totalRetries() + 1}/${retrySignal.failure()} due to error:"
+                        "Retrying request to '/$zoneName', attempt ${retrySignal.totalRetries() + 1}/$retries due to error: ${retrySignal.failure()}"
                     }
                 }
             }
diff --git a/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/service/dto/CurrentTime.kt b/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/service/dto/CurrentTime.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2020-2025. Ivan Vakhrushev and others.
+ * https://github.com/mfvanek/spring-boot-open-telemetry-demo
+ *
+ * Licensed under the Apache License 2.0
+ */
+
 package io.github.mfvanek.spring.boot3.kotlin.test.service.dto
 
 data class CurrentTime (
diff --git a/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/service/dto/ParsedDateTime.kt b/spring-boot-3-demo-app-kotlin/src/main/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/service/dto/ParsedDateTime.kt
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2020-2025. Ivan Vakhrushev and others.
+ * https://github.com/mfvanek/spring-boot-open-telemetry-demo
+ *
+ * Licensed under the Apache License 2.0
+ */
+
 package io.github.mfvanek.spring.boot3.kotlin.test.service.dto
 
 import java.time.LocalDateTime
diff --git a/spring-boot-3-demo-app-kotlin/src/test/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/controllers/TimeControllerTest.kt b/spring-boot-3-demo-app-kotlin/src/test/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/controllers/TimeControllerTest.kt
@@ -2,6 +2,16 @@ package io.github.mfvanek.spring.boot3.kotlin.test.controllers
 
 import io.github.mfvanek.spring.boot3.kotlin.test.filters.TraceIdInResponseServletFilter.Companion.TRACE_ID_HEADER_NAME
 import io.github.mfvanek.spring.boot3.kotlin.test.service.dto.toParsedDateTime
+import io.github.mfvanek.spring.boot3.kotlin.test.support.KafkaInitializer
+import io.github.mfvanek.spring.boot3.kotlin.test.support.TestBase
+import java.nio.charset.StandardCharsets
+import java.time.Duration
+import java.time.LocalDateTime
+import java.util.Locale
+import java.util.UUID
+import java.util.concurrent.BlockingQueue
+import java.util.concurrent.LinkedBlockingQueue
+import java.util.concurrent.TimeUnit
 import org.apache.kafka.clients.CommonClientConfigs
 import org.apache.kafka.clients.consumer.ConsumerConfig
 import org.apache.kafka.clients.consumer.ConsumerRecord
@@ -26,17 +36,6 @@ import org.springframework.kafka.listener.MessageListener
 import org.springframework.kafka.test.utils.ContainerTestUtils
 import org.springframework.kafka.test.utils.KafkaTestUtils
 import org.testcontainers.shaded.org.awaitility.Awaitility
-import io.github.mfvanek.spring.boot3.kotlin.test.support.KafkaInitializer
-import io.github.mfvanek.spring.boot3.kotlin.test.support.TestBase
-import net.bytebuddy.utility.dispatcher.JavaDispatcher.Container
-import java.nio.charset.StandardCharsets
-import java.time.Duration
-import java.time.LocalDateTime
-import java.util.Locale
-import java.util.UUID
-import java.util.concurrent.BlockingQueue
-import java.util.concurrent.LinkedBlockingQueue
-import java.util.concurrent.TimeUnit
 
 @ExtendWith(OutputCaptureExtension::class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -113,27 +112,26 @@ class TimeControllerTest : TestBase() {
         val traceId = result.responseHeaders.getFirst(TRACE_ID_HEADER_NAME);
         assertThat(traceId)
             .isEqualTo("38c19768104ab8ae64fabbeed65bbbdf");
-
         assertThat(output.all)
             .containsPattern(
                 String.format(
                     Locale.ROOT,
-                    ".*\"message\":\"Retrying request to '${Locale.ROOT}', attempt 1/1 due to error:\"," +
-                        "\"logger\":\"io\\.github\\.mfvanek\\.spring\\.boot3\\.test\\.service\\.PublicApiService\"," +
-                        "\"thread\":\"[^\"]+\",\"level\":\"INFO\",\"stack_trace\":\".+?\"," +
-                        "\"traceId\":\"38c19768104ab8ae64fabbeed65bbbdf\",\"spanId\":\"[a-f0-9]+\",\"instance_timezone\":\"${Locale.ROOT}\",\"applicationName\":\"spring-boot-3-demo-app\"\\}%n",
+                    ".*\"message\":\"Request to '/%s' failed after 2 attempts.\",\"logger\":\"io\\.github\\.mfvanek\\.spring\\.boot3\\.kotlin\\.test\\.service\\.PublicApiService\"," +
+                        "\"thread\":\"[^\"]+\",\"level\":\"ERROR\"," +
+                        "\"traceId\":\"38c19768104ab8ae64fabbeed65bbbdf\",\"spanId\":\"[a-f0-9]+\",\"applicationName\":\"spring-boot-3-demo-app\"\\}%n",
                     zoneName
-                )
+                ).toPattern()
             )
             .containsPattern(
                 String.format(
                     Locale.ROOT,
-                    ".*\"message\":\"Request to '/%s' failed after 2 attempts.\",\"logger\":\"io\\.github\\.mfvanek\\.spring\\.boot3\\.test\\.service\\.PublicApiService\"," +
+                    ".*\"message\":\"Request to '/%s' failed after 2 attempts.\",\"logger\":\"io\\.github\\.mfvanek\\.spring\\.boot3\\.kotlin\\.test\\.service\\.PublicApiService\"," +
                         "\"thread\":\"[^\"]+\",\"level\":\"ERROR\"," +
-                        "\"traceId\":\"38c19768104ab8ae64fabbeed65bbbdf\",\"spanId\":\"[a-f0-9]+\",\"applicationName\":\"spring-boot-3-demo-app\"}%n",
+                        "\"traceId\":\"38c19768104ab8ae64fabbeed65bbbdf\",\"spanId\":\"[a-f0-9]+\",\"applicationName\":\"spring-boot-3-demo-app\"\\}%n",
                     zoneName
-                )
+                ).toPattern()
             )
+
     }
 
     private fun countRecordsInTable(): Long {
@@ -148,11 +146,11 @@ class TimeControllerTest : TestBase() {
         assertThat(headerNames)
             .hasSize(2)
             .containsExactlyInAnyOrder("traceparent", "b3");
-        val headerValues = headers.map { it.key() }
-            .map { v -> String(v.toByteArray(), StandardCharsets.UTF_8) }
+        val headerValues = headers
+            .map { String(it.value(), StandardCharsets.UTF_8) }
         assertThat(headerValues)
             .hasSameSizeAs(headerNames)
-            .allSatisfy { h -> assertThat(h).contains(expectedTraceId) }
+            .allSatisfy { assertThat(it).contains(expectedTraceId) }
     }
 
     private fun awaitStoringIntoDatabase() {
diff --git a/spring-boot-3-demo-app-kotlin/src/test/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/service/PublicApiServiceTest.kt b/spring-boot-3-demo-app-kotlin/src/test/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/service/PublicApiServiceTest.kt
@@ -6,21 +6,18 @@ import io.github.mfvanek.spring.boot3.kotlin.test.support.TestBase
 import io.micrometer.observation.Observation
 import io.micrometer.observation.ObservationRegistry
 import io.micrometer.tracing.Tracer
-import org.assertj.core.api.Assertions
+import java.time.LocalDateTime
+import java.time.temporal.ChronoUnit
+import java.util.Locale
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.system.CapturedOutput
 import org.springframework.boot.test.system.OutputCaptureExtension
-import java.time.LocalDateTime
-import java.time.temporal.ChronoUnit
-import java.util.Locale
-import java.util.Objects
-import javax.annotation.Nonnull
 
 @ExtendWith(OutputCaptureExtension::class)
-class PublicApiServiceTest: TestBase() {
+class PublicApiServiceTest : TestBase() {
     @Autowired
     private lateinit var publicApiService: PublicApiService
 
@@ -70,26 +67,24 @@ class PublicApiServiceTest: TestBase() {
                 .containsPattern(
                     String.format(
                         Locale.ROOT,
-                        ".*\"message\":\"Retrying request to '[^']+?', attempt 1/1 due to error:\"," +
-                                "\"logger\":\"io\\.github\\.mfvanek\\.spring\\.boot3\\.test\\.service\\.PublicApiService\"," +
-                                "\"thread\":\"[^\"]+\",\"level\":\"INFO\",\"stack_trace\":\".+?\"," +
-                                "\"traceId\":\"%s\",\"spanId\":\"[a-f0-9]+\",\"instance_timezone\":\"%s\",\"applicationName\":\"spring-boot-3-demo-app\"\\}%n",
-                        traceId,
-                        zoneName
+                        ".*\"message\":\"Retrying request to '[^']+?', attempt 1/1 due to error: .+?," +
+                            "\"logger\":\"io\\.github\\.mfvanek\\.spring\\.boot3\\.kotlin\\.test\\.service\\.PublicApiService\"," +
+                            "\"thread\":\"[^\"]+\",\"level\":\"INFO\"," +
+                            "\"traceId\":\"%s\",\"spanId\":\"[a-f0-9]+\",\"instance_timezone\":\"%s\",\"applicationName\":\"spring-boot-3-demo-app\"\\}%n", traceId, zoneName
                     )
+                        .toPattern()
                 )
                 .containsPattern(
                     String.format(
                         Locale.ROOT,
                         ".*\"message\":\"Request to '[^']+?' failed after 2 attempts.\"," +
-                                "\"logger\":\"io\\.github\\.mfvanek\\.spring\\.boot3\\.test\\.service\\.PublicApiService\"," +
-                                "\"thread\":\"[^\"]+\",\"level\":\"ERROR\",\"traceId\":\"%s\",\"spanId\":\"[a-f0-9]+\",\"applicationName\":\"spring-boot-3-demo-app\"}%n",
-                        traceId
+                            "\"logger\":\"io\\.github\\.mfvanek\\.spring\\.boot3\\.kotlin\\.test\\.service\\.PublicApiService\"," +
+                            "\"thread\":\"[^\"]+\",\"level\":\"ERROR\",\"traceId\":\"%s\",\"spanId\":\"[a-f0-9]+\",\"applicationName\":\"spring-boot-3-demo-app\"}%n", traceId
                     )
+                        .toPattern()
                 )
                 .doesNotContain("Failed to convert response ")
         }
-
         WireMock.verify(
             2, WireMock.getRequestedFor(
                 WireMock.urlPathMatching(

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Licensed under the Apache License 2.0`
`6`	`6`	`*/`
	`7`	`+`
`7`	`8`	`package io.github.mfvanek.spring.boot3.kotlin.test`
`8`	`9`
`9`	`10`	`import org.springframework.web.bind.annotation.GetMapping`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class TimeController(`
`33`	`33`	`val nowFromRemote = publicApiService.getZonedTime()`
`34`	`34`	`val now = nowFromRemote ?: LocalDateTime.now(clock)`
`35`	`35`	`kafkaSendingService.sendNotification("Current time = $now")`
`36`		`- .thenRun { logger.info("Awaiting acknowledgement from Kafka") }`
	`36`	`+ .thenRun { logger.info{"Awaiting acknowledgement from Kafka"} }`
`37`	`37`	`.get()`
`38`	`38`	`return now`
`39`	`39`	`}`