From 1860d08fdc3fde314e18c74f745c2861178388a7 Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Tue, 12 Dec 2017 00:33:36 +0100 Subject: rename TickSnapshot to PeriodSnapshot, use Instant instead of plain Longs --- .../src/main/scala/kamon/ReporterRegistry.scala | 17 ++--- .../main/scala/kamon/metric/PeriodSnapshot.scala | 75 ++++++++++++++++++++++ .../src/main/scala/kamon/metric/TickSnapshot.scala | 73 --------------------- 3 files changed, 84 insertions(+), 81 deletions(-) create mode 100644 kamon-core/src/main/scala/kamon/metric/PeriodSnapshot.scala delete mode 100644 kamon-core/src/main/scala/kamon/metric/TickSnapshot.scala diff --git a/kamon-core/src/main/scala/kamon/ReporterRegistry.scala b/kamon-core/src/main/scala/kamon/ReporterRegistry.scala index 7d05ab92..89bafa36 100644 --- a/kamon-core/src/main/scala/kamon/ReporterRegistry.scala +++ b/kamon-core/src/main/scala/kamon/ReporterRegistry.scala @@ -15,7 +15,7 @@ package kamon -import java.time.Duration +import java.time.{Duration, Instant} import java.util.concurrent.atomic.{AtomicLong, AtomicReference} import java.util.concurrent._ @@ -40,7 +40,7 @@ sealed trait Reporter { } trait MetricReporter extends Reporter { - def reportTickSnapshot(snapshot: TickSnapshot): Unit + def reportPeriodSnapshot(snapshot: PeriodSnapshot): Unit } trait SpanReporter extends Reporter { @@ -321,12 +321,13 @@ object ReporterRegistry { private class MetricReporterTicker(snapshotGenerator: MetricsSnapshotGenerator, reporterEntries: TrieMap[Long, MetricReporterEntry]) extends Runnable { val logger = LoggerFactory.getLogger(classOf[MetricReporterTicker]) - var lastTick = System.currentTimeMillis() + var lastInstant = Instant.now() def run(): Unit = try { - val currentTick = System.currentTimeMillis() - val tickSnapshot = TickSnapshot( - interval = Interval(lastTick, currentTick), + val currentInstant = Instant.now() + val tickSnapshot = PeriodSnapshot( + from = lastInstant, + to = currentInstant, metrics = snapshotGenerator.snapshot() ) @@ -334,7 +335,7 @@ object ReporterRegistry { Future { Try { if (entry.isActive) - entry.reporter.reportTickSnapshot(tickSnapshot) + entry.reporter.reportPeriodSnapshot(tickSnapshot) }.failed.foreach { error => logger.error(s"Reporter [${entry.name}] failed to process a metrics tick.", error) @@ -343,7 +344,7 @@ object ReporterRegistry { }(entry.executionContext) } - lastTick = currentTick + lastInstant = currentInstant } catch { case NonFatal(t) => logger.error("Error while running a tick", t) diff --git a/kamon-core/src/main/scala/kamon/metric/PeriodSnapshot.scala b/kamon-core/src/main/scala/kamon/metric/PeriodSnapshot.scala new file mode 100644 index 00000000..50a5f778 --- /dev/null +++ b/kamon-core/src/main/scala/kamon/metric/PeriodSnapshot.scala @@ -0,0 +1,75 @@ +/* ========================================================================================= + * Copyright © 2013-2017 the kamon project + * + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language governing permissions + * and limitations under the License. + * ========================================================================================= + */ + +package kamon +package metric + +import java.time.Instant + + +/** + * Contains immutable snapshots of all metrics recorded since from and until to. + * + * @param from + * @param to + * @param metrics + */ +case class PeriodSnapshot(from: Instant, to: Instant, metrics: MetricsSnapshot) + +case class MetricsSnapshot( + histograms: Seq[MetricDistribution], + rangeSamplers: Seq[MetricDistribution], + gauges: Seq[MetricValue], + counters: Seq[MetricValue] +) + +/** + * Snapshot for instruments that internally track a single value. Meant to be used for counters and gauges. + * + */ +case class MetricValue(name: String, tags: Tags, unit: MeasurementUnit, value: Long) + +/** + * Snapshot for instruments that internally the distribution of values in a defined dynamic range. Meant to be used + * with histograms and min max counters. + */ +case class MetricDistribution(name: String, tags: Tags, unit: MeasurementUnit, dynamicRange: DynamicRange, distribution: Distribution) + + +trait Distribution { + def buckets: Seq[Bucket] + def bucketsIterator: Iterator[Bucket] + + def min: Long + def max: Long + def sum: Long + def count: Long + def percentile(p: Double): Percentile + + def percentiles: Seq[Percentile] + def percentilesIterator: Iterator[Percentile] +} + +trait Bucket { + def value: Long + def frequency: Long +} + +trait Percentile { + def quantile: Double + def value: Long + def countUnderQuantile: Long +} + diff --git a/kamon-core/src/main/scala/kamon/metric/TickSnapshot.scala b/kamon-core/src/main/scala/kamon/metric/TickSnapshot.scala deleted file mode 100644 index 45666de1..00000000 --- a/kamon-core/src/main/scala/kamon/metric/TickSnapshot.scala +++ /dev/null @@ -1,73 +0,0 @@ -/* ========================================================================================= - * Copyright © 2013-2017 the kamon project - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language governing permissions - * and limitations under the License. - * ========================================================================================= - */ - -package kamon -package metric - - -/** - * - * @param interval - * @param metrics - */ -case class TickSnapshot(interval: Interval, metrics: MetricsSnapshot) - -case class Interval(from: Long, to: Long) - -case class MetricsSnapshot( - histograms: Seq[MetricDistribution], - rangeSamplers: Seq[MetricDistribution], - gauges: Seq[MetricValue], - counters: Seq[MetricValue] -) - -/** - * Snapshot for instruments that internally track a single value. Meant to be used for counters and gauges. - * - */ -case class MetricValue(name: String, tags: Tags, unit: MeasurementUnit, value: Long) - -/** - * Snapshot for instruments that internally the distribution of values in a defined dynamic range. Meant to be used - * with histograms and min max counters. - */ -case class MetricDistribution(name: String, tags: Tags, unit: MeasurementUnit, dynamicRange: DynamicRange, distribution: Distribution) - - -trait Distribution { - def buckets: Seq[Bucket] - def bucketsIterator: Iterator[Bucket] - - def min: Long - def max: Long - def sum: Long - def count: Long - def percentile(p: Double): Percentile - - def percentiles: Seq[Percentile] - def percentilesIterator: Iterator[Percentile] -} - -trait Bucket { - def value: Long - def frequency: Long -} - -trait Percentile { - def quantile: Double - def value: Long - def countUnderQuantile: Long -} - -- cgit v1.2.3