move ALMaxUpdater and MeasurementUnit to kamon.metric

14 files changed, 121 insertions, 20 deletions

diff --git a/kamon-core/src/main/scala/kamon/metric/Accumulator.scala b/kamon-core/src/main/scala/kamon/metric/Accumulator.scala
index 9017c14e..9f7c6d70 100644
--- a/kamon-core/src/main/scala/kamon/metric/Accumulator.scala
+++ b/kamon-core/src/main/scala/kamon/metric/Accumulator.scala
@@ -15,8 +15,6 @@
 
 package kamon.metric
 
-import kamon.util.MeasurementUnit
-
 
 class DistributionAccumulator(dynamicRange: DynamicRange) {
   private val accumulatorHistogram = new HdrHistogram("metric-distribution-accumulator",
diff --git a/kamon-core/src/main/scala/kamon/metric/AtomicLongMaxUpdater.scala b/kamon-core/src/main/scala/kamon/metric/AtomicLongMaxUpdater.scala
new file mode 100644
index 00000000..14e45631
--- /dev/null
+++ b/kamon-core/src/main/scala/kamon/metric/AtomicLongMaxUpdater.scala
@@ -0,0 +1,40 @@
+/* =========================================================================================
+ * Copyright © 2013-2017 the kamon project <http://kamon.io/>
+ *
+ * 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.metric
+
+import java.util.concurrent.atomic.AtomicLong
+
+import scala.annotation.tailrec
+
+class AtomicLongMaxUpdater(value:AtomicLong) {
+
+  def update(newMax:Long):Unit = {
+    @tailrec def compare():Long = {
+      val currentMax = value.get()
+      if(newMax > currentMax) if (!value.compareAndSet(currentMax, newMax)) compare() else newMax
+      else currentMax
+    }
+    compare()
+  }
+
+  def maxThenReset(newValue:Long): Long =
+    value.getAndSet(newValue)
+}
+
+object AtomicLongMaxUpdater {
+  def apply(): AtomicLongMaxUpdater =
+    new AtomicLongMaxUpdater(new AtomicLong(0))
+}
\ No newline at end of file
diff --git a/kamon-core/src/main/scala/kamon/metric/Counter.scala b/kamon-core/src/main/scala/kamon/metric/Counter.scala
index 043ce6e6..d056d327 100644
--- a/kamon-core/src/main/scala/kamon/metric/Counter.scala
+++ b/kamon-core/src/main/scala/kamon/metric/Counter.scala
@@ -16,7 +16,6 @@
 package kamon.metric
 
 import kamon.jsr166.LongAdder
-import kamon.util.MeasurementUnit
 import org.slf4j.LoggerFactory
 
 trait Counter {
diff --git a/kamon-core/src/main/scala/kamon/metric/Gauge.scala b/kamon-core/src/main/scala/kamon/metric/Gauge.scala
index f109b885..eaa37794 100644
--- a/kamon-core/src/main/scala/kamon/metric/Gauge.scala
+++ b/kamon-core/src/main/scala/kamon/metric/Gauge.scala
@@ -17,8 +17,6 @@ package kamon.metric
 
 import java.util.concurrent.atomic.AtomicLong
 
-import kamon.util.MeasurementUnit
-
 trait Gauge {
   def unit: MeasurementUnit
 
diff --git a/kamon-core/src/main/scala/kamon/metric/Histogram.scala b/kamon-core/src/main/scala/kamon/metric/Histogram.scala
index 65027fcf..592dae7d 100644
--- a/kamon-core/src/main/scala/kamon/metric/Histogram.scala
+++ b/kamon-core/src/main/scala/kamon/metric/Histogram.scala
@@ -19,7 +19,6 @@ package metric
 import java.nio.ByteBuffer
 
 import kamon.metric.SnapshotCreation.ZigZagCountsDistribution
-import kamon.util.MeasurementUnit
 import org.HdrHistogram.{AtomicHistogramExtension, HdrHistogramOps, SimpleHistogramExtension, ZigZag}
 import org.slf4j.LoggerFactory
 
diff --git a/kamon-core/src/main/scala/kamon/metric/InstrumentFactory.scala b/kamon-core/src/main/scala/kamon/metric/InstrumentFactory.scala
index 3901ea75..abab1207 100644
--- a/kamon-core/src/main/scala/kamon/metric/InstrumentFactory.scala
+++ b/kamon-core/src/main/scala/kamon/metric/InstrumentFactory.scala
@@ -21,8 +21,6 @@ import java.util.concurrent.TimeUnit
 
 import com.typesafe.config.Config
 import kamon.metric.InstrumentFactory.CustomInstrumentSettings
-import kamon.util.MeasurementUnit
-
 import java.time.Duration
 
 
diff --git a/kamon-core/src/main/scala/kamon/metric/MeasurementUnit.scala b/kamon-core/src/main/scala/kamon/metric/MeasurementUnit.scala
new file mode 100644
index 00000000..025fa39f
--- /dev/null
+++ b/kamon-core/src/main/scala/kamon/metric/MeasurementUnit.scala
@@ -0,0 +1,79 @@
+/* =========================================================================================
+ * Copyright © 2013-2017 the kamon project <http://kamon.io/>
+ *
+ * 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.metric
+
+/**
+  * A MeasurementUnit is a simple representation of the dimension and magnitude of a quantity being measured, such as
+  * "Time in Seconds" or "Data in Kilobytes".
+  */
+case class MeasurementUnit(dimension: MeasurementUnit.Dimension, magnitude: MeasurementUnit.Magnitude)
+
+object MeasurementUnit {
+  val none = MeasurementUnit(Dimension.None, Magnitude("none", 1D))
+
+  val time: TimeUnits = new TimeUnits {
+    val seconds = MeasurementUnit(Dimension.Time, Magnitude("seconds", 1D))
+    val milliseconds = MeasurementUnit(Dimension.Time, Magnitude("milliseconds", 1e-3))
+    val microseconds = MeasurementUnit(Dimension.Time, Magnitude("microseconds", 1e-6))
+    val nanoseconds = MeasurementUnit(Dimension.Time, Magnitude("nanoseconds", 1e-9))
+  }
+
+  val information: DataUnits = new DataUnits {
+    val bytes = MeasurementUnit(Dimension.Information, Magnitude("byte", 1))
+    val kilobytes = MeasurementUnit(Dimension.Information, Magnitude("kilobytes", 1024))
+    val megabytes = MeasurementUnit(Dimension.Information, Magnitude("megabytes", 1024 * 1024))
+    val gigabytes = MeasurementUnit(Dimension.Information, Magnitude("gigabytes", 1024 * 1024 * 1024))
+  }
+
+  /**
+    * Scales the provided value between two MeasurementUnits of the same dimension.
+    *
+    * @param value value to be scaled.
+    * @param from value's [[MeasurementUnit]].
+    * @param to target [[MeasurementUnit]].
+    * @return equivalent of the provided value on the target [[MeasurementUnit]]
+    */
+  def scale(value: Long, from: MeasurementUnit, to: MeasurementUnit): Double = {
+    if(from.dimension != to.dimension)
+      sys.error(s"Can't scale values from the [${from.dimension.name}] dimension into the [${to.dimension.name}] dimension.")
+    else if(from == to)
+      value.toDouble
+    else (from.magnitude.scaleFactor / to.magnitude.scaleFactor) * value.toDouble
+  }
+
+  case class Dimension(name: String)
+  case class Magnitude(name: String, scaleFactor: Double)
+
+  object Dimension {
+    val None = Dimension("none")
+    val Time = Dimension("time")
+    val Information = Dimension("information")
+  }
+
+  trait TimeUnits {
+    def seconds: MeasurementUnit
+    def milliseconds: MeasurementUnit
+    def microseconds: MeasurementUnit
+    def nanoseconds: MeasurementUnit
+  }
+
+  trait DataUnits {
+    def bytes: MeasurementUnit
+    def kilobytes: MeasurementUnit
+    def megabytes: MeasurementUnit
+    def gigabytes: MeasurementUnit
+  }
+}
diff --git a/kamon-core/src/main/scala/kamon/metric/Metric.scala b/kamon-core/src/main/scala/kamon/metric/Metric.scala
index 87a7ca48..90e5ede7 100644
--- a/kamon-core/src/main/scala/kamon/metric/Metric.scala
+++ b/kamon-core/src/main/scala/kamon/metric/Metric.scala
@@ -20,7 +20,6 @@ import java.util.concurrent.atomic.AtomicReference
 
 import kamon.metric.InstrumentFactory.InstrumentType
 import kamon.metric.InstrumentFactory.InstrumentTypes._
-import kamon.util.MeasurementUnit
 
 import scala.collection.concurrent.TrieMap
 import java.time.Duration
diff --git a/kamon-core/src/main/scala/kamon/metric/MetricLookup.scala b/kamon-core/src/main/scala/kamon/metric/MetricLookup.scala
index 564a213d..fcca04bd 100644
--- a/kamon-core/src/main/scala/kamon/metric/MetricLookup.scala
+++ b/kamon-core/src/main/scala/kamon/metric/MetricLookup.scala
@@ -16,8 +16,6 @@
 package kamon
 package metric
 
-
-import kamon.util.MeasurementUnit
 import java.time.Duration
 
 trait MetricLookup {
diff --git a/kamon-core/src/main/scala/kamon/metric/MetricRegistry.scala b/kamon-core/src/main/scala/kamon/metric/MetricRegistry.scala
index 07a0ebaa..ebc17834 100644
--- a/kamon-core/src/main/scala/kamon/metric/MetricRegistry.scala
+++ b/kamon-core/src/main/scala/kamon/metric/MetricRegistry.scala
@@ -20,8 +20,7 @@ import java.util.concurrent.atomic.AtomicReference
 
 import com.typesafe.config.Config
 import kamon.metric.InstrumentFactory.{InstrumentType, InstrumentTypes}
-import kamon.util.MeasurementUnit
-import kamon.util.MeasurementUnit.time
+import kamon.metric.MeasurementUnit.time
 
 import scala.collection.concurrent.TrieMap
 import java.time.Duration
diff --git a/kamon-core/src/main/scala/kamon/metric/MinMaxCounter.scala b/kamon-core/src/main/scala/kamon/metric/MinMaxCounter.scala
index 6acb7c54..2cb01e77 100644
--- a/kamon-core/src/main/scala/kamon/metric/MinMaxCounter.scala
+++ b/kamon-core/src/main/scala/kamon/metric/MinMaxCounter.scala
@@ -19,8 +19,6 @@ import java.lang.Math.abs
 import java.time.Duration
 import java.util.concurrent.atomic.AtomicLong
 
-import kamon.util.{AtomicLongMaxUpdater, MeasurementUnit}
-
 trait MinMaxCounter {
   def unit: MeasurementUnit
   def dynamicRange: DynamicRange
diff --git a/kamon-core/src/main/scala/kamon/metric/Scaler.scala b/kamon-core/src/main/scala/kamon/metric/Scaler.scala
index 6a98e256..e0af2a89 100644
--- a/kamon-core/src/main/scala/kamon/metric/Scaler.scala
+++ b/kamon-core/src/main/scala/kamon/metric/Scaler.scala
@@ -15,8 +15,7 @@
 
 package kamon.metric
 
-import kamon.util.MeasurementUnit
-import kamon.util.MeasurementUnit.Dimension
+import MeasurementUnit.Dimension
 
 class Scaler(targetTimeUnit: MeasurementUnit, targetInformationUnit: MeasurementUnit, dynamicRange: DynamicRange) {
   require(targetTimeUnit.dimension == Dimension.Time, "timeUnit must be in the time dimension.")
diff --git a/kamon-core/src/main/scala/kamon/metric/TickSnapshot.scala b/kamon-core/src/main/scala/kamon/metric/TickSnapshot.scala
index 32e88764..83176d4f 100644
--- a/kamon-core/src/main/scala/kamon/metric/TickSnapshot.scala
+++ b/kamon-core/src/main/scala/kamon/metric/TickSnapshot.scala
@@ -16,8 +16,6 @@
 package kamon
 package metric
 
-import kamon.util.MeasurementUnit
-
 
 /**
   *
diff --git a/kamon-core/src/main/scala/kamon/metric/Timer.scala b/kamon-core/src/main/scala/kamon/metric/Timer.scala
index 4750856d..d3ccb840 100644
--- a/kamon-core/src/main/scala/kamon/metric/Timer.scala
+++ b/kamon-core/src/main/scala/kamon/metric/Timer.scala
@@ -16,7 +16,6 @@
 package kamon.metric
 
 import kamon.Tags
-import kamon.util.MeasurementUnit
 
 trait Timer extends Histogram {
   def start(): StartedTimer