annotations for logger

zio · Oct 31, 2024 · f2b8633 · f2b8633
1 parent 869db6f
commit f2b8633
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/slf4j-bridge/src/main/scala/zio/logging/slf4j/bridge/ZioLoggerRuntime.scala b/slf4j-bridge/src/main/scala/zio/logging/slf4j/bridge/ZioLoggerRuntime.scala
@@ -44,14 +44,13 @@ final class ZioLoggerRuntime(runtime: Runtime[Any], filter: LogFilter[Any]) exte
         runtime.fiberRefs.joinAs(fiberId)(currentFiber.unsafe.getFiberRefs())
       }
 
-      val logSpan    = zio.LogSpan(logger.name, java.lang.System.currentTimeMillis())
-      val loggerName = (zio.logging.loggerNameAnnotationKey -> logger.name)
+      val logSpan = zio.LogSpan(logger.name, java.lang.System.currentTimeMillis())
 
       val fiberRefs = currentFiberRefs
         .updatedAs(fiberId)(FiberRef.currentLogSpan, logSpan :: currentFiberRefs.getOrDefault(FiberRef.currentLogSpan))
         .updatedAs(fiberId)(
           FiberRef.currentLogAnnotations,
-          currentFiberRefs.getOrDefault(FiberRef.currentLogAnnotations) + loggerName
+          currentFiberRefs.getOrDefault(FiberRef.currentLogAnnotations) ++ logger.annotations
         )
 
       val fiberRuntime = zio.internal.FiberRuntime(fiberId, fiberRefs, runtime.runtimeFlags)

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
@@ -44,19 +44,19 @@ final class ZioLoggerRuntime(runtime: Runtime[Any], filter: LogFilter[Any]) exte
         runtime.fiberRefs.joinAs(fiberId)(currentFiber.unsafe.getFiberRefs())
       }
 
-      val logSpan        = zio.LogSpan(logger.name, java.lang.System.currentTimeMillis())
-      val loggerName     = (zio.logging.loggerNameAnnotationKey -> logger.name)
-      val logAnnotations = if (keyValues != null) {
-        keyValues.asScala.map(kv => (kv.key, kv.value.toString)).toMap
+      val logSpan = zio.LogSpan(logger.name, java.lang.System.currentTimeMillis())
+
+      val logAnnotations = if (keyValues != null && !keyValues.isEmpty) {
+        keyValues.asScala.map(kv => (kv.key, kv.value.toString)).toMap ++ logger.annotations
       } else {
-        Map.empty
+        logger.annotations
       }
 
       val fiberRefs = currentFiberRefs
         .updatedAs(fiberId)(FiberRef.currentLogSpan, logSpan :: currentFiberRefs.getOrDefault(FiberRef.currentLogSpan))
         .updatedAs(fiberId)(
           FiberRef.currentLogAnnotations,
-          currentFiberRefs.getOrDefault(FiberRef.currentLogAnnotations) ++ logAnnotations + loggerName
+          currentFiberRefs.getOrDefault(FiberRef.currentLogAnnotations) ++ logAnnotations
         )
 
       val fiberRuntime = zio.internal.FiberRuntime(fiberId, fiberRefs, runtime.runtimeFlags)