Fix race condition Exception Replay smoke tests (#10011)

jpbempel · web-flow · commit e5347b6a4eea · 2025-11-25T11:03:16.000+01:00
need to wait for having added the fingerprint into the Concurrent Map
otherwise it will try to reinstrument the exception on the second call
Generalize the usage of NonRetryable annotation because all debugger
smoke tests rely on the fact that they are run only once (log file
naming)
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/AbstractExceptionDebugger.java
@@ -114,6 +114,7 @@ public void handleException(Throwable t, AgentSpan span) {
   private void applyExceptionConfiguration(String fingerprint) {
     configurationUpdater.accept(EXCEPTION, exceptionProbeManager.getProbes());
     exceptionProbeManager.addFingerprint(fingerprint);
+    LOGGER.debug("Exception Fingerprint {} added", fingerprint);
   }
 
   protected void addStackFrameTags(
diff --git a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/ServerDebuggerTestApplication.java b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/ServerDebuggerTestApplication.java
@@ -98,6 +98,16 @@ protected void waitForReTransformation(String className) {
     }
   }
 
+  protected void waitForExceptionFingerprint() {
+    System.out.println("waitForExceptionFingerprint");
+    try {
+      TestApplicationHelper.waitForExceptionFingerprint(LOG_FILENAME);
+      System.out.println("fingerprint added!");
+    } catch (IOException ex) {
+      ex.printStackTrace();
+    }
+  }
+
   protected void waitForSpecificLine(String line) {
     System.out.println("waitForSpecificLine...");
     try {
@@ -281,6 +291,11 @@ public MockResponse dispatch(RecordedRequest request) throws InterruptedExceptio
             app.waitForReTransformation(className);
             break;
           }
+        case "/app/waitForExceptionFingerprint":
+          {
+            app.waitForExceptionFingerprint();
+            break;
+          }
         case "/app/waitForSpecificLine":
           {
             String feature = request.getRequestUrl().queryParameter("line");
diff --git a/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/TestApplicationHelper.java b/dd-smoke-tests/debugger-integration-tests/src/main/java/datadog/smoketest/debugger/TestApplicationHelper.java
@@ -23,6 +23,8 @@ public class TestApplicationHelper {
       "[dd-remote-config] DEBUG com.datadog.debugger.agent.ConfigurationUpdater - Re-transforming class: %s";
   private static final String RETRANSFORMATION_DONE =
       "com.datadog.debugger.agent.ConfigurationUpdater - Re-transformation done";
+  private static final String EXCEPTION_FINGERPRINT_ADDED =
+      "DEBUG com.datadog.debugger.exception.AbstractExceptionDebugger - Exception Fingerprint ";
   private static final long SLEEP_MS = 100;
   private static final long TIMEOUT_S = 10;
 
@@ -90,6 +92,10 @@ public static String waitForReTransformation(
         Duration.ofSeconds(TIMEOUT_S));
   }
 
+  public static String waitForExceptionFingerprint(String logFileName) throws IOException {
+    return waitForSpecificLine(logFileName, EXCEPTION_FINGERPRINT_ADDED, null);
+  }
+
   public static String waitForSpecificLine(String logFileName, String specificLine, String fromLine)
       throws IOException {
     return waitForSpecificLogLine(
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/AgentDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/AgentDebuggerIntegrationTest.java
@@ -5,6 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.datadog.debugger.probe.LogProbe;
+import datadog.trace.test.util.NonRetryable;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -14,6 +15,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+@NonRetryable
 public class AgentDebuggerIntegrationTest extends SimpleAppDebuggerIntegrationTest {
   @Test
   @DisplayName("testLatestJdk")
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/CodeOriginIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/CodeOriginIntegrationTest.java
@@ -8,12 +8,14 @@
 
 import datadog.trace.api.DDTags;
 import datadog.trace.test.agent.decoder.DecodedSpan;
+import datadog.trace.test.util.NonRetryable;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+@NonRetryable
 public class CodeOriginIntegrationTest extends ServerAppDebuggerIntegrationTest {
 
   @Override
@@ -45,7 +47,7 @@ void testCodeOriginTraceAnnotation() throws Exception {
                 assertEquals("runTracedMethod", span.getMeta().get(DD_CODE_ORIGIN_FRAME_METHOD));
                 assertEquals(
                     "(java.lang.String)", span.getMeta().get(DD_CODE_ORIGIN_FRAME_SIGNATURE));
-                assertEquals("146", span.getMeta().get(DD_CODE_ORIGIN_FRAME_LINE));
+                assertEquals("156", span.getMeta().get(DD_CODE_ORIGIN_FRAME_LINE));
                 codeOrigin.set(true);
               }
             }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ExceptionDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ExceptionDebuggerIntegrationTest.java
@@ -10,7 +10,6 @@
 import datadog.trace.bootstrap.debugger.CapturedContext;
 import datadog.trace.test.agent.decoder.DecodedSpan;
 import datadog.trace.test.agent.decoder.DecodedTrace;
-import datadog.trace.test.util.Flaky;
 import datadog.trace.test.util.NonRetryable;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -23,7 +22,6 @@
 import org.junit.jupiter.api.condition.DisabledIf;
 
 @NonRetryable
-@Flaky
 public class ExceptionDebuggerIntegrationTest extends ServerAppDebuggerIntegrationTest {
 
   private List<String> snapshotIdTags = new ArrayList<>();
@@ -59,7 +57,7 @@ protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params
   void testSimpleSingleFrameException() throws Exception {
     appUrl = startAppAndAndGetUrl();
     execute(appUrl, TRACED_METHOD_NAME, "oops"); // instrumenting first exception
-    waitForInstrumentation(appUrl, SERVER_DEBUGGER_TEST_APP_CLASS, false);
+    waitForExceptionFingerprint();
     execute(appUrl, TRACED_METHOD_NAME, "oops"); // collecting snapshots and sending them
     registerTraceListener(this::receiveExceptionReplayTrace);
     registerSnapshotListener(this::receiveSnapshot);
@@ -127,7 +125,7 @@ void testNoSubsequentCaptureAfterFirst() throws Exception {
   void test3CapturedFrames() throws Exception {
     appUrl = startAppAndAndGetUrl();
     execute(appUrl, TRACED_METHOD_NAME, "deepOops"); // instrumenting first exception
-    waitForInstrumentation(appUrl, SERVER_DEBUGGER_TEST_APP_CLASS, false);
+    waitForExceptionFingerprint();
     execute(appUrl, TRACED_METHOD_NAME, "deepOops"); // collecting snapshots and sending them
     registerTraceListener(this::receiveExceptionReplayTrace);
     registerSnapshotListener(this::receiveSnapshot);
@@ -185,7 +183,7 @@ void test5CapturedFrames() throws Exception {
     additionalJvmArgs.add("-Ddd.exception.replay.capture.max.frames=5");
     appUrl = startAppAndAndGetUrl();
     execute(appUrl, TRACED_METHOD_NAME, "deepOops"); // instrumenting first exception
-    waitForInstrumentation(appUrl, SERVER_DEBUGGER_TEST_APP_CLASS, false);
+    waitForExceptionFingerprint();
     execute(appUrl, TRACED_METHOD_NAME, "deepOops"); // collecting snapshots and sending them
     registerTraceListener(this::receiveExceptionReplayTrace);
     registerSnapshotListener(this::receiveSnapshot);
@@ -262,7 +260,7 @@ void test5CapturedFrames() throws Exception {
   void test3CapturedRecursiveFrames() throws Exception {
     appUrl = startAppAndAndGetUrl();
     execute(appUrl, TRACED_METHOD_NAME, "recursiveOops"); // instrumenting first exception
-    waitForInstrumentation(appUrl, SERVER_DEBUGGER_TEST_APP_CLASS, false);
+    waitForExceptionFingerprint();
     execute(appUrl, TRACED_METHOD_NAME, "recursiveOops"); // collecting snapshots and sending them
     registerTraceListener(this::receiveExceptionReplayTrace);
     registerSnapshotListener(this::receiveSnapshot);
@@ -310,7 +308,7 @@ void testLambdaHiddenFrames() throws Exception {
     additionalJvmArgs.add("-XX:+ShowHiddenFrames");
     appUrl = startAppAndAndGetUrl();
     execute(appUrl, TRACED_METHOD_NAME, "lambdaOops"); // instrumenting first exception
-    waitForInstrumentation(appUrl, SERVER_DEBUGGER_TEST_APP_CLASS, false);
+    waitForExceptionFingerprint();
     execute(appUrl, TRACED_METHOD_NAME, "lambdaOops"); // collecting snapshots and sending them
     registerTraceListener(this::receiveExceptionReplayTrace);
     registerSnapshotListener(this::receiveSnapshot);
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
@@ -1,13 +1,15 @@
 package datadog.smoketest;
 
 import com.datadog.debugger.probe.LogProbe;
+import datadog.trace.test.util.NonRetryable;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+@NonRetryable
 public class InProductEnablementIntegrationTest extends ServerAppDebuggerIntegrationTest {
   private List<String> additionalJvmArgs = new ArrayList<>();
 
@@ -46,7 +48,7 @@ void testDynamicInstrumentationEnablementWithLineProbe() throws Exception {
     LogProbe probe =
         LogProbe.builder()
             .probeId(LINE_PROBE_ID1)
-            .where("ServerDebuggerTestApplication.java", 312)
+            .where("ServerDebuggerTestApplication.java", 327)
             .build();
     setCurrentConfiguration(createConfig(probe));
     waitForFeatureStarted(appUrl, "Dynamic Instrumentation");
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
@@ -24,6 +24,7 @@
 import datadog.trace.bootstrap.debugger.CapturedContext;
 import datadog.trace.bootstrap.debugger.MethodLocation;
 import datadog.trace.bootstrap.debugger.ProbeId;
+import datadog.trace.test.util.NonRetryable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -37,6 +38,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 
+@NonRetryable
 public class LogProbesIntegrationTest extends SimpleAppDebuggerIntegrationTest {
   @Test
   @DisplayName("testInaccessibleObject")
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
@@ -7,12 +7,14 @@
 import com.datadog.debugger.el.DSL;
 import com.datadog.debugger.el.ValueScript;
 import com.datadog.debugger.probe.MetricProbe;
+import datadog.trace.test.util.NonRetryable;
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+@NonRetryable
 public class MetricProbesIntegrationTest extends SimpleAppDebuggerIntegrationTest {
 
   @AfterEach
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
@@ -7,6 +7,7 @@
 import com.datadog.debugger.agent.ProbeStatus;
 import com.datadog.debugger.probe.LogProbe;
 import com.datadog.debugger.sink.Snapshot;
+import datadog.trace.test.util.NonRetryable;
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.jupiter.api.BeforeEach;
@@ -16,6 +17,7 @@
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.condition.DisabledIf;
 
+@NonRetryable
 public class ProbeStateIntegrationTest extends ServerAppDebuggerIntegrationTest {
 
   @BeforeEach
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ServerAppDebuggerIntegrationTest.java
@@ -128,6 +128,13 @@ protected void waitForInstrumentation(
     LOG.info("instrumentation done");
   }
 
+  protected void waitForExceptionFingerprint() throws Exception {
+    String url = String.format(appUrl + "/waitForExceptionFingerprint");
+    LOG.info("waitForExceptionFingerprint with url={}", url);
+    sendRequest(url);
+    LOG.info("exceptionFingerprint added");
+  }
+
   protected void waitForAProbeStatus(ProbeStatus.Status status) throws Exception {
     AtomicBoolean statusResult = new AtomicBoolean();
     registerProbeStatusListener(
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
@@ -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.NonRetryable;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
@@ -29,6 +30,7 @@
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.condition.DisabledIf;
 
+@NonRetryable
 public class SpanDecorationProbesIntegrationTests extends ServerAppDebuggerIntegrationTest {
 
   @BeforeEach
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpanProbesIntegrationTest.java
@@ -5,13 +5,15 @@
 import com.datadog.debugger.agent.ProbeStatus;
 import com.datadog.debugger.probe.SpanProbe;
 import datadog.trace.test.agent.decoder.DecodedSpan;
+import datadog.trace.test.util.NonRetryable;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 
+@NonRetryable
 public class SpanProbesIntegrationTest extends SimpleAppDebuggerIntegrationTest {
 
   @Override
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
@@ -12,6 +12,7 @@
 import datadog.trace.agent.test.utils.PortUtils;
 import datadog.trace.bootstrap.debugger.MethodLocation;
 import datadog.trace.bootstrap.debugger.ProbeId;
+import datadog.trace.test.util.NonRetryable;
 import datadog.trace.util.TagsHelper;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -29,6 +30,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
+@NonRetryable
 public class TracerDebuggerIntegrationTest extends BaseIntegrationTest {
 
   private static final String DEBUGGER_TEST_APP_CLASS =

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@ public void handleException(Throwable t, AgentSpan span) {`
`114`	`114`	`private void applyExceptionConfiguration(String fingerprint) {`
`115`	`115`	`configurationUpdater.accept(EXCEPTION, exceptionProbeManager.getProbes());`
`116`	`116`	`exceptionProbeManager.addFingerprint(fingerprint);`
	`117`	`+ LOGGER.debug("Exception Fingerprint {} added", fingerprint);`
`117`	`118`	`}`
`118`	`119`
`119`	`120`	`protected void addStackFrameTags(`