* Introduce Java 8 Unsafe intrinsics in LogAdder (lock addq and lock xchg)

* Introduce atomic variant of LongAdder::sumThenReset -> LongAdder::sumAndReset
* Remove LongMaxUpdater in favor to AtomicLongMaxUpdater

1 files changed, 50 insertions, 44 deletions

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 d76b3613..b4e3fe96 100644
--- a/kamon-core/src/test/scala/kamon/metric/instrument/CounterSpec.scala
+++ b/kamon-core/src/test/scala/kamon/metric/instrument/CounterSpec.scala
@@ -1,46 +1,52 @@
+/* =========================================================================================
+ * Copyright © 2013-2017 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.LogInterceptor
-//import kamon.metric.Entity
-//import kamon.testkit.DefaultInstrumentFactory
-//import org.scalatest.{Matchers, WordSpec}
-//import uk.org.lidalia.slf4jext.Level
-//import uk.org.lidalia.slf4jtest.TestLoggerFactory
-//
-//class CounterSpec extends WordSpec with Matchers with LogInterceptor with DefaultInstrumentFactory {
-//  implicit val testLogger = TestLoggerFactory.getTestLogger(classOf[LongAdderCounter])
-////
-////  "a Counter" should {
-////
-////    "allow unit and bundled increments" in {
-////      val counter = buildCounter("unit-increments")
-////      counter.increment()
-////      counter.increment()
-////      counter.increment(40)
-////
-////      counter.snapshot().value shouldBe(42)
-////    }
-////
-////    "warn the user and ignore attempts to decrement the counter" in {
-////      val counter = buildCounter("attempt-to-decrement")
-////      counter.increment(100)
-////      counter.increment(100)
-////      counter.increment(100)
-////
-////      interceptLog(Level.WARN) {
-////        counter.increment(-10L)
-////      }.head.getMessage() shouldBe(s"Ignored attempt to decrement counter [attempt-to-decrement] on entity [$defaultEntity]")
-////
-////      counter.snapshot().value shouldBe(300)
-////    }
-////
-////    "reset the internal state to zero after taking snapshots" in {
-////      val counter = buildCounter("reset-after-snapshot")
-////      counter.increment()
-////      counter.increment(10)
-////
-////      counter.snapshot().value shouldBe(11)
-////      counter.snapshot().value shouldBe(0)
-////    }
-////  }
-//}
+import kamon.testkit.DefaultInstrumentFactory
+import org.scalatest.{Matchers, WordSpec}
+
+class CounterSpec extends WordSpec with Matchers with DefaultInstrumentFactory {
+
+  "a Counter" should {
+
+    "allow unit and bundled increments" in {
+      val counter = buildCounter("unit-increments")
+      counter.increment()
+      counter.increment()
+      counter.increment(40)
+
+      counter.snapshot().value shouldBe 42
+    }
+
+    "warn the user and ignore attempts to decrement the counter" in {
+      val counter = buildCounter("attempt-to-decrement")
+      counter.increment(100)
+      counter.increment(100)
+      counter.increment(100)
+
+      counter.snapshot().value shouldBe 300
+    }
+
+    "reset the internal state to zero after taking snapshots" in {
+      val counter = buildCounter("reset-after-snapshot")
+      counter.increment()
+      counter.increment(10)
+
+      counter.snapshot().value shouldBe 11
+      counter.snapshot().value shouldBe 0
+    }
+  }
+}