From 206dddfee73b28bfdec67b66d8262d58df958f1b Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Fri, 5 Dec 2025 14:11:34 +0100 Subject: [PATCH 1/3] Limit heap size for Gradle daemons forked by the smoke tests --- .../datadog/trace/civisibility/CiVisibilitySmokeTest.groovy | 2 +- .../test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy index 31e4d6a67af..3da385d79af 100644 --- a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy +++ b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy @@ -68,7 +68,7 @@ abstract class CiVisibilitySmokeTest extends Specification { } protected List buildJvmArguments(String mockBackendIntakeUrl, String serviceName, Map additionalArgs) { - List arguments = [] + List arguments = ["-Xms512m", "-Xmx512m"] Map argMap = buildJvmArgMap(mockBackendIntakeUrl, serviceName, additionalArgs) // for convenience when debugging locally diff --git a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy index 45a7c5deb7c..3b5c6af27f7 100644 --- a/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy +++ b/dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy @@ -27,9 +27,6 @@ class GradleDaemonSmokeTest extends AbstractGradleTest { private static final int GRADLE_DISTRIBUTION_NETWORK_TIMEOUT = 30_000 // Gradle's default timeout is 10s - // TODO: Gradle daemons started by the TestKit have an idle period of 3 minutes - // so by the time tests finish, at least some of the daemons are still alive. - // Because of that the temporary TestKit folder cannot be fully deleted @Shared @TempDir Path testKitFolder From 112da8d6571cb2ed60d0de188ab3c1a233eed0da Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Fri, 5 Dec 2025 14:18:02 +0100 Subject: [PATCH 2/3] Reduce heap size to 256mb --- .../datadog/trace/civisibility/CiVisibilitySmokeTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy index 3da385d79af..1051862b93e 100644 --- a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy +++ b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy @@ -68,7 +68,7 @@ abstract class CiVisibilitySmokeTest extends Specification { } protected List buildJvmArguments(String mockBackendIntakeUrl, String serviceName, Map additionalArgs) { - List arguments = ["-Xms512m", "-Xmx512m"] + List arguments = ["-Xms256m", "-Xmx256m"] Map argMap = buildJvmArgMap(mockBackendIntakeUrl, serviceName, additionalArgs) // for convenience when debugging locally From 5408c78c856ca33669f5f3032d2ab60d84dfa7e1 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Fri, 5 Dec 2025 15:01:29 +0100 Subject: [PATCH 3/3] Fix JUnit Console JVM args --- .../test/groovy/datadog/smoketest/JUnitConsoleSmokeTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-smoke-tests/junit-console/src/test/groovy/datadog/smoketest/JUnitConsoleSmokeTest.groovy b/dd-smoke-tests/junit-console/src/test/groovy/datadog/smoketest/JUnitConsoleSmokeTest.groovy index cf579d9f3e1..8fb85be0f53 100644 --- a/dd-smoke-tests/junit-console/src/test/groovy/datadog/smoketest/JUnitConsoleSmokeTest.groovy +++ b/dd-smoke-tests/junit-console/src/test/groovy/datadog/smoketest/JUnitConsoleSmokeTest.groovy @@ -220,7 +220,7 @@ class JUnitConsoleSmokeTest extends CiVisibilitySmokeTest { String javaToolOptions(Map additionalAgentArgs) { additionalAgentArgs.put(CiVisibilityConfig.CIVISIBILITY_BUILD_INSTRUMENTATION_ENABLED, "false") - return buildJvmArguments(mockBackend.intakeUrl, TEST_SERVICE_NAME, additionalAgentArgs).join("\\ ") + return buildJvmArguments(mockBackend.intakeUrl, TEST_SERVICE_NAME, additionalAgentArgs).join(" ") } private static class StreamConsumer extends Thread {