aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/main/scala/kamon/metric
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2016-10-04 19:52:09 +0200
committerDiego Parra <diegolparra@gmail.com>2016-10-04 19:52:09 +0200
commitddd73214a61182823b8f1897687d8d16bb40390b (patch)
tree2acec2dd5b78712b13836f60dd984305e3821e08 /kamon-core/src/main/scala/kamon/metric
parentbe07f2cded403b5939d5b7c0817444dd9b3f9e4e (diff)
downloadKamon-ddd73214a61182823b8f1897687d8d16bb40390b.tar.gz
Kamon-ddd73214a61182823b8f1897687d8d16bb40390b.tar.bz2
Kamon-ddd73214a61182823b8f1897687d8d16bb40390b.zip
Cas collect compatibility with earlier jvms (#399)
! core: introduce CAS for safer counter collection and inline implementation of Unsafe.getAndSetLong for <jdk8 compatibility.
Diffstat (limited to 'kamon-core/src/main/scala/kamon/metric')
-rw-r--r--kamon-core/src/main/scala/kamon/metric/instrument/Counter.scala2
1 files changed, 1 insertions, 1 deletions
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 349a12bd..b7ab60de 100644
--- a/kamon-core/src/main/scala/kamon/metric/instrument/Counter.scala
+++ b/kamon-core/src/main/scala/kamon/metric/instrument/Counter.scala
@@ -48,7 +48,7 @@ class LongAdderCounter extends Counter {
counter.add(times)
}
- def collect(context: CollectionContext): Counter.Snapshot = CounterSnapshot(counter.sumThenReset())
+ def collect(context: CollectionContext): Counter.Snapshot = CounterSnapshot(counter.sumAndReset())
def cleanup: Unit = {}
}