move ALMaxUpdater and MeasurementUnit to kamon.metric

19 files changed, 9 insertions, 30 deletions

diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala
index b1490e32..884f2d93 100644
--- a/kamon-core/src/main/scala/kamon/Kamon.scala
+++ b/kamon-core/src/main/scala/kamon/Kamon.scala
@@ -18,7 +18,7 @@ package kamon
 import com.typesafe.config.{Config, ConfigFactory}
 import kamon.metric._
 import kamon.trace._
-import kamon.util.{Filters, MeasurementUnit, Registration}
+import kamon.util.{Filters, Registration}
 
 import scala.concurrent.Future
 import java.time.Duration
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/util/AtomicLongMaxUpdater.scala b/kamon-core/src/main/scala/kamon/metric/AtomicLongMaxUpdater.scala
index 36c01c83..14e45631 100644
--- a/kamon-core/src/main/scala/kamon/util/AtomicLongMaxUpdater.scala
+++ b/kamon-core/src/main/scala/kamon/metric/AtomicLongMaxUpdater.scala
@@ -13,7 +13,7 @@
  * =========================================================================================
  */
 
-package kamon.util
+package kamon.metric
 
 import java.util.concurrent.atomic.AtomicLong
 
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/util/MeasurementUnit.scala b/kamon-core/src/main/scala/kamon/metric/MeasurementUnit.scala
index f5764ad1..025fa39f 100644
--- a/kamon-core/src/main/scala/kamon/util/MeasurementUnit.scala
+++ b/kamon-core/src/main/scala/kamon/metric/MeasurementUnit.scala
@@ -13,15 +13,13 @@
  * =========================================================================================
  */
 
-package kamon.util
-
-import kamon.util.MeasurementUnit.{Dimension, Magnitude}
+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: Dimension, magnitude: Magnitude)
+case class MeasurementUnit(dimension: MeasurementUnit.Dimension, magnitude: MeasurementUnit.Magnitude)
 
 object MeasurementUnit {
   val none = MeasurementUnit(Dimension.None, Magnitude("none", 1D))
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
diff --git a/kamon-core/src/main/scala/kamon/trace/Span.scala b/kamon-core/src/main/scala/kamon/trace/Span.scala
index a4424a45..0ec71b32 100644
--- a/kamon-core/src/main/scala/kamon/trace/Span.scala
+++ b/kamon-core/src/main/scala/kamon/trace/Span.scala
@@ -18,8 +18,9 @@ package trace
 
 import kamon.ReporterRegistry.SpanSink
 import kamon.context.Key
+import kamon.metric.MeasurementUnit
 import kamon.trace.SpanContext.SamplingDecision
-import kamon.util.{Clock, MeasurementUnit}
+import kamon.util.Clock
 
 
 trait Span {
diff --git a/kamon-core/src/test/scala/kamon/metric/HistogramSpec.scala b/kamon-core/src/test/scala/kamon/metric/HistogramSpec.scala
index a582a2ae..f0ea1292 100644
--- a/kamon-core/src/test/scala/kamon/metric/HistogramSpec.scala
+++ b/kamon-core/src/test/scala/kamon/metric/HistogramSpec.scala
@@ -2,7 +2,7 @@ package kamon.metric
 
 import kamon.Kamon
 import org.scalatest.{Matchers, WordSpec}
-import kamon.util.MeasurementUnit._
+import MeasurementUnit._
 
 
 class HistogramSpec extends WordSpec with Matchers {
diff --git a/kamon-core/src/test/scala/kamon/metric/LongAdderCounterSpec.scala b/kamon-core/src/test/scala/kamon/metric/LongAdderCounterSpec.scala
index 226b8f43..4014d6df 100644
--- a/kamon-core/src/test/scala/kamon/metric/LongAdderCounterSpec.scala
+++ b/kamon-core/src/test/scala/kamon/metric/LongAdderCounterSpec.scala
@@ -15,7 +15,6 @@
 
 package kamon.metric
 
-import kamon.util.MeasurementUnit
 import org.scalatest.{Matchers, WordSpec}
 
 class LongAdderCounterSpec extends WordSpec with Matchers {
diff --git a/kamon-core/src/test/scala/kamon/metric/MinMaxCounterSpec.scala b/kamon-core/src/test/scala/kamon/metric/MinMaxCounterSpec.scala
index 062ae99d..0ad3c45c 100644
--- a/kamon-core/src/test/scala/kamon/metric/MinMaxCounterSpec.scala
+++ b/kamon-core/src/test/scala/kamon/metric/MinMaxCounterSpec.scala
@@ -18,7 +18,6 @@ package kamon.metric
 
 import java.time.Duration
 
-import kamon.util.MeasurementUnit
 import org.scalatest.{Matchers, WordSpec}
 
 case class TemporalBucket(value: Long, frequency: Long) extends Bucket