Merge pull request #808 from eikek/scribe-update

Update scribe to 3.9.0
eikek · Jun 26, 2022 · ea05034 · ea05034
2 parents fc6e5aa + 8f5444e
commit ea05034
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/modules/logging/scribe/src/main/scala/sharry/logging/impl/JsonWriter.scala b/modules/logging/scribe/src/main/scala/sharry/logging/impl/JsonWriter.scala
@@ -13,8 +13,8 @@ import scribe.output.format.OutputFormat
 import scribe.writer._
 
 final case class JsonWriter(writer: Writer, compact: Boolean = true) extends Writer {
-  override def write[M](
-      record: LogRecord[M],
+  override def write(
+      record: LogRecord,
       output: LogOutput,
       outputFormat: OutputFormat
   ): Unit = {

diff --git a/modules/logging/scribe/src/main/scala/sharry/logging/impl/LogfmtWriter.scala b/modules/logging/scribe/src/main/scala/sharry/logging/impl/LogfmtWriter.scala
@@ -14,8 +14,8 @@ import scribe.writer._
 
 // https://brandur.org/logfmt
 final case class LogfmtWriter(writer: Writer) extends Writer {
-  override def write[M](
-      record: LogRecord[M],
+  override def write(
+      record: LogRecord,
       output: LogOutput,
       outputFormat: OutputFormat
   ): Unit = {

diff --git a/modules/logging/scribe/src/main/scala/sharry/logging/impl/Record.scala b/modules/logging/scribe/src/main/scala/sharry/logging/impl/Record.scala
@@ -38,18 +38,23 @@ private[impl] case class Record(
 
 private[impl] object Record {
 
-  def fromLogRecord[M](record: LogRecord[M]): Record = {
+  def fromLogRecord(record: LogRecord): Record = {
     val l = record.timeStamp
-    val traces = record.additionalMessages.collect {
+    val traces = record.messages.collect {
       case message: Message[_] if message.value.isInstanceOf[Throwable] =>
         throwable2Trace(message.value.asInstanceOf[Throwable])
     }
-    val additionalMessages = record.additionalMessages.map(_.logOutput.plainText)
+    val (firstMessage, additionalMessages) = record.messages match {
+      case h :: rest =>
+        (h.logOutput.plainText, rest.map(_.logOutput.plainText))
+      case Nil =>
+        ("", Nil)
+    }
 
     Record(
       level = record.level.name,
       levelValue = record.levelValue,
-      message = record.logOutput.plainText,
+      message = firstMessage,
       additionalMessages = additionalMessages,
       fileName = record.fileName,
       className = record.className,

diff --git a/modules/logging/scribe/src/main/scala/sharry/logging/impl/ScribeWrapper.scala b/modules/logging/scribe/src/main/scala/sharry/logging/impl/ScribeWrapper.scala
@@ -8,11 +8,9 @@ package sharry.logging.impl
 
 import cats.Id
 import cats.effect.Sync
-
 import sharry.logging.{Level, LogEvent, Logger}
-
 import scribe.LoggerSupport
-import scribe.message.{LoggableMessage, Message}
+import scribe.message.LoggableMessage
 
 private[logging] object ScribeWrapper {
   final class ImplUnsafe(log: scribe.Logger) extends Logger[Id] {
@@ -42,11 +40,11 @@ private[logging] object ScribeWrapper {
     val level = convertLevel(ev.level)
     val additional: List[LoggableMessage] = ev.additional.map { x =>
       x() match {
-        case Right(ex) => Message.static(ex)
-        case Left(msg) => Message.static(msg)
+        case Right(ex) => LoggableMessage.throwable2Message(ex)
+        case Left(msg) => LoggableMessage.string2Message(msg)
       }
     }
-    LoggerSupport(level, ev.msg(), additional, ev.pkg, ev.fileName, ev.name, ev.line)
+    LoggerSupport(level, ev.msg() :: additional, ev.pkg, ev.fileName, ev.name, ev.line)
       .copy(data = ev.data)
   }
 }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -20,7 +20,7 @@ object Dependencies {
   val OrganizeImportsVersion = "0.6.0"
   val PostgresVersion = "42.4.0"
   val PureConfigVersion = "0.17.1"
-  val ScribeVersion = "3.8.0"
+  val ScribeVersion = "3.9.0"
   val SourcecodeVersion = "0.2.8"
   val SwaggerVersion = "4.11.1"
   val TikaVersion = "2.4.1"