Skip to content
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.

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

Relocate JCTools #7004

Merged
merged 1 commit into from
May 9, 2024
Merged

Relocate JCTools #7004

merged 1 commit into from
May 9, 2024

Conversation

luneo7
Copy link
Contributor

@luneo7 luneo7 commented May 7, 2024

What Does This Do

Relocates JCTools

Motivation

DD JCTools usage is clashing with Quarkus 3.10, since they both use JCTools and it requires GraalVM substitutions. Quarkus has the GraalVM config to do substitutions, and DD does as well, so this yields the following error Error: Substition: org.jctools.util.UnsafeRefArrayAccess.REF_ELEMENT_SHIFT conflicts with previously registered: org.jctools.util.UnsafeRefArrayAccess.REF_ELEMENT_SHIFT... which means that there are two substitutions being registered for the same target.
Relocating JCTools fixes not only that but prevents it from happening with other Java frameworks, as GraalVM (https://github.com/oracle/graal/blob/481625b5da2b293cc672fd4b9348612483b6e76c/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotationSubstitutionProcessor.java#L904) throws an error if there is more than one substitution for the same key.

fixes #7002

@luneo7 luneo7 requested a review from a team as a code owner May 7, 2024 20:26
@luneo7 luneo7 requested review from dougqh and nayeem-kamal May 7, 2024 20:26
@luneo7
Copy link
Contributor Author

luneo7 commented May 7, 2024

CI failed because of Timeout waiting to lock Java compile cache (/home/circleci/.gradle/caches/8.4/javaCompile). It is currently in use by another Gradle instance.... I never have any luck with the CI here 🤣

Copy link
Contributor

@mcculls mcculls left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 thanks for the contribution!

@mcculls mcculls added tag: community Community contribution comp: native-image GraalVM native-image labels May 9, 2024
@mcculls
Copy link
Contributor

mcculls commented May 9, 2024

Yes some of our tests don't run properly for external contributors, so I ran these changes through CI here 🟢

@mcculls mcculls merged commit 6300467 into DataDog:master May 9, 2024
8 of 11 checks passed
@mcculls mcculls added this to the 1.35.0 milestone May 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
comp: native-image GraalVM native-image tag: community Community contribution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

DD agent is not compatible with Quarkus 3.10
3 participants