Skip to content

Commit 0686562

Browse files
committed
Skip failing smoke tests for Java 24 until we have a fix
1 parent 7be83af commit 0686562

File tree

6 files changed

+34
-0
lines changed

6 files changed

+34
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ class GradleDaemonSmokeTest extends AbstractGradleTest {
5959
"7.6.4" | "test-corrupted-config-legacy-instrumentation" | false | 1 | 0
6060
}
6161

62+
@IgnoreIf(reason = "Failing on Java 24. Skip until we have a fix.", value = {
63+
Platform.isJavaVersionAtLeast(24)
64+
})
6265
def "test #projectName, v#gradleVersion, configCache: #configurationCache"() {
6366
runGradleTest(gradleVersion, projectName, configurationCache, successExpected, flakyRetries, expectedTraces, expectedCoverages)
6467

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
package datadog.smoketest
22

3+
import spock.lang.IgnoreIf
4+
import datadog.trace.api.Platform
5+
6+
@IgnoreIf(reason = "Failing on Java 24. Skip until we have a fix.", value = {
7+
Platform.isJavaVersionAtLeast(24)
8+
})
39
class JBossModulesV2SmokeTest extends AbstractModulesSmokeTest {}

dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import datadog.trace.api.Config
44
import datadog.trace.api.civisibility.CIConstants
55
import datadog.trace.api.config.CiVisibilityConfig
66
import datadog.trace.api.config.GeneralConfig
7+
import datadog.trace.api.Platform
78
import datadog.trace.civisibility.CiVisibilitySmokeTest
89
import datadog.trace.util.Strings
910
import java.nio.file.FileVisitResult
@@ -26,10 +27,14 @@ import org.slf4j.LoggerFactory
2627
import org.w3c.dom.Document
2728
import org.w3c.dom.NodeList
2829
import spock.lang.AutoCleanup
30+
import spock.lang.IgnoreIf
2931
import spock.lang.Shared
3032
import spock.lang.TempDir
3133
import spock.util.environment.Jvm
3234

35+
@IgnoreIf(reason = "Failing on Java 24. Skip until we have a fix.", value = {
36+
Platform.isJavaVersionAtLeast(24)
37+
})
3338
class MavenSmokeTest extends CiVisibilitySmokeTest {
3439

3540
private static final Logger LOGGER = LoggerFactory.getLogger(MavenSmokeTest.class)

dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/JFRBasedProfilingIntegrationTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.junit.jupiter.api.DisplayName;
5050
import org.junit.jupiter.api.Test;
5151
import org.junit.jupiter.api.TestInfo;
52+
import org.junit.jupiter.api.condition.DisabledIf;
5253
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
5354
import org.openjdk.jmc.common.IMCStackTrace;
5455
import org.openjdk.jmc.common.item.Aggregators;
@@ -70,6 +71,9 @@
7071
import spock.util.environment.OperatingSystem;
7172

7273
@DisabledIfSystemProperty(named = "java.vm.name", matches = ".*J9.*")
74+
@DisabledIf(
75+
value = "isJavaVersionAtLeast24",
76+
disabledReason = "Failing on Java 24. Skip until we have a fix.")
7377
class JFRBasedProfilingIntegrationTest {
7478
private static final Logger log = LoggerFactory.getLogger(JFRBasedProfilingIntegrationTest.class);
7579
private static final Duration ONE_NANO = Duration.ofNanos(1);
@@ -841,4 +845,8 @@ private static boolean logHasErrors(final Path logFilePath) throws IOException {
841845
}
842846
return logHasErrors[0];
843847
}
848+
849+
public static boolean isJavaVersionAtLeast24() {
850+
return Platform.isJavaVersionAtLeast(24);
851+
}
844852
}

dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusJBossLoggingSmokeTest.groovy

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
package datadog.smoketest
22

3+
import datadog.trace.api.Platform
4+
import spock.lang.IgnoreIf
5+
6+
@IgnoreIf(reason = "Failing on Java 24. Skip until we have a fix.", value = {
7+
Platform.isJavaVersionAtLeast(24)
8+
})
39
class QuarkusJBossLoggingSmokeTest extends QuarkusSmokeTest {
410
@Override
511
String helloEndpointName() {

dd-smoke-tests/quarkus/src/test/groovy/datadog/smoketest/QuarkusSlf4jSmokeTest.groovy

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
package datadog.smoketest
22

3+
import datadog.trace.api.Platform
4+
import spock.lang.IgnoreIf
5+
6+
@IgnoreIf(reason = "Failing on Java 24. Skip until we have a fix.", value = {
7+
Platform.isJavaVersionAtLeast(24)
8+
})
39
class QuarkusSlf4jSmokeTest extends QuarkusSmokeTest {
410
@Override
511
String helloEndpointName() {

0 commit comments

Comments
 (0)