diff options
| author | vlad <vlad@drivergrp.com> | 2016-11-09 11:14:04 -0800 |
|---|---|---|
| committer | vlad <vlad@drivergrp.com> | 2016-11-09 11:14:04 -0800 |
| commit | 3c6b272033341c38b2cb1852a7b48ea7befb7002 (patch) | |
| tree | 9674b34df268c2aea1c9e43654fb48db560e89db /src/main/scala/xyz/driver/core/rest.scala | |
| parent | 3fa6c7797d019dacedd90924f01e2e1f38cd42b8 (diff) | |
| download | driver-core-3c6b272033341c38b2cb1852a7b48ea7befb7002.tar.gz driver-core-3c6b272033341c38b2cb1852a7b48ea7befb7002.tar.bz2 driver-core-3c6b272033341c38b2cb1852a7b48ea7befb7002.zip | |
DIR-135 Return tracing headers in all responsesv0.9.12
Diffstat (limited to 'src/main/scala/xyz/driver/core/rest.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/core/rest.scala | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala index 1988cf4..f05a800 100644 --- a/src/main/scala/xyz/driver/core/rest.scala +++ b/src/main/scala/xyz/driver/core/rest.scala @@ -22,7 +22,12 @@ object rest { object ContextHeaders { val AuthenticationTokenHeader = "WWW-Authenticate" - val TrackingIdHeader = "l5d-ctx-trace" // https://linkerd.io/doc/0.7.4/linkerd/protocol-http/ + val TrackingIdHeader = "X-Trace" + + object LinkerD { + // https://linkerd.io/doc/0.7.4/linkerd/protocol-http/ + def isLinkerD(headerName: String) = headerName.startsWith("l5d-") + } } final case class ServiceRequestContext( @@ -45,7 +50,8 @@ object rest { def extractContextHeaders(ctx: RequestContext): Map[String, String] = { ctx.request.headers.filter { h => - h.lowercaseName.startsWith("l5d-") || h.name === ContextHeaders.AuthenticationTokenHeader + h.name === ContextHeaders.AuthenticationTokenHeader || h.name === ContextHeaders.TrackingIdHeader + // || ContextHeaders.LinkerD.isLinkerD(h.lowercaseName) } map { header => header.name -> header.value } toMap |