2 files changed, 3 insertions, 6 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala
index f2d1e319..54050c18 100644
--- a/kamon-core/src/main/scala/kamon/Kamon.scala
+++ b/kamon-core/src/main/scala/kamon/Kamon.scala
@@ -16,14 +16,11 @@ package kamon
 
 import _root_.akka.actor
 import _root_.akka.actor._
-import _root_.akka.event.Logging
-import com.typesafe.config.{ ConfigFactory, Config }
+import com.typesafe.config.{ Config, ConfigFactory }
 import kamon.metric._
-import kamon.trace.{ TracerModuleImpl, TracerModule }
+import kamon.trace.TracerModuleImpl
 import org.slf4j.LoggerFactory
 
-import _root_.scala.util.Try
-
 object Kamon {
   private val log = LoggerFactory.getLogger(getClass)
 
diff --git a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala
index 1bd72089..9642233a 100644
--- a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala
+++ b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala
@@ -158,7 +158,7 @@ object TimestampedTraceContextAware {
 }
 
 trait SegmentAware {
-  @volatile var segment: Segment = EmptyTraceContext.EmptySegment
+  @volatile @transient var segment: Segment = EmptyTraceContext.EmptySegment
 }
 
 object SegmentAware {