slf4j bridge - logger name annotation

zio · Dec 29, 2022 · 3ef441b · 3ef441b
1 parent f974fe2
commit 3ef441b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 24 deletions.
diff --git a/build.sbt b/build.sbt
@@ -21,11 +21,10 @@ inThisBuild(
   )
 )
 
-val ZioVersion           = "2.0.5"
-val scalaJavaTimeVersion = "2.3.0"
-val slf4jVersion         = "1.7.36"
-val slf4j2Version        = "2.0.5"
-val logbackVersion       = "1.2.11"
+val ZioVersion     = "2.0.5"
+val slf4jVersion   = "1.7.36"
+val slf4j2Version  = "2.0.6"
+val logbackVersion = "1.2.11"
 
 addCommandAlias("fix", "; all compile:scalafix test:scalafix; all scalafmtSbt scalafmtAll")
 addCommandAlias("check", "; scalafmtSbtCheck; scalafmtCheckAll; compile:scalafix --check; test:scalafix --check")

diff --git a/project/MimaSettings.scala b/project/MimaSettings.scala
@@ -5,7 +5,7 @@ import sbt.Keys.{ name, organization }
 import sbt._
 
 object MimaSettings {
-  lazy val bincompatVersionToCompare = "2.1.4"
+  lazy val bincompatVersionToCompare = "2.1.7"
 
   def mimaSettings(failOnProblem: Boolean) =
     Seq(

diff --git a/slf4j2-bridge/src/main/scala/zio/logging/slf4j/bridge/Slf4jBridge.scala b/slf4j2-bridge/src/main/scala/zio/logging/slf4j/bridge/Slf4jBridge.scala
@@ -4,6 +4,8 @@ import zio.{ ZIO, ZLayer }
 
 object Slf4jBridge {
 
+  val loggerNameAnnotationKey: String = "slf4j_logger_name"
+
   def initialize: ZLayer[Any, Nothing, Unit] =
     ZLayer {
       ZIO.runtime[Any].flatMap { runtime =>

diff --git a/slf4j2-bridge/src/main/scala/zio/logging/slf4j/bridge/ZioLoggerRuntime.scala b/slf4j2-bridge/src/main/scala/zio/logging/slf4j/bridge/ZioLoggerRuntime.scala
@@ -19,19 +19,21 @@ final class ZioLoggerRuntime(runtime: Runtime[Any]) extends LoggerRuntime {
       runtime.unsafe.run {
         val logLevel = ZioLoggerRuntime.logLevelMapping(level)
         ZIO.logSpan(name) {
-          ZIO.logLevel(logLevel) {
-            lazy val msg = if (arguments != null) {
-              MessageFormatter.arrayFormat(messagePattern, arguments.toArray).getMessage
-            } else {
-              messagePattern
-            }
-            val cause    = if (throwable != null) {
-              Cause.die(throwable)
-            } else {
-              Cause.empty
-            }
+          ZIO.logAnnotate(Slf4jBridge.loggerNameAnnotationKey, name) {
+            ZIO.logLevel(logLevel) {
+              lazy val msg = if (arguments != null) {
+                MessageFormatter.arrayFormat(messagePattern, arguments.toArray).getMessage
+              } else {
+                messagePattern
+              }
+              val cause    = if (throwable != null) {
+                Cause.die(throwable)
+              } else {
+                Cause.empty
+              }
 
-            ZIO.logCause(msg, cause)
+              ZIO.logCause(msg, cause)
+            }
           }
         }
       }

diff --git a/slf4j2-bridge/src/test/scala/zio/logging/slf4j/bridge/Slf4jBridgeSpec.scala b/slf4j2-bridge/src/test/scala/zio/logging/slf4j/bridge/Slf4jBridgeSpec.scala
@@ -42,42 +42,42 @@ object Slf4jBridgeSpec extends ZIOSpecDefault {
             LogEntry(
               List("test.logger"),
               LogLevel.Debug,
-              Map.empty,
+              Map(Slf4jBridge.loggerNameAnnotationKey -> "test.logger"),
               "test debug message",
               Cause.empty
             ),
             LogEntry(
               List("test.logger"),
               LogLevel.Warning,
-              Map.empty,
+              Map(Slf4jBridge.loggerNameAnnotationKey -> "test.logger"),
               "hello world",
               Cause.empty
             ),
             LogEntry(
               List("test.logger"),
               LogLevel.Warning,
-              Map.empty,
+              Map(Slf4jBridge.loggerNameAnnotationKey -> "test.logger"),
               "3..2..1 ... go!",
               Cause.empty
             ),
             LogEntry(
               List("test.logger"),
               LogLevel.Warning,
-              Map.empty,
+              Map(Slf4jBridge.loggerNameAnnotationKey -> "test.logger"),
               "warn cause",
               Cause.die(testFailure)
             ),
             LogEntry(
               List("test.logger"),
               LogLevel.Error,
-              Map.empty,
+              Map(Slf4jBridge.loggerNameAnnotationKey -> "test.logger"),
               "error",
               Cause.die(testFailure)
             ),
             LogEntry(
               List("test.logger"),
               LogLevel.Error,
-              Map.empty,
+              Map(Slf4jBridge.loggerNameAnnotationKey -> "test.logger"),
               "error",
               Cause.empty
             )