Adjust JFR checks for J9

Author: jbachorik

dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/util/JfrCliHelperTest.java

@@ -9,6 +9,7 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.withSettings;
 
+import datadog.trace.api.Platform;
 import datadog.trace.api.profiling.RecordingData;
 import datadog.trace.api.profiling.RecordingInputStream;
 import datadog.trace.relocate.api.IOLogger;
@@ -24,6 +25,7 @@
 import java.util.Set;
 import java.util.zip.GZIPOutputStream;
 import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -44,6 +46,9 @@ public class JfrCliHelperTest {
 
   @Test
   public void testInvokeOn() throws Exception {
+    // J9 may have 'jfr' command present but it requires additional setup
+    // Currently we don't support J9 JFR so we can safely skip this test
+    Assumptions.assumeFalse(Platform.isJ9());
     final RecordingData recording = mockRecordingData();
 
     JfrCliHelper.invokeOn(recording, ioLogger);

dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/CompositeController.java

@@ -153,11 +153,10 @@ public static Controller build(ConfigProvider provider, ControllerContext contex
       }
       if (!isOracleJDK8) {
         try {
-          Class<?> frClass = Class.forName("jdk.jfr.FlightRecorder");
-          boolean isJfrAvailable =
-              (boolean) frClass.getMethod("isAvailable", new Class<?>[0]).invoke(null);
-          if (isJfrAvailable) {
+          if (Platform.hasJfr()) {
             controllers.add(OpenJdkController.instance(provider));
+          } else {
+            log.debug("JFR is not available on this platform");
           }
         } catch (Throwable ignored) {
           log.debug("Failed to load openjdk profiler", ignored);

internal-api/src/main/java/datadog/trace/api/Platform.java

@@ -42,7 +42,8 @@ private static boolean checkForJfr() {
        * Need this custom check because ClassLoaderMatchers.hasClassNamed() does not support bootstrap class loader yet.
        * Note: the downside of this is that we load some JFR classes at startup.
        */
-      return ClassLoader.getSystemClassLoader().getResource("jdk/jfr/Event.class") != null;
+      Class<?> frClass = Class.forName("jdk.jfr.FlightRecorder");
+      return (boolean) frClass.getMethod("isAvailable", new Class<?>[0]).invoke(null);
     } catch (Throwable e) {
       return false;
     }