Support arguments where possible for Logback and Slf4j

oshai · Nov 27, 2024 · 6760811 · 6760811
1 parent 1f9ecdd
commit 6760811
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/src/commonMain/kotlin/io/github/oshai/kotlinlogging/KLoggingEventBuilder.kt b/src/commonMain/kotlin/io/github/oshai/kotlinlogging/KLoggingEventBuilder.kt
@@ -4,6 +4,7 @@ public class KLoggingEventBuilder {
   public var message: String? = null
   public var cause: Throwable? = null
   public var payload: Map<String, Any?>? = null
+  public var arguments: Array<Any>? = null
 
   /**
    * Internal data that is used by compiler plugin to provide additional information about the log

diff --git a/src/javaMain/kotlin/io/github/oshai/kotlinlogging/slf4j/internal/LocationAwareKLogger.kt b/src/javaMain/kotlin/io/github/oshai/kotlinlogging/slf4j/internal/LocationAwareKLogger.kt
@@ -58,6 +58,7 @@ internal class LocationAwareKLogger(override val underlyingLogger: LocationAware
     val builder = underlyingLogger.atLevel(level.toSlf4j())
     marker?.toSlf4j()?.let { builder.addMarker(it) }
     kLoggingEventBuilder.payload?.forEach { (key, value) -> builder.addKeyValue(key, value) }
+    kLoggingEventBuilder.arguments?.forEach { arg -> builder.addArgument(arg) }
     builder.setCause(kLoggingEventBuilder.cause)
     if (builder is CallerBoundaryAware) {
       builder.setCallerBoundary(fqcn)
@@ -75,7 +76,7 @@ internal class LocationAwareKLogger(override val underlyingLogger: LocationAware
       fqcn,
       level.toSlf4j().toInt(),
       kLoggingEventBuilder.message,
-      null,
+      kLoggingEventBuilder.arguments,
       kLoggingEventBuilder.cause,
     )
   }

diff --git a/src/javaMain/kotlin/io/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger.kt b/src/javaMain/kotlin/io/github/oshai/kotlinlogging/slf4j/internal/LocationIgnorantKLogger.kt
@@ -43,6 +43,7 @@ internal class LocationIgnorantKLogger(override val underlyingLogger: Logger) :
     val builder = underlyingLogger.atLevel(level.toSlf4j())
     marker?.toSlf4j()?.let { builder.addMarker(it) }
     kLoggingEventBuilder.payload?.forEach { (key, value) -> builder.addKeyValue(key, value) }
+    kLoggingEventBuilder.arguments?.forEach { arg -> builder.addArgument(arg) }
     builder.setCause(kLoggingEventBuilder.cause)
     builder.log(kLoggingEventBuilder.message)
   }
@@ -55,6 +56,7 @@ internal class LocationIgnorantKLogger(override val underlyingLogger: Logger) :
     val slf4jMarker = marker?.toSlf4j()
     val message = kLoggingEventBuilder.message
     val cause = kLoggingEventBuilder.cause
+
     when (level) {
       Level.TRACE -> underlyingLogger.trace(slf4jMarker, message, cause)
       Level.DEBUG -> underlyingLogger.debug(slf4jMarker, message, cause)

diff --git a/src/jvmMain/kotlin/io/github/oshai/kotlinlogging/logback/internal/LogbackLogEvent.kt b/src/jvmMain/kotlin/io/github/oshai/kotlinlogging/logback/internal/LogbackLogEvent.kt
@@ -18,7 +18,7 @@ public class LogbackLogEvent(
     level.toLogbackLevel(),
     kLoggingEvent.internalCompilerData?.messageTemplate ?: kLoggingEvent.message,
     kLoggingEvent.cause,
-    emptyArray(),
+    kLoggingEvent.arguments ?: emptyArray(),
   ) {
 
   override fun getFormattedMessage(): String? {