aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Parra <diegolparra@gmail.com>2015-12-24 12:30:58 -0300
committerDiego Parra <diegolparra@gmail.com>2015-12-24 12:30:58 -0300
commit9899b33351ad769558b0bcd9af4533b070c91162 (patch)
tree735de28155e9ec9fce26b2f0ed1754a38fb81ade
parent961c6080fbf3cb1662121992a6ba65d7ca999a1e (diff)
parent4a918ce6570129d3d4fd2d3e98d43f8078bb2d99 (diff)
downloadKamon-9899b33351ad769558b0bcd9af4533b070c91162.tar.gz
Kamon-9899b33351ad769558b0bcd9af4533b070c91162.tar.bz2
Kamon-9899b33351ad769558b0bcd9af4533b070c91162.zip
Merge pull request #294 from jozic/scale
Scale
-rw-r--r--kamon-core/src/main/scala/kamon/metric/EntityRecorder.scala2
-rw-r--r--kamon-core/src/main/scala/kamon/metric/MetricScaleDecorator.scala55
-rw-r--r--kamon-core/src/main/scala/kamon/metric/instrument/Counter.scala5
-rw-r--r--kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala34
-rw-r--r--kamon-core/src/main/scala/kamon/metric/instrument/Instrument.scala6
-rw-r--r--kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala2
-rw-r--r--kamon-core/src/main/scala/kamon/metric/instrument/UnitOfMeasurement.scala40
-rw-r--r--kamon-core/src/main/scala/kamon/util/ConfigTools.scala6
-rw-r--r--kamon-core/src/main/scala/kamon/util/NeedToScale.scala37
-rw-r--r--kamon-core/src/test/scala/kamon/metric/MetricScaleDecoratorSpec.scala100
-rw-r--r--kamon-core/src/test/scala/kamon/metric/instrument/CounterSpec.scala9
-rw-r--r--kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala32
-rw-r--r--kamon-core/src/test/scala/kamon/metric/instrument/UnitOfMeasurementSpec.scala98
-rw-r--r--kamon-core/src/test/scala/kamon/util/NeedToScaleSpec.scala64
14 files changed, 477 insertions, 13 deletions
diff --git a/kamon-core/src/main/scala/kamon/metric/EntityRecorder.scala b/kamon-core/src/main/scala/kamon/metric/EntityRecorder.scala
index 15e20d1a..71b40ea6 100644
--- a/kamon-core/src/main/scala/kamon/metric/EntityRecorder.scala
+++ b/kamon-core/src/main/scala/kamon/metric/EntityRecorder.scala
@@ -89,7 +89,7 @@ case class GaugeRecorder(key: MetricKey, instrument: Gauge) extends SingleInstru
/**
* Base class with plenty of utility methods to facilitate the creation of [[EntityRecorder]] implementations.
- * It is not required to use this base class for defining custom a custom [[EntityRecorder]], but it is certainly
+ * It is not required to use this base class for defining a custom [[EntityRecorder]], but it is certainly
* the most convenient way to do it and the preferred approach throughout the Kamon codebase.
*/
abstract class GenericEntityRecorder(instrumentFactory: InstrumentFactory) extends EntityRecorder {
diff --git a/kamon-core/src/main/scala/kamon/metric/MetricScaleDecorator.scala b/kamon-core/src/main/scala/kamon/metric/MetricScaleDecorator.scala
new file mode 100644
index 00000000..e096429d
--- /dev/null
+++ b/kamon-core/src/main/scala/kamon/metric/MetricScaleDecorator.scala
@@ -0,0 +1,55 @@
+/*
+ * =========================================================================================
+ * Copyright © 2013-2015 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 akka.actor.{ Actor, ActorRef, Props }
+import kamon.metric.SubscriptionsDispatcher.TickMetricSnapshot
+import kamon.metric.instrument._
+
+/**
+ * Can be used as a decorator to scale TickMetricSnapshot messages to given `timeUnits` and/or `memoryUnits`
+ * before forwarding to original receiver
+ * @param timeUnits Optional time units to scale time metrics to
+ * @param memoryUnits Optional memory units to scale memory metrics to
+ * @param receiver Receiver of scaled metrics snapshot, usually a backend sender
+ */
+class MetricScaleDecorator(timeUnits: Option[Time], memoryUnits: Option[Memory], receiver: ActorRef) extends Actor {
+ require(timeUnits.isDefined || memoryUnits.isDefined,
+ "Use MetricScaleDecorator only when any of units is defined")
+
+ override def receive: Receive = {
+ case tick: TickMetricSnapshot ⇒
+ val scaled = tick.copy(metrics = tick.metrics.mapValues { entitySnapshot ⇒
+ new DefaultEntitySnapshot(entitySnapshot.metrics.map {
+ case (metricKey, metricSnapshot) ⇒
+ val scaledSnapshot = (metricKey.unitOfMeasurement, timeUnits, memoryUnits) match {
+ case (time: Time, Some(to), _) ⇒ metricSnapshot.scale(time, to)
+ case (memory: Memory, _, Some(to)) ⇒ metricSnapshot.scale(memory, to)
+ case _ ⇒ metricSnapshot
+ }
+ metricKey -> scaledSnapshot
+ })
+ })
+ receiver forward scaled
+ }
+}
+
+object MetricScaleDecorator {
+ def props(timeUnits: Option[Time], memoryUnits: Option[Memory], receiver: ActorRef): Props =
+ Props(new MetricScaleDecorator(timeUnits, memoryUnits, receiver))
+}
+
diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/Counter.scala b/kamon-core/src/main/scala/kamon/metric/instrument/Counter.scala
index c1b69cbe..349a12bd 100644
--- a/kamon-core/src/main/scala/kamon/metric/instrument/Counter.scala
+++ b/kamon-core/src/main/scala/kamon/metric/instrument/Counter.scala
@@ -33,6 +33,7 @@ object Counter {
trait Snapshot extends InstrumentSnapshot {
def count: Long
def merge(that: InstrumentSnapshot, context: CollectionContext): Counter.Snapshot
+ def scale(from: UnitOfMeasurement, to: UnitOfMeasurement): Counter.Snapshot
}
}
@@ -57,4 +58,8 @@ case class CounterSnapshot(count: Long) extends Counter.Snapshot {
case CounterSnapshot(thatCount) ⇒ CounterSnapshot(count + thatCount)
case other ⇒ sys.error(s"Cannot merge a CounterSnapshot with the incompatible [${other.getClass.getName}] type.")
}
+
+ override def scale(from: UnitOfMeasurement, to: UnitOfMeasurement): Counter.Snapshot =
+ CounterSnapshot(from.tryScale(to)(count).toLong)
+
} \ No newline at end of file
diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala b/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala
index d2fb88a2..dc9a4bbf 100644
--- a/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala
+++ b/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala
@@ -85,6 +85,39 @@ object Histogram {
def recordsIterator: Iterator[Record]
def merge(that: InstrumentSnapshot, context: CollectionContext): InstrumentSnapshot
def merge(that: Histogram.Snapshot, context: CollectionContext): Histogram.Snapshot
+
+ override def scale(from: UnitOfMeasurement, to: UnitOfMeasurement): Histogram.Snapshot =
+ new ScaledSnapshot(from, to, this)
+ }
+
+ class ScaledSnapshot(from: UnitOfMeasurement, to: UnitOfMeasurement, snapshot: Snapshot) extends Snapshot {
+ private def doScale(v: Long) = from.tryScale(to)(v).toLong
+ override def numberOfMeasurements: Long = snapshot.numberOfMeasurements
+
+ override def max: Long = doScale(snapshot.max)
+
+ override def merge(that: InstrumentSnapshot, context: CollectionContext): InstrumentSnapshot = snapshot.merge(that, context)
+
+ override def merge(that: Snapshot, context: CollectionContext): Snapshot = snapshot.merge(that, context)
+
+ override def percentile(percentile: Double): Long = doScale(snapshot.percentile(percentile))
+
+ override def min: Long = doScale(snapshot.min)
+
+ override def sum: Long = doScale(snapshot.sum)
+
+ override def recordsIterator: Iterator[Record] = {
+ snapshot.recordsIterator.map(record ⇒ new Record {
+ override def count: Long = record.count
+
+ override def level: Long = doScale(record.level)
+
+ override private[kamon] def rawCompactRecord: Long = record.rawCompactRecord
+ })
+ }
+
+ override def scale(from: UnitOfMeasurement, to: UnitOfMeasurement): Histogram.Snapshot =
+ if (this.from == from && this.to == to) this else super.scale(from, to)
}
object Snapshot {
@@ -97,6 +130,7 @@ object Histogram {
override def merge(that: InstrumentSnapshot, context: CollectionContext): InstrumentSnapshot = that
override def merge(that: Histogram.Snapshot, context: CollectionContext): Histogram.Snapshot = that
override def numberOfMeasurements: Long = 0L
+ override def scale(from: UnitOfMeasurement, to: UnitOfMeasurement): Histogram.Snapshot = this
}
}
}
diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/Instrument.scala b/kamon-core/src/main/scala/kamon/metric/instrument/Instrument.scala
index 089dbeec..2c4b4319 100644
--- a/kamon-core/src/main/scala/kamon/metric/instrument/Instrument.scala
+++ b/kamon-core/src/main/scala/kamon/metric/instrument/Instrument.scala
@@ -18,10 +18,6 @@ package kamon.metric.instrument
import java.nio.LongBuffer
-import akka.actor.{ Scheduler, Cancellable }
-import akka.dispatch.MessageDispatcher
-import scala.concurrent.duration.FiniteDuration
-
private[kamon] trait Instrument {
type SnapshotType <: InstrumentSnapshot
@@ -31,6 +27,8 @@ private[kamon] trait Instrument {
trait InstrumentSnapshot {
def merge(that: InstrumentSnapshot, context: CollectionContext): InstrumentSnapshot
+
+ def scale(from: UnitOfMeasurement, to: UnitOfMeasurement): InstrumentSnapshot
}
trait CollectionContext {
diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala b/kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala
index 4423964a..f7516262 100644
--- a/kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala
+++ b/kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala
@@ -1,7 +1,5 @@
package kamon.metric.instrument
-import java.util.concurrent.TimeUnit
-
import com.typesafe.config.Config
import kamon.metric.instrument.Histogram.DynamicRange
diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/UnitOfMeasurement.scala b/kamon-core/src/main/scala/kamon/metric/instrument/UnitOfMeasurement.scala
index c5a1b81a..5952b906 100644
--- a/kamon-core/src/main/scala/kamon/metric/instrument/UnitOfMeasurement.scala
+++ b/kamon-core/src/main/scala/kamon/metric/instrument/UnitOfMeasurement.scala
@@ -22,14 +22,27 @@ package kamon.metric.instrument
* recorders and might be used to scale certain kinds of measurements in metric backends.
*/
trait UnitOfMeasurement {
+ type U <: UnitOfMeasurement
+
def name: String
def label: String
+ def scale(toUnit: U)(value: Double): Double = value
+
+ def tryScale(toUnit: UnitOfMeasurement)(value: Double): Double =
+ if (canScale(toUnit)) scale(toUnit.asInstanceOf[U])(value)
+ else throw new IllegalArgumentException(s"Can't scale different types of units `$name` and `${toUnit.name}`")
+
+ protected def canScale(toUnit: UnitOfMeasurement): Boolean
+
}
object UnitOfMeasurement {
case object Unknown extends UnitOfMeasurement {
+ override type U = Unknown.type
val name = "unknown"
val label = "unknown"
+
+ override protected def canScale(toUnit: UnitOfMeasurement): Boolean = UnitOfMeasurement.isUnknown(toUnit)
}
def isUnknown(uom: UnitOfMeasurement): Boolean =
@@ -47,10 +60,13 @@ object UnitOfMeasurement {
* UnitOfMeasurement representing time.
*/
case class Time(factor: Double, label: String) extends UnitOfMeasurement {
+ override type U = Time
val name = "time"
- def scale(toUnit: Time)(value: Double): Double =
+ override def scale(toUnit: Time)(value: Double): Double =
(value * factor) / toUnit.factor
+
+ override protected def canScale(toUnit: UnitOfMeasurement): Boolean = UnitOfMeasurement.isTime(toUnit)
}
object Time {
@@ -58,22 +74,36 @@ object Time {
val Microseconds = Time(1E-6, "µs")
val Milliseconds = Time(1E-3, "ms")
val Seconds = Time(1, "s")
+
+ val units = List(Nanoseconds, Microseconds, Milliseconds, Seconds)
+
+ def apply(time: String): Time = units.find(_.label.toLowerCase == time.toLowerCase) getOrElse {
+ throw new IllegalArgumentException(s"Can't recognize time unit '$time'")
+ }
}
/**
* UnitOfMeasurement representing computer memory space.
*/
case class Memory(factor: Double, label: String) extends UnitOfMeasurement {
+ override type U = Memory
val name = "bytes"
- def scale(toUnit: Memory)(value: Double): Double =
+ override def scale(toUnit: Memory)(value: Double): Double =
(value * factor) / toUnit.factor
+
+ override protected def canScale(toUnit: UnitOfMeasurement): Boolean = UnitOfMeasurement.isMemory(toUnit)
}
object Memory {
val Bytes = Memory(1, "b")
val KiloBytes = Memory(1024, "Kb")
- val MegaBytes = Memory(1024E2, "Mb")
- val GigaBytes = Memory(1024E3, "Gb")
-}
+ val MegaBytes = Memory(1024 * 1024, "Mb")
+ val GigaBytes = Memory(1024 * 1024 * 1024, "Gb")
+ val units = List(Bytes, KiloBytes, MegaBytes, GigaBytes)
+
+ def apply(memory: String): Memory = units.find(_.label.toLowerCase == memory.toLowerCase) getOrElse {
+ throw new IllegalArgumentException(s"Can't recognize memory unit '$memory'")
+ }
+}
diff --git a/kamon-core/src/main/scala/kamon/util/ConfigTools.scala b/kamon-core/src/main/scala/kamon/util/ConfigTools.scala
index bcec22c3..d0665764 100644
--- a/kamon-core/src/main/scala/kamon/util/ConfigTools.scala
+++ b/kamon-core/src/main/scala/kamon/util/ConfigTools.scala
@@ -22,6 +22,8 @@ import com.typesafe.config.Config
import scala.concurrent.duration.FiniteDuration
+import kamon.metric.instrument.{ Memory, Time }
+
object ConfigTools {
implicit class Syntax(val config: Config) extends AnyVal {
// We are using the deprecated .getNanoseconds option to keep Kamon source code compatible with
@@ -37,6 +39,10 @@ object ConfigTools {
case entry ⇒ entry.getKey.takeWhile(_ != '.')
} toSet
}
+
+ def time(path: String): Time = Time(config.getString(path))
+
+ def memory(path: String): Memory = Memory(config.getString(path))
}
}
diff --git a/kamon-core/src/main/scala/kamon/util/NeedToScale.scala b/kamon-core/src/main/scala/kamon/util/NeedToScale.scala
new file mode 100644
index 00000000..19e1ae06
--- /dev/null
+++ b/kamon-core/src/main/scala/kamon/util/NeedToScale.scala
@@ -0,0 +1,37 @@
+/*
+ * =========================================================================================
+ * Copyright © 2013-2015 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.util
+
+import com.typesafe.config.Config
+import kamon.metric.instrument.{ Memory, Time }
+import kamon.util.ConfigTools._
+
+object NeedToScale {
+ val TimeUnits = "time-units"
+ val MemoryUnits = "memory-units"
+
+ def unapply(config: Config): Option[(Option[Time], Option[Memory])] = {
+ val scaleTimeTo: Option[Time] =
+ if (config.hasPath(TimeUnits)) Some(config.time(TimeUnits)) else None
+
+ val scaleMemoryTo: Option[Memory] =
+ if (config.hasPath(MemoryUnits)) Some(config.memory(MemoryUnits)) else None
+ if (scaleTimeTo.isDefined || scaleMemoryTo.isDefined) Some(scaleTimeTo -> scaleMemoryTo)
+ else None
+ }
+}
+
diff --git a/kamon-core/src/test/scala/kamon/metric/MetricScaleDecoratorSpec.scala b/kamon-core/src/test/scala/kamon/metric/MetricScaleDecoratorSpec.scala
new file mode 100644
index 00000000..04821923
--- /dev/null
+++ b/kamon-core/src/test/scala/kamon/metric/MetricScaleDecoratorSpec.scala
@@ -0,0 +1,100 @@
+/*
+ * =========================================================================================
+ * Copyright © 2013-2015 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 kamon.Kamon
+import kamon.metric.SubscriptionsDispatcher.TickMetricSnapshot
+import kamon.metric.instrument.{InstrumentFactory, Memory, Time, UnitOfMeasurement}
+import kamon.testkit.BaseKamonSpec
+import kamon.util.MilliTimestamp
+import org.scalatest.OptionValues._
+
+class MetricScaleDecoratorSpec extends BaseKamonSpec("metrics-scale-decorator-spec") with SnapshotFixtures {
+ "the MetricScaleDecorator" when {
+ "receives a snapshot" which {
+
+ val scaleDecorator = system.actorOf(MetricScaleDecorator.props(
+ Some(Time.Milliseconds), Some(Memory.KiloBytes), testActor))
+ "is empty" should {
+ "do nothing for empty snapshots" in {
+ scaleDecorator ! emptySnapshot
+ expectMsg(emptySnapshot)
+ }
+ }
+ "is non empty" should {
+ scaleDecorator ! nonEmptySnapshot
+ val scaled = expectMsgType[TickMetricSnapshot]
+ val snapshot = scaled.metrics(testEntity)
+
+ "scale time metrics" in {
+ snapshot.histogram("nano-time").value.max should be(10L +- 1L)
+ snapshot.counter("micro-time").value.count should be(1000L)
+ }
+ "scale memory metrics" in {
+ snapshot.histogram("byte-memory").value.max should be(1)
+ snapshot.counter("kbyte-memory").value.count should be(100L)
+ }
+ "do nothing with unknown metrics" in {
+ snapshot.histogram("unknown-histogram").value.max should be(1000L)
+ snapshot.counter("unknown-counter").value.count should be(10L)
+ }
+ "not change from and to" in {
+ scaled.from.millis should be(1000)
+ scaled.to.millis should be(2000)
+ }
+ }
+ }
+ }
+}
+
+trait SnapshotFixtures {
+ self: BaseKamonSpec =>
+
+ class ScaleDecoratorTestMetrics(instrumentFactory: InstrumentFactory)
+ extends GenericEntityRecorder(instrumentFactory) {
+ val nanoTime = histogram("nano-time", Time.Nanoseconds)
+ val microTime = counter("micro-time", Time.Microseconds)
+ val byteMemory = histogram("byte-memory", Memory.Bytes)
+ val kbyteMemory = counter("kbyte-memory", Memory.KiloBytes)
+ val unknownHistogram = histogram("unknown-histogram", UnitOfMeasurement.Unknown)
+ val unknownCounter = counter("unknown-counter", UnitOfMeasurement.Unknown)
+ }
+
+ object ScaleDecoratorTestMetrics extends EntityRecorderFactory[ScaleDecoratorTestMetrics] {
+ override def category: String = "decorator-spec"
+
+ override def createRecorder(instrumentFactory: InstrumentFactory): ScaleDecoratorTestMetrics =
+ new ScaleDecoratorTestMetrics(instrumentFactory)
+ }
+
+ val testEntity = Entity("metrics-scale-decorator-spec", "decorator-spec")
+ val recorder = Kamon.metrics.entity(ScaleDecoratorTestMetrics, "metrics-scale-decorator-spec")
+
+ val emptySnapshot = TickMetricSnapshot(new MilliTimestamp(1000), new MilliTimestamp(2000), Map.empty)
+
+ recorder.unknownCounter.increment(10)
+ recorder.unknownHistogram.record(1000L)
+ recorder.nanoTime.record(10000000L)
+ recorder.microTime.increment(1000000L)
+ recorder.byteMemory.record(1024L)
+ recorder.kbyteMemory.increment(100L)
+
+ val nonEmptySnapshot = TickMetricSnapshot(new MilliTimestamp(1000), new MilliTimestamp(2000), Map(
+ (testEntity -> recorder.collect(collectionContext))))
+
+}
+
diff --git a/kamon-core/src/test/scala/kamon/metric/instrument/CounterSpec.scala b/kamon-core/src/test/scala/kamon/metric/instrument/CounterSpec.scala
index 094baf4c..850200d4 100644
--- a/kamon-core/src/test/scala/kamon/metric/instrument/CounterSpec.scala
+++ b/kamon-core/src/test/scala/kamon/metric/instrument/CounterSpec.scala
@@ -56,6 +56,15 @@ class CounterSpec extends WordSpec with Matchers {
counterBSnapshot.merge(counterASnapshot, collectionContext).count should be(300)
}
+ "produce a snapshot that can be scaled" in new CounterFixture {
+ counter.increment(100)
+
+ val counterSnapshot = takeSnapshotFrom(counter)
+
+ val scaledSnapshot = counterSnapshot.scale(Time.Milliseconds, Time.Microseconds)
+ scaledSnapshot.count should be(100000)
+ }
+
}
trait CounterFixture {
diff --git a/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala b/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala
index 9a50e149..ff71cd56 100644
--- a/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala
+++ b/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala
@@ -48,7 +48,7 @@ class HistogramSpec extends WordSpec with Matchers {
}
"produce a snapshot" which {
- "supports min, max, percentile, sum and numberOfMeasurements operations" in new HistogramFixture {
+ "supports min, max, percentile, sum, numberOfMeasurements and recordsIterator operations" in new HistogramFixture {
histogram.record(100)
histogram.record(200, count = 200)
histogram.record(300)
@@ -64,6 +64,36 @@ class HistogramSpec extends WordSpec with Matchers {
snapshot.sum should be(41300)
snapshot.numberOfMeasurements should be(203)
+ val records = snapshot.recordsIterator.map(r => r.level -> r.count).toSeq
+ records.size should be (4)
+ records(0) should be(100 -> 1)
+ records(1) should be(200 -> 200)
+ records(2) should be(300 -> 1)
+ records(3) should be(900 -> 1)
+ }
+
+ "can be scaled" in new HistogramFixture {
+ histogram.record(100)
+ histogram.record(200, count = 200)
+ histogram.record(300)
+ histogram.record(900)
+
+ val snapshot = takeSnapshot().scale(Time.Seconds, Time.Milliseconds)
+
+ snapshot.min should equal(100000L +- 1000L)
+ snapshot.max should equal(900000L +- 9000L)
+ snapshot.percentile(50.0D) should be(200000)
+ snapshot.percentile(99.5D) should be(300000)
+ snapshot.percentile(99.9D) should be(900000)
+ snapshot.sum should be(41300000)
+ snapshot.numberOfMeasurements should be(203)
+
+ val records = snapshot.recordsIterator.map(r => r.level -> r.count).toSeq
+ records.size should be (4)
+ records(0) should be(100000 -> 1)
+ records(1) should be(200000 -> 200)
+ records(2) should be(300000 -> 1)
+ records(3) should be(900000 -> 1)
}
"can be merged with another snapshot" in new MultipleHistogramFixture {
diff --git a/kamon-core/src/test/scala/kamon/metric/instrument/UnitOfMeasurementSpec.scala b/kamon-core/src/test/scala/kamon/metric/instrument/UnitOfMeasurementSpec.scala
new file mode 100644
index 00000000..7133579e
--- /dev/null
+++ b/kamon-core/src/test/scala/kamon/metric/instrument/UnitOfMeasurementSpec.scala
@@ -0,0 +1,98 @@
+/*
+ * =========================================================================================
+ * Copyright © 2013-2015 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.instrument
+
+import kamon.metric.instrument.UnitOfMeasurement.Unknown
+import org.scalatest.{Matchers, WordSpec}
+
+class UnitOfMeasurementSpec extends WordSpec with Matchers {
+
+ "Time unit" should {
+ "resolve Time Unit by valid name" in {
+ Time("s") should be(Time.Seconds)
+ Time("n") should be(Time.Nanoseconds)
+ Time("ms") should be(Time.Milliseconds)
+ Time("µs") should be(Time.Microseconds)
+ }
+ "fail to resolve Time Unit by invalid name" in {
+ val ex = intercept[IllegalArgumentException](Time("boo"))
+ ex.getMessage should be("Can't recognize time unit 'boo'")
+ }
+ "scale time properly" in {
+ val epsilon = 0.0001
+
+ Time.Nanoseconds.scale(Time.Nanoseconds)(1000000D) should be(1000000D +- epsilon)
+ Time.Nanoseconds.scale(Time.Microseconds)(1000000D) should be(1000D +- epsilon)
+ Time.Nanoseconds.scale(Time.Milliseconds)(1000000D) should be(1D +- epsilon)
+ Time.Nanoseconds.scale(Time.Seconds)(1000000D) should be(0.001D +- epsilon)
+ Time.Seconds.scale(Time.Nanoseconds)(1D) should be(1000000000D +- epsilon)
+ }
+ "allow scale only time" in {
+ intercept[IllegalArgumentException](Time.Nanoseconds.tryScale(Unknown)(100))
+ .getMessage should be("Can't scale different types of units `time` and `unknown`")
+ intercept[IllegalArgumentException](Time.Nanoseconds.tryScale(Memory.Bytes)(100))
+ .getMessage should be("Can't scale different types of units `time` and `bytes`")
+ val epsilon = 0.0001
+
+ Time.Nanoseconds.tryScale(Time.Nanoseconds)(100D) should be(100D +- epsilon)
+ }
+ }
+
+ "Memory unit" should {
+ "resolve Memory Unit by valid name" in {
+ Memory("b") should be(Memory.Bytes)
+ Memory("Kb") should be(Memory.KiloBytes)
+ Memory("Mb") should be(Memory.MegaBytes)
+ Memory("Gb") should be(Memory.GigaBytes)
+ }
+ "fail to resolve Memory Unit by invalid name" in {
+ val ex = intercept[IllegalArgumentException](Memory("boo"))
+ ex.getMessage should be("Can't recognize memory unit 'boo'")
+ }
+ "scale memory properly" in {
+ val epsilon = 0.0001
+
+ Memory.Bytes.scale(Memory.Bytes)(1000000D) should be(1000000D +- epsilon)
+ Memory.Bytes.scale(Memory.KiloBytes)(1000000D) should be(976.5625D +- epsilon)
+ Memory.Bytes.scale(Memory.MegaBytes)(1000000D) should be(0.9536D +- epsilon)
+ Memory.Bytes.scale(Memory.GigaBytes)(1000000D) should be(9.3132E-4D +- epsilon)
+ Memory.MegaBytes.scale(Memory.Bytes)(1D) should be(1048576D +- epsilon)
+ }
+ "allow scale only memory" in {
+ intercept[IllegalArgumentException](Memory.Bytes.tryScale(Unknown)(100))
+ .getMessage should be("Can't scale different types of units `bytes` and `unknown`")
+ intercept[IllegalArgumentException](Memory.Bytes.tryScale(Time.Nanoseconds)(100))
+ .getMessage should be("Can't scale different types of units `bytes` and `time`")
+ val epsilon = 0.0001
+
+ Memory.Bytes.tryScale(Memory.Bytes)(100D) should be(100D +- epsilon)
+ }
+
+ }
+
+ "Unknown unit" should {
+ "allow scale only Unknown" in {
+ intercept[IllegalArgumentException](Unknown.tryScale(Memory.Bytes)(100))
+ .getMessage should be("Can't scale different types of units `unknown` and `bytes`")
+ intercept[IllegalArgumentException](Unknown.tryScale(Time.Nanoseconds)(100))
+ .getMessage should be("Can't scale different types of units `unknown` and `time`")
+
+ Unknown.scale(Unknown)(100D) should be(100D)
+ }
+
+ }
+}
diff --git a/kamon-core/src/test/scala/kamon/util/NeedToScaleSpec.scala b/kamon-core/src/test/scala/kamon/util/NeedToScaleSpec.scala
new file mode 100644
index 00000000..3486a60c
--- /dev/null
+++ b/kamon-core/src/test/scala/kamon/util/NeedToScaleSpec.scala
@@ -0,0 +1,64 @@
+/*
+ * =========================================================================================
+ * Copyright © 2013-2015 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.util
+
+import com.typesafe.config.ConfigFactory
+import kamon.metric.instrument.{Memory, Time}
+import org.scalatest.{Matchers, WordSpec}
+
+class NeedToScaleSpec extends WordSpec with Matchers {
+
+ "NeedToScale" should {
+ "extract time unit to scale to from config" in {
+ val config = ConfigFactory.parseString(
+ """
+ |time-units = "ms"
+ """.stripMargin)
+
+ config match {
+ case NeedToScale(timeUnits, memoryUnits) =>
+ timeUnits should be(Some(Time.Milliseconds))
+ memoryUnits should be(None)
+ }
+ }
+ "extract memory unit to scale to from config" in {
+ val config = ConfigFactory.parseString(
+ """
+ |memory-units = "kb"
+ """.stripMargin)
+
+ config match {
+ case NeedToScale(timeUnits, memoryUnits) =>
+ timeUnits should be(None)
+ memoryUnits should be(Some(Memory.KiloBytes))
+ }
+ }
+ "extract nothing if config has no proper keys" in {
+ val config = ConfigFactory.parseString(
+ """
+ |some-other-key = "value"
+ """.stripMargin)
+
+ config match {
+ case NeedToScale(timeUnits, memoryUnits) =>
+ fail("Should not match")
+ case _ =>
+ }
+ }
+ }
+
+}