Test HealthCheck

Author: reshmabidikar

.idea/misc.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-oss-parent</artifactId>
-        <version>0.146.30</version>
+        <version>0.146.51-SNAPSHOT</version>
     </parent>
     <groupId>org.kill-bill.billing.plugin.java</groupId>
     <artifactId>hello-world-plugin</artifactId>

pom.xml

@@ -25,6 +25,7 @@
 import javax.servlet.Servlet;
 import javax.servlet.http.HttpServlet;
 
+import org.killbill.billing.invoice.plugin.api.InvoiceFormatterFactory;
 import org.killbill.billing.invoice.plugin.api.InvoicePluginApi;
 import org.killbill.billing.osgi.api.Healthcheck;
 import org.killbill.billing.osgi.api.OSGIPluginProperties;
@@ -36,9 +37,12 @@
 import org.killbill.billing.plugin.core.config.PluginEnvironmentConfig;
 import org.killbill.billing.plugin.core.resources.jooby.PluginApp;
 import org.killbill.billing.plugin.core.resources.jooby.PluginAppBuilder;
+import org.killbill.commons.health.api.HealthCheckRegistry;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
-import org.killbill.billing.invoice.plugin.api.InvoiceFormatterFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class HelloWorldActivator extends KillbillActivatorBase {
 
@@ -48,16 +52,26 @@ public class HelloWorldActivator extends KillbillActivatorBase {
     //
     public static final String PLUGIN_NAME = "hello-world-plugin";
 
+    private static final Logger logger = LoggerFactory.getLogger(HelloWorldActivator.class);
+
     private HelloWorldConfigurationHandler helloWorldConfigurationHandler;
     private OSGIKillbillEventDispatcher.OSGIKillbillEventHandler killbillEventHandler;
     private MetricsGeneratorExample metricsGenerator;
 
     private ServiceTracker<InvoiceFormatterFactory, InvoiceFormatterFactory> invoiceFormatterTracker;
 
+    private HealthCheckRegistry healthCheckRegistry;
+
     @Override
     public void start(final BundleContext context) throws Exception {
         super.start(context);
-
+        final ServiceReference<HealthCheckRegistry> reference = context.getServiceReference(HealthCheckRegistry.class);
+        if (reference != null) {
+            final HealthCheckRegistry healthCheckRegistry = context.getService(reference);
+            if (healthCheckRegistry != null) {
+                this.healthCheckRegistry = healthCheckRegistry;
+            }
+        }
         final String region = PluginEnvironmentConfig.getRegion(configProperties.getProperties());
 
         // Register an event listener for plugin configuration (optional)
@@ -72,7 +86,7 @@ public void start(final BundleContext context) throws Exception {
 
 
         // Register an event listener (optional)
-        killbillEventHandler = new HelloWorldListener(killbillAPI, invoiceFormatterTracker, configProperties.getProperties());
+        killbillEventHandler = new HelloWorldListener(killbillAPI, invoiceFormatterTracker, healthCheckRegistry, configProperties.getProperties());
 
         // As an example, this plugin registers a PaymentPluginApi (this could be
         // changed to any other plugin api)
@@ -99,6 +113,7 @@ public void start(final BundleContext context) throws Exception {
         registerServlet(context, httpServlet);
 
         registerHandlers();
+        //        HealthCheck aviateHealthCheck = hea
     }
 
     @Override

src/main/java/org/killbill/billing/plugin/helloworld/HelloWorldActivator.java

@@ -22,8 +22,8 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
+import java.util.Set;
 
-import org.joda.time.LocalDate;
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.account.api.AccountApiException;
 import org.killbill.billing.invoice.api.Invoice;
@@ -36,6 +36,8 @@
 import org.killbill.billing.osgi.libs.killbill.OSGIKillbillEventDispatcher;
 import org.killbill.billing.plugin.api.PluginTenantContext;
 import org.killbill.billing.util.callcontext.TenantContext;
+import org.killbill.commons.health.api.HealthCheckRegistry;
+import org.killbill.commons.health.api.Result;
 import org.osgi.util.tracker.ServiceTracker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,9 +52,12 @@ public class HelloWorldListener implements OSGIKillbillEventDispatcher.OSGIKillb
 
     private final Properties configProperties;
 
-    public HelloWorldListener(final OSGIKillbillAPI killbillAPI, final ServiceTracker<InvoiceFormatterFactory, InvoiceFormatterFactory> invoiceFormatterTracker, Properties configProperties) {
+    private final HealthCheckRegistry healthCheckRegistry;
+
+    public HelloWorldListener(final OSGIKillbillAPI killbillAPI, final ServiceTracker<InvoiceFormatterFactory, InvoiceFormatterFactory> invoiceFormatterTracker, final HealthCheckRegistry healthCheckRegistry, final Properties configProperties) {
         this.osgiKillbillAPI = killbillAPI;
         this.invoiceFormatterTracker = invoiceFormatterTracker;
+        this.healthCheckRegistry = healthCheckRegistry;
         this.configProperties = configProperties;
     }
 
@@ -66,6 +71,7 @@ public void handleKillbillEvent(final ExtBusEvent killbillEvent) {
                     killbillEvent.getObjectType());
 
         final TenantContext context = new PluginTenantContext(killbillEvent.getAccountId(), killbillEvent.getTenantId());
+        //        HealthCheck aviateHealthCheck = hea
         switch (killbillEvent.getEventType()) {
             //
             // Handle ACCOUNT_CREATION and ACCOUNT_CHANGE only for demo purpose and just print the account
@@ -78,6 +84,14 @@ public void handleKillbillEvent(final ExtBusEvent killbillEvent) {
                 } catch (final AccountApiException e) {
                     logger.warn("Unable to find account", e);
                 }
+                final Set<String> names = healthCheckRegistry.getNames();
+                logger.info("names {}", names);
+                Result result = healthCheckRegistry.runHealthCheck("org.killbill.billing.server.healthchecks.KillbillHealthcheck");
+                logger.info("KB healthcheck result: {}", result.isHealthy());
+                result = healthCheckRegistry.runHealthCheck("org.killbill.billing.server.healthchecks.KillbillPluginsHealthcheck");
+                logger.info("Plugins healthcheck result: {}", result.isHealthy());
+                result = healthCheckRegistry.runHealthCheck("com.killbill.billing.plugin.aviate.AviateHealthCheck"); //This line fails
+                logger.info("Aviate healthcheck result: {}", result.isHealthy());
                 break;
             case INVOICE_CREATION: