diff options
author | John St. John <jstjohn@users.noreply.github.com> | 2017-10-05 16:10:49 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-05 16:10:49 -0700 |
commit | b00892d723f6dedf50dc1c1fde7d443e9c3f9497 (patch) | |
tree | 6e71cdeccd66d305d752e8ecb6ef9522f07a04f6 /src/main/scala/xyz/driver/core/rest.scala | |
parent | db83f93f8e63211b538d371f83c780fc01239770 (diff) | |
parent | 2c9f274f961ba6b0af662752afc3c0ee99a475de (diff) | |
download | driver-core-b00892d723f6dedf50dc1c1fde7d443e9c3f9497.tar.gz driver-core-b00892d723f6dedf50dc1c1fde7d443e9c3f9497.tar.bz2 driver-core-b00892d723f6dedf50dc1c1fde7d443e9c3f9497.zip |
cleanup logging, remove old tracing, use new tracing library
Diffstat (limited to 'src/main/scala/xyz/driver/core/rest.scala')
-rw-r--r-- | src/main/scala/xyz/driver/core/rest.scala | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala index 95df010..ee564de 100644 --- a/src/main/scala/xyz/driver/core/rest.scala +++ b/src/main/scala/xyz/driver/core/rest.scala @@ -25,7 +25,7 @@ import org.slf4j.MDC import pdi.jwt.{Jwt, JwtAlgorithm} import xyz.driver.core.auth._ import xyz.driver.core.time.provider.TimeProvider -import xyz.driver.core.{Name, generators, trace} +import xyz.driver.core.{Name, generators} import scala.concurrent.duration._ import scala.concurrent.{ExecutionContext, Future, Promise} @@ -59,7 +59,7 @@ object `package` { request.headers.filter { h => h.name === ContextHeaders.AuthenticationTokenHeader || h.name === ContextHeaders.TrackingIdHeader || h.name === ContextHeaders.PermissionsTokenHeader || h.name === ContextHeaders.StacktraceHeader || - h.name === ContextHeaders.TracingHeader + h.name === ContextHeaders.TraceHeaderName || h.name === ContextHeaders.SpanHeaderName } map { header => if (header.name === ContextHeaders.AuthenticationTokenHeader) { header.name -> header.value.stripPrefix(ContextHeaders.AuthenticationHeaderPrefix).trim @@ -172,12 +172,14 @@ class AuthorizedServiceRequestContext[U <: User](override val trackingId: String } object ContextHeaders { + import xyz.driver.tracing.TracingDirectives val AuthenticationTokenHeader = "Authorization" val PermissionsTokenHeader = "Permissions" val AuthenticationHeaderPrefix = "Bearer" val TrackingIdHeader = "X-Trace" val StacktraceHeader = "X-Stacktrace" - val TracingHeader = trace.TracingHeaderKey + val TraceHeaderName = TracingDirectives.TraceHeaderName + val SpanHeaderName = TracingDirectives.SpanHeaderName } object AuthProvider { |