Skip to content

Limit heap size for Gradle daemons forked by the smoke tests #10089

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
nikita-tkachenko-datadog merged 6 commits into from
Dec 9, 2025
+2 −5
Merged

Limit heap size for Gradle daemons forked by the smoke tests #10089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
206dddf
Limit heap size for Gradle daemons forked by the smoke tests
nikita-tkachenko-datadog Dec 5, 2025
112da8d
Reduce heap size to 256mb
nikita-tkachenko-datadog Dec 5, 2025
5408c78
Fix JUnit Console JVM args
nikita-tkachenko-datadog Dec 5, 2025
b899da7
Merge branch 'master' into nikita-tkachenko/gradle-daemon-smoke-tests
AlexeyKuznetsov-DD Dec 6, 2025
ba5f1fb
Merge branch 'master' into nikita-tkachenko/gradle-daemon-smoke-tests
nikita-tkachenko-datadog Dec 9, 2025
3cec393
Merge branch 'master' into nikita-tkachenko/gradle-daemon-smoke-tests
AlexeyKuznetsov-DD Dec 9, 2025
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
2 changes: 1 addition & 1 deletion ...ity-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ abstract class CiVisibilitySmokeTest extends Specification {
}

protected List<String> buildJvmArguments(String mockBackendIntakeUrl, String serviceName, Map<String, String> additionalArgs) {
List<String> arguments = []
List<String> arguments = ["-Xms256m", "-Xmx256m"]

arguments += preventJulPrefsFileLock()

Expand Down
3 changes: 0 additions & 3 deletions dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/junit-console/src/test/groovy/datadog/smoketest/JUnitConsoleSmokeTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class JUnitConsoleSmokeTest extends CiVisibilitySmokeTest {

String javaToolOptions(Map<String, String> 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 {
Expand Down