aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.sbt10
-rw-r--r--src/main/scala/GoogleTracer.scala17
-rw-r--r--src/main/scala/Span.scala2
-rw-r--r--src/main/scala/TracingDirectives.scala13
-rw-r--r--src/main/scala/google/OAuth2.scala19
-rw-r--r--src/main/scala/google/api.scala7
-rw-r--r--src/test/scala/TracingDirectivesSpec.scala26
7 files changed, 48 insertions, 46 deletions
diff --git a/build.sbt b/build.sbt
index dbf4d5d..5b9ea39 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,12 +1,12 @@
scalaVersion := "2.12.3"
libraryDependencies ++= Seq(
- "com.pauldijou" %% "jwt-core" % "0.14.0",
- "com.typesafe.akka" %% "akka-http" % "10.0.10",
+ "com.pauldijou" %% "jwt-core" % "0.14.0",
+ "com.typesafe.akka" %% "akka-http" % "10.0.10",
"com.typesafe.akka" %% "akka-http-spray-json" % "10.0.10",
- "io.spray" %% "spray-json" % "1.3.3",
- "com.typesafe.akka" %% "akka-http-testkit" % "10.0.10" % "test",
- "org.scalatest" %% "scalatest" % "3.0.2" % "test",
+ "io.spray" %% "spray-json" % "1.3.3",
+ "com.typesafe.akka" %% "akka-http-testkit" % "10.0.10" % "test",
+ "org.scalatest" %% "scalatest" % "3.0.2" % "test",
)
fork in test := true
diff --git a/src/main/scala/GoogleTracer.scala b/src/main/scala/GoogleTracer.scala
index 7ffd356..42fb9fd 100644
--- a/src/main/scala/GoogleTracer.scala
+++ b/src/main/scala/GoogleTracer.scala
@@ -1,19 +1,18 @@
package xyz.driver.tracing
-import google._
import java.nio.file.Path
-import akka.stream._
-import akka.stream.scaladsl._
+
import akka.actor.ActorSystem
import akka.http.scaladsl._
-import akka.http.scaladsl.marshalling._
import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
+import akka.http.scaladsl.marshalling._
import akka.http.scaladsl.model._
-import akka.http.scaladsl.server._
-import scala.util.control._
+import akka.stream._
+import akka.stream.scaladsl._
+import xyz.driver.tracing.google._
+
import scala.concurrent.duration._
-import spray.json.DefaultJsonProtocol._
-import java.util.UUID
+import scala.util.control._
class GoogleTracer(projectId: String,
serviceAccountFile: Path,
@@ -69,7 +68,7 @@ class GoogleTracer(projectId: String,
.viaMat(connectionPool)(Keep.left)
.mapError {
case NonFatal(e) =>
- system.log.error(s"Exception encountered while submitting trace", e)
+ system.log.error(e, s"Exception encountered while submitting trace")
e
}
.to(Sink.ignore)
diff --git a/src/main/scala/Span.scala b/src/main/scala/Span.scala
index fcd52b6..f5851f4 100644
--- a/src/main/scala/Span.scala
+++ b/src/main/scala/Span.scala
@@ -1,7 +1,7 @@
package xyz.driver.tracing
-import java.util.UUID
import java.time._
+import java.util.UUID
case class Span(
name: String,
diff --git a/src/main/scala/TracingDirectives.scala b/src/main/scala/TracingDirectives.scala
index d0cbfd2..6dd0b09 100644
--- a/src/main/scala/TracingDirectives.scala
+++ b/src/main/scala/TracingDirectives.scala
@@ -1,13 +1,12 @@
package xyz.driver.tracing
+import java.util.UUID
+
import akka.http.scaladsl.model._
import akka.http.scaladsl.model.headers._
-import akka.http.scaladsl.server._
import akka.http.scaladsl.server.Directives._
-import java.util.UUID
-import scala.util.Random
-import java.time._
-import scala.concurrent._
+import akka.http.scaladsl.server._
+
import scala.collection.immutable.Seq
trait TracingDirectives {
@@ -21,7 +20,9 @@ trait TracingDirectives {
def withTraceContext(ctx: TraceContext): Directive0 =
mapRequest(req => req.withHeaders(ctx.headers))
- def trace(tracer: Tracer, name: String, extraLabels: Map[String, String] = Map.empty): Directive0 =
+ def trace(tracer: Tracer,
+ name: String,
+ extraLabels: Map[String, String] = Map.empty): Directive0 =
extractRequest.flatMap { request =>
val labels = Map(
"/http/user_agent" -> "driver-tracer",
diff --git a/src/main/scala/google/OAuth2.scala b/src/main/scala/google/OAuth2.scala
index 43811c4..d17ec78 100644
--- a/src/main/scala/google/OAuth2.scala
+++ b/src/main/scala/google/OAuth2.scala
@@ -1,22 +1,21 @@
package xyz.driver.tracing
package google
-import akka.stream.scaladsl._
-import akka.stream._
-import akka.stream.stage._
+import java.nio.file._
+import java.time._
+
import akka.http.scaladsl._
-import akka.http.scaladsl.unmarshalling._
import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
import akka.http.scaladsl.model._
import akka.http.scaladsl.model.headers._
-import akka.util.ByteString
-import java.time._
-import java.nio.file._
-import spray.json._
-import spray.json.DefaultJsonProtocol._
+import akka.http.scaladsl.unmarshalling._
+import akka.stream._
+import akka.stream.scaladsl._
import pdi.jwt._
+import spray.json.DefaultJsonProtocol._
+import spray.json._
+
import scala.concurrent._
-import scala.concurrent.duration._
object OAuth2 {
diff --git a/src/main/scala/google/api.scala b/src/main/scala/google/api.scala
index de4c82b..17db031 100644
--- a/src/main/scala/google/api.scala
+++ b/src/main/scala/google/api.scala
@@ -1,12 +1,13 @@
package xyz.driver.tracing
package google
-import spray.json._
-import spray.json.DefaultJsonProtocol.{LongJsonFormat => _, _}
-import java.util.UUID
import java.nio.ByteBuffer
import java.time._
import java.time.format._
+import java.util.UUID
+
+import spray.json.DefaultJsonProtocol.{LongJsonFormat => _, _}
+import spray.json._
case class TraceSpan(
spanId: Long,
diff --git a/src/test/scala/TracingDirectivesSpec.scala b/src/test/scala/TracingDirectivesSpec.scala
index 2454314..ebe7858 100644
--- a/src/test/scala/TracingDirectivesSpec.scala
+++ b/src/test/scala/TracingDirectivesSpec.scala
@@ -1,18 +1,20 @@
package xyz.driver.tracing
-import akka.actor._
-import akka.stream._
import java.nio.file._
-import akka.http.scaladsl.server._
+
import akka.http.scaladsl.server.Directives._
+import akka.http.scaladsl.server._
import akka.http.scaladsl.testkit.ScalatestRouteTest
-import TracingDirectives._
+import org.scalatest._
+import xyz.driver.tracing.TracingDirectives._
+
import scala.concurrent._
import scala.concurrent.duration._
-import org.scalatest._
-
-class TracingDirectivesSpec extends FlatSpec with BeforeAndAfterAll with ScalatestRouteTest {
+class TracingDirectivesSpec
+ extends FlatSpec
+ with BeforeAndAfterAll
+ with ScalatestRouteTest {
implicit val tracer = new GoogleTracer(
"driverinc-sandbox",
@@ -33,12 +35,12 @@ class TracingDirectivesSpec extends FlatSpec with BeforeAndAfterAll with Scalate
}
}
} ~
- pathPrefix("2") {
- trace(tracer, "test-sub-trace-2") {
- Thread.sleep(20)
- complete("ok")
+ pathPrefix("2") {
+ trace(tracer, "test-sub-trace-2") {
+ Thread.sleep(20)
+ complete("ok")
+ }
}
- }
}
"Tracer" should "submit" in {