take advantage of the new Trace[F].attachError signature to attach at…

…tributes to the exception event
typelevel · Jan 18, 2023 · 5b8971f · 5b8971f
1 parent 66d18dc
commit 5b8971f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/core/shared/src/main/scala/org/typelevel/log4cats/natchez/package.scala b/core/shared/src/main/scala/org/typelevel/log4cats/natchez/package.scala
@@ -22,7 +22,7 @@ package object natchez {
     override def fromName(name: String): F[SelfAwareStructuredLogger[F]] = getLoggerFromName(name).pure[F]
   }
 
-  implicit def traceLogger[F[_] : Trace : Applicative]: StructuredLogger[F] = new TraceLogger[F]
+  implicit def traceLogger[F[_] : Trace]: StructuredLogger[F] = new TraceLogger[F]
 }
 
 package natchez {
@@ -59,10 +59,10 @@ package natchez {
     }
 
     private[TraceLogger] val mapContextToTraceValue: Map[String, String] => List[(String, TraceValue)] =
-      _.toList.nested.map(TraceValue.StringValue.apply).value
+      _.toList.nested.map(TraceableValue[String].toTraceValue).value
   }
 
-  class TraceLogger[F[_] : Trace : Applicative] extends StructuredLogger[F] {
+  class TraceLogger[F[_] : Trace] extends StructuredLogger[F] {
     private def log(logLevel: LogLevel,
                     ctx: Map[String, String],
                     maybeThrowable: Option[Throwable],
@@ -73,7 +73,7 @@ package natchez {
           "severity_text" -> logLevelToSeverityText(logLevel) ::
           mapContextToTraceValue(ctx)
 
-      Trace[F].log(attributes: _*) *> maybeThrowable.fold(().pure[F])(Trace[F].attachError)
+      maybeThrowable.fold(Trace[F].log(attributes: _*))(Trace[F].attachError(_, attributes: _*))
     }
 
     override def trace(ctx: Map[String, String])(msg: => String): F[Unit] = log(LogLevel.Trace, ctx, None, msg)