From 90202659d0385da0797af516471808751f05c935 Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Sun, 27 Jul 2014 20:33:38 -0300 Subject: = newrelic: upgrade to the latest metrics scheme, closes #54 --- kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala | 4 ++-- .../src/main/scala/kamon/metric/instrument/Histogram.scala | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'kamon-core') diff --git a/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala b/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala index 187eb07d..c506fe81 100644 --- a/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala +++ b/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala @@ -69,8 +69,8 @@ object TraceMetrics extends MetricGroupCategory { val segmentConfig = settings.getConfig("segment") new TraceMetricRecorder( - Histogram.fromConfig(elapsedTimeConfig), - () ⇒ Histogram.fromConfig(segmentConfig)) + Histogram.fromConfig(elapsedTimeConfig, Scale.Nano), + () ⇒ Histogram.fromConfig(segmentConfig, Scale.Nano)) } } diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala b/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala index 9ce11f49..7d8022f7 100644 --- a/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala +++ b/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala @@ -78,6 +78,17 @@ object Histogram { def recordsIterator: Iterator[Record] def merge(that: Histogram.Snapshot, context: CollectionContext): Histogram.Snapshot } + + object Snapshot { + def empty(targetScale: Scale) = new Snapshot { + override def min: Long = 0L + override def max: Long = 0L + override def recordsIterator: Iterator[Record] = Iterator.empty + override def merge(that: Snapshot, context: CollectionContext): Snapshot = that + override def scale: Scale = targetScale + override def numberOfMeasurements: Long = 0L + } + } } /** -- cgit v1.2.3