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..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 @@ -53,7 +53,6 @@ void testDynamicInstrumentationResetEnablement() throws Exception { waitForReTransformation(appUrl); // wait for retransformation of removed probe } - @Flaky @Test @DisplayName("testDynamicInstrumentationEnablementWithLineProbe") void testDynamicInstrumentationEnablementWithLineProbe() throws Exception { 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..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 @@ -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 { @@ -643,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); } }); 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/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 {