diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-07-03 14:39:10 -0300 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-07-03 14:39:10 -0300 |
| commit | fc2333281acc028c79e1cfe00840666deea5a9d1 (patch) | |
| tree | e81af37eb7f3edee9cffc9703740f36010c48f4a /kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala | |
| parent | 9133663dd5f34bb60cb2d431fa4852f4f339cda0 (diff) | |
| parent | a3353d3e3fcb1dfab3e8f401187e236e99df2202 (diff) | |
| download | Kamon-fc2333281acc028c79e1cfe00840666deea5a9d1.tar.gz Kamon-fc2333281acc028c79e1cfe00840666deea5a9d1.tar.bz2 Kamon-fc2333281acc028c79e1cfe00840666deea5a9d1.zip | |
Merge branch 'wip/metrics-collection-refactor'
Conflicts:
kamon-datadog/src/test/scala/kamon/datadog/DatadogMetricSenderSpec.scala
Diffstat (limited to 'kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala')
| -rw-r--r-- | kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala | 4 |
1 files changed, 2 insertions, 2 deletions
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)) |