Merge pull request #196 from wttech/bundle-context-issues-in-hc

Bundle state visible in HC

Author: krystian-panek-vmltech

core/src/main/java/dev/vml/es/acm/core/instance/HealthChecker.java

@@ -2,7 +2,12 @@
 
 import dev.vml.es.acm.core.code.*;
 import dev.vml.es.acm.core.code.script.ExtensionScriptSyntax;
-import dev.vml.es.acm.core.osgi.*;
+import dev.vml.es.acm.core.osgi.InstanceInfo;
+import dev.vml.es.acm.core.osgi.InstanceType;
+import dev.vml.es.acm.core.osgi.OsgiEvent;
+import dev.vml.es.acm.core.osgi.OsgiEventCollector;
+import dev.vml.es.acm.core.osgi.OsgiScanner;
+import dev.vml.es.acm.core.osgi.OsgiUtils;
 import dev.vml.es.acm.core.repo.Repo;
 import dev.vml.es.acm.core.util.ExceptionUtils;
 import dev.vml.es.acm.core.util.ResolverUtils;
@@ -162,25 +167,44 @@ private void checkRepository(HealthStatus result, ResourceResolver resourceResol
         }
     }
 
+    /**
+     * @see <https://github.com/apache/felix-dev/blob/master/framework/src/main/java/org/apache/felix/framework/BundleContextImpl.java> 'checkValidity()' method
+     */
     private void checkBundles(HealthStatus result) {
         if (!config.bundleChecking()) {
             return;
         }
+
+        try {
+            osgiScanner.getBundleContext().getBundle();
+        } catch (Exception e) {
+            result.issues.add(new HealthIssue(
+                    HealthIssueSeverity.CRITICAL,
+                    HealthIssueCategory.OSGI,
+                    "Bundle context not valid",
+                    ExceptionUtils.toString(e)));
+            return;
+        }
+
         osgiScanner.scanBundles().filter(b -> !isBundleIgnored(b)).forEach(bundle -> {
             if (osgiScanner.isFragment(bundle)) {
                 if (!osgiScanner.isBundleResolved(bundle)) {
                     result.issues.add(new HealthIssue(
                             HealthIssueSeverity.CRITICAL,
                             HealthIssueCategory.OSGI,
-                            String.format("Bundle fragment not resolved: '%s'", bundle.getSymbolicName()),
+                            String.format(
+                                    "Bundle fragment not resolved (%s): '%s'",
+                                    OsgiUtils.bundleStateName(bundle.getState()), bundle.getSymbolicName()),
                             null));
                 }
             } else {
                 if (!osgiScanner.isBundleActive(bundle)) {
                     result.issues.add(new HealthIssue(
                             HealthIssueSeverity.CRITICAL,
                             HealthIssueCategory.OSGI,
-                            String.format("Bundle not active: '%s'", bundle.getSymbolicName()),
+                            String.format(
+                                    "Bundle not active (%s): '%s'",
+                                    OsgiUtils.bundleStateName(bundle.getState()), bundle.getSymbolicName()),
                             null));
                 }
             }

core/src/main/java/dev/vml/es/acm/core/osgi/OsgiScanner.java

@@ -24,7 +24,7 @@ public class OsgiScanner {
 
     private static final String BUNDLE_WIRING_PACKAGE = "osgi.wiring.package";
 
-    private BundleContext getBundleContext() {
+    public BundleContext getBundleContext() {
         return FrameworkUtil.getBundle(getClass()).getBundleContext();
     }
 

core/src/main/java/dev/vml/es/acm/core/osgi/OsgiUtils.java

@@ -0,0 +1,29 @@
+package dev.vml.es.acm.core.osgi;
+
+import org.osgi.framework.Bundle;
+
+public final class OsgiUtils {
+
+    private OsgiUtils() {
+        // Utility class
+    }
+
+    public static String bundleStateName(int state) {
+        switch (state) {
+            case Bundle.UNINSTALLED:
+                return "uninstalled";
+            case Bundle.INSTALLED:
+                return "installed";
+            case Bundle.RESOLVED:
+                return "resolved";
+            case Bundle.STARTING:
+                return "starting";
+            case Bundle.STOPPING:
+                return "stopping";
+            case Bundle.ACTIVE:
+                return "active";
+            default:
+                return String.format("state '%d'", state);
+        }
+    }
+}