use headers already stored in contextheaders and remove unused test import

2 files changed, 3 insertions, 4 deletions

diff --git a/src/main/scala/xyz/driver/core/app.scala b/src/main/scala/xyz/driver/core/app.scala
index 82471b2..06f215a 100644
--- a/src/main/scala/xyz/driver/core/app.scala
+++ b/src/main/scala/xyz/driver/core/app.scala
@@ -23,8 +23,8 @@ import xyz.driver.core.rest._
 import xyz.driver.core.stats.SystemStats
 import xyz.driver.core.time.Time
 import xyz.driver.core.time.provider.{SystemTimeProvider, TimeProvider}
-import xyz.driver.tracing._
 import xyz.driver.tracing.TracingDirectives._
+import xyz.driver.tracing._
 
 import scala.compat.Platform.ConcurrentModificationException
 import scala.concurrent.duration._
@@ -89,8 +89,8 @@ object app {
         "Access-Control-Allow-Headers",
         "Server",
         "Date",
-        TraceHeaderName,
-        SpanHeaderName,
+        ContextHeaders.TraceHeaderName,
+        ContextHeaders.SpanHeaderName,
         ContextHeaders.StacktraceHeader,
         ContextHeaders.AuthenticationTokenHeader,
         "X-Frame-Options",
diff --git a/src/test/scala/xyz/driver/core/MessagesTest.scala b/src/test/scala/xyz/driver/core/MessagesTest.scala
index 3b891d3..08b00b4 100644
--- a/src/test/scala/xyz/driver/core/MessagesTest.scala
+++ b/src/test/scala/xyz/driver/core/MessagesTest.scala
@@ -3,7 +3,6 @@ package xyz.driver.core
 import java.util.Locale
 
 import com.typesafe.config.{ConfigException, ConfigFactory}
-import org.scalatest.mockito.MockitoSugar
 import org.scalatest.{FlatSpec, Matchers}
 import xyz.driver.core.messages.Messages
 import xyz.driver.core.logging.NoLogger