MdcLoggingDirectives (withMdcLogging, withMdcEntry, withMdcEntries, extractMarkerLog)

.gitignore

@@ -10,3 +10,5 @@ target
 .*.swp
 *.vim
 .ensime*
+.bsp
+.tool-versions

akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/MdcLoggingDirectivesSpec.scala

@@ -0,0 +1,117 @@
+package akka.http.scaladsl.server.directives
+
+import akka.event.{ DiagnosticMarkerBusLoggingAdapter, MarkerLoggingAdapter }
+import akka.http.scaladsl.model.StatusCodes
+import akka.http.scaladsl.server.RoutingSpec
+import scala.jdk.CollectionConverters._
+
+class MdcLoggingDirectivesSpec extends RoutingSpec {
+
+  "The `withMdcLogging` directive" should {
+    "provide a DiagnosticMarkerBusLoggingAdapter" in {
+      Get() ~> withMdcLogging {
+        extractLog {
+          case _: DiagnosticMarkerBusLoggingAdapter => completeOk
+          case other                                => failTest(s"expected a DiagnosticMarkerBusLoggingAdapter but found $other")
+        }
+      } ~> check {
+        response shouldEqual Ok
+      }
+    }
+    "provide a new DiagnosticMarkerBusLoggingAdapter for each request" in {
+      val route = withMdcLogging {
+        extractLog {
+          case l: DiagnosticMarkerBusLoggingAdapter => complete(l.hashCode().toString)
+          case other                                => failTest(s"expected a DiagnosticMarkerBusLoggingAdapter but found $other")
+        }
+      }
+      val reps = 100
+      val responseEntities = (1 to reps).map(_ => Get() ~> route ~> check {
+        status shouldEqual StatusCodes.OK
+        entityAs[String]
+      })
+      responseEntities.distinct.length shouldBe reps
+    }
+    "provide the same DiagnosticMarkerBusLoggingAdapter when nested multiple times" in {
+      Get() ~> withMdcLogging {
+        extractLog { log1 =>
+          withMdcLogging {
+            extractLog { log2 =>
+              if (log1 == log2) completeOk
+              else failTest(s"$log1 != $log2")
+            }
+          }
+        }
+      } ~> check {
+        response shouldEqual Ok
+      }
+    }
+  }
+
+  "The `extractMarkerLog` directive" should {
+    "provide a MarkerLoggingAdapter" in {
+      Get() ~> extractMarkerLog {
+        case _: MarkerLoggingAdapter => completeOk
+        case other                   => failTest(s"expected a MarkerLoggingAdapter but found $other")
+      }
+    }
+    "provide a new MarkerLoggingAdapter for each request" in {
+      val route = extractMarkerLog {
+        case log: MarkerLoggingAdapter => complete(log.hashCode().toString)
+        case other                     => failTest(s"expected a MarkerLoggingAdapter but found $other")
+      }
+      val reps = 100
+      val responseEntities = (1 to reps).map(_ => Get() ~> route ~> check {
+        status shouldEqual StatusCodes.OK
+        entityAs[String]
+      })
+      responseEntities.distinct.length shouldBe reps
+    }
+    "provide the same MarkerLoggingAdapter when nested multiple times" in {
+      Get() ~> extractMarkerLog { log1 =>
+        withMdcLogging {
+          extractMarkerLog { log2 =>
+            if (log1 == log2) completeOk
+            else failTest(s"$log1 != $log2")
+          }
+        }
+      } ~> check {
+        response shouldEqual Ok
+      }
+    }
+  }
+
+  "The `withMdcEntries` directive" should {
+    "append entries to the DiagnosticMarkerBusLoggingAdapter's MDC map" in {
+      Get() ~> withMdcEntries(("foo", "foo entry"), ("bar", "bar entry")) {
+        extractMarkerLog {
+          case log: DiagnosticMarkerBusLoggingAdapter =>
+            val map = log.getMDC.asScala
+            if (!map.get("foo").contains("foo entry")) failTest(s"missing or incorrect key 'foo' in $map")
+            else if (!map.get("bar").contains("bar entry")) failTest(s"missing or incorrect key 'bar' in $map")
+            else completeOk
+          case other => failTest(s"expected a DiagnosticMarkerBusLoggingAdapter but found $other")
+        }
+      } ~> check {
+        response shouldEqual Ok
+      }
+    }
+    "replace entries with same key when nested" in {
+      Get() ~> withMdcEntries(("foo", "foo entry 1")) {
+        extractMarkerLog {
+          case log: DiagnosticMarkerBusLoggingAdapter =>
+            val map = log.getMDC.asScala
+            if (!map.get("foo").contains("foo entry 1")) failTest(s"'foo' should be 'foo entry 1'")
+            else withMdcEntries(("foo", "foo entry 2")) {
+              val map = log.getMDC.asScala
+              if (!map.get("foo").contains("foo entry 2")) failTest(s"'foo' should be 'foo entry 2'")
+              else completeOk
+            }
+          case other => failTest(s"expected a DiagnosticMarkerBusLoggingAdapter but found $other")
+        }
+      } ~> check {
+        response shouldEqual Ok
+      }
+    }
+  }
+}

akka-http/src/main/scala/akka/http/scaladsl/server/Directives.scala

@@ -38,6 +38,7 @@ trait Directives extends RouteConcatenation
   with WebSocketDirectives
   with FramedEntityStreamingDirectives
   with AttributeDirectives
+  with MdcLoggingDirectives
 
 /**
  * Collects all default directives into one object for simple importing.

akka-http/src/main/scala/akka/http/scaladsl/server/directives/MdcLoggingDirectives.scala

@@ -0,0 +1,62 @@
+package akka.http.scaladsl.server.directives
+
+import akka.event.{
+  DefaultLoggingFilter,
+  DiagnosticMarkerBusLoggingAdapter,
+  LogSource,
+  MarkerLoggingAdapter
+}
+import akka.http.scaladsl.server.Directives._
+import akka.http.scaladsl.server._
+
+/**
+ * @groupname mdc Mdc logging directives
+ * @groupprio mdc 240
+ */
+trait MdcLoggingDirectives {
+
+  import MdcLoggingDirectives.extractDiagnosticMarkerLog
+
+  def withMdcLogging: Directive0 = extractDiagnosticMarkerLog
+    .flatMap { dmbla: DiagnosticMarkerBusLoggingAdapter =>
+      mapRequestContext { ctx =>
+        ctx.withLog(dmbla)
+      }
+    }
+
+  def extractMarkerLog: Directive1[MarkerLoggingAdapter] =
+    withMdcLogging.tflatMap { _ =>
+      extractDiagnosticMarkerLog
+        .map(identity[MarkerLoggingAdapter])
+    }
+
+  def withMdcEntries(entries: (String, Any)*): Directive0 =
+    withMdcLogging.tflatMap { _ =>
+      extractDiagnosticMarkerLog
+        .map(log => log.mdc(log.mdc ++ entries.toMap))
+    }
+
+  def withMdcEntry(key: String, value: Any): Directive0 =
+    withMdcEntries((key, value))
+}
+
+object MdcLoggingDirectives extends MdcLoggingDirectives {
+  private val extractDiagnosticMarkerLog: Directive1[DiagnosticMarkerBusLoggingAdapter] =
+    extractActorSystem
+      .flatMap { sys =>
+        extractRequestContext
+          .flatMap { ctx =>
+            provide {
+              ctx.log match {
+                // If it's already a DiagnosticMarkerBusLoggingAdapter, this is a no-op.
+                case dmbla: DiagnosticMarkerBusLoggingAdapter => dmbla
+                // Otherwise, we need to construct a DiagnosticLoggingAdapter.
+                case _ =>
+                  val (str, cls) = LogSource.fromAnyRef(sys, sys)
+                  val filter = new DefaultLoggingFilter(sys.settings, sys.eventStream)
+                  new DiagnosticMarkerBusLoggingAdapter(sys.eventStream, str, cls, filter)
+              }
+            }
+          }
+      }
+}

docs/src/main/paradox/routing-dsl/directives/alphabetically.md

@@ -41,6 +41,7 @@
 |@ref[extractMaterializer](basic-directives/extractMaterializer.md)                                                   | Extracts the @apidoc[Materializer] from the @apidoc[RequestContext]                                                                                                                                                     |
 |@ref[extractHost](host-directives/extractHost.md)                                                                    | Extracts the hostname part of the Host request header value                                                                                                                                               |
 |@ref[extractLog](basic-directives/extractLog.md)                                                                     | Extracts the @apidoc[LoggingAdapter] from the @apidoc[RequestContext]                                                                                                                                                   |
+|@ref[extractMarkerLog](mdc-logging-directives/extractMarkerLog.md)                                  | Calls @ref[withMdcLogging](mdc-logging-directives/withMdcLogging.md) and provides the resulting @apidoc[MarkerLoggingAdapter] from the @apidoc[RequestContext] |
 |@ref[extractMethod](method-directives/extractMethod.md)                                                              | Extracts the request method                                                                                                                                                                               |
 |@ref[extractOfferedWsProtocols](websocket-directives/extractOfferedWsProtocols.md)                                   | Extract the list of websocket subprotocols offered by the client in the `Sec-WebSocket-Protocol` header if this is a websocket request and otherwise rejects with an @apidoc[ExpectedWebSocketRequestRejection$]  |
 |@ref[extractParserSettings](basic-directives/extractParserSettings.md)                                               | Extracts the @apidoc[ParserSettings] from the @apidoc[RequestContext]                                                                                                                                                   |
@@ -158,6 +159,9 @@
 |@ref[withExecutionContext](basic-directives/withExecutionContext.md)                                                 | Runs its inner route with the given alternative `ExecutionContext`                                                                                                                                        |
 |@ref[withLog](basic-directives/withLog.md)                                                                           | Runs its inner route with the given alternative @apidoc[LoggingAdapter]                                                                                                                                          |
 |@ref[withMaterializer](basic-directives/withMaterializer.md)                                                         | Runs its inner route with the given alternative @apidoc[Materializer]                                                                                                                                            |
+|@ref[withMdcEntries](mdc-logging-directives/withMdcEntries.md)                                                       | Adds one or more (key, value) entries to the current MDC logging context |
+|@ref[withMdcEntry](mdc-logging-directives/withMdcEntry.md)                                                           | Adds a single (key, value) entry to the current MDC logging context |
+|@ref[withMdcLogging](mdc-logging-directives/withMdcLogging.md)                                                       | Replaces the @apidoc[RequestContext]'s existing @apidoc[LoggingAdapter] with an MDC-compatible @apidoc[MarkerLoggingAdapter] |
 |@ref[withPrecompressedMediaTypeSupport](coding-directives/withPrecompressedMediaTypeSupport.md)                      | Adds a `Content-Encoding: gzip` response header if the entity's media-type is precompressed with gzip header                                                                                              |
 |@ref[withRangeSupport](range-directives/withRangeSupport.md)                                                         | Adds `Accept-Ranges: bytes` to responses to GET requests, produces partial responses if the initial request contained a valid `Range` header                                                              |
 |@ref[withRequestTimeout](timeout-directives/withRequestTimeout.md)                                                   | Configures the @ref[request timeouts](../../common/timeouts.md#request-timeout) for a given route.                                                                                                        |

docs/src/main/paradox/routing-dsl/directives/by-trait.md

@@ -77,6 +77,9 @@ All predefined directives are organized into traits that form one part of the ov
 @ref[TimeoutDirectives](timeout-directives/index.md)
 :   Configure request timeouts and automatic timeout responses.
 
+@ref[MdcLoggingDirectives](mdc-logging-directives/index.md)
+:   Directives for mapped diagnostic context logging.
+
 ## List of predefined directives by trait
 
 @@toc { depth=1 }
@@ -109,5 +112,6 @@ All predefined directives are organized into traits that form one part of the ov
 * [security-directives/index](security-directives/index.md)
 * [websocket-directives/index](websocket-directives/index.md)
 * [timeout-directives/index](timeout-directives/index.md)
+* [mdc-logging-directives/index](mdc-logging-directives/index.md)
 
 @@@

docs/src/main/paradox/routing-dsl/directives/mdc-logging-directives/extractMarkerLog.md

@@ -0,0 +1,20 @@
+# extractMarkerLog
+
+@@@ div { .group-scala }
+
+## Signature
+
+@@signature [MdcLoggingDirectives.scala](/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MdcLoggingDirectives.scala) { #extractMarkerLog }
+
+@@@
+
+## Description
+
+Calls @ref[withMdcLogging](./withMdcLogging.md) and provides the resulting @apidoc[MarkerLoggingAdapter] from the @apidoc[RequestContext].
+
+Nested calls will provide the same instance of `MarkerLoggingAdapter`.
+
+## Example
+
+Scala
+:  @@snip [MdcLoggingDirectivesExamplesSpec.scala](/docs/src/test/scala/docs/http/scaladsl/server/directives/MdcLoggingDirectivesExamplesSpec.scala) { #extractMarkerLog }

docs/src/main/paradox/routing-dsl/directives/mdc-logging-directives/index.md

@@ -0,0 +1,41 @@
+# MdcLoggingDirectives
+
+Directives for request-level mapped diagnostic context logging using the @apidoc[MarkerLoggingAdapter]. 
+
+These directives provide an API to setup a new MDC-compatible logger for every request and append (key, value) MDC entries to be included in any emitted logs for the duration of the request 
+
+For example, one might extract a request ID from a header at the beginning of the request and append it as a (key, value) MDC entry.
+Any subsequent logs emitted by this request would include the request ID as an entry.
+
+@@toc { depth=1 }
+
+@@@ index
+
+* [withMdcLogging](withMdcLogging.md)
+* [withMdcEntries](withMdcEntries.md)
+* [withMdcEntry](withMdcEntry.md)
+* [extractMarkerLog](extractMarkerLog.md)
+
+@@@
+
+## Structured JSON MDC Logging
+
+In order to get structured (i.e., JSON) MDC logging, some additional configurations are necessary. 
+One possible configuration is as follows:
+
+1. Add akka-slf4j, logback-classic, and logstash-logback-encoder as dependencies.
+2. Add the configuration `akka.loggers = ["akka.event.slf4j.Slf4jLogger"]` to application.conf.
+3. Create a `logback.xml` file with an appender that uses the LogstashEncoder:
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
+    </appender>
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+    </root>
+</configuration>
+```  
+

docs/src/main/paradox/routing-dsl/directives/mdc-logging-directives/withMdcEntries.md

@@ -0,0 +1,20 @@
+# withMdcEntries
+
+@@@ div { .group-scala }
+
+## Signature
+
+@@signature [MdcLoggingDirectives.scala](/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MdcLoggingDirectives.scala) { #withMdcEntries }
+
+@@@
+
+## Description
+
+Adds one or more (key, value) entries to the current MDC logging context.
+
+Nested calls will accumulate entries.
+
+## Example
+
+Scala
+:  @@snip [MdcLoggingDirectivesExamplesSpec.scala](/docs/src/test/scala/docs/http/scaladsl/server/directives/MdcLoggingDirectivesExamplesSpec.scala) { #withMdcEntries }

docs/src/main/paradox/routing-dsl/directives/mdc-logging-directives/withMdcEntry.md

@@ -0,0 +1,20 @@
+# withMdcEntry
+
+@@@ div { .group-scala }
+
+## Signature
+
+@@signature [MdcLoggingDirectives.scala](/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MdcLoggingDirectives.scala) { #withMdcEntry }
+
+@@@
+
+## Description
+
+Adds a single (key, value) entry to the current MDC logging context.
+
+Nested calls will accumulate entries.
+
+## Example
+
+Scala
+:  @@snip [MdcLoggingDirectivesExamplesSpec.scala](/docs/src/test/scala/docs/http/scaladsl/server/directives/MdcLoggingDirectivesExamplesSpec.scala) { #withMdcEntry }

docs/src/main/paradox/routing-dsl/directives/mdc-logging-directives/withMdcLogging.md

@@ -0,0 +1,20 @@
+# withMdcLogging
+
+@@@ div { .group-scala }
+
+## Signature
+
+@@signature [MdcLoggingDirectives.scala](/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MdcLoggingDirectives.scala) { #withMdcLogging }
+
+@@@
+
+## Description
+
+Replaces the @apidoc[RequestContext]'s existing @apidoc[LoggingAdapter] with an MDC-compatible @apidoc[MarkerLoggingAdapter].
+
+Nested calls will provide the same instance of `MarkerLoggingAdapter`.
+
+## Example
+
+Scala
+:  @@snip [MdcLoggingDirectivesExamplesSpec.scala](/docs/src/test/scala/docs/http/scaladsl/server/directives/MdcLoggingDirectivesExamplesSpec.scala) { #withMdcLogging }