Merge branch 'wip/metrics-collection-refactor'

Conflicts:
	kamon-datadog/src/test/scala/kamon/datadog/DatadogMetricSenderSpec.scala

2 files changed, 6 insertions, 6 deletions

diff --git a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala
index 307cf17a..9ce3cd4e 100644
--- a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala
+++ b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala
@@ -18,11 +18,11 @@ package kamon.trace
 
 import akka.actor.ActorSystem
 import kamon.Kamon
-import kamon.metrics._
+import kamon.metric._
 import java.util.concurrent.ConcurrentLinkedQueue
 import kamon.trace.TraceContextAware.DefaultTraceContextAware
 import kamon.trace.TraceContext.SegmentIdentity
-import kamon.metrics.TraceMetrics.TraceMetricRecorder
+import kamon.metric.TraceMetrics.TraceMetricRecorder
 
 trait TraceContext {
   def name: String
@@ -41,7 +41,7 @@ object TraceContext {
 }
 
 trait SegmentCompletionHandle {
-  def finish(metadata: Map[String, String])
+  def finish(metadata: Map[String, String] = Map.empty)
 }
 
 case class SegmentData(identity: MetricIdentity, duration: Long, metadata: Map[String, String])
@@ -76,7 +76,7 @@ object SegmentCompletionHandleAware {
 }
 
 class SimpleMetricCollectionContext(@volatile private var _name: String, val token: String, metadata: Map[String, String],
-                                    val system: ActorSystem) extends TraceContext {
+    val system: ActorSystem) extends TraceContext {
   @volatile private var _isOpen = true
   val levelOfDetail = OnlyMetrics
   val startMark = System.nanoTime()
diff --git a/kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala b/kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala
index c57ac064..0b3118ed 100644
--- a/kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala
+++ b/kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala
@@ -36,7 +36,7 @@ object TraceRecorder {
   def newToken = "%s-%s".format(hostnamePrefix, tokenCounter.incrementAndGet())
 
   private def newTraceContext(name: String, token: Option[String], metadata: Map[String, String],
-                              system: ActorSystem): TraceContext = {
+    system: ActorSystem): TraceContext = {
 
     // In the future this should select between implementations.
     val finalToken = token.getOrElse(newToken)
@@ -54,7 +54,7 @@ object TraceRecorder {
     traceContextStorage.set(Some(ctx))
   }
 
-  def startSegment(identity: SegmentIdentity, metadata: Map[String, String]): Option[SegmentCompletionHandle] =
+  def startSegment(identity: SegmentIdentity, metadata: Map[String, String] = Map.empty): Option[SegmentCompletionHandle] =
     currentContext.map(_.startSegment(identity, metadata))
 
   def rename(name: String): Unit = currentContext.map(_.rename(name))