From 388842a4afab4d88ae9ea110a310cc72f840a71a Mon Sep 17 00:00:00 2001
From: John St John <johnthesaintjohn@gmail.com>
Date: Thu, 5 Oct 2017 12:38:09 -0700
Subject: remove trace/span header from passed headers prior to adding new
 headers

---
 src/main/scala/TracingDirectives.scala | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/TracingDirectives.scala b/src/main/scala/TracingDirectives.scala
index a172808..34f9c82 100644
--- a/src/main/scala/TracingDirectives.scala
+++ b/src/main/scala/TracingDirectives.scala
@@ -51,7 +51,12 @@ trait TracingDirectives {
         RawHeader(SpanHeaderName, span.spanId.toString)
       )
 
-      mapRequest(childRequest => childRequest.withHeaders(childHeaders)) & mapRouteResult {
+      mapRequest(childRequest =>
+        childRequest
+          .withHeaders(childRequest.headers
+            .filterNot(h =>
+              h.name() == TraceHeaderName ||
+                h.name() == SpanHeaderName) ++ childHeaders)) & mapRouteResult {
         result =>
           tracer.submit(span.end())
           result
-- 
cgit v1.2.3