Merge pull request #22507 from vespa-engine/prepare-for-logging-in-jdisc_corev7.583.48

Prepare for logging in jdisc core [run-systemtest]

2 files changed, 57 insertions, 29 deletions

diff --git a/container-core/pom.xml b/container-core/pom.xml
index 7b1b6195879..be22e5cae5c 100644
--- a/container-core/pom.xml
+++ b/container-core/pom.xml
@@ -19,11 +19,6 @@
     <!-- COMPILE scope -->
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>annotations</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
       <artifactId>container-documentapi</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -128,22 +123,6 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>vespajlib</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>vespalog</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.hdrhistogram</groupId>
       <artifactId>HdrHistogram</artifactId>
     </dependency>
@@ -187,6 +166,12 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
+      <artifactId>annotations</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
       <artifactId>component</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
@@ -223,6 +208,12 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
+      <artifactId>hosted-zone-api</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
       <artifactId>jdisc_core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
@@ -235,13 +226,25 @@
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>yolean</artifactId>
+      <artifactId>vespajlib</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>vespalog</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>hosted-zone-api</artifactId>
+      <artifactId>yolean</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java
index 4909f9a76eb..1e171a19b05 100644
--- a/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java
+++ b/container-core/src/main/java/com/yahoo/osgi/OsgiImpl.java
@@ -27,6 +27,8 @@ public class OsgiImpl implements Osgi {
     // The initial bundles are never scheduled for uninstall
     private final List<Bundle> initialBundles;
 
+    private final Bundle systemBundle;
+
     // An initial bundle that is not the framework, and can hence be used to look up current bundles
     private final Bundle alwaysCurrentBundle;
 
@@ -37,6 +39,7 @@ public class OsgiImpl implements Osgi {
         if (initialBundles.isEmpty())
             throw new IllegalStateException("No initial bundles!");
 
+        systemBundle = getSystemBundle(initialBundles, jdiscOsgi);
         alwaysCurrentBundle = firstNonFrameworkBundle(initialBundles);
         if (alwaysCurrentBundle == null)
             throw new IllegalStateException("The initial bundles only contained the framework bundle!");
@@ -59,20 +62,33 @@ public class OsgiImpl implements Osgi {
         if (bundle != null) {
             return resolveFromBundle(spec, bundle);
         } else {
-            return resolveFromClassPath(spec);
+            return resolveFromThisBundleOrSystemBundle(spec);
         }
     }
 
+    /**
+     * Tries to resolve the given class from this class' bundle classloader.
+     * If unsuccessful, resolves the class from .
+     */
     @SuppressWarnings("unchecked")
-    private static Class<Object> resolveFromClassPath(BundleInstantiationSpecification spec) {
+    private Class<Object> resolveFromThisBundleOrSystemBundle(BundleInstantiationSpecification spec) {
+        log.fine(() -> "Resolving class from container-disc: " + spec.classId.getName());
         try {
             return (Class<Object>) Class.forName(spec.classId.getName());
         } catch (ClassNotFoundException e) {
-            throw new IllegalArgumentException("Could not create a component with id '" + spec.classId.getName() +
-                    "'. Tried to load class directly, since no bundle was found for spec: " + spec.bundle +
-                    ". If a bundle with the same name is installed, there is a either a version mismatch" +
-                    " or the installed bundle's version contains a qualifier string.");
+            if (hasFelixFramework()) {
+                log.fine(() -> "Resolving class from the system bundle (jdisc core): " + spec.classId.getName());
+                try {
+                    return (Class<Object>) systemBundle.loadClass(spec.classId.getName());
+                } catch (ClassNotFoundException e2) {
+                    // empty
+                }
+            }
         }
+        throw new IllegalArgumentException(
+                "Could not create a component with id '" + spec.classId.getName() + "'. Tried to load class directly, " +
+                        "since no bundle was found for spec: " + spec.bundle + ". If a bundle with the same name is installed, " +
+                        "there is a either a version mismatch or the installed bundle's version contains a qualifier string.");
     }
 
     @SuppressWarnings("unchecked")
@@ -157,6 +173,15 @@ public class OsgiImpl implements Osgi {
         return jdiscOsgi.isFelixFramework();
     }
 
+    private static Bundle getSystemBundle(List<Bundle> bundles, OsgiFramework jdiscOsgi) {
+        for (Bundle b : bundles) {
+            if (b instanceof Framework)
+                return b;
+        }
+        if (jdiscOsgi.isFelixFramework()) throw new IllegalStateException("No system bundle in " + bundles);
+        return null;
+    }
+
     private static Bundle firstNonFrameworkBundle(List<Bundle> bundles) {
         for (Bundle b : bundles) {
             if (! (b instanceof Framework))