Merge pull request #83 from dtrejod/default-exports

Add in Prometheus default java metric exports.
jenkinsci · Jan 21, 2019 · 46f8037 · 46f8037
2 parents 8918be0 + dc04d7e
commit 46f8037
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -95,6 +95,11 @@
       <version>2.3.1</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>simpleclient_hotspot</artifactId>
+      <version>${prometheus.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>simpleclient</artifactId>

diff --git a/src/main/java/org/jenkinsci/plugins/prometheus/rest/PrometheusAction.java b/src/main/java/org/jenkinsci/plugins/prometheus/rest/PrometheusAction.java
@@ -8,6 +8,7 @@
 import hudson.util.HttpResponses;
 import io.prometheus.client.CollectorRegistry;
 import io.prometheus.client.dropwizard.DropwizardExports;
+import io.prometheus.client.hotspot.DefaultExports;
 import jenkins.metrics.api.Metrics;
 import jenkins.model.Jenkins;
 import org.acegisecurity.Authentication;
@@ -48,6 +49,7 @@ public Object doDynamic(StaplerRequest request) {
                 if (Metrics.metricRegistry() != null) {
                     collectorRegistry.register(new DropwizardExports(Metrics.metricRegistry()));
                 }
+                DefaultExports.initialize();
             }
             return MetricsRequest.prometheusResponse(collectorRegistry);
         }