diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2017-06-17 22:32:34 +0200 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2017-06-18 10:33:43 +0200 |
commit | cf6f369b9d7cb6135f6f321da7be8c3f7d538fd4 (patch) | |
tree | 3acf0cd6b3fd0937320b69bcacaf395646bb7c72 /kamon-core/src/main/scala/kamon/metric/Scaler.scala | |
parent | dd645df1b7c462418c01074d0e137982d2f270b7 (diff) | |
download | Kamon-cf6f369b9d7cb6135f6f321da7be8c3f7d538fd4.tar.gz Kamon-cf6f369b9d7cb6135f6f321da7be8c3f7d538fd4.tar.bz2 Kamon-cf6f369b9d7cb6135f6f321da7be8c3f7d538fd4.zip |
use unit instead of measurementUnit (shorter and nicer)
Diffstat (limited to 'kamon-core/src/main/scala/kamon/metric/Scaler.scala')
-rw-r--r-- | kamon-core/src/main/scala/kamon/metric/Scaler.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kamon-core/src/main/scala/kamon/metric/Scaler.scala b/kamon-core/src/main/scala/kamon/metric/Scaler.scala index 21270e4c..6a98e256 100644 --- a/kamon-core/src/main/scala/kamon/metric/Scaler.scala +++ b/kamon-core/src/main/scala/kamon/metric/Scaler.scala @@ -25,7 +25,7 @@ class Scaler(targetTimeUnit: MeasurementUnit, targetInformationUnit: Measurement val scaleHistogram = new AtomicHdrHistogram("scaler", Map.empty, MeasurementUnit.none, dynamicRange) def scaleDistribution(metric: MetricDistribution): MetricDistribution = { - metric.measurementUnit match { + metric.unit match { case MeasurementUnit(Dimension.Time, magnitude) if(magnitude != targetTimeUnit.magnitude) => scaleMetricDistributionToTarget(metric, targetTimeUnit) @@ -37,7 +37,7 @@ class Scaler(targetTimeUnit: MeasurementUnit, targetInformationUnit: Measurement } def scaleMetricValue(metric: MetricValue): MetricValue = { - metric.measurementUnit match { + metric.unit match { case MeasurementUnit(Dimension.Time, magnitude) if(magnitude != targetTimeUnit.magnitude) => scaleMetricValueToTarget(metric, targetTimeUnit) @@ -50,24 +50,24 @@ class Scaler(targetTimeUnit: MeasurementUnit, targetInformationUnit: Measurement private def scaleMetricDistributionToTarget(metric: MetricDistribution, targetUnit: MeasurementUnit): MetricDistribution = { metric.distribution.bucketsIterator.foreach(b => { - val scaledValue = MeasurementUnit.scale(b.value, metric.measurementUnit, targetUnit) + val scaledValue = MeasurementUnit.scale(b.value, metric.unit, targetUnit) scaleHistogram.record(Math.ceil(scaledValue).toLong, b.frequency) }) scaleHistogram.snapshot(resetState = true).copy( name = metric.name, tags = metric.tags, - measurementUnit = targetUnit, + unit = targetUnit, dynamicRange = dynamicRange ) } private def scaleMetricValueToTarget(metric: MetricValue, targetUnit: MeasurementUnit): MetricValue = { - val scaledValue = MeasurementUnit.scale(metric.value, metric.measurementUnit, targetUnit) + val scaledValue = MeasurementUnit.scale(metric.value, metric.unit, targetUnit) metric.copy( value = Math.ceil(scaledValue).toLong, - measurementUnit = targetUnit + unit = targetUnit ) } } |