Allow disabling JFR profiler manually via configuration (DataDog#6428)

jbachorik · web-flow · commit ffd45ae838ee · 2024-01-02T13:39:35.000+01:00
diff --git a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ControllerFactory.java b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ControllerFactory.java
@@ -23,6 +23,7 @@
 import com.datadog.profiling.controller.oracle.OracleJdkController;
 import datadog.trace.api.Config;
 import datadog.trace.api.Platform;
+import datadog.trace.api.config.ProfilingConfig;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.lang.reflect.InvocationTargetException;
@@ -76,20 +77,25 @@ public static Controller createController(final ConfigProvider configProvider)
     Implementation impl = Implementation.NONE;
     boolean isOracleJDK8 = Platform.isOracleJDK8();
     boolean isDatadogProfilerEnabled = Config.get().isDatadogProfilerEnabled();
-    if (isOracleJDK8 && !isDatadogProfilerEnabled) {
-      try {
-        Class.forName("com.oracle.jrockit.jfr.Producer");
-        impl = Implementation.ORACLE;
-      } catch (ClassNotFoundException ignored) {
-        log.debug("Failed to load oracle profiler", ignored);
+    if (ConfigProvider.getInstance()
+        .getBoolean(ProfilingConfig.PROFILING_DEBUG_JFR_DISABLED, false)) {
+      log.warn("JFR is disabled by configuration");
+    } else {
+      if (isOracleJDK8 && !isDatadogProfilerEnabled) {
+        try {
+          Class.forName("com.oracle.jrockit.jfr.Producer");
+          impl = Implementation.ORACLE;
+        } catch (ClassNotFoundException ignored) {
+          log.debug("Failed to load oracle profiler", ignored);
+        }
       }
-    }
-    if (!isOracleJDK8) {
-      try {
-        Class.forName("jdk.jfr.Event");
-        impl = Implementation.OPENJDK;
-      } catch (ClassNotFoundException ignored) {
-        log.debug("Failed to load openjdk profiler", ignored);
+      if (!isOracleJDK8) {
+        try {
+          Class.forName("jdk.jfr.Event");
+          impl = Implementation.OPENJDK;
+        } catch (ClassNotFoundException ignored) {
+          log.debug("Failed to load openjdk profiler", ignored);
+        }
       }
     }
     if (impl == Implementation.NONE) {
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingConfig.java
@@ -168,6 +168,7 @@ public final class ProfilingConfig {
   public static final String PROFILING_ENABLED_EVENTS = "profiling.enabled.events";
 
   public static final String PROFILING_DEBUG_DUMP_PATH = "profiling.debug.dump_path";
+  public static final String PROFILING_DEBUG_JFR_DISABLED = "profiling.debug.jfr.disabled";
 
   public static final String PROFILING_CONTEXT_ATTRIBUTES = "profiling.context.attributes";
 
