diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2013-11-25 02:09:43 -0300 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2013-11-25 02:09:43 -0300 |
| commit | 1e7a60be32b42df1669933ca40bb8d47740fe90d (patch) | |
| tree | dc689d59755621921d7bbe03fc63189b30a75fd5 /kamon-spray/src/main/scala/spray | |
| parent | 3daf857ad6236e6b3671dd272f0eaa5e90ed5aa9 (diff) | |
| download | Kamon-1e7a60be32b42df1669933ca40bb8d47740fe90d.tar.gz Kamon-1e7a60be32b42df1669933ca40bb8d47740fe90d.tar.bz2 Kamon-1e7a60be32b42df1669933ca40bb8d47740fe90d.zip | |
fix conflict between futures and spray server instrumentation
Diffstat (limited to 'kamon-spray/src/main/scala/spray')
| -rw-r--r-- | kamon-spray/src/main/scala/spray/can/server/ServerRequestTracing.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kamon-spray/src/main/scala/spray/can/server/ServerRequestTracing.scala b/kamon-spray/src/main/scala/spray/can/server/ServerRequestTracing.scala index 8055cf6b..cd7cae93 100644 --- a/kamon-spray/src/main/scala/spray/can/server/ServerRequestTracing.scala +++ b/kamon-spray/src/main/scala/spray/can/server/ServerRequestTracing.scala @@ -1,7 +1,7 @@ package spray.can.server import org.aspectj.lang.annotation.{After, Pointcut, DeclareMixin, Aspect} -import kamon.trace.{Trace, TraceContext, ContextAware} +import kamon.trace.{Trace, ContextAware} import spray.http.HttpRequest import akka.actor.ActorSystem import akka.event.Logging.Warning |