Skip to content

Preload java.util.concurrent.ThreadLocalRandom… #4865

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
mcculls merged 1 commit into from
Mar 7, 2023
Merged

Preload java.util.concurrent.ThreadLocalRandom… #4865

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import datadog.trace.bootstrap.FieldBackedContextAccessor;
import datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter;
import datadog.trace.util.AgentTaskScheduler;
import de.thetaphi.forbiddenapis.SuppressForbidden;
import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.Instrumentation;
import java.util.Collections;
Expand Down Expand Up @@ -43,6 +44,17 @@ public class AgentInstaller {
addByteBuddyRawSetting();
// register weak map supplier as early as possible
WeakMaps.registerAsSupplier();
circularityErrorWorkaround();
}

@SuppressForbidden
private static void circularityErrorWorkaround() {
// these classes have been involved in intermittent ClassCircularityErrors during startup
// they don't need context storage, so it's safe to load them before installing the agent
try {
Class.forName("java.util.concurrent.ThreadLocalRandom");
} catch (Throwable ignore) {
}
}

public static void installBytebuddyAgent(final Instrumentation inst) {
Expand Down