1 files changed, 17 insertions, 4 deletions
diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala
index f1eab45..7e6c800 100644
--- a/src/main/scala/xyz/driver/core/rest.scala
+++ b/src/main/scala/xyz/driver/core/rest.scala
@@ -18,6 +18,7 @@ import com.typesafe.config.Config
 import io.swagger.models.Scheme
 import xyz.driver.core.auth._
 import xyz.driver.core.time.provider.TimeProvider
+import org.slf4j.MDC
 
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Failure, Success}
@@ -41,9 +42,14 @@ package rest {
         .fold(java.util.UUID.randomUUID.toString)(_.value())
     }
 
+    def extractStacktrace(request: HttpRequest): Array[String] =
+      request.headers.find(_.name == ContextHeaders.StacktraceHeader).fold("")(_.value()).split("->")
+
     def extractContextHeaders(request: HttpRequest): Map[String, String] = {
       request.headers.filter { h =>
-        h.name === ContextHeaders.AuthenticationTokenHeader || h.name === ContextHeaders.TrackingIdHeader
+        h.name === ContextHeaders.AuthenticationTokenHeader ||
+        h.name === ContextHeaders.TrackingIdHeader ||
+        h.name === ContextHeaders.StacktraceHeader
       } map { header =>
         if (header.name === ContextHeaders.AuthenticationTokenHeader) {
           header.name -> header.value.stripPrefix(ContextHeaders.AuthenticationHeaderPrefix).trim
@@ -106,6 +112,7 @@ package rest {
     val PermissionsTokenHeader     = "Permissions"
     val AuthenticationHeaderPrefix = "Bearer"
     val TrackingIdHeader           = "X-Trace"
+    val StacktraceHeader           = "X-Stacktrace"
   }
 
   object AuthProvider {
@@ -265,9 +272,15 @@ package rest {
       val requestTime = time.currentTime()
 
       val request = requestStub
-        .withHeaders(RawHeader(ContextHeaders.TrackingIdHeader, context.trackingId))
-        .withHeaders(context.contextHeaders.toSeq.map { h =>
-          RawHeader(h._1, h._2): HttpHeader
+        .withHeaders(context.contextHeaders.toSeq.map {
+          case (ContextHeaders.TrackingIdHeader, headerValue) =>
+            RawHeader(ContextHeaders.TrackingIdHeader, context.trackingId)
+          case (ContextHeaders.StacktraceHeader, headerValue) =>
+            RawHeader(ContextHeaders.StacktraceHeader,
+                      Option(MDC.get("stack"))
+                        .orElse(context.contextHeaders.get(ContextHeaders.StacktraceHeader))
+                        .getOrElse(""))
+          case (header, headerValue) => RawHeader(header, headerValue)
         }: _*)
 
       log.info(s"Sending request to ${request.method} ${request.uri}")