Use AGENT_CLASSLOADER directly

rkennke · rkennke · commit 46a956dce376 · 2025-12-09T14:28:47.000+01:00
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
@@ -869,7 +869,7 @@ private static synchronized void startJmx() {
     // Load JFR Handlers class early, if present (it has been moved and renamed in JDK23+).
     // This prevents a deadlock. See PROF-13025.
     try {
-      Agent.class.getClassLoader().loadClass("jdk.jfr.events.Handlers");
+      AGENT_CLASSLOADER.loadClass("jdk.jfr.events.Handlers");
     } catch (Exception e) {
       // Ignore when the class is not found or anything else goes wrong.
     }

Original file line number	Diff line number	Diff line change
`@@ -869,7 +869,7 @@ private static synchronized void startJmx() {`
`869`	`869`	`// Load JFR Handlers class early, if present (it has been moved and renamed in JDK23+).`
`870`	`870`	`// This prevents a deadlock. See PROF-13025.`
`871`	`871`	`try {`
`872`		`- Agent.class.getClassLoader().loadClass("jdk.jfr.events.Handlers");`
	`872`	`+ AGENT_CLASSLOADER.loadClass("jdk.jfr.events.Handlers");`
`873`	`873`	`} catch (Exception e) {`
`874`	`874`	`// Ignore when the class is not found or anything else goes wrong.`
`875`	`875`	`}`