Polish CompilationMetrics

micrometer-metrics · Dec 16, 2019 · 114d62b · 114d62b
1 parent 9f8d0a0
commit 114d62b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/...rument/binder/jvm/CompilationMetrics.java → ...ent/binder/jvm/JvmCompilationMetrics.java b/...rument/binder/jvm/CompilationMetrics.java → ...ent/binder/jvm/JvmCompilationMetrics.java
@@ -28,24 +28,29 @@
 
 import static java.util.Collections.emptyList;
 
+/**
+ * {@link MeterBinder} for JVM compilation metrics.
+ *
+ * @since 1.4.0
+ */
 @NonNullApi
 @NonNullFields
-public class CompilationMetrics implements MeterBinder {
+public class JvmCompilationMetrics implements MeterBinder {
     private final Iterable<Tag> tags;
 
-    public CompilationMetrics() {
+    public JvmCompilationMetrics() {
         this(emptyList());
     }
 
-    public CompilationMetrics(Iterable<Tag> tags) {
+    public JvmCompilationMetrics(Iterable<Tag> tags) {
         this.tags = tags;
     }
 
     @Override
     public void bindTo(MeterRegistry registry) {
         CompilationMXBean compilationBean = ManagementFactory.getCompilationMXBean();
-        if (compilationBean.isCompilationTimeMonitoringSupported()) {
-            FunctionCounter.builder("jvm.compilation.time.total", compilationBean, CompilationMXBean::getTotalCompilationTime)
+        if (compilationBean != null && compilationBean.isCompilationTimeMonitoringSupported()) {
+            FunctionCounter.builder("jvm.compilation.time", compilationBean, CompilationMXBean::getTotalCompilationTime)
                     .tags(Tags.concat(tags, "compiler", compilationBean.getName()))
                     .description("The approximate accumulated elapsed time spent in compilation")
                     .baseUnit("ms")

diff --git a/...nt/binder/jvm/CompilationMetricsTest.java → ...binder/jvm/JvmCompilationMetricsTest.java b/...nt/binder/jvm/CompilationMetricsTest.java → ...binder/jvm/JvmCompilationMetricsTest.java
@@ -19,14 +19,26 @@
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import org.junit.jupiter.api.Test;
 
+import java.lang.management.CompilationMXBean;
+import java.lang.management.ManagementFactory;
+
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.junit.Assume.assumeTrue;
+
+/**
+ * Tests for {@link JvmCompilationMetrics}.
+ */
+class JvmCompilationMetricsTest {
+
+    MeterRegistry registry = new SimpleMeterRegistry();
 
-class CompilationMetricsTest {
     @Test
     void compilationTimeMetric() {
-        MeterRegistry registry = new SimpleMeterRegistry();
-        new CompilationMetrics().bindTo(registry);
+        new JvmCompilationMetrics().bindTo(registry);
+
+        CompilationMXBean compilationMXBean = ManagementFactory.getCompilationMXBean();
+        assumeTrue(compilationMXBean != null && compilationMXBean.isCompilationTimeMonitoringSupported());
 
-        assertThat(registry.get("jvm.compilation.time.total").functionCounter().count()).isGreaterThan(0);
+        assertThat(registry.get("jvm.compilation.time").functionCounter().count()).isGreaterThan(0);
     }
 }