Skip to content

Commit c0239b4

Browse files
test: disable tests on java 26
1 parent cf6146b commit c0239b4

2 files changed

Lines changed: 17 additions & 14 deletions

File tree

dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import java.nio.file.Path
1515
import static datadog.trace.util.ConfigStrings.propertyNameToSystemPropertyName
1616

1717
abstract class CiVisibilitySmokeTest extends Specification {
18-
static final List<String> SMOKE_IGNORED_TAGS = ["content.meta.['_dd.integration']"]
18+
static final List<String> SMOKE_IGNORED_TAGS = ["content.meta.['_dd.integration']", "content.meta.['_dd.svc_src']"]
1919

2020
protected static final String AGENT_JAR = System.getProperty("datadog.smoketest.agent.shadowJar.path")
2121
protected static final String TEST_ENVIRONMENT_NAME = "integration-test"

dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleDaemonSmokeTest.groovy

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import datadog.environment.JavaVirtualMachine
44
import datadog.trace.api.config.CiVisibilityConfig
55
import datadog.trace.api.config.GeneralConfig
66
import datadog.trace.api.config.TraceInstrumentationConfig
7+
import java.nio.file.Files
8+
import java.nio.file.Path
79
import org.gradle.testkit.runner.BuildResult
810
import org.gradle.testkit.runner.GradleRunner
911
import org.gradle.testkit.runner.TaskOutcome
@@ -18,9 +20,9 @@ import spock.lang.IgnoreIf
1820
import spock.lang.Shared
1921
import spock.lang.TempDir
2022

21-
import java.nio.file.Files
22-
import java.nio.file.Path
23-
23+
@IgnoreIf(reason = "TODO: Fix for Java 26. Javac plugin fails to populate source tags correctly.", value = {
24+
JavaVirtualMachine.isJavaVersionAtLeast(26)
25+
})
2426
class GradleDaemonSmokeTest extends AbstractGradleTest {
2527

2628
private static final String TEST_SERVICE_NAME = "test-gradle-service"
@@ -66,7 +68,8 @@ class GradleDaemonSmokeTest extends AbstractGradleTest {
6668
LATEST_GRADLE_VERSION | "test-corrupted-config-new-instrumentation" | false | false | false | 1 | 0
6769
LATEST_GRADLE_VERSION | "test-succeed-junit-5" | false | true | false | 5 | 1
6870
LATEST_GRADLE_VERSION | "test-failed-flaky-retries" | false | false | true | 8 | 0
69-
LATEST_GRADLE_VERSION | "test-succeed-gradle-plugin-test" | false | true | false | 5 | 0
71+
// TODO: add back LATEST_GRADLE_VERSION after fixing in Gradle 9.4.0
72+
"9.3.1" | "test-succeed-gradle-plugin-test" | false | true | false | 5 | 0
7073
}
7174

7275
def "test junit4 class ordering v#gradleVersion"() {
@@ -87,32 +90,32 @@ class GradleDaemonSmokeTest extends AbstractGradleTest {
8790
verifyTestOrder(mockBackend.waitForEvents(eventsNumber), expectedOrder)
8891

8992
where:
90-
gradleVersion | projectName | flakyTests | expectedOrder | eventsNumber
91-
"7.6.4" | "test-succeed-junit-4-class-ordering" | [
93+
gradleVersion | projectName | flakyTests | expectedOrder | eventsNumber
94+
"7.6.4" | "test-succeed-junit-4-class-ordering" | [
9295
test("datadog.smoke.TestSucceedB", "test_succeed"),
9396
test("datadog.smoke.TestSucceedB", "test_succeed_another"),
9497
test("datadog.smoke.TestSucceedA", "test_succeed")
95-
] | [
98+
] | [
9699
test("datadog.smoke.TestSucceedC", "test_succeed"),
97100
test("datadog.smoke.TestSucceedC", "test_succeed_another"),
98101
test("datadog.smoke.TestSucceedA", "test_succeed_another"),
99102
test("datadog.smoke.TestSucceedA", "test_succeed"),
100103
test("datadog.smoke.TestSucceedB", "test_succeed"),
101104
test("datadog.smoke.TestSucceedB", "test_succeed_another")
102-
] | 15
105+
] | 15
103106
// TODO: add back LATEST_GRADLE_VERSION after fixing ordering on Gradle 9.3.0
104-
"9.2.1" | "test-succeed-junit-4-class-ordering" | [
107+
"9.2.1" | "test-succeed-junit-4-class-ordering" | [
105108
test("datadog.smoke.TestSucceedB", "test_succeed"),
106109
test("datadog.smoke.TestSucceedB", "test_succeed_another"),
107110
test("datadog.smoke.TestSucceedA", "test_succeed")
108-
] | [
111+
] | [
109112
test("datadog.smoke.TestSucceedC", "test_succeed"),
110113
test("datadog.smoke.TestSucceedC", "test_succeed_another"),
111114
test("datadog.smoke.TestSucceedA", "test_succeed_another"),
112115
test("datadog.smoke.TestSucceedA", "test_succeed"),
113116
test("datadog.smoke.TestSucceedB", "test_succeed"),
114117
test("datadog.smoke.TestSucceedB", "test_succeed_another")
115-
] | 15
118+
] | 15
116119
}
117120

118121
private runGradleTest(String gradleVersion, String projectName, boolean configurationCache, boolean successExpected, boolean flakyRetries, int expectedTraces, int expectedCoverages) {
@@ -153,7 +156,7 @@ class GradleDaemonSmokeTest extends AbstractGradleTest {
153156
Files.write(ddApiKeyPath, "dummy".getBytes())
154157

155158
def additionalArgs = [
156-
(GeneralConfig.API_KEY_FILE): ddApiKeyPath.toAbsolutePath().toString(),
159+
(GeneralConfig.API_KEY_FILE) : ddApiKeyPath.toAbsolutePath().toString(),
157160
(CiVisibilityConfig.CIVISIBILITY_JACOCO_PLUGIN_VERSION): JACOCO_PLUGIN_VERSION,
158161
/*
159162
* Some of the smoke tests (in particular the one with the Gradle plugin), are using Gradle Test Kit for their tests.
@@ -164,7 +167,7 @@ class GradleDaemonSmokeTest extends AbstractGradleTest {
164167
* This causes the tests to fail because the number of reported traces is different.
165168
* To avoid this discrepancy between local and CI runs, we disable tracing instrumentations.
166169
*/
167-
(TraceInstrumentationConfig.TRACE_ENABLED): "false"
170+
(TraceInstrumentationConfig.TRACE_ENABLED) : "false"
168171
]
169172
def arguments = buildJvmArguments(mockBackend.intakeUrl, TEST_SERVICE_NAME, additionalArgs)
170173

0 commit comments

Comments
 (0)