MdcLoggingDirectives (withMdcLogging, withMdcEntry, withMdcEntries, extractMarkerLog)

.gitignore

@@ -10,3 +10,4 @@ target
 .*.swp
 *.vim
 .ensime*
+.bsp

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

@@ -0,0 +1,91 @@
+package akka.http.scaladsl.server.directives
+
+import akka.event._
+import akka.http.scaladsl.server.RoutingSpec
+import akka.testkit.EventFilter
+
+import scala.collection.mutable.ListBuffer
+
+class MdcLoggingDirectivesSpec extends RoutingSpec {
+
+  "The `withMarkerLoggingAdapter` directive" should {
+    "set a DiagnosticMarkerBusLoggingAdapter on the request context and provide the same adapter to the caller" in {
+      Get() ~> withMarkerLoggingAdapter { provided: MarkerLoggingAdapter =>
+        extractLog { extracted: LoggingAdapter =>
+          extracted shouldEqual provided
+          completeOk
+        }
+      } ~> check {
+        response shouldEqual Ok
+      }
+    }
+    "provides a new DiagnosticMarkerBusLoggingAdapter for each invocation" in {
+      Get() ~> withMarkerLoggingAdapter { _ =>
+        extractLog { log1 =>
+          withMarkerLoggingAdapter { _ =>
+            extractLog { log2 =>
+              log1 should not equal log2
+              completeOk
+            }
+          }
+        }
+      } ~> check {
+        response shouldEqual Ok
+      }
+    }
+  }
+
+  "The `withMdcEntries` and `withMdcEntry` directives" should {
+    "incrementally append entries to the LoggingAdapter MDC maps" in {
+      Get() ~> extractLog { log1 =>
+        withMdcEntry("foo", "foo entry 1") {
+          extractLog { log2 =>
+            withMdcEntries("foo" -> "foo entry 2", "bar" -> "bar entry 1") {
+              extractLog { log3 =>
+                log1.mdc shouldBe Map.empty
+                log2.mdc shouldBe Map("foo" -> "foo entry 1")
+                log3.mdc shouldBe Map("foo" -> "foo entry 2", "bar" -> "bar entry 1")
+                completeOk
+              }
+            }
+          }
+        }
+      } ~> check {
+        response shouldEqual Ok
+      }
+    }
+    "include the entries in the LoggingEvents" in {
+      val buf = ListBuffer.empty[Logging.Info2]
+      val filter = EventFilter.custom {
+        case e: Logging.Info2 => buf.append(e).nonEmpty
+
+      }
+      filter.intercept {
+        Get() ~> withMdcEntries("user_id" -> "1234", "request_id" -> "abcd") {
+          extractLog { log1 =>
+            log1.info("test 1")
+            withMdcEntry("status", "200") {
+              extractLog { log2 =>
+                log1.info("test 2")
+                log2.info("test 3")
+                completeOk
+              }
+            }
+          }
+        } ~> check {
+          response shouldEqual Ok
+          buf.size shouldBe 3
+          val l1 = buf(0)
+          val l2 = buf(1)
+          val l3 = buf(2)
+          l1.message shouldBe "test 1"
+          l1.mdc shouldBe Map("user_id" -> "1234", "request_id" -> "abcd")
+          l2.message shouldBe "test 2"
+          l2.mdc shouldBe Map("user_id" -> "1234", "request_id" -> "abcd")
+          l3.message shouldBe "test 3"
+          l3.mdc shouldBe Map("user_id" -> "1234", "request_id" -> "abcd", "status" -> "200")
+        }
+      }
+    }
+  }
+}

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,64 @@
+package akka.http.scaladsl.server.directives
+
+import akka.event._
+import akka.http.scaladsl.server.Directives._
+import akka.http.scaladsl.server._
+
+/**
+ * @groupname mdc Mdc logging directives
+ * @groupprio mdc 240
+ */
+trait MdcLoggingDirectives {
+
+  import MdcLoggingDirectives.createDiagnosticMarkerLoggingAdapter
+
+  def withMarkerLoggingAdapter: Directive1[MarkerLoggingAdapter] = {
+    createDiagnosticMarkerLoggingAdapter(Map.empty)
+      .flatMap { dmbla: DiagnosticMarkerBusLoggingAdapter =>
+        mapRequestContext { ctx =>
+          ctx.withLog(dmbla)
+        } & provide {
+          dmbla: MarkerLoggingAdapter
+        }
+      }
+  }
+
+  def withMdcEntries(mdc: (String, Any)*): Directive0 =
+    createDiagnosticMarkerLoggingAdapter(mdc.toMap)
+      .flatMap { dmbla: DiagnosticMarkerBusLoggingAdapter =>
+        mapRequestContext { ctx =>
+          ctx.withLog(dmbla)
+        }
+      }
+
+  def withMdcEntry(key: String, value: Any): Directive0 =
+    withMdcEntries((key, value))
+}
+
+object MdcLoggingDirectives extends MdcLoggingDirectives {
+  private def createDiagnosticMarkerLoggingAdapter(entries: Map[String, Any]): Directive1[DiagnosticMarkerBusLoggingAdapter] =
+    extractActorSystem
+      .flatMap { sys =>
+        extractRequestContext
+          .flatMap { ctx =>
+            provide {
+              ctx.log match {
+                // In order to avoid race conditions from using a shared LoggingAdapter, even if the existing adapter
+                // is a DiagnosticMarkerBusLoggingAdapter, we still create a new one and merge the two entries.
+                case existingAdapter: DiagnosticMarkerBusLoggingAdapter =>
+                  import existingAdapter._
+                  val newAdapter = new DiagnosticMarkerBusLoggingAdapter(bus, logSource, logClass, loggingFilterWithMarker)
+                  newAdapter.mdc(existingAdapter.mdc ++ entries)
+                  newAdapter
+                // If the logger is not already a DiagnosticLoggingAdapter, we create a new one with the given entries.
+                case _ =>
+                  val (str, cls) = LogSource.fromAnyRef(sys, sys)
+                  val filter = new DefaultLoggingFilter(sys.settings, sys.eventStream)
+                  val newAdapter = new DiagnosticMarkerBusLoggingAdapter(sys.eventStream, str, cls, filter)
+                  newAdapter.mdc(entries)
+                  newAdapter
+              }
+            }
+          }
+      }
+}

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

@@ -158,6 +158,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 @apidoc[LoggingAdapter]'s MDC map. All subsequent logs using this @apidoc[LoggingAdapter] will include the given entries. |
+|@ref[withMdcEntry](mdc-logging-directives/withMdcEntry.md) | Adds a single (key, value) entry to the @apidoc[LoggingAdapter]'s MDC map. All subsequent logs using this @apidoc[LoggingAdapter] will include the given entries. |
+|@ref[withMarkerLoggingAdapter](mdc-logging-directives/withMarkerLoggingAdapter.md) | Replaces the @apidoc[RequestContext]'s existing @apidoc[LoggingAdapter] with a new instance of @apidoc[MarkerLoggingAdapter] and provides the same @apidoc[MarkerLoggingAdapter] to the caller. If the existing @apidoc[LoggingAdapter] already has an MDC map, the directive will copy its entries into the new @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/index.md

@@ -0,0 +1,40 @@
+# MdcLoggingDirectives
+
+Directives for request-level mapped diagnostic context logging using the @apidoc[MarkerLoggingAdapter]. 
+
+These directives provide an API to instantiate a new MDC-compatible logger for every request and append (key, value) MDC entries to be included in any logs emitted from 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
+
+* [withMarkerLoggingAdapter](withMarkerLoggingAdapter.md)
+* [withMdcEntries](withMdcEntries.md)
+* [withMdcEntry](withMdcEntry.md)
+
+@@@
+
+## Structured JSON MDC Logging
+
+In order to get structured (i.e., JSON) MDC logging, some additional dependencies and 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/withMarkerLoggingAdapter.md

@@ -0,0 +1,18 @@
+# withMarkerLoggingAdapter
+
+@@@ div { .group-scala }
+
+## Signature
+
+@@signature [MdcLoggingDirectives.scala](/akka-http/src/main/scala/akka/http/scaladsl/server/directives/MdcLoggingDirectives.scala) { #withMarkerLoggingAdapter }
+
+@@@
+
+## Description
+
+Replaces the @apidoc[RequestContext]'s existing @apidoc[LoggingAdapter] with a new instance of @apidoc[MarkerLoggingAdapter] and provides the same @apidoc[MarkerLoggingAdapter] to the caller. If the existing @apidoc[LoggingAdapter] already has an MDC map, the directive will copy its entries into the new @apidoc[MarkerLoggingAdapter].
+
+## Example
+
+Scala
+:  @@snip [MdcLoggingDirectivesExamplesSpec.scala](/docs/src/test/scala/docs/http/scaladsl/server/directives/MdcLoggingDirectivesExamplesSpec.scala) { #withMarkerLoggingAdapter }

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/test/scala/docs/http/scaladsl/server/directives/MdcLoggingDirectivesExamplesSpec.scala

@@ -0,0 +1,49 @@
+package docs.http.scaladsl.server.directives
+
+import akka.event._
+import akka.http.scaladsl.model.StatusCodes
+import akka.http.scaladsl.server.RoutingSpec
+import docs.CompileOnlySpec
+
+class MdcLoggingDirectivesExamplesSpec extends RoutingSpec with CompileOnlySpec {
+
+  "withMarkerLoggingAdapter" in {
+    //#withMarkerLoggingAdapter
+    withMarkerLoggingAdapter { m: MarkerLoggingAdapter =>
+      // This log.info includes entries for "user_id" and "request_id",
+      // but subsequent logging calls will not include them.
+      val marker = LogMarker("", Map("user_id" -> "1234", "request_id" -> "abcd"))
+      m.info(marker, "completing request")
+      complete(StatusCodes.OK)
+    }
+    //#withMarkerLoggingAdapter
+  }
+
+  "withMdcEntries" in {
+    //#withMdcEntries
+    withMdcEntries(("user_id", "1234"), ("request_id", "abcd")) {
+      extractLog { log =>
+        // This log.info includes entries for "user_id" and "request_id",
+        // and subsequent calls will also include them.
+        log.info("completing request")
+        complete(StatusCodes.OK)
+      }
+    }
+    //#withMdcEntries
+  }
+
+  "withMdcEntry" in {
+    //#withMdcEntry
+    withMdcEntry("user_id", "1234") {
+      withMdcEntry("request_id", "abcd") {
+        extractLog { log =>
+          // This log.info includes entries for "user_id" and "request_id",
+          // and subsequent calls will also include them.
+          log.info("completing request")
+          complete(StatusCodes.OK)
+        }
+      }
+    }
+    //#withMdcEntry
+  }
+}