Add support for providing a custom MetricRegistry to Codahale and Dro…

…pwizard metrics
vladmihalcea · Oct 14, 2016 · 5caf957 · 5caf957
1 parent 132431c
commit 5caf957
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 4 deletions.
diff --git a/...ale-metrics/src/main/java/com/vladmihalcea/flexypool/metric/codahale/CodahaleMetrics.java b/...ale-metrics/src/main/java/com/vladmihalcea/flexypool/metric/codahale/CodahaleMetrics.java
@@ -72,14 +72,16 @@ public Reservoir newInstance(Class<? extends Metric> metricClass, String metricN
     /**
      * Init constructor
      * @param configurationProperties configuration properties
+     * @param metricRegistry metric registry
      * @param reservoirFactory reservoir factory
      * @param callbacks life cycle callbacks
      */
     public CodahaleMetrics(ConfigurationProperties configurationProperties,
+                           MetricRegistry metricRegistry,
                            ReservoirFactory reservoirFactory,
                            MetricsLifeCycleCallback... callbacks) {
         super(configurationProperties);
-        this.metricRegistry = new MetricRegistry();
+        this.metricRegistry = metricRegistry;
         this.reservoirFactory = reservoirFactory;
         this.callbacks.add(new Slf4jMetricReporter().init(configurationProperties, metricRegistry));
         this.callbacks.add(new JmxMetricReporter().init(configurationProperties, metricRegistry));
@@ -88,6 +90,18 @@ public CodahaleMetrics(ConfigurationProperties configurationProperties,
         }
     }
 
+    /**
+     * Init constructor
+     * @param configurationProperties configuration properties
+     * @param reservoirFactory reservoir factory
+     * @param callbacks life cycle callbacks
+     */
+    public CodahaleMetrics(ConfigurationProperties configurationProperties,
+                           ReservoirFactory reservoirFactory,
+                           MetricsLifeCycleCallback... callbacks) {
+        this(configurationProperties, new MetricRegistry(), reservoirFactory, callbacks);
+    }
+
     /**
      * {@inheritDoc}
      */

diff --git a/...metrics/src/test/java/com/vladmihalcea/flexypool/metric/codahale/CodahaleMetricsTest.java b/...metrics/src/test/java/com/vladmihalcea/flexypool/metric/codahale/CodahaleMetricsTest.java
@@ -1,10 +1,12 @@
 package com.vladmihalcea.flexypool.metric.codahale;
 
+import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Reservoir;
 import com.vladmihalcea.flexypool.metric.Histogram;
 import com.vladmihalcea.flexypool.metric.Metrics;
 import com.vladmihalcea.flexypool.metric.Timer;
 import com.vladmihalcea.flexypool.common.ConfigurationProperties;
+import com.vladmihalcea.flexypool.util.ReflectionUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -24,6 +26,9 @@ public class CodahaleMetricsTest {
     @Mock
     private ConfigurationProperties configurationProperties;
 
+    @Mock
+    private MetricRegistry metricRegistry;
+
     @Mock
     private ReservoirFactory reservoirFactory;
 
@@ -35,6 +40,12 @@ public void before() {
         MockitoAnnotations.initMocks(this);
     }
 
+    @Test
+    public void testMetricRegistry() {
+        CodahaleMetrics codahaleMetrics = new CodahaleMetrics(configurationProperties, metricRegistry, reservoirFactory);
+        assertSame(metricRegistry, ReflectionUtils.getFieldValue(codahaleMetrics, "metricRegistry"));
+    }
+
     @Test
     public void testHistogram() {
         CodahaleMetrics codahaleMetrics = new CodahaleMetrics(configurationProperties, reservoirFactory);

diff --git a/...metrics/src/main/java/com/vladmihalcea/flexypool/metric/dropwizard/DropwizardMetrics.java b/...metrics/src/main/java/com/vladmihalcea/flexypool/metric/dropwizard/DropwizardMetrics.java
@@ -72,14 +72,16 @@ public Reservoir newInstance(Class<? extends Metric> metricClass, String metricN
     /**
      * Init constructor
      * @param configurationProperties configuration properties
+     * @param metricRegistry metric registry
      * @param reservoirFactory reservoir factory
      * @param callbacks life cycle callbacks
      */
     public DropwizardMetrics(ConfigurationProperties configurationProperties,
+                             MetricRegistry metricRegistry,
                              ReservoirFactory reservoirFactory,
                              MetricsLifeCycleCallback... callbacks) {
         super(configurationProperties);
-        this.metricRegistry = new MetricRegistry();
+        this.metricRegistry = metricRegistry;
         this.reservoirFactory = reservoirFactory;
         this.callbacks.add(new Slf4jMetricReporter().init(configurationProperties, metricRegistry));
         this.callbacks.add(new JmxMetricReporter().init(configurationProperties, metricRegistry));
@@ -88,6 +90,18 @@ public DropwizardMetrics(ConfigurationProperties configurationProperties,
         }
     }
 
+    /**
+     * Init constructor
+     * @param configurationProperties configuration properties
+     * @param reservoirFactory reservoir factory
+     * @param callbacks life cycle callbacks
+     */
+    public DropwizardMetrics(ConfigurationProperties configurationProperties,
+                             ReservoirFactory reservoirFactory,
+                             MetricsLifeCycleCallback... callbacks) {
+        this(configurationProperties, new MetricRegistry(), reservoirFactory, callbacks);
+    }
+
     /**
      * {@inheritDoc}
      */

diff --git a/...ics/src/test/java/com/vladmihalcea/flexypool/metric/dropwizard/DropwizardMetricsTest.java b/...ics/src/test/java/com/vladmihalcea/flexypool/metric/dropwizard/DropwizardMetricsTest.java
@@ -1,10 +1,12 @@
 package com.vladmihalcea.flexypool.metric.dropwizard;
 
-import io.dropwizard.metrics.Reservoir;
+import com.vladmihalcea.flexypool.common.ConfigurationProperties;
 import com.vladmihalcea.flexypool.metric.Histogram;
 import com.vladmihalcea.flexypool.metric.Metrics;
 import com.vladmihalcea.flexypool.metric.Timer;
-import com.vladmihalcea.flexypool.common.ConfigurationProperties;
+import com.vladmihalcea.flexypool.util.ReflectionUtils;
+import io.dropwizard.metrics.MetricRegistry;
+import io.dropwizard.metrics.Reservoir;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -24,6 +26,9 @@ public class DropwizardMetricsTest {
     @Mock
     private ConfigurationProperties configurationProperties;
 
+    @Mock
+    private MetricRegistry metricRegistry;
+
     @Mock
     private ReservoirFactory reservoirFactory;
 
@@ -35,6 +40,12 @@ public void before() {
         MockitoAnnotations.initMocks(this);
     }
 
+    @Test
+    public void testMetricRegistry() {
+        DropwizardMetrics dropwizardMetrics = new DropwizardMetrics(configurationProperties, metricRegistry, reservoirFactory);
+        assertSame(metricRegistry, ReflectionUtils.getFieldValue(dropwizardMetrics, "metricRegistry"));
+    }
+
     @Test
     public void testHistogram() {
         DropwizardMetrics dropwizardMetrics = new DropwizardMetrics(configurationProperties, reservoirFactory);