Skip to content

Commit d08e41c

Browse files
committed
Adjust JFR checks for J9
1 parent 5b9a331 commit d08e41c

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ public static Controller build(ConfigProvider provider, ControllerContext contex
153153
}
154154
if (!isOracleJDK8) {
155155
try {
156-
Class.forName("jdk.jfr.Event");
156+
Class<?> clz = Class.forName("jdk.jfr.Recording");
157+
clz.newInstance();
157158
controllers.add(OpenJdkController.instance(provider));
158159
} catch (Throwable ignored) {
159160
log.debug("Failed to load openjdk profiler", ignored);

dd-java-agent/testing/src/test/groovy/AgentTestRunnerTest.groovy

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ class AgentTestRunnerTest extends AgentTestRunner {
5050
if (!jfrSupported && info.name.startsWith("datadog.trace.bootstrap.instrumentation.jfr.")) {
5151
continue // skip exception-profiling classes - they won't load if JFR is not available
5252
}
53+
if (info.name.startsWith("datadog.trace.bootstrap.instrumentation.jfr.")) {
54+
println("===> ${info.name} : ${jfrSupported}")
55+
}
5356
try {
5457
Class<?> bootstrapClass = Class.forName(info.getName())
5558
if (bootstrapClass.getClassLoader() != BOOTSTRAP_CLASSLOADER) {
@@ -181,7 +184,8 @@ class AgentTestRunnerTest extends AgentTestRunner {
181184

182185
boolean isJFRSupported() {
183186
try {
184-
Class.forName("jdk.jfr.Recording")
187+
Class<?> clz = Class.forName("jdk.jfr.Recording")
188+
clz.newInstance()
185189
return true
186190
} catch (Throwable e) {
187191
return false

0 commit comments

Comments
 (0)