Synchronize less often in AbstractMeterRegistry (fixes micrometer-met…

…rics#134)
jkemming · Oct 2, 2017 · 9e24b2e · 9e24b2e
1 parent e0c8447
commit 9e24b2e
Showing 1 changed file with 20 additions and 22 deletions.
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/AbstractMeterRegistry.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/AbstractMeterRegistry.java
@@ -115,28 +115,26 @@ protected String getConventionName(Meter.Id id) {
 
     @Override
     public Meter register(Meter.Id id, Meter.Type type, Iterable<Measurement> measurements) {
-        synchronized (meterMap) {
-            return registerMeterIfNecessary(Meter.class, id, id2 -> {
-                id2.setType(type);
-                newMeter(id2, type, measurements);
-                return new Meter() {
-                    @Override
-                    public Id getId() {
-                        return id2;
-                    }
-
-                    @Override
-                    public Type getType() {
-                        return type;
-                    }
-
-                    @Override
-                    public Iterable<Measurement> measure() {
-                        return measurements;
-                    }
-                };
-            });
-        }
+        return registerMeterIfNecessary(Meter.class, id, id2 -> {
+            id2.setType(type);
+            newMeter(id2, type, measurements);
+            return new Meter() {
+                @Override
+                public Id getId() {
+                    return id2;
+                }
+
+                @Override
+                public Type getType() {
+                    return type;
+                }
+
+                @Override
+                public Iterable<Measurement> measure() {
+                    return measurements;
+                }
+            };
+        });
     }
 
     @Override