aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/main/scala/kamon/metric/instrument
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2014-08-13 00:13:21 -0400
committerIvan Topolnjak <ivantopo@gmail.com>2014-08-13 00:13:21 -0400
commitd2a2d590abf0f287d5d07edc00970f4c6069d20e (patch)
tree60de0f32639c1807a649d80096f3260bff707c7f /kamon-core/src/main/scala/kamon/metric/instrument
parent0777a6ff7b6c11f8f4a4e89ac27287b1a18449de (diff)
downloadKamon-d2a2d590abf0f287d5d07edc00970f4c6069d20e.tar.gz
Kamon-d2a2d590abf0f287d5d07edc00970f4c6069d20e.tar.bz2
Kamon-d2a2d590abf0f287d5d07edc00970f4c6069d20e.zip
= core: ensure that MinMaxCounters never record values bellow zero, fixes #71
Diffstat (limited to 'kamon-core/src/main/scala/kamon/metric/instrument')
-rw-r--r--kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala17
1 files changed, 10 insertions, 7 deletions
diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala b/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala
index 13dea8fe..4882d2aa 100644
--- a/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala
+++ b/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala
@@ -33,6 +33,7 @@ trait MinMaxCounter extends MetricRecorder {
def increment(times: Long): Unit
def decrement()
def decrement(times: Long)
+ def refreshValues(): Unit
}
object MinMaxCounter {
@@ -95,19 +96,21 @@ class PaddedMinMaxCounter(underlyingHistogram: Histogram) extends MinMaxCounter
def refreshValues(): Unit = {
val currentValue = {
val value = sum.get()
- if (value < 0) 0 else value
+ if (value <= 0) 0 else value
}
val currentMin = {
- val minAbs = abs(min.maxThenReset())
- if (minAbs <= currentValue) minAbs else 0
+ val rawMin = min.maxThenReset(-currentValue)
+ if (rawMin >= 0)
+ 0
+ else
+ abs(rawMin)
}
+ val currentMax = max.maxThenReset(currentValue)
+
underlyingHistogram.record(currentValue)
underlyingHistogram.record(currentMin)
- underlyingHistogram.record(max.maxThenReset())
-
- max.update(currentValue)
- min.update(-currentValue)
+ underlyingHistogram.record(currentMax)
}
}