+ core: added MinMaxCounterSpec and new test in ActorMetricsSpec

2 files changed, 25 insertions, 1 deletions

diff --git a/kamon-core/src/main/scala/kamon/metrics/instruments/counter/MinMaxCounter.scala b/kamon-core/src/main/scala/kamon/metrics/instruments/counter/MinMaxCounter.scala
index ed83f4bc..6c89a4d1 100644
--- a/kamon-core/src/main/scala/kamon/metrics/instruments/counter/MinMaxCounter.scala
+++ b/kamon-core/src/main/scala/kamon/metrics/instruments/counter/MinMaxCounter.scala
@@ -39,7 +39,7 @@ class MinMaxCounter {
 
   def collect(): (Long, Long, Long) = {
     val currentValue = sum.get()
-    val result = (abs(min.max()), max.max(), currentValue)
+    val result = (abs(min.maxThenReset()), max.maxThenReset(), currentValue)
     max.update(currentValue)
     min.update(-currentValue)
     result
diff --git a/kamon-core/src/main/scala/kamon/util/Contexts.scala b/kamon-core/src/main/scala/kamon/util/Contexts.scala
new file mode 100644
index 00000000..d2fe6360
--- /dev/null
+++ b/kamon-core/src/main/scala/kamon/util/Contexts.scala
@@ -0,0 +1,24 @@
+package kamon.util
+
+import akka.actor.ActorSystem
+
+/*
+ * =========================================================================================
+ * Copyright © 2013-2014 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.
+ * =========================================================================================
+ */
+object Contexts {
+    val kamonDefaultDispatcher =  "kamon.default-dispatcher"
+
+    def lookupExecutionContext(id:String)(implicit system: ActorSystem) = system.dispatchers.lookup(id)
+}