Export JVM metrics

Author: ahornace

opengrok-indexer/src/main/java/org/opengrok/indexer/Metrics.java

@@ -22,18 +22,31 @@
  */
 package org.opengrok.indexer;
 
+import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
+import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
+import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
 import io.micrometer.prometheus.PrometheusConfig;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
 
 public final class Metrics {
 
-    private static final PrometheusMeterRegistry instance = new PrometheusMeterRegistry(PrometheusConfig.DEFAULT);
+    private static final PrometheusMeterRegistry registry = new PrometheusMeterRegistry(PrometheusConfig.DEFAULT);
+
+    static {
+        new ClassLoaderMetrics().bindTo(registry);
+        new JvmMemoryMetrics().bindTo(registry);
+        new JvmGcMetrics().bindTo(registry);
+        new ProcessorMetrics().bindTo(registry);
+        new JvmThreadMetrics().bindTo(registry);
+    }
 
     private Metrics() {
     }
 
-    public static PrometheusMeterRegistry getInstance() {
-        return instance;
+    public static PrometheusMeterRegistry getRegistry() {
+        return registry;
     }
 
 }

opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationFramework.java

@@ -55,14 +55,14 @@ public final class AuthorizationFramework extends PluginFramework<IAuthorization
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AuthorizationFramework.class);
 
-    private final Counter authStackReloadCounter = Metrics.getInstance().counter("authorization_stack_reload");
-    private final Counter authCacheHits = Metrics.getInstance().counter("authorization_cache_hits");
-    private final Counter authCacheMisses = Metrics.getInstance().counter("authorization_cache_misses");
-    private final Counter authSessionsInvalidated = Metrics.getInstance().counter("authorization_sessions_invalidated");
+    private final Counter authStackReloadCounter = Metrics.getRegistry().counter("authorization_stack_reload");
+    private final Counter authCacheHits = Metrics.getRegistry().counter("authorization_cache_hits");
+    private final Counter authCacheMisses = Metrics.getRegistry().counter("authorization_cache_misses");
+    private final Counter authSessionsInvalidated = Metrics.getRegistry().counter("authorization_sessions_invalidated");
 
-    private final Timer authTimer = Metrics.getInstance().timer("authorization");
-    private final Timer authPositiveTimer = Metrics.getInstance().timer("authorization_positive");
-    private final Timer authNegativeTimer = Metrics.getInstance().timer("authorization_negative");
+    private final Timer authTimer = Metrics.getRegistry().timer("authorization");
+    private final Timer authPositiveTimer = Metrics.getRegistry().timer("authorization_positive");
+    private final Timer authNegativeTimer = Metrics.getRegistry().timer("authorization_negative");
 
     /**
      * Stack of available plugins/stacks in the order of the execution.
@@ -542,8 +542,8 @@ private boolean checkAll(HttpServletRequest request, String cache, Nameable enti
         } else {
             authNegativeTimer.record(duration);
         }
-        Metrics.getInstance().timer(String.format("authorization_of_%s", entity.getName())).record(duration);
-        Metrics.getInstance()
+        Metrics.getRegistry().timer(String.format("authorization_of_%s", entity.getName())).record(duration);
+        Metrics.getRegistry()
                 .timer(String.format("authorization_%s_of_%s", overallDecision ? "positive" : "negative", entity.getName()))
                 .record(duration);
 

opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationStack.java

@@ -285,15 +285,15 @@ protected boolean processStack(Nameable entity,
         }
         Duration duration = Duration.between(start, Instant.now());
 
-        Metrics.getInstance()
+        Metrics.getRegistry()
                 .timer(String.format("authorization_in_stack_%s_%s", getName(),
                         overallDecision ? "positive" : "negative"))
                 .record(duration);
-        Metrics.getInstance()
+        Metrics.getRegistry()
                 .timer(String.format("authorization_in_stack_%s_%s_of_%s", getName(),
                         overallDecision ? "positive" : "negative", entity.getName()))
                 .record(duration);
-        Metrics.getInstance()
+        Metrics.getRegistry()
                 .timer(String.format("authorization_in_stack_%s_of_%s", getName(), entity.getName()))
                 .record(duration);
 

opengrok-indexer/src/test/java/org/opengrok/indexer/authorization/AuthorizationFrameworkReloadTest.java

@@ -146,7 +146,7 @@ public void run() {
         }
 
         // Double check that at least one reload() was done.
-        long reloads = (long) Metrics.getInstance().counter("authorization_stack_reload").count();
+        long reloads = (long) Metrics.getRegistry().counter("authorization_stack_reload").count();
         assertTrue(reloads > 0);
     }
 

opengrok-web/src/main/java/org/opengrok/web/AuthorizationFilter.java

@@ -50,8 +50,8 @@ public class AuthorizationFilter implements Filter {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AuthorizationFilter.class);
 
-    private final DistributionSummary requests = Metrics.getInstance().summary(StatisticsFilter.REQUESTS_METRIC);
-    private final Timer requestsForbidden = Metrics.getInstance().timer("requests_forbidden");
+    private final DistributionSummary requests = Metrics.getRegistry().summary(StatisticsFilter.REQUESTS_METRIC);
+    private final Timer requestsForbidden = Metrics.getRegistry().timer("requests_forbidden");
 
     @Override
     public void init(FilterConfig fc) {

opengrok-web/src/main/java/org/opengrok/web/StatisticsFilter.java

@@ -44,11 +44,11 @@ public class StatisticsFilter implements Filter {
 
     static final String REQUESTS_METRIC = "requests";
 
-    private final DistributionSummary requests = Metrics.getInstance().summary(REQUESTS_METRIC);
+    private final DistributionSummary requests = Metrics.getRegistry().summary(REQUESTS_METRIC);
 
-    private final Timer genericTimer = Metrics.getInstance().timer("*");
-    private final Timer emptySearch = Metrics.getInstance().timer("empty_search");
-    private final Timer successfulSearch = Metrics.getInstance().timer("successful_search");
+    private final Timer genericTimer = Metrics.getRegistry().timer("*");
+    private final Timer emptySearch = Metrics.getRegistry().timer("empty_search");
+    private final Timer successfulSearch = Metrics.getRegistry().timer("successful_search");
 
     @Override
     public void init(FilterConfig fc) throws ServletException {
@@ -83,11 +83,11 @@ public void doFilter(ServletRequest sr, ServletResponse sr1, FilterChain fc)
         requests.record(1);
         genericTimer.record(duration);
 
-        Metrics.getInstance().timer(category).record(duration);
+        Metrics.getRegistry().timer(category).record(duration);
 
         /* supplementary categories */
         if (config.getProject() != null) {
-            Metrics.getInstance()
+            Metrics.getRegistry()
                     .timer("viewing_of_" + config.getProject().getName())
                     .record(duration);
         }

opengrok-web/src/main/java/org/opengrok/web/servlet/MetricsServlet.java

@@ -37,7 +37,7 @@ public class MetricsServlet extends HttpServlet {
     @Override
     protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws IOException {
         try (PrintWriter pw = resp.getWriter()) {
-            pw.print(Metrics.getInstance().scrape());
+            pw.print(Metrics.getRegistry().scrape());
         }
     }
 }