Track stale ActiveContainer instances

3 files changed, 23 insertions, 6 deletions

diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationEnvironmentModule.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationEnvironmentModule.java
index c6d6efd0ee9..c6acde814eb 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationEnvironmentModule.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationEnvironmentModule.java
@@ -8,6 +8,7 @@ import com.yahoo.jdisc.application.ContainerBuilder;
 import com.yahoo.jdisc.application.ContainerThread;
 import com.yahoo.jdisc.application.OsgiFramework;
 import com.yahoo.jdisc.service.CurrentContainer;
+import com.yahoo.jdisc.statistics.ActiveContainerStatistics;
 
 import java.util.concurrent.ThreadFactory;
 
@@ -28,6 +29,7 @@ class ApplicationEnvironmentModule extends AbstractModule {
         bind(CurrentContainer.class).toInstance(loader);
         bind(OsgiFramework.class).toInstance(loader.osgiFramework());
         bind(ThreadFactory.class).to(ContainerThread.Factory.class);
+        bind(ActiveContainerStatistics.class).toInstance(loader.getActiveContainerStatistics());
     }
 
     @Provides
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java
index 2dd7f7eb879..4e63bc77c9a 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java
@@ -5,9 +5,17 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.yahoo.jdisc.AbstractResource;
-import com.yahoo.jdisc.application.*;
+import com.yahoo.jdisc.application.Application;
+import com.yahoo.jdisc.application.ApplicationNotReadyException;
+import com.yahoo.jdisc.application.ContainerActivator;
+import com.yahoo.jdisc.application.ContainerBuilder;
+import com.yahoo.jdisc.application.DeactivatedContainer;
+import com.yahoo.jdisc.application.GuiceRepository;
+import com.yahoo.jdisc.application.OsgiFramework;
+import com.yahoo.jdisc.application.OsgiHeader;
 import com.yahoo.jdisc.service.ContainerNotReadyException;
 import com.yahoo.jdisc.service.CurrentContainer;
+import com.yahoo.jdisc.statistics.ActiveContainerStatistics;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
@@ -28,11 +36,13 @@ import java.util.logging.Logger;
 public class ApplicationLoader implements BootstrapLoader, ContainerActivator, CurrentContainer {
 
     private static final Logger log = Logger.getLogger(ApplicationLoader.class.getName());
+
     private final OsgiFramework osgiFramework;
     private final GuiceRepository guiceModules = new GuiceRepository();
     private final AtomicReference<ActiveContainer> containerRef = new AtomicReference<>();
     private final Object appLock = new Object();
     private final List<Bundle> appBundles = new ArrayList<>();
+    private final ActiveContainerStatistics statistics = new ActiveContainerStatistics();
     private Application application;
     private ApplicationInUseTracker applicationInUseTracker;
 
@@ -62,9 +72,11 @@ public class ApplicationLoader implements BootstrapLoader, ContainerActivator, C
             }
 
             prev = containerRef.getAndSet(next);
+            statistics.onActivated(next);
             if (prev == null) {
                 return null;
             }
+            statistics.onDeactivated(prev);
         }
         prev.release();
         DeactivatedContainer deactivatedContainer = prev.shutdown();
@@ -82,11 +94,9 @@ public class ApplicationLoader implements BootstrapLoader, ContainerActivator, C
                                 Thread.sleep(TimeUnit.MILLISECONDS.convert(currentWaitTimeSeconds, TimeUnit.SECONDS))
                 );
 
+                statistics.printSummaryToLog();
                 final ActiveContainer prevContainer = prevContainerReference.get();
-                if (prevContainer == null) {
-                    return;
-                }
-                if (prevContainer.retainCount() == 0) {
+                if (prevContainer == null || prevContainer.retainCount() == 0) {
                     return;
                 }
                 log.warning("Previous container not terminated in the last " + totalTimeWaited + " seconds."
@@ -231,6 +241,10 @@ public class ApplicationLoader implements BootstrapLoader, ContainerActivator, C
         }
     }
 
+    public ActiveContainerStatistics getActiveContainerStatistics() {
+        return statistics;
+    }
+
     public OsgiFramework osgiFramework() {
         return osgiFramework;
     }
@@ -258,4 +272,5 @@ public class ApplicationLoader implements BootstrapLoader, ContainerActivator, C
             }
         }
     }
+
 }
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java
index afe43718bc5..3dbc4af5422 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java
@@ -1,7 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jdisc.core;
 
-import com.yahoo.container.plugin.bundle.AnalyzeBundle;
 import com.yahoo.container.plugin.bundle.TransformExportPackages;
 import com.yahoo.container.plugin.osgi.ExportPackages.Export;
 import org.apache.felix.framework.util.Util;
@@ -38,6 +37,7 @@ public class ExportPackages {
            .append("com.yahoo.jdisc.application,")
            .append("com.yahoo.jdisc.handler,")
            .append("com.yahoo.jdisc.service,")
+           .append("com.yahoo.jdisc.statistics,")
            .append("javax.inject;version=1.0.0,")  // Included in guice, but not exported. Needed by container-jersey.
            .append("org.aopalliance.intercept,")
            .append("org.aopalliance.aop,")