chore: misc fixes

Author: sureshg

backend/jvm/src/main/kotlin/dev/suresh/plugins/Http.kt

@@ -25,7 +25,6 @@ import io.ktor.server.sessions.*
 import io.ktor.server.sse.*
 import io.ktor.server.websocket.*
 import kotlin.concurrent.atomics.AtomicLong
-import kotlin.concurrent.atomics.incrementAndFetch
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 import org.slf4j.event.Level
@@ -93,16 +92,16 @@ fun Application.configureHTTP() {
 
   install(HSTS)
 
-  install(CallId) {
-    header(HttpHeaders.XRequestId)
-    generate {
-      when (it.isApi) {
-        true -> "$TRACE_ID-${counter.incrementAndFetch()}"
-        else -> "$TRACE_ID-00000"
-      }
-    }
-    verify { it.isNotEmpty() }
-  }
+  // install(CallId) {
+  //   header(HttpHeaders.XRequestId)
+  //   generate {
+  //     when (it.isApi) {
+  //       true -> "$TRACE_ID-${counter.incrementAndFetch()}"
+  //       else -> "$TRACE_ID-00000"
+  //     }
+  //   }
+  //   verify { it.isNotEmpty() }
+  // }
 
   install(CallLogging) {
     level = Level.INFO
@@ -111,7 +110,7 @@ fun Application.configureHTTP() {
 
     // Add MDC entries
     mdc("remoteHost") { call -> call.request.origin.remoteHost }
-    callIdMdc(TRACE_ID)
+    // callIdMdc(TRACE_ID)
 
     // Enable logging for API routes only
     filter { it.isApi }

backend/jvm/src/main/resources/logback.xml

@@ -12,7 +12,7 @@
     <!--<include resource="logback-include.xml"/>-->
 
     <property name="pattern"
-              value="%date{yyyy-MM-dd'T'HH:mm:ss.SSS z, America/Los_Angeles} %X{trace-id} %-5level %X{remoteHost} [%thread]  %logger{16} - %msg%n%rEx"/>
+              value="%date{yyyy-MM-dd'T'HH:mm:ss.SSS z, America/Los_Angeles} %-5level %X{remoteHost} [%thread]  %logger{16} - %msg%n%rEx"/>
 
     <property name="otel-pattern"
               value="%date{yyyy-MM-dd'T'HH:mm:ss.SSS z, America/Los_Angeles} trace_id=%X{trace_id} span_id=%X{span_id} trace_flags=%X{trace_flags} %-5level %logger{16} - %msg%n"/>

backend/jvm/src/main/resources/otel/sdk-config.yaml

@@ -369,14 +369,13 @@ instrumentation:
     # https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/main/instrumentation/logback/logback-appender-1.0/javaagent
     logback-appender:
       enabled: true
-      experimental-log-attributes: false
+      experimental-log-attributes: true
       experimental:
         capture-code-attributes: false
-        capture-marker-attributes: false
+        capture-marker-attributes: true
         capture-key-value-pair-attributes: false
         capture-logger-context-attributes: false
         capture-arguments: false
-        capture-mdc-attributes: false
+        capture-mdc-attributes: true
     ktor:
-      # Disable default ktor instrumentation.
-      enabled: false
+      enabled: true

backend/jvm/src/test/kotlin/dev/suresh/AppTests.kt

@@ -21,13 +21,10 @@ import io.ktor.server.testing.*
 import kotlinx.coroutines.slf4j.MDCContext
 import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.withContext
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty
-import org.slf4j.LoggerFactory
-import org.slf4j.MDC
-import org.testcontainers.containers.GenericContainer
-import org.testcontainers.containers.PostgreSQLContainer
+import org.slf4j.*
+import org.testcontainers.containers.*
 import org.testcontainers.containers.output.Slf4jLogConsumer
 import org.testcontainers.containers.wait.strategy.Wait
 import org.testcontainers.images.builder.Transferable
@@ -65,8 +62,18 @@ class AppTests {
 
   @Test
   fun appTest() = testApplication {
+    val infoLogs = mutableListOf<String>()
+    val errorLogs = mutableListOf<String>()
+
     environment {
-      log = logger
+      log = object : Logger by logger{
+          override fun info(msg: String) {
+              infoLogs += msg
+          }
+          override fun error(msg: String) {
+              errorLogs += msg
+          }
+      }
       config = MapApplicationConfig("ktor.environment" to "test")
     }
 
@@ -170,7 +177,7 @@ class AppTests {
       it.start()
       val endPoint = "https://${it.host}:${it.getMappedPort(tlsPort)}/"
       val statusCode = testHttpClient.get(endPoint).status
-      assertTrue(statusCode.value == 200)
+      assertEquals(statusCode.value, 200)
     }
   }