From 86c72d622ac027dc96f9a744771c0a468d46dc60 Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Tue, 15 Aug 2017 00:15:21 +0200 Subject: move ALMaxUpdater and MeasurementUnit to kamon.metric --- kamon-core/src/main/scala/kamon/Kamon.scala | 2 +- .../src/main/scala/kamon/metric/Accumulator.scala | 2 - .../scala/kamon/metric/AtomicLongMaxUpdater.scala | 40 +++++++++++ .../src/main/scala/kamon/metric/Counter.scala | 1 - kamon-core/src/main/scala/kamon/metric/Gauge.scala | 2 - .../src/main/scala/kamon/metric/Histogram.scala | 1 - .../scala/kamon/metric/InstrumentFactory.scala | 2 - .../main/scala/kamon/metric/MeasurementUnit.scala | 79 +++++++++++++++++++++ .../src/main/scala/kamon/metric/Metric.scala | 1 - .../src/main/scala/kamon/metric/MetricLookup.scala | 2 - .../main/scala/kamon/metric/MetricRegistry.scala | 3 +- .../main/scala/kamon/metric/MinMaxCounter.scala | 2 - .../src/main/scala/kamon/metric/Scaler.scala | 3 +- .../src/main/scala/kamon/metric/TickSnapshot.scala | 2 - kamon-core/src/main/scala/kamon/metric/Timer.scala | 1 - kamon-core/src/main/scala/kamon/trace/Span.scala | 3 +- .../scala/kamon/util/AtomicLongMaxUpdater.scala | 40 ----------- .../main/scala/kamon/util/MeasurementUnit.scala | 81 ---------------------- .../test/scala/kamon/metric/HistogramSpec.scala | 2 +- .../scala/kamon/metric/LongAdderCounterSpec.scala | 1 - .../scala/kamon/metric/MinMaxCounterSpec.scala | 1 - 21 files changed, 125 insertions(+), 146 deletions(-) create mode 100644 kamon-core/src/main/scala/kamon/metric/AtomicLongMaxUpdater.scala create mode 100644 kamon-core/src/main/scala/kamon/metric/MeasurementUnit.scala delete mode 100644 kamon-core/src/main/scala/kamon/util/AtomicLongMaxUpdater.scala delete mode 100644 kamon-core/src/main/scala/kamon/util/MeasurementUnit.scala 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/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 + * + * 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 + * + * 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 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/main/scala/kamon/util/AtomicLongMaxUpdater.scala b/kamon-core/src/main/scala/kamon/util/AtomicLongMaxUpdater.scala deleted file mode 100644 index 36c01c83..00000000 --- a/kamon-core/src/main/scala/kamon/util/AtomicLongMaxUpdater.scala +++ /dev/null @@ -1,40 +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.util - -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/util/MeasurementUnit.scala b/kamon-core/src/main/scala/kamon/util/MeasurementUnit.scala deleted file mode 100644 index f5764ad1..00000000 --- a/kamon-core/src/main/scala/kamon/util/MeasurementUnit.scala +++ /dev/null @@ -1,81 +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.util - -import kamon.util.MeasurementUnit.{Dimension, Magnitude} - -/** - * 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) - -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/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 -- cgit v1.2.3