Merge pull request #607 from optimaster/external-health-check-registry

Add support for external health check registry.

Author: jknack

…metrics/HealthCheckRegistryProvider.java …rics/HealthCheckRegistryInitializer.javajooby-metrics/src/main/java/org/jooby/internal/metrics/HealthCheckRegistryProvider.java renamed to jooby-metrics/src/main/java/org/jooby/internal/metrics/HealthCheckRegistryInitializer.java jooby-metrics/src/main/java/org/jooby/internal/metrics/HealthCheckRegistryProvider.java renamed to jooby-metrics/src/main/java/org/jooby/internal/metrics/HealthCheckRegistryInitializer.java

@@ -21,24 +21,16 @@
 import java.util.Map;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 
 import com.codahale.metrics.health.HealthCheck;
 import com.codahale.metrics.health.HealthCheckRegistry;
 
-public class HealthCheckRegistryProvider implements Provider<HealthCheckRegistry> {
-
-  private HealthCheckRegistry registry;
+public class HealthCheckRegistryInitializer {
 
   @Inject
-  public HealthCheckRegistryProvider(final Map<String, HealthCheck> checks) {
-    registry = new HealthCheckRegistry();
+  public HealthCheckRegistryInitializer(final HealthCheckRegistry registry,
+      final Map<String, HealthCheck> checks) {
     checks.forEach(registry::register);
   }
 
-  @Override
-  public HealthCheckRegistry get() {
-    return registry;
-  }
-
 }

jooby-metrics/src/main/java/org/jooby/metrics/Metrics.java

@@ -32,7 +32,7 @@
 import org.jooby.Env;
 import org.jooby.Jooby;
 import org.jooby.Router;
-import org.jooby.internal.metrics.HealthCheckRegistryProvider;
+import org.jooby.internal.metrics.HealthCheckRegistryInitializer;
 import org.jooby.internal.metrics.MetricRegistryInitializer;
 
 import com.codahale.metrics.Metric;
@@ -160,19 +160,33 @@ static interface Bindings {
 
   private Set<BiFunction<MetricRegistry, Config, Reporter>> reporters = new LinkedHashSet<>();
 
-  private MetricRegistry registry;
+  private MetricRegistry metricRegistry;
+  private HealthCheckRegistry healthCheckRegistry;
 
   /**
    * Creates a new {@link Metric} module.
    *
-   * @param registry Use the given registry.
+   * @param metricRegistry Use the given metricRegistry.
+   * @param healthCheckRegistry Use the given healthCheckRegistry.
    * @param pattern A root pattern where to publish all the services. Default is: <code>/sys</code>.
    */
-  public Metrics(final MetricRegistry registry, final String pattern) {
-    this.registry = requireNonNull(registry, "Registry is required.");
+  public Metrics(final MetricRegistry metricRegistry,
+    final HealthCheckRegistry healthCheckRegistry, final String pattern) {
+    this.metricRegistry = requireNonNull(metricRegistry, "Metric registry is required.");
+    this.healthCheckRegistry = requireNonNull(healthCheckRegistry, "Health check registry is required.");
     this.pattern = requireNonNull(pattern, "A pattern is required.");
   }
 
+  /**
+   * Creates a new {@link Metric} module.
+   *
+   * @param metricRegistry Use the given metricRegistry.
+   * @param pattern A root pattern where to publish all the services. Default is: <code>/sys</code>.
+   */
+  public Metrics(final MetricRegistry metricRegistry, final String pattern) {
+    this(metricRegistry, new HealthCheckRegistry(), pattern);
+  }
+
   /**
    * Creates a new {@link Metric} module.
    *
@@ -185,10 +199,19 @@ public Metrics(final String pattern) {
   /**
    * Creates a new {@link Metric} module. Services will be available at: <code>/sys</code>.
    *
-   * @param registry Use the given registry.
+   * @param healthCheckRegistry Use the given healthCheckRegistry.
    */
-  public Metrics(final MetricRegistry registry) {
-    this(registry, "/sys");
+  public Metrics(final HealthCheckRegistry healthCheckRegistry) {
+    this(new MetricRegistry(), healthCheckRegistry, "/sys");
+  }
+
+  /**
+   * Creates a new {@link Metric} module. Services will be available at: <code>/sys</code>.
+   *
+   * @param metricRegistry Use the given metricRegistry.
+   */
+  public Metrics(final MetricRegistry metricRegistry) {
+    this(metricRegistry, "/sys");
   }
 
   /**
@@ -217,7 +240,7 @@ public Metrics request(final String method, final String pattern) {
    * @return This metrics module.
    */
   public Metrics request(final String pattern) {
-    return request("GET", "*");
+    return request("GET", pattern);
   }
 
   /**
@@ -358,17 +381,17 @@ public void configure(final Env env, final Config conf, final Binder binder) {
 
     Multibinder<Reporter> reporters = Multibinder.newSetBinder(binder, Reporter.class);
 
-    binder.bind(MetricRegistry.class).toInstance(registry);
+    binder.bind(MetricRegistry.class).toInstance(metricRegistry);
 
-    this.reporters.forEach(it -> reporters.addBinding().toInstance(it.apply(registry, conf)));
+    this.reporters.forEach(it -> reporters.addBinding().toInstance(it.apply(metricRegistry, conf)));
 
     binder.bind(MetricRegistryInitializer.class).asEagerSingleton();
 
     env.onStop(app -> app.require(MetricRegistryInitializer.class).close());
 
-    binder.bind(HealthCheckRegistry.class)
-        .toProvider(HealthCheckRegistryProvider.class)
-        .asEagerSingleton();
+    binder.bind(HealthCheckRegistry.class).toInstance(healthCheckRegistry);
+
+    binder.bind(HealthCheckRegistryInitializer.class).asEagerSingleton();
 
     bindings.forEach(it -> it.bind(binder, routes, conf));
 

jooby-metrics/src/test/java/org/jooby/internal/metrics/HealthCheckRegistryInitializerTest.java

@@ -0,0 +1,35 @@
+package org.jooby.internal.metrics;
+
+import static org.easymock.EasyMock.expectLastCall;
+
+import java.util.Map;
+
+import com.codahale.metrics.health.HealthCheck;
+import org.jooby.test.MockUnit;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import com.codahale.metrics.health.HealthCheckRegistry;
+import com.google.common.collect.ImmutableMap;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(HealthCheckRegistryInitializer.class)
+public class HealthCheckRegistryInitializerTest {
+
+  @Test
+  public void register() throws Exception {
+    new MockUnit(HealthCheckRegistry.class, HealthCheck.class)
+      .expect(unit -> {
+        HealthCheckRegistry registry = unit.get(HealthCheckRegistry.class);
+        registry.register("h", unit.get(HealthCheck.class));
+        expectLastCall();
+      })
+      .run(unit -> {
+        Map<String, HealthCheck> checks = ImmutableMap.of("h", unit.get(HealthCheck.class));
+        HealthCheckRegistryInitializer hcri = new HealthCheckRegistryInitializer(
+        unit.get(HealthCheckRegistry.class), checks);
+      });
+  }
+}