Skip to content

Fix race condition for Failed Test Replay #10679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 6 commits into from
Mar 2, 2026
+11 −4
Merged

Fix race condition for Failed Test Replay #10679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f28890
fix: flakiness in junit console FTR test
daniel-mohedano Feb 25, 2026
60a8235
chore: update comment
daniel-mohedano Feb 26, 2026
ccae7d4
Merge branch 'master' into daniel.mohedano/junit-console-flaky-fix
daniel-mohedano Feb 26, 2026
aba284a
fix: also update flush interval
daniel-mohedano Feb 26, 2026
aff07bd
fix: update approach to requeue
daniel-mohedano Feb 26, 2026
0de9403
feat: reduce catch scope to assertionerror
daniel-mohedano Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/DebuggerSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ public void start() {
}

public void stop() {
lowRateFlush(this);
snapshotSink.highRateFlush(null);
cancelSchedule(this.flushIntervalScheduled);
cancelSchedule(this.lowRateScheduled);
lowRateFlush(this);
snapshotSink.highRateFlush(null);
probeStatusSink.stop();
symbolSink.stop();
snapshotSink.stop();
Expand Down
5 changes: 5 additions & 0 deletions dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SnapshotSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,11 @@ private List<String> getSerializedSnapshots(BlockingQueue<Snapshot> queue, int l
if (!largeBatch) {
LOGGER.debug("Sending snapshot for probe: {}", snapshot.getProbe().getId());
}
} catch (AssertionError e) {
// Re-queue on AssertionError from Moshi when thread is interrupted so the shutdown hook
// flush can retry with a non-interrupted thread
ExceptionHelper.logException(LOGGER, e, "Error during snapshot serialization:");
queue.offer(snapshot);
} catch (Exception e) {
ExceptionHelper.logException(LOGGER, e, "Error during snapshot serialization:");
}
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/backend-mock/src/main/groovy/datadog/smoketest/MockBackend.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ class MockBackend implements AutoCloseable {
}

List<Map<String, Object>> waitForLogs(int expectedCount) {
def traceReceiveConditions = new PollingConditions(timeout: 15, initialDelay: 1, delay: 0.5, factor: 1)
def traceReceiveConditions = new PollingConditions(timeout: 30, initialDelay: 1, delay: 0.5, factor: 1)
traceReceiveConditions.eventually {
assert receivedLogs.size() == expectedCount
}
Expand Down
4 changes: 3 additions & 1 deletion dd-smoke-tests/junit-console/src/test/groovy/datadog/smoketest/JUnitConsoleSmokeTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package datadog.smoketest


import datadog.trace.api.config.CiVisibilityConfig
import datadog.trace.api.config.DebuggerConfig
import datadog.trace.api.config.GeneralConfig
import datadog.trace.civisibility.CiVisibilitySmokeTest
import java.nio.file.FileVisitResult
Expand Down Expand Up @@ -52,7 +53,8 @@ class JUnitConsoleSmokeTest extends CiVisibilitySmokeTest {

def exitCode = whenRunningJUnitConsole([
(CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_COUNT): "3",
(GeneralConfig.AGENTLESS_LOG_SUBMISSION_URL): mockBackend.intakeUrl
(GeneralConfig.AGENTLESS_LOG_SUBMISSION_URL): mockBackend.intakeUrl,
(DebuggerConfig.DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL): "999999" // avoid possible race conditions on shutdown
],
[:])
assert exitCode == 1
Expand Down