Use Flight Recorder when registerStandardMXBeans is called

Netflix · Sep 3, 2024 · 6f70c0a · 6f70c0a
1 parent fdf7d82
commit 6f70c0a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/spectator-ext-jvm/src/main/java/com/netflix/spectator/jvm/Jmx.java b/spectator-ext-jvm/src/main/java/com/netflix/spectator/jvm/Jmx.java
@@ -27,6 +27,8 @@
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryPoolMXBean;
 import java.lang.management.ThreadMXBean;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 
 /**
  * Helpers for working with JMX mbeans.
@@ -42,6 +44,15 @@ private Jmx() {
    * mbeans from the local jvm.
    */
   public static void registerStandardMXBeans(Registry registry) {
+    if (JavaFlightRecorder.isSupported()) {
+      Executor executor = Executors.newSingleThreadExecutor(r -> {
+        Thread t = new Thread(r, "spectator-jfr");
+        t.setDaemon(true);
+        return t;
+      });
+      JavaFlightRecorder.monitorDefaultEvents(registry, executor);
+      return;
+    }
     monitorClassLoadingMXBean(registry);
     monitorThreadMXBean(registry);
     monitorCompilationMXBean(registry);

diff --git a/spectator-ext-jvm/src/test/java17/com/netflix/spectator/jvm/JavaFlightRecorderTest.java b/spectator-ext-jvm/src/test/java17/com/netflix/spectator/jvm/JavaFlightRecorderTest.java
@@ -56,11 +56,7 @@ public void checkDefaultMeasures() throws Exception {
     executor.shutdownNow();
 
     Map<Id, Measurement> measures = registry.measurements()
-      .collect(Collectors.toMap(Measurement::id, m -> m));
-
-    Measurement tenuringThreshold = measures.get(Id.create("jvm.gc.tenuringThreshold"));
-    assertNotEquals(null, tenuringThreshold);
-    assertTrue(tenuringThreshold.value() > 0);
+      .collect(Collectors.toMap(Measurement::id, m -> m));gd
 
     Measurement classesLoaded = measures.get(Id.create("jvm.classloading.classesLoaded"));
     Measurement classesUnloaded = measures.get(Id.create("jvm.classloading.classesUnloaded"));