From f94116d672880e06897eddcb0388feb9ef590901 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bempel Date: Wed, 28 Oct 2026 09:50:47 +0100 Subject: [PATCH 1/3] Remove @Flaky on debugger smoke tests since no flakiness for a week after several fixes, removing the annotation --- .../datadog/smoketest/InProductEnablementIntegrationTest.java | 3 --- .../test/java/datadog/smoketest/LogProbesIntegrationTest.java | 2 -- .../java/datadog/smoketest/MetricProbesIntegrationTest.java | 2 -- .../test/java/datadog/smoketest/ProbeStateIntegrationTest.java | 2 -- .../smoketest/SpanDecorationProbesIntegrationTests.java | 2 -- .../java/datadog/smoketest/TracerDebuggerIntegrationTest.java | 2 -- 6 files changed, 13 deletions(-) diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/InProductEnablementIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/InProductEnablementIntegrationTest.java index bf26c855e38..501280e92d8 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/InProductEnablementIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/InProductEnablementIntegrationTest.java @@ -1,7 +1,6 @@ package datadog.smoketest; import com.datadog.debugger.probe.LogProbe; -import datadog.trace.test.util.Flaky; import datadog.trace.test.util.NonRetryable; import java.io.IOException; import okhttp3.mockwebserver.MockResponse; @@ -53,7 +52,6 @@ void testDynamicInstrumentationResetEnablement() throws Exception { waitForReTransformation(appUrl); // wait for retransformation of removed probe } - @Flaky @Test @DisplayName("testDynamicInstrumentationEnablementWithLineProbe") void testDynamicInstrumentationEnablementWithLineProbe() throws Exception { @@ -113,7 +111,6 @@ void testExceptionReplayEnablement() throws Exception { // TODO test for failure of starting ER, SymDB and DI: should degrade gracefully // TODO by not providing endpoints - @Flaky @Test @DisplayName("testExceptionReplayEnablementFailure") @EnabledForJreRange(min = JRE.JAVA_11) diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java index 7cbd7433e1a..d21e82b0bec 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java @@ -27,7 +27,6 @@ import datadog.trace.bootstrap.debugger.CapturedContext; import datadog.trace.bootstrap.debugger.MethodLocation; import datadog.trace.bootstrap.debugger.ProbeId; -import datadog.trace.test.util.Flaky; import datadog.trace.test.util.NonRetryable; import java.util.ArrayList; import java.util.Arrays; @@ -43,7 +42,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIf; -@Flaky @NonRetryable public class LogProbesIntegrationTest extends SimpleAppDebuggerIntegrationTest { diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MetricProbesIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MetricProbesIntegrationTest.java index dfd5150fcd4..9b2ca7354bb 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MetricProbesIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/MetricProbesIntegrationTest.java @@ -7,7 +7,6 @@ import com.datadog.debugger.el.DSL; import com.datadog.debugger.el.ValueScript; import com.datadog.debugger.probe.MetricProbe; -import datadog.trace.test.util.Flaky; import datadog.trace.test.util.NonRetryable; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; @@ -15,7 +14,6 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -@Flaky @NonRetryable public class MetricProbesIntegrationTest extends SimpleAppDebuggerIntegrationTest { diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java index fb8ca62de94..36bd25b4dfa 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProbeStateIntegrationTest.java @@ -7,7 +7,6 @@ import com.datadog.debugger.agent.ProbeStatus; import com.datadog.debugger.probe.LogProbe; import com.datadog.debugger.sink.Snapshot; -import datadog.trace.test.util.Flaky; import datadog.trace.test.util.NonRetryable; import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; @@ -74,7 +73,6 @@ void testAddSourceFileProbeLargeInnerClasses() throws Exception { @Test @DisplayName("testAddSourceFileProbeHugeInnerClasses") - @Flaky @DisabledIf( value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Flaky on J9 JVMs") diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java index 90c7d26bc4a..477fd4f31e3 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java @@ -18,7 +18,6 @@ import com.datadog.debugger.probe.SpanDecorationProbe; import datadog.trace.bootstrap.debugger.EvaluationError; import datadog.trace.test.agent.decoder.DecodedSpan; -import datadog.trace.test.util.Flaky; import datadog.trace.test.util.NonRetryable; import java.util.Arrays; import java.util.List; @@ -74,7 +73,6 @@ void testMethodSimpleTagNoCondition() throws Exception { traceReceived::get, () -> String.format("timeout traceReceived=%s", traceReceived.get())); } - @Flaky @Test @DisplayName("testMethodMultiTagsMultiConditions") @DisabledIf( diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java index f737ac7463c..d723a83c6ff 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java @@ -12,7 +12,6 @@ import com.datadog.debugger.sink.Snapshot; import datadog.trace.bootstrap.debugger.MethodLocation; import datadog.trace.bootstrap.debugger.ProbeId; -import datadog.trace.test.util.Flaky; import datadog.trace.test.util.NonRetryable; import datadog.trace.util.TagsHelper; import java.util.concurrent.atomic.AtomicBoolean; @@ -24,7 +23,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -@Flaky @NonRetryable public class TracerDebuggerIntegrationTest extends SpringBasedIntegrationTest { From 38d3505a4e7d070f931acdcd310f44f71c823268 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bempel Date: Fri, 30 Oct 2026 11:21:54 +0100 Subject: [PATCH 2/3] fix timeout --- .../test/java/datadog/smoketest/LogProbesIntegrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java index d21e82b0bec..6b7ead0ccc1 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java @@ -641,7 +641,7 @@ void testTemplateTimeout() throws Exception { snapshot -> { if (snapshot.getProbe().getProbeId().equals(PROBE_ID)) { assertEquals(1, snapshot.getEvaluationErrors().size()); - assertEquals("timeout (50ms)", snapshot.getEvaluationErrors().get(0).getMessage()); + assertEquals("timeout (200ms)", snapshot.getEvaluationErrors().get(0).getMessage()); snapshotReceived.set(true); } }); From e1c769f77038ce3098950cb7e45e17b6c0852f89 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bempel Date: Fri, 30 Oct 2026 14:13:57 +0100 Subject: [PATCH 3/3] still flaky --- .../datadog/smoketest/InProductEnablementIntegrationTest.java | 2 ++ .../datadog/smoketest/SpanDecorationProbesIntegrationTests.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/InProductEnablementIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/InProductEnablementIntegrationTest.java index 501280e92d8..257aad00e50 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/InProductEnablementIntegrationTest.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/InProductEnablementIntegrationTest.java @@ -1,6 +1,7 @@ package datadog.smoketest; import com.datadog.debugger.probe.LogProbe; +import datadog.trace.test.util.Flaky; import datadog.trace.test.util.NonRetryable; import java.io.IOException; import okhttp3.mockwebserver.MockResponse; @@ -111,6 +112,7 @@ void testExceptionReplayEnablement() throws Exception { // TODO test for failure of starting ER, SymDB and DI: should degrade gracefully // TODO by not providing endpoints + @Flaky @Test @DisplayName("testExceptionReplayEnablementFailure") @EnabledForJreRange(min = JRE.JAVA_11) diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java index 477fd4f31e3..90c7d26bc4a 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanDecorationProbesIntegrationTests.java @@ -18,6 +18,7 @@ import com.datadog.debugger.probe.SpanDecorationProbe; import datadog.trace.bootstrap.debugger.EvaluationError; import datadog.trace.test.agent.decoder.DecodedSpan; +import datadog.trace.test.util.Flaky; import datadog.trace.test.util.NonRetryable; import java.util.Arrays; import java.util.List; @@ -73,6 +74,7 @@ void testMethodSimpleTagNoCondition() throws Exception { traceReceived::get, () -> String.format("timeout traceReceived=%s", traceReceived.get())); } + @Flaky @Test @DisplayName("testMethodMultiTagsMultiConditions") @DisabledIf(