From cf6f369b9d7cb6135f6f321da7be8c3f7d538fd4 Mon Sep 17 00:00:00 2001
From: Ivan Topolnjak <ivantopo@gmail.com>
Date: Sat, 17 Jun 2017 22:32:34 +0200
Subject: use unit instead of measurementUnit (shorter and nicer)

---
 kamon-core/src/main/scala/kamon/metric/Scaler.scala | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'kamon-core/src/main/scala/kamon/metric/Scaler.scala')

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
     )
   }
 }
-- 
cgit v1.2.3