= core: minor refactor

5 files changed, 55 insertions, 30 deletions

diff --git a/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala b/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala
index 973eab5a..e747b731 100644
--- a/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala
+++ b/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala
@@ -21,15 +21,18 @@ import java.util.concurrent.ConcurrentLinkedQueue
 import akka.event.LoggingAdapter
 import kamon.Kamon
 import kamon.metric.{ SegmentMetrics, TraceMetrics }
-import kamon.trace.States.Status
 import kamon.util.{ NanoInterval, RelativeNanoTimestamp }
 
 import scala.annotation.tailrec
 import scala.collection.concurrent.TrieMap
 
-private[kamon] class MetricsOnlyContext(traceName: String, val token: String, traceTags: Map[String, String], currentStatus: Status, val levelOfDetail: LevelOfDetail,
-  val startTimestamp: RelativeNanoTimestamp, log: LoggingAdapter)
-    extends TraceContext {
+private[kamon] class MetricsOnlyContext(traceName: String,
+    val token: String,
+    traceTags: Map[String, String],
+    currentStatus: Status,
+    val levelOfDetail: LevelOfDetail,
+    val startTimestamp: RelativeNanoTimestamp,
+    log: LoggingAdapter) extends TraceContext {
 
   @volatile private var _name = traceName
   @volatile private var _status = currentStatus
@@ -40,7 +43,7 @@ private[kamon] class MetricsOnlyContext(traceName: String, val token: String, tr
   private val _tags = TrieMap.empty[String, String] ++= traceTags
 
   def rename(newName: String): Unit =
-    if (States.Open == status)
+    if (Status.Open == status)
       _name = newName
     else
       log.warning("Can't rename trace from [{}] to [{}] because the trace is already closed.", name, newName)
@@ -53,7 +56,7 @@ private[kamon] class MetricsOnlyContext(traceName: String, val token: String, tr
   def removeTag(key: String, value: String): Boolean = _tags.remove(key, value)
 
   private def finish(withError: Boolean): Unit = {
-    _status = if (withError) States.FinishedWithError else States.FinishedSuccessfully
+    _status = if (withError) Status.FinishedWithError else Status.FinishedSuccessfully
     val traceElapsedTime = NanoInterval.since(startTimestamp)
     _elapsedTime = traceElapsedTime
 
@@ -95,7 +98,13 @@ private[kamon] class MetricsOnlyContext(traceName: String, val token: String, tr
     }
   }
 
-  protected def finishSegment(segmentName: String, category: String, library: String, duration: NanoInterval, segmentTags: Map[String, String], isFinishedWithError: Boolean): Unit = {
+  protected def finishSegment(segmentName: String,
+    category: String,
+    library: String,
+    duration: NanoInterval,
+    segmentTags: Map[String, String],
+    isFinishedWithError: Boolean): Unit = {
+
     _finishedSegments.add(SegmentLatencyData(segmentName, category, library, duration, segmentTags, isFinishedWithError))
 
     if (isClosed) {
@@ -110,13 +119,17 @@ private[kamon] class MetricsOnlyContext(traceName: String, val token: String, tr
   // will be returned.
   def elapsedTime: NanoInterval = _elapsedTime
 
-  class MetricsOnlySegment(segmentName: String, val category: String, val library: String, segmentTags: Map[String, String]) extends Segment {
+  class MetricsOnlySegment(segmentName: String,
+      val category: String,
+      val library: String,
+      segmentTags: Map[String, String]) extends Segment {
+
     private val _startTimestamp = RelativeNanoTimestamp.now
     protected val _tags = TrieMap.empty[String, String] ++= segmentTags
 
     @volatile private var _segmentName = segmentName
     @volatile private var _elapsedTime = NanoInterval.default
-    @volatile private var _status: Status = States.Open
+    @volatile private var _status: Status = Status.Open
 
     def name: String = _segmentName
     def isEmpty: Boolean = false
@@ -126,13 +139,13 @@ private[kamon] class MetricsOnlyContext(traceName: String, val token: String, tr
     def removeTag(key: String, value: String): Boolean = _tags.remove(key, value)
 
     def rename(newName: String): Unit =
-      if (States.Open == status)
+      if (Status.Open == status)
         _segmentName = newName
       else
         log.warning("Can't rename segment from [{}] to [{}] because the segment is already closed.", name, newName)
 
     private def finish(withError: Boolean): Unit = {
-      _status = if (withError) States.FinishedWithError else States.FinishedSuccessfully
+      _status = if (withError) Status.FinishedWithError else Status.FinishedSuccessfully
       val segmentElapsedTime = NanoInterval.since(_startTimestamp)
       _elapsedTime = segmentElapsedTime
 
@@ -154,4 +167,9 @@ private[kamon] class MetricsOnlyContext(traceName: String, val token: String, tr
   }
 }
 
-case class SegmentLatencyData(name: String, category: String, library: String, duration: NanoInterval, tags: Map[String, String], isFinishedWithError: Boolean)
\ No newline at end of file
+case class SegmentLatencyData(name: String,
+  category: String,
+  library: String,
+  duration: NanoInterval,
+  tags: Map[String, String],
+  isFinishedWithError: Boolean)
\ No newline at end of file
diff --git a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala
index 6bf82ac1..43a87470 100644
--- a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala
+++ b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala
@@ -19,7 +19,7 @@ package kamon.trace
 import java.io.ObjectStreamException
 import java.util
 
-import kamon.trace.States.{ Closed, Status }
+import kamon.trace.Status.Closed
 import kamon.trace.TraceContextAware.DefaultTraceContextAware
 import kamon.util.{ Function, RelativeNanoTimestamp, SameThreadExecutionContext, Supplier }
 
@@ -30,7 +30,7 @@ trait TraceContext {
   def token: String
   def isEmpty: Boolean
   def nonEmpty: Boolean = !isEmpty
-  def isClosed: Boolean = !(States.Open == status)
+  def isClosed: Boolean = !(Status.Open == status)
   def status: Status
   def finish(): Unit
   def finishWithError(cause: Throwable): Unit
@@ -88,7 +88,7 @@ trait Segment {
   def library: String
   def isEmpty: Boolean
   def nonEmpty: Boolean = !isEmpty
-  def isClosed: Boolean = !(States.Open == status)
+  def isClosed: Boolean = !(Status.Open == status)
   def status: Status
   def finish(): Unit
   def finishWithError(cause: Throwable): Unit
@@ -148,8 +148,8 @@ object LevelOfDetail {
   case object FullTrace extends LevelOfDetail
 }
 
-object States {
-  sealed trait Status
+sealed trait Status
+object Status {
   case object Open extends Status
   case object Closed extends Status
   case object FinishedWithError extends Status
diff --git a/kamon-core/src/main/scala/kamon/trace/TracerModule.scala b/kamon-core/src/main/scala/kamon/trace/TracerModule.scala
index 2fc166b6..a0aff083 100644
--- a/kamon-core/src/main/scala/kamon/trace/TracerModule.scala
+++ b/kamon-core/src/main/scala/kamon/trace/TracerModule.scala
@@ -23,7 +23,6 @@ import akka.event.{ Logging, LoggingAdapter }
 import com.typesafe.config.Config
 import kamon.Kamon
 import kamon.metric.MetricsModule
-import kamon.trace.States.Status
 import kamon.util._
 
 import scala.collection.JavaConverters._
@@ -140,7 +139,7 @@ private[kamon] class TracerModuleImpl(metricsExtension: MetricsModule, config: C
     createTraceContext(name, token, tags, timestamp, status, isLocal)
 
   private def createTraceContext(traceName: String, token: Option[String], tags: Map[String, String] = Map.empty, startTimestamp: RelativeNanoTimestamp = RelativeNanoTimestamp.now,
-    status: Status = States.Open, isLocal: Boolean = true): TraceContext = {
+    status: Status = Status.Open, isLocal: Boolean = true): TraceContext = {
 
     def newMetricsOnlyContext(token: String): TraceContext =
       new MetricsOnlyContext(traceName, token, tags, status, _settings.levelOfDetail, startTimestamp, _logger)
@@ -153,7 +152,7 @@ private[kamon] class TracerModuleImpl(metricsExtension: MetricsModule, config: C
       case _ if !isLocal || !_settings.sampler.shouldTrace ⇒
         newMetricsOnlyContext(traceToken)
       case _ ⇒
-        new TracingContext(traceName, traceToken, tags, currentStatus = States.Open, _settings.levelOfDetail, isLocal, startTimestamp, _logger, dispatchTracingContext)
+        new TracingContext(traceName, traceToken, tags, currentStatus = Status.Open, _settings.levelOfDetail, isLocal, startTimestamp, _logger, dispatchTracingContext)
     }
   }
 
diff --git a/kamon-core/src/main/scala/kamon/trace/TracingContext.scala b/kamon-core/src/main/scala/kamon/trace/TracingContext.scala
index 496d7317..34a373fb 100644
--- a/kamon-core/src/main/scala/kamon/trace/TracingContext.scala
+++ b/kamon-core/src/main/scala/kamon/trace/TracingContext.scala
@@ -20,14 +20,19 @@ import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.atomic.AtomicInteger
 
 import akka.event.LoggingAdapter
-import kamon.trace.States.Status
 import kamon.util.{ NanoInterval, NanoTimestamp, RelativeNanoTimestamp }
 
 import scala.collection.concurrent.TrieMap
 
-private[trace] class TracingContext(traceName: String, token: String, tags: Map[String, String], currentStatus: Status, levelOfDetail: LevelOfDetail,
-  isLocal: Boolean, startTimeztamp: RelativeNanoTimestamp, log: LoggingAdapter, traceInfoSink: TracingContext ⇒ Unit)
-    extends MetricsOnlyContext(traceName, token, tags, currentStatus, levelOfDetail, startTimeztamp, log) {
+private[trace] class TracingContext(traceName: String,
+    token: String,
+    tags: Map[String, String],
+    currentStatus: Status,
+    levelOfDetail: LevelOfDetail,
+    isLocal: Boolean,
+    startTimeztamp: RelativeNanoTimestamp,
+    log: LoggingAdapter,
+    traceInfoSink: TracingContext ⇒ Unit) extends MetricsOnlyContext(traceName, token, tags, currentStatus, levelOfDetail, startTimeztamp, log) {
 
   private val _openSegments = new AtomicInteger(0)
   private val _startTimestamp = NanoTimestamp.now
@@ -57,7 +62,7 @@ private[trace] class TracingContext(traceName: String, token: String, tags: Map[
     super.finishSegment(segmentName, category, library, duration, tags, isFinishedWithError)
   }
 
-  def shouldIncubate: Boolean = (States.Open == status) || _openSegments.get() > 0
+  def shouldIncubate: Boolean = (Status.Open == status) || _openSegments.get() > 0
 
   // Handle with care, should only be used after a trace is finished.
   def generateTraceInfo: TraceInfo = {
@@ -77,7 +82,11 @@ private[trace] class TracingContext(traceName: String, token: String, tags: Map[
     TraceInfo(name, token, _startTimestamp, elapsedTime, _metadata.toMap, segmentsInfo.result())
   }
 
-  class TracingSegment(segmentName: String, category: String, library: String, tags: Map[String, String]) extends MetricsOnlySegment(segmentName, category, library, tags) {
+  class TracingSegment(segmentName: String,
+      category: String,
+      library: String,
+      tags: Map[String, String]) extends MetricsOnlySegment(segmentName, category, library, tags) {
+
     private val metadata = TrieMap.empty[String, String]
     override def addMetadata(key: String, value: String): Unit = metadata.put(key, value)
 
diff --git a/kamon-core/src/main/scala/kamon/trace/logging/MdcKeysSupport.scala b/kamon-core/src/main/scala/kamon/trace/logging/MdcKeysSupport.scala
index 60a02ef8..c757027c 100644
--- a/kamon-core/src/main/scala/kamon/trace/logging/MdcKeysSupport.scala
+++ b/kamon-core/src/main/scala/kamon/trace/logging/MdcKeysSupport.scala
@@ -1,6 +1,6 @@
 /*
  * =========================================================================================
- * Copyright © 2013-2014 the kamon project <http://kamon.io/>
+ * Copyright © 2013-2016 the kamon project <http://kamon.io/>
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of the License at
@@ -24,7 +24,6 @@ import org.slf4j.MDC
 trait MdcKeysSupport {
 
   val traceTokenKey = "traceToken"
-
   val traceNameKey = "traceName"
 
   private val defaultKeys = Seq(traceTokenKey, traceNameKey)
@@ -37,7 +36,7 @@ trait MdcKeysSupport {
   // Java variant.
   def withMdc[A](thunk: Supplier[A]): A = withMdc(thunk.get)
 
-  private[this] def copyToMdc(traceContext: TraceContext): Iterable[String] = traceContext match {
+  private[kamon] def copyToMdc(traceContext: TraceContext): Iterable[String] = traceContext match {
     case ctx: MetricsOnlyContext ⇒
 
       // Add the default key value pairs for the trace token and trace name.
@@ -46,7 +45,7 @@ trait MdcKeysSupport {
 
       defaultKeys ++ ctx.traceLocalStorage.underlyingStorage.collect {
         case (available: AvailableToMdc, value) ⇒ Map(available.mdcKey -> String.valueOf(value))
-      }.map { value ⇒ value.map { case (k, v) ⇒ MDC.put(k, v); k } }.flatten
+      }.flatMap { value ⇒ value.map { case (k, v) ⇒ MDC.put(k, v); k } }
 
     case EmptyTraceContext ⇒ Iterable.empty[String]
   }