Stop trying so hard

lloydmeta · Feb 27, 2015 · b03d69c · b03d69c
1 parent cfb90b0
commit b03d69c
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/zipkin-futures-play/src/main/scala/com/beachape/zipkin/ZipkinHeaderFilter.scala b/zipkin-futures-play/src/main/scala/com/beachape/zipkin/ZipkinHeaderFilter.scala
@@ -31,7 +31,7 @@ class ZipkinHeaderFilter(zipkinServiceFactory: => ZipkinServiceLike, reqHeaderTo
 
   def apply(nextFilter: (RequestHeader) => Future[Result])(req: RequestHeader): Future[Result] = {
     val parentSpan = zipkinService.generateSpan(reqHeaderToSpanName(req), req2span(req))
-    val fMaybeServerSpan = zipkinService.serverReceived(parentSpan)
+    val fMaybeServerSpan = zipkinService.serverReceived(parentSpan).recover { case NonFatal(e) => None }
     fMaybeServerSpan flatMap {
       case None => nextFilter(req)
       case Some(serverSpan) => {
@@ -42,8 +42,6 @@ class ZipkinHeaderFilter(zipkinServiceFactory: => ZipkinServiceLike, reqHeaderTo
         }
         fResult
       }
-    } recoverWith {
-      case NonFatal(e) => nextFilter(req)
     }
   }