From e927a88c9a7772f54e4382fe7d50c83fa69e39e7 Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Thu, 24 Apr 2025 22:30:42 +0100 Subject: [PATCH] Limit net.bytebuddy.raw fix to agent-tooling, to avoid causing test side-effects elsewhere --- dd-java-agent/agent-tooling/build.gradle | 6 ++++++ .../trace/test/util/ConfigTransformSpockExtension.groovy | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dd-java-agent/agent-tooling/build.gradle b/dd-java-agent/agent-tooling/build.gradle index 5c488c9d1fa..467202dc50e 100644 --- a/dd-java-agent/agent-tooling/build.gradle +++ b/dd-java-agent/agent-tooling/build.gradle @@ -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"] +} diff --git a/utils/test-utils/src/main/groovy/datadog/trace/test/util/ConfigTransformSpockExtension.groovy b/utils/test-utils/src/main/groovy/datadog/trace/test/util/ConfigTransformSpockExtension.groovy index 57373547f11..625c43d9af3 100644 --- a/utils/test-utils/src/main/groovy/datadog/trace/test/util/ConfigTransformSpockExtension.groovy +++ b/utils/test-utils/src/main/groovy/datadog/trace/test/util/ConfigTransformSpockExtension.groovy @@ -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"