diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-02-05 01:12:34 -0300 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-02-05 01:12:34 -0300 |
| commit | 1e5deeac75d900635e46705224ad3e3db786d4a8 (patch) | |
| tree | bac0dbcff32e62417a377fc693c457eb0cf134e7 | |
| parent | db561584d9ef1f7ea8e5cfc5178385477a4f5d86 (diff) | |
| download | Kamon-1e5deeac75d900635e46705224ad3e3db786d4a8.tar.gz Kamon-1e5deeac75d900635e46705224ad3e3db786d4a8.tar.bz2 Kamon-1e5deeac75d900635e46705224ad3e3db786d4a8.zip | |
kamon-newrelic now uses the subscription protocol to report metrics to NewRelic
| -rw-r--r-- | kamon-core/src/main/scala/kamon/metrics/Metrics.scala | 4 | ||||
| -rw-r--r-- | kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/kamon-core/src/main/scala/kamon/metrics/Metrics.scala b/kamon-core/src/main/scala/kamon/metrics/Metrics.scala index ee32dbe8..81475d52 100644 --- a/kamon-core/src/main/scala/kamon/metrics/Metrics.scala +++ b/kamon-core/src/main/scala/kamon/metrics/Metrics.scala @@ -102,8 +102,8 @@ object MetricSnapshot { case class DefaultMetricSnapshot(numberOfMeasurements: Long, measurementLevels: Vector[MetricSnapshot.Measurement]) extends MetricSnapshot -object MetricGroupIdentity { - +object DefaultMetricSnapshot { + val empty = DefaultMetricSnapshot(0, Vector.empty) } trait MetricGroupFactory { diff --git a/kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala b/kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala index 3e3bb19f..0e264cd2 100644 --- a/kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala +++ b/kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala @@ -54,6 +54,8 @@ object TraceRecorder { def startSegment(identity: SegmentIdentity, metadata: Map[String, String]): Option[SegmentCompletionHandle] = currentContext.map(_.startSegment(identity, metadata)) + def rename(name: String): Unit = currentContext.map(_.rename(name)) + def withNewTraceContext[T](name: String, token: Option[String] = None, metadata: Map[String, String] = Map.empty)(thunk: ⇒ T)(implicit system: ActorSystem): T = withTraceContext(Some(newTraceContext(name, token, metadata, system)))(thunk) |