root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Tweak to support finer grained locking 

Fixes gh-543
This commit is contained in:
Dave Syer 2014-03-22 14:57:12 +00:00
parent 8d442b1fbc
commit b824a6ea05
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CodahaleMetricWriter.java
View File

@ -16,6 +16,8 @@
package org.springframework.boot.actuate.metrics.writer;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
import org.springframework.boot.actuate.metrics.Metric;
@ -49,6 +51,8 @@ public class CodahaleMetricWriter implements MetricWriter {
private final MetricRegistry registry;
private final ConcurrentMap<String, Object> gaugeLocks = new ConcurrentHashMap<String, Object>();
/**
* Create a new {@link CodahaleMetricWriter} instance.
* @param registry the underlying metric registry
@ -86,13 +90,19 @@ public class CodahaleMetricWriter implements MetricWriter {
}
else {
final double gauge = value.getValue().doubleValue();
Object lock = null;
if (this.gaugeLocks.containsKey(name)) {
lock = this.gaugeLocks.get(name);
}
else {
this.gaugeLocks.putIfAbsent(name, new Object());
lock = this.gaugeLocks.get(name);
}
// ensure we synchronize on the registry to avoid another thread
// pre-empting this thread after remove causing register to be
// called twice causing an error in CodaHale metrics
// NOTE: this probably should not be synchronized, but CodaHale
// provides no other methods to get or add a particular gauge
synchronized (this.registry) {
// Ensure we synchronize to avoid another thread pre-empting this thread after
// remove causing an error in CodaHale metrics
// NOTE: CodaHale provides no way to do this atomically
synchronized (lock) {
this.registry.remove(name);
this.registry.register(name, new SimpleGauge(gauge));
}