-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Close #441 - Add MdcAdapter for Cats Effect 3 to properly share conte…
…xt through MDC with IO and IOLocal from Cats Effect 3
- Loading branch information
Showing
14 changed files
with
1,205 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
...logback-mdc-cats-effect3/shared/src/main/scala/loggerf/logger/logback/Ce3MdcAdapter.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| package loggerf.logger.logback | ||
|
|
||
| import cats.effect.unsafe.IOLocals | ||
| import cats.effect.{IOLocal, SyncIO} | ||
| import cats.syntax.all._ | ||
| import ch.qos.logback.classic.LoggerContext | ||
| import logback_scala_interop.JLoggerFMdcAdapter | ||
| import org.slf4j.{LoggerFactory, MDC} | ||
|
|
||
| import java.util.{Map => JMap, Set => JSet} | ||
| import scala.jdk.CollectionConverters._ | ||
| import scala.util.control.NonFatal | ||
|
|
||
| /** @author Kevin Lee | ||
| * @since 2023-07-07 | ||
| */ | ||
| class Ce3MdcAdapter extends JLoggerFMdcAdapter { | ||
|
|
||
| private[this] val localContext: IOLocal[Map[String, String]] = | ||
| IOLocal[Map[String, String]](Map.empty[String, String]) | ||
| .syncStep(1) | ||
| .flatMap( | ||
| _.leftMap(_ => | ||
| new Error( | ||
| "Failed to initialize the local context of the Ce3MdcAdapter." | ||
| ) | ||
| ).liftTo[SyncIO] | ||
| ) | ||
| .unsafeRunSync() | ||
|
|
||
| override def put(key: String, `val`: String): Unit = | ||
| IOLocals.update(localContext)(_ + (key -> `val`)) | ||
|
|
||
| @SuppressWarnings(Array("org.wartremover.warts.Null")) | ||
| override def get(key: String): String = | ||
| IOLocals.get(localContext).getOrElse(key, null) // scalafix:ok DisableSyntax.null | ||
|
|
||
| override def remove(key: String): Unit = IOLocals.update(localContext)(_ - key) | ||
|
|
||
| override def clear(): Unit = IOLocals.reset(localContext) | ||
|
|
||
| override def getCopyOfContextMap: JMap[String, String] = getPropertyMap0 | ||
|
|
||
| override def setContextMap0(contextMap: JMap[String, String]): Unit = | ||
| IOLocals.set(localContext, contextMap.asScala.toMap) | ||
|
|
||
| private def getPropertyMap0: JMap[String, String] = IOLocals.get(localContext).asJava | ||
|
|
||
| override def getPropertyMap: JMap[String, String] = getPropertyMap0 | ||
|
|
||
| override def getKeys: JSet[String] = IOLocals.get(localContext).keySet.asJava | ||
|
|
||
| } | ||
| object Ce3MdcAdapter { | ||
|
|
||
| @SuppressWarnings(Array("org.wartremover.warts.Null")) | ||
| private def initialize0(): Ce3MdcAdapter = { | ||
| val field = classOf[MDC].getDeclaredField("mdcAdapter") | ||
| field.setAccessible(true) | ||
| val adapter = new Ce3MdcAdapter | ||
| field.set(null, adapter) // scalafix:ok DisableSyntax.null | ||
| field.setAccessible(false) | ||
| adapter | ||
| } | ||
|
|
||
| @SuppressWarnings(Array("org.wartremover.warts.AsInstanceOf", "scalafix:DisableSyntax.asInstanceOf")) | ||
| def initialize(): Ce3MdcAdapter = { | ||
| val loggerContext = | ||
| LoggerFactory.getILoggerFactory.asInstanceOf[LoggerContext] | ||
| initializeWithLoggerContext(loggerContext) | ||
| } | ||
|
|
||
| def initializeWithLoggerContext(loggerContext: LoggerContext): Ce3MdcAdapter = { | ||
| val adapter = initialize0() | ||
| try { | ||
| val field = classOf[LoggerContext].getDeclaredField("mdcAdapter") | ||
| field.setAccessible(true) | ||
| field.set(loggerContext, adapter) | ||
| field.setAccessible(false) | ||
| adapter | ||
| } catch { | ||
| case NonFatal(_) => adapter | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.