Emit the application config generation as a metric

1 files changed, 21 insertions, 19 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
index 25299978ecd..ec80c568489 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
@@ -50,24 +50,6 @@ public class HandlersConfigurerDi {
 
     private static final Logger log = Logger.getLogger(HandlersConfigurerDi.class.getName());
 
-    public static class RegistriesHack {
-
-        @Inject
-        public RegistriesHack(com.yahoo.container.Container vespaContainer,
-                              ComponentRegistry<AbstractComponent> allComponents,
-                              ComponentRegistry<RequestHandler> requestHandlerRegistry,
-                              ComponentRegistry<ClientProvider> clientProviderRegistry,
-                              ComponentRegistry<ServerProvider> serverProviderRegistry) {
-            log.log(Level.FINE, "RegistriesHack.init " + System.identityHashCode(this));
-
-            vespaContainer.setComponentRegistry(allComponents);
-            vespaContainer.setRequestHandlerRegistry(requestHandlerRegistry);
-            vespaContainer.setClientProviderRegistry(clientProviderRegistry);
-            vespaContainer.setServerProviderRegistry(serverProviderRegistry);
-        }
-
-    }
-
     private final com.yahoo.container.Container vespaContainer;
     private final Container container;
 
@@ -154,7 +136,6 @@ public class HandlersConfigurerDi {
                                                       restartOnRedeploy);
     }
 
-    @SuppressWarnings("deprecation")
     private Injector createFallbackInjector(com.yahoo.container.Container vespaContainer, Injector discInjector) {
         return discInjector.createChildInjector(new AbstractModule() {
             @Override
@@ -182,4 +163,25 @@ public class HandlersConfigurerDi {
         container.shutdown(currentGraph, deconstructor);
     }
 
+    /** Returns the currently active application configuration generation */
+    public long generation() { return currentGraph.generation(); }
+
+    public static class RegistriesHack {
+
+        @Inject
+        public RegistriesHack(com.yahoo.container.Container vespaContainer,
+                              ComponentRegistry<AbstractComponent> allComponents,
+                              ComponentRegistry<RequestHandler> requestHandlerRegistry,
+                              ComponentRegistry<ClientProvider> clientProviderRegistry,
+                              ComponentRegistry<ServerProvider> serverProviderRegistry) {
+            log.log(Level.FINE, "RegistriesHack.init " + System.identityHashCode(this));
+
+            vespaContainer.setComponentRegistry(allComponents);
+            vespaContainer.setRequestHandlerRegistry(requestHandlerRegistry);
+            vespaContainer.setClientProviderRegistry(clientProviderRegistry);
+            vespaContainer.setServerProviderRegistry(serverProviderRegistry);
+        }
+
+    }
+
 }