Skip to content

Fix flaky Gradle Daemon instrumentation smoke test #8955

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
merged 3 commits into from
Jun 10, 2025
Merged

Fix flaky Gradle Daemon instrumentation smoke test #8955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
910f4d8
Fix flaky Gradle Daemon instrumentation smoke test
nikita-tkachenko-datadog Jun 10, 2025
468f853
Update old Gradle test version
nikita-tkachenko-datadog Jun 10, 2025
af4a98d
Apply review suggestion
nikita-tkachenko-datadog Jun 10, 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
3 changes: 2 additions & 1 deletion 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 @@ -50,7 +50,7 @@ class GradleDaemonSmokeTest extends AbstractGradleTest {

where:
gradleVersion | projectName | successExpected | expectedTraces | expectedCoverages
"3.0" | "test-succeed-old-gradle" | true | 5 | 1
"3.5" | "test-succeed-old-gradle" | true | 5 | 1
"7.6.4" | "test-succeed-legacy-instrumentation" | true | 5 | 1
"7.6.4" | "test-succeed-multi-module-legacy-instrumentation" | true | 7 | 2
"7.6.4" | "test-succeed-multi-forks-legacy-instrumentation" | true | 6 | 2
Expand Down Expand Up @@ -244,6 +244,7 @@ class GradleDaemonSmokeTest extends AbstractGradleTest {
.withProjectDir(projectFolder.toFile())
.withGradleVersion(gradleVersion)
.withArguments(arguments)
.withEnvironment(["GRADLE_VERSION": gradleVersion])
.forwardOutput()

println "${new Date()}: $specificationContext.currentIteration.displayName - Starting Gradle run"
Expand Down
4 changes: 2 additions & 2 deletions dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/coverages.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[ {
"files" : [ {
"bitmap" : "AAAAx98=",
"bitmap" : "AAAAx+EN",
"filename" : "src/test/java/datadog/smoke/HelloPluginFunctionalTest.java"
} ],
"span_id" : ${content_span_id_4},
"test_session_id" : ${content_test_session_id},
"test_suite_id" : ${content_test_suite_id}
} ]
} ]
6 changes: 3 additions & 3 deletions dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
"_dd.profiling.enabled" : 0,
"_dd.trace_span_attribute_schema" : 0,
"process_id" : ${content_metrics_process_id_2},
"test.source.end" : 40,
"test.source.end" : 44,
"test.source.start" : 16
},
"name" : "junit5.test_suite",
Expand Down Expand Up @@ -273,7 +273,7 @@
"_dd.profiling.enabled" : 0,
"_dd.trace_span_attribute_schema" : 0,
"process_id" : ${content_metrics_process_id_2},
"test.source.end" : 39,
"test.source.end" : 43,
"test.source.start" : 30
},
"name" : "junit5.test",
Expand Down Expand Up @@ -464,4 +464,4 @@
},
"type" : "span",
"version" : 1
} ]
} ]
6 changes: 5 additions & 1 deletion ...est-succeed-gradle-plugin-test/src/test/java/datadog/smoke/HelloPluginFunctionalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ void pluginPrintsHelloMessageOnGradle85() {
BuildResult result = GradleRunner.create()
.withProjectDir(testProjectDir.toFile())
.withPluginClasspath()
.withGradleVersion("8.5")
// Use the same Gradle version as of the actual smoke test that builds this project.
// This is to ensure Gradle is already downloaded and available in the environment.
// Gradle Test Kit can download a Gradle distribution by itself,
// but sometimes these downloads fail, making the test flaky.
.withGradleVersion(System.getenv("GRADLE_VERSION"))
.withArguments("hello", "--stacktrace")
.forwardOutput()
.build();
Expand Down