Merge 37f66c3 into 51037ae

broadinstitute · Sep 12, 2019 · 88dd538 · 88dd538
2 parents 51037ae + 37f66c3
commit 88dd538
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/google2/src/main/scala/org/broadinstitute/dsde/workbench/google2/JsonCodec.scala b/google2/src/main/scala/org/broadinstitute/dsde/workbench/google2/JsonCodec.scala
@@ -10,5 +10,5 @@ object JsonCodec {
       s"projects/${projectTopicName.getProject}/topics/${projectTopicName.getTopic}"
   )
 
-  implicit val traceIdEncoder: Encoder[TraceId] = Encoder.encodeString.contramap(_.uuid.toString)
+  implicit val traceIdEncoder: Encoder[TraceId] = Encoder.encodeString.contramap(_.asString)
 }
diff --git a/model/src/main/scala/org/broadinstitute/dsde/workbench/model/models.scala b/model/src/main/scala/org/broadinstitute/dsde/workbench/model/models.scala
@@ -2,5 +2,9 @@ package org.broadinstitute.dsde.workbench.model
 
 import java.util.UUID
 
-// uuid for tracing a unique call flow in logging
-final case class TraceId(uuid: UUID) extends AnyVal
+// unique identifier for tracing a unique call flow in logging
+final case class TraceId(asString: String) extends AnyVal
+
+object TraceId {
+  def apply(uuid: UUID): TraceId = new TraceId(uuid.toString)
+}
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -9,4 +9,4 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
 
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")
 
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.1.1")
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.3.2")