Update Logger.log to support nullable Throwable

GitOrigin-RevId: 933929911db0fd1c45fa77a8abfccc1129e6cc2e

Author: ericloe-cash

misk/src/main/kotlin/misk/web/interceptors/hooks/RequestResponseLoggingHook.kt

@@ -106,16 +106,28 @@ internal class RequestResponseLoggingHook private constructor(
     val randomDouble = random.current().nextDouble()
     val includeBody = randomDouble < sampling
 
-    val additionalTags: MutableSet<Tag> = mutableSetOf(
+    var additionalTags: Set<Tag> = setOf(
       "response_code" to statusCode,
       "response_time_millis" to elapsed.toMillis(),
-    )
+   )
+
+    val error = error?.unwrap()
+    var level = Level.INFO
+
+    if (error != null) {
+      // Log with the exception and smart tags applied on error.
+      level = mapperResolver.mapperFor(error)?.loggingLevel(error) ?: Level.ERROR
+      additionalTags = additionalTags + SmartTagsThreadLocalHandler.peekThreadLocalSmartTags()
+    }
 
     requestResponseLoggedCapture.onLogged()
 
-    val error = error?.unwrap()
-    fun buildDescriptionImpl(): Any? {
-      return buildDescription(
+    logger.log(
+      level = level,
+      th = error,
+      tags = additionalTags.toTypedArray(),
+    ) {
+      buildDescription(
         caller = caller,
         httpCall = httpCall,
         elapsedToString = elapsedToString,
@@ -124,24 +136,6 @@ internal class RequestResponseLoggingHook private constructor(
         includeBody = includeBody,
       )
     }
-
-    if (error != null) {
-      // Log with the exception and smart tags applied on error.
-      val level = mapperResolver.mapperFor(error)?.loggingLevel(error) ?: Level.ERROR
-
-      logger.log(
-        level = level,
-        th = error,
-        tags = (SmartTagsThreadLocalHandler.peekThreadLocalSmartTags() + additionalTags).toTypedArray(),
-        message = ::buildDescriptionImpl,
-      )
-    } else {
-      logger.log(
-        level = Level.INFO,
-        tags = additionalTags.toTypedArray(),
-        message = ::buildDescriptionImpl,
-      )
-    }
   }
 
   private fun buildDescription(

wisp/wisp-logging/src/main/kotlin/wisp/logging/Logging.kt

@@ -87,7 +87,7 @@ fun KLogger.log(level: Level, vararg tags: Tag, message: () -> Any?) {
 }
 
 // This logger takes care of adding the mdc tags and cleaning them up when done
-fun KLogger.log(level: Level, th: Throwable, vararg tags: Tag, message: () -> Any?) {
+fun KLogger.log(level: Level, th: Throwable?, vararg tags: Tag, message: () -> Any?) {
   withTags(*tags) {
     when (level) {
       Level.ERROR -> error(th, message)