Added writing tracking Id to MDC so it can be logged for all messages, removed some linkerd legacy and refined Revision equals

1 files changed, 7 insertions, 4 deletions

diff --git a/src/main/scala/xyz/driver/core/app.scala b/src/main/scala/xyz/driver/core/app.scala
index 8edb427..5a1b803 100644
--- a/src/main/scala/xyz/driver/core/app.scala
+++ b/src/main/scala/xyz/driver/core/app.scala
@@ -68,7 +68,8 @@ object app {
       val versionRt      = versionRoute(version, gitHash, time.currentTime())
 
       val _ = Future {
-        http.bindAndHandle(route2HandlerFlow(handleExceptions(ExceptionHandler(exceptionHandler)) { ctx =>
+        http.bindAndHandle(route2HandlerFlow({ ctx =>
+
           val trackingId = rest.extractTrackingId(ctx.request)
           MDC.put("trackingId", trackingId)
           log.audit(s"Received request ${ctx.request}")
@@ -76,9 +77,11 @@ object app {
           val contextWithTrackingId =
             ctx.withRequest(ctx.request.addHeader(RawHeader(ContextHeaders.TrackingIdHeader, trackingId)))
 
-          respondWithHeaders(List(RawHeader(ContextHeaders.TrackingIdHeader, trackingId))) {
-            modules.map(_.route).foldLeft(versionRt ~ healthRoute ~ swaggerRoutes)(_ ~ _)
-          }(contextWithTrackingId)
+          handleExceptions(ExceptionHandler(exceptionHandler))({ _ =>
+            respondWithHeaders(List(RawHeader(ContextHeaders.TrackingIdHeader, trackingId))) {
+              modules.map(_.route).foldLeft(versionRt ~ healthRoute ~ swaggerRoutes)(_ ~ _)
+            }(contextWithTrackingId)
+          })(contextWithTrackingId)
         }), interface, port)(materializer)
       }
     }