Skip to content

Request carrier-scoped ddprof context storage on JDK 21+ #11826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 8 commits into from
Jul 6, 2026
Merged

Request carrier-scoped ddprof context storage on JDK 21+ #11826

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4bd035f
profiling: request carrier-scoped ddprof context storage on JDK 21+ (…
rkennke Jul 1, 2026
21833f1
docs: clarify profiler context-storage helper runs before installData…
rkennke Jul 1, 2026
7c7fc81
profiling: align ddprof context-storage property to ddprof.debug.* (P…
rkennke Jul 1, 2026
1b65abc
Merge branch 'master' into rkennke/PROF-15271
rkennke Jul 6, 2026
da01a07
profiling: drop internal ddprof context-storage property, keep only t…
rkennke Jul 6, 2026
a2e5507
[ci: NON_DEFAULT_JVMS] trigger graalvm smoke tests
rkennke Jul 6, 2026
985013e
Merge branch 'master' into rkennke/PROF-15271
jbachorik Jul 6, 2026
7ba6d03
Merge branch 'master' into rkennke/PROF-15271
rkennke Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import datadog.trace.bootstrap.instrumentation.jfr.InstrumentationBasedProfiling;
import datadog.trace.util.AgentTaskScheduler;
import datadog.trace.util.AgentThreadFactory.AgentThread;
import datadog.trace.util.JDK9ModuleAccess;
import datadog.trace.util.throwable.FatalAgentMisconfigurationError;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.lang.instrument.Instrumentation;
Expand Down Expand Up @@ -659,6 +660,8 @@ public InstallDatadogTracerCallback(
}

installDatadogMeter(initTelemetry);
// Must run before installDatadogTracer, which triggers the ddprof profiler load.
prepareDatadogProfilerContextStorage(instrumentation);
installDatadogTracer(initTelemetry, scoClass, sco);
maybeInstallLogsIntake(scoClass, sco);
maybeStartIast(instrumentation);
Expand Down Expand Up @@ -1356,6 +1359,33 @@ public void withTracer(TracerAPI tracer) {
});
}

/**
* Exports {@code jdk.internal.misc} to the classloader that loads {@code
* com.datadoghq.profiler.*} before the Datadog profiler is loaded.
*
* <p>On JDK 21+, the profiler scopes its context {@code ThreadContext} storage to the carrier
* thread using {@code jdk.internal.misc.CarrierThreadLocal}, so a mounted virtual thread resolves
* to its current carrier's record — fixing a virtual-thread context use-after-free. That type
* lives in a non-exported package, hence the export. Must run before {@code
* installDatadogTracer}, which loads the profiler via {@link
* #createProfilingContextIntegration()}.
*/
private static void prepareDatadogProfilerContextStorage(Instrumentation inst) {
try {
if (inst == null
|| !Config.get().isProfilingEnabled()
|| !Config.get().isDatadogProfilerEnabled()
|| OperatingSystem.isWindows()
|| !isJavaVersionAtLeast(21)) {
return;
Comment thread
jbachorik marked this conversation as resolved.
}
JDK9ModuleAccess.exportModuleToUnnamedModule(
inst, "java.base", new String[] {"jdk.internal.misc"}, AGENT_CLASSLOADER);
} catch (Throwable t) {
log.debug("Unable to export jdk.internal.misc for the Datadog profiler", t);
}
}

/**
* {@see com.datadog.profiling.ddprof.DatadogProfilingIntegration} must not be modified to depend
* on JFR.
Expand Down