Fallback to Json.Null if getMessage is null

typelevel · Apr 4, 2023 · 887a5a8 · 887a5a8
1 parent 2cdc31f
commit 887a5a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/log/shared/src/main/scala/LogSpan.scala b/modules/log/shared/src/main/scala/LogSpan.scala
@@ -75,7 +75,7 @@ private[log] final case class LogSpan[F[_]: Sync: Logger](
     putAny(
       "exit.case" -> "error".asJson,
       "exit.error.class" -> err.getClass.getName.asJson,
-      "exit.error.message" -> err.toString.asJson, // toString handles null message
+      "exit.error.message" -> Option(err.getMessage).map(_.asJson).getOrElse(Json.Null),
       "exit.error.stackTrace" -> err.getStackTrace.map(_.toString).asJson
     ) *> put(fields: _*)
 

diff --git a/modules/log/shared/src/test/scala/LogSuite.scala b/modules/log/shared/src/test/scala/LogSuite.scala
@@ -105,7 +105,7 @@ class LogSuite extends CatsEffectSuite {
                       |  ],
                       |  "exit.case" : "succeeded",
                       |  "exit.error.class" : "java.lang.RuntimeException",
-                      |  "exit.error.message" : "java.lang.RuntimeException: oops",
+                      |  "exit.error.message" : "oops",
                       |  "children" : [
                       |  ]
                       |}
@@ -118,7 +118,7 @@ class LogSuite extends CatsEffectSuite {
                    |  ],
                    |  "exit.case" : "succeeded",
                    |  "exit.error.class" : "java.lang.RuntimeException",
-                   |  "exit.error.message" : "java.lang.RuntimeException",
+                   |  "exit.error.message" : null,
                    |  "children" : [
                    |  ]
                    |}