Skip to content

Add quick 'datadog.' prefix check before applying delegation fix #9793

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
Oct 18, 2025
Merged

Add quick 'datadog.' prefix check before applying delegation fix #9793

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
4 changes: 4 additions & 0 deletions ...src/main/java/datadog/trace/instrumentation/classloading/ClassloadingInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ public void methodAdvice(MethodTransformer transformer) {
public static class LoadClassAdvice {
@Advice.OnMethodEnter(skipOn = Advice.OnNonDefaultValue.class, suppress = Throwable.class)
public static Class<?> onEnter(@Advice.Argument(0) final String name) {
if (!name.startsWith("datadog.")) {
return null; // ignore packages that won't be bundled on the dd-java-agent bootstrap
}

// we must access agent types used in the call-depth block like 'Constants' before entering it
// - otherwise we risk loading these agent types with a non-zero call-depth, which will fail
final String[] bootstrapPrefixes = Constants.BOOTSTRAP_PACKAGE_PREFIXES;
Expand Down