Issue ReactiveX#72: Implemented review findings

jihoonson · Apr 3, 2017 · aafaac4 · aafaac4
1 parent 101880e
commit aafaac4
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/resilience4j-metrics/src/main/java/io/github/resilience4j/metrics/CircuitBreakerMetrics.java b/resilience4j-metrics/src/main/java/io/github/resilience4j/metrics/CircuitBreakerMetrics.java
@@ -41,16 +41,19 @@ public class CircuitBreakerMetrics implements MetricSet{
 
     private CircuitBreakerMetrics(Seq<CircuitBreaker> circuitBreakers){
         circuitBreakers.forEach(circuitBreaker -> {
-            metricRegistry.register(name("resilience4j.circuitbreaker", circuitBreaker.getName(), "successful"),
-                    (Gauge<Integer>) () -> circuitBreaker.getMetrics().getNumberOfSuccessfulCalls());
-            metricRegistry.register(name("resilience4j.circuitbreaker", circuitBreaker.getName(), "failed"),
-                    (Gauge<Integer>) () -> circuitBreaker.getMetrics().getNumberOfFailedCalls());
-            metricRegistry.register(name("resilience4j.circuitbreaker", circuitBreaker.getName(), "not_permitted"),
-                    (Gauge<Long>) () -> circuitBreaker.getMetrics().getNumberOfNotPermittedCalls());
-            metricRegistry.register(name("resilience4j.circuitbreaker", circuitBreaker.getName(), "buffered"),
-                    (Gauge<Integer>) () -> circuitBreaker.getMetrics().getNumberOfBufferedCalls());
-            metricRegistry.register(name("resilience4j.circuitbreaker", circuitBreaker.getName(), "buffered_max"),
-                    (Gauge<Integer>) () -> circuitBreaker.getMetrics().getMaxNumberOfBufferedCalls());
+            String name = circuitBreaker.getName();
+            CircuitBreaker.Metrics metrics = circuitBreaker.getMetrics();
+
+            metricRegistry.register(name("resilience4j.circuitbreaker", name, "successful"),
+                    (Gauge<Integer>) metrics::getNumberOfSuccessfulCalls);
+            metricRegistry.register(name("resilience4j.circuitbreaker", name, "failed"),
+                    (Gauge<Integer>) metrics::getNumberOfFailedCalls);
+            metricRegistry.register(name("resilience4j.circuitbreaker", name, "not_permitted"),
+                    (Gauge<Long>) metrics::getNumberOfNotPermittedCalls);
+            metricRegistry.register(name("resilience4j.circuitbreaker", name, "buffered"),
+                    (Gauge<Integer>) metrics::getNumberOfBufferedCalls);
+            metricRegistry.register(name("resilience4j.circuitbreaker", name, "buffered_max"),
+                    (Gauge<Integer>) metrics::getMaxNumberOfBufferedCalls);
             }
         );
     }
@@ -59,6 +62,10 @@ public static CircuitBreakerMetrics of(CircuitBreakerRegistry circuitBreakerRegi
         return new CircuitBreakerMetrics(circuitBreakerRegistry.getAllCircuitBreakers());
     }
 
+    public static CircuitBreakerMetrics of(Seq<CircuitBreaker> circuitBreakers) {
+        return new CircuitBreakerMetrics(circuitBreakers);
+    }
+
     public static CircuitBreakerMetrics of(CircuitBreaker circuitBreaker) {
         return new CircuitBreakerMetrics(Array.of(circuitBreaker));
     }