Skip to content

Limit net.bytebuddy.raw fix to agent-tooling… #8732

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
Apr 24, 2025
Merged

Limit net.bytebuddy.raw fix to agent-tooling… #8732

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions dd-java-agent/agent-tooling/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,9 @@ project.tasks.compileTest_java11Java.configure {
final jmh = project.tasks.jmh
jmh.outputs.upToDateWhen { false }
jmh.dependsOn(compileTestJava)

tasks.withType(Test).configureEach {
// same setting as AgentInstaller to avoid spurious agent-tooling test failures
// caused by ConfigTransformSpockExtension installing byte-buddy during testing
jvmArgs += ["-Dnet.bytebuddy.raw=true"]
}
5 changes: 0 additions & 5 deletions ...s/test-utils/src/main/groovy/datadog/trace/test/util/ConfigTransformSpockExtension.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ import static net.bytebuddy.matcher.ElementMatchers.none
* Transforms the Config class to make its INSTANCE field non-final and volatile.
*/
class ConfigTransformSpockExtension implements IGlobalExtension {
static {
// same setting as AgentInstaller to avoid spurious agent-tooling test failures
System.setProperty("net.bytebuddy.raw", "true")
}

static final String INST_CONFIG = "datadog.trace.api.InstrumenterConfig"
static final String CONFIG = "datadog.trace.api.Config"

Expand Down