From 2c814b4ff920cba8700484e391f59bd7f4dfaaaf Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 3 Dec 2025 09:08:50 -0600 Subject: [PATCH 1/3] Make test fail --- .../datadog/trace/instrumentation/synapse3/SynapseTest.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/test/groovy/datadog/trace/instrumentation/synapse3/SynapseTest.groovy b/dd-java-agent/instrumentation/synapse-3.0/src/test/groovy/datadog/trace/instrumentation/synapse3/SynapseTest.groovy index caf7be64d54..6a6a1949e2e 100644 --- a/dd-java-agent/instrumentation/synapse-3.0/src/test/groovy/datadog/trace/instrumentation/synapse3/SynapseTest.groovy +++ b/dd-java-agent/instrumentation/synapse-3.0/src/test/groovy/datadog/trace/instrumentation/synapse3/SynapseTest.groovy @@ -119,9 +119,10 @@ abstract class SynapseTest extends VersionedNamingTestBase { int statusCode = client.newCall(request).execute().code() then: + // should fail here assertTraces(1) { trace(1) { - serverSpan(it, 0, 'GET', statusCode, query) + serverSpan(it, 1, 'GET', statusCode, query) } } statusCode == 200 From e9aa54911b790f8ce589465f4c71f510bd745c39 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 3 Dec 2025 15:00:44 -0600 Subject: [PATCH 2/3] Make another test fail --- .../src/test/groovy/OpensearchTransportClientTest.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/instrumentation/opensearch/transport/src/test/groovy/OpensearchTransportClientTest.groovy b/dd-java-agent/instrumentation/opensearch/transport/src/test/groovy/OpensearchTransportClientTest.groovy index 273802eb278..79fa43caaa6 100644 --- a/dd-java-agent/instrumentation/opensearch/transport/src/test/groovy/OpensearchTransportClientTest.groovy +++ b/dd-java-agent/instrumentation/opensearch/transport/src/test/groovy/OpensearchTransportClientTest.groovy @@ -87,7 +87,8 @@ class OpensearchTransportClientTest extends InstrumentationSpecification { def status = result.get().status expect: - status.name() == "GREEN" + // should fail here + status.name() == "XGREEN" assertTraces(2) { trace(1) { span { From 318c9ba1ebbedddd30ba7b7e832fab3e7d3af064 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Thu, 4 Dec 2025 09:15:49 -0500 Subject: [PATCH 3/3] Run all tests always --- .../dd-trace-java.configure-tests.gradle.kts | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/buildSrc/src/main/kotlin/dd-trace-java.configure-tests.gradle.kts b/buildSrc/src/main/kotlin/dd-trace-java.configure-tests.gradle.kts index d0060bbf278..34c8a340c03 100644 --- a/buildSrc/src/main/kotlin/dd-trace-java.configure-tests.gradle.kts +++ b/buildSrc/src/main/kotlin/dd-trace-java.configure-tests.gradle.kts @@ -81,21 +81,23 @@ tasks.named("check") { } tasks.withType().configureEach { - // Flaky tests management for JUnit 5 - (options as? JUnitPlatformOptions)?.apply { - if (skipFlakyTestsProvider.isPresent) { - excludeTags("flaky") - } else if (runFlakyTestsProvider.isPresent) { - includeTags("flaky") - } - } + // run all tests for now - // Set system property flag that is checked from tests to determine if they should be skipped or run - if (skipFlakyTestsProvider.isPresent) { - jvmArgs("-Drun.flaky.tests=false") - } else if (runFlakyTestsProvider.isPresent) { - jvmArgs("-Drun.flaky.tests=true") - } + // // Flaky tests management for JUnit 5 + // (options as? JUnitPlatformOptions)?.apply { + // if (skipFlakyTestsProvider.isPresent) { + // excludeTags("flaky") + // } else if (runFlakyTestsProvider.isPresent) { + // includeTags("flaky") + // } + // } + + // // Set system property flag that is checked from tests to determine if they should be skipped or run + // if (skipFlakyTestsProvider.isPresent) { + // jvmArgs("-Drun.flaky.tests=false") + // } else if (runFlakyTestsProvider.isPresent) { + // jvmArgs("-Drun.flaky.tests=true") + // } } tasks.withType().configureEach {