Support both boolean and binary expressions of Sampled value (Finagle…

… impl and openzipkin spec are contraditory)
lmlynik · Apr 8, 2016 · d9b0dc6 · d9b0dc6
1 parent d6e5b61
commit d9b0dc6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/play/src/main/scala/com/github/levkhomich/akka/tracing/play/TracingSettings.scala b/play/src/main/scala/com/github/levkhomich/akka/tracing/play/TracingSettings.scala
@@ -36,13 +36,13 @@ trait TracingSettings extends GlobalSettings with PlayControllerTracing {
   lazy val excludedHeaders = Set.empty[String]
 
   protected def sample(request: RequestHeader): Unit = {
-    val upstreamSampling = request.headers.get(TracingHeaders.Sampled).map(_.toBoolean)
+    val upstreamSampling = request.headers.get(TracingHeaders.Sampled).map(_.toLowerCase)
     upstreamSampling match {
-      case Some(true) =>
+      case Some("true") | Some("1") =>
         trace.sample(request, serviceName, true)
       case None =>
         trace.sample(request, serviceName)
-      case Some(false) =>
+      case Some(x) =>
       // don't sample
     }
   }

diff --git a/play/src/test/scala/com/github/levkhomich/akka/tracing/play/PlayTracingSpec.scala b/play/src/test/scala/com/github/levkhomich/akka/tracing/play/PlayTracingSpec.scala
@@ -171,7 +171,7 @@ class PlayTracingSpec extends PlaySpecification with TracingTestCommons with Moc
       expectSpans(0)
     }
 
-    "ensure upstream 'do sample' decision is honoured" in new WithApplication(disabledLocalSamplingApplication) {
+    "ensure upstream 'do sample' decision is honoured" in new WithApplication(fakeApplication) {
       val spanId = Random.nextLong
       val result = route(FakeRequest("GET", TestPath + "?key=value",
         FakeHeaders(Seq(
@@ -180,6 +180,16 @@ class PlayTracingSpec extends PlaySpecification with TracingTestCommons with Moc
         )), AnyContentAsEmpty)).map(Await.result(_, defaultAwaitTimeout.duration))
       expectSpans(1)
     }
+
+    "ensure upstream 'do sample' decision is honoured (binary value)" in new WithApplication(fakeApplication) {
+      val spanId = Random.nextLong
+      val result = route(FakeRequest("GET", TestPath + "?key=value",
+        FakeHeaders(Seq(
+          TracingHeaders.TraceId -> Seq(SpanMetadata.idToString(spanId)),
+          TracingHeaders.Sampled -> Seq("1")
+        )), AnyContentAsEmpty)).map(Await.result(_, defaultAwaitTimeout.duration))
+      expectSpans(1)
+    }
   }
 
   step {