aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/core/rest.scala
diff options
context:
space:
mode:
authorJohn St. John <jstjohn@users.noreply.github.com>2017-09-21 16:28:23 -0700
committerGitHub <noreply@github.com>2017-09-21 16:28:23 -0700
commit9b0bed19489dbbd59c52a77e9c0c080a880ca262 (patch)
tree74934c57133ada3cd84a5c8a702cdf2683e8881e /src/main/scala/xyz/driver/core/rest.scala
parent037f522caf47d70d674daba62b540a451542c64d (diff)
downloaddriver-core-9b0bed19489dbbd59c52a77e9c0c080a880ca262.tar.gz
driver-core-9b0bed19489dbbd59c52a77e9c0c080a880ca262.tar.bz2
driver-core-9b0bed19489dbbd59c52a77e9c0c080a880ca262.zip
Jstjohn/google stackdriver trace (#64)v1.0.1
Add app-level tracing to driver-core (https://www.pivotaltracker.com/story/show/151100422)
Diffstat (limited to 'src/main/scala/xyz/driver/core/rest.scala')
-rw-r--r--src/main/scala/xyz/driver/core/rest.scala10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala
index dde570a..95df010 100644
--- a/src/main/scala/xyz/driver/core/rest.scala
+++ b/src/main/scala/xyz/driver/core/rest.scala
@@ -13,8 +13,8 @@ import akka.http.scaladsl.server.AuthenticationFailedRejection.CredentialsReject
import akka.http.scaladsl.server.Route
import akka.http.scaladsl.settings.{ClientConnectionSettings, ConnectionPoolSettings}
import akka.http.scaladsl.unmarshalling.{Unmarshal, Unmarshaller}
-import akka.stream.scaladsl.{Flow, Keep, Sink, Source}
import akka.stream._
+import akka.stream.scaladsl.{Flow, Keep, Sink, Source}
import akka.util.ByteString
import com.github.swagger.akka.model._
import com.github.swagger.akka.{HasActorSystem, SwaggerHttpService}
@@ -24,11 +24,11 @@ import io.swagger.models.Scheme
import org.slf4j.MDC
import pdi.jwt.{Jwt, JwtAlgorithm}
import xyz.driver.core.auth._
-import xyz.driver.core.{Name, generators}
import xyz.driver.core.time.provider.TimeProvider
+import xyz.driver.core.{Name, generators, trace}
-import scala.concurrent.{ExecutionContext, Future, Promise}
import scala.concurrent.duration._
+import scala.concurrent.{ExecutionContext, Future, Promise}
import scala.util.{Failure, Success}
import scalaz.Scalaz.{futureInstance, intInstance, listInstance, mapEqual, mapMonoid, stringInstance}
import scalaz.syntax.equal._
@@ -58,7 +58,8 @@ object `package` {
def extractContextHeaders(request: HttpRequest): Map[String, String] = {
request.headers.filter { h =>
h.name === ContextHeaders.AuthenticationTokenHeader || h.name === ContextHeaders.TrackingIdHeader ||
- h.name === ContextHeaders.PermissionsTokenHeader || h.name === ContextHeaders.StacktraceHeader
+ h.name === ContextHeaders.PermissionsTokenHeader || h.name === ContextHeaders.StacktraceHeader ||
+ h.name === ContextHeaders.TracingHeader
} map { header =>
if (header.name === ContextHeaders.AuthenticationTokenHeader) {
header.name -> header.value.stripPrefix(ContextHeaders.AuthenticationHeaderPrefix).trim
@@ -176,6 +177,7 @@ object ContextHeaders {
val AuthenticationHeaderPrefix = "Bearer"
val TrackingIdHeader = "X-Trace"
val StacktraceHeader = "X-Stacktrace"
+ val TracingHeader = trace.TracingHeaderKey
}
object AuthProvider {