Skip to content

Avoid double snapshots for Exception Replay #8273

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
jpbempel merged 3 commits into from
Jan 24, 2025
Merged

Avoid double snapshots for Exception Replay #8273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ebc003
Avoid double snapshots for Exception Replay
jpbempel Jan 21, 2025
3b953a5
Update system-tests to 9039f27868f0f7d6db344ca2f0631071a1b9de6f
jpbempel Jan 23, 2025
835da7b
Update system-tests to c706e333ef06800b866ac300e4b6cdb7566cc5e5
jpbempel Jan 24, 2025
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
2 changes: 1 addition & 1 deletion .circleci/config.continue.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core"
profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"

default_system_tests_commit: &default_system_tests_commit 8b05076e897fe62206d7704f2e8e650ed83ebd1f
default_system_tests_commit: &default_system_tests_commit c706e333ef06800b866ac300e4b6cdb7566cc5e5

parameters:
nightly:
Expand Down
5 changes: 4 additions & 1 deletion ...agent-debugger/src/main/java/com/datadog/debugger/exception/DefaultExceptionDebugger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,13 @@ private static void processSnapshotsAndSetTags(
String tagName = String.format(SNAPSHOT_ID_TAG_FMT, frameIndex);
span.setTag(tagName, snapshot.getId());
LOGGER.debug("add tag to span[{}]: {}: {}", span.getSpanId(), tagName, snapshot.getId());
DebuggerAgent.getSink().addSnapshot(snapshot);
if (!state.isSnapshotSent()) {
DebuggerAgent.getSink().addSnapshot(snapshot);
}
snapshotAssigned = true;
}
if (snapshotAssigned) {
state.markAsSnapshotSent();
span.setTag(DD_DEBUG_ERROR_EXCEPTION_ID, state.getExceptionId());
LOGGER.debug(
"add tag to span[{}]: {}: {}",
Expand Down
9 changes: 9 additions & 0 deletions ...nt/agent-debugger/src/main/java/com/datadog/debugger/exception/ExceptionProbeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ boolean hasExceptionStateTracked() {
public static class ThrowableState {
private final String exceptionId;
private List<Snapshot> snapshots;
private boolean snapshotSent;

private ThrowableState(String exceptionId) {
this.exceptionId = exceptionId;
Expand All @@ -206,5 +207,13 @@ public void addSnapshot(Snapshot snapshot) {
}
snapshots.add(snapshot);
}

public boolean isSnapshotSent() {
return snapshotSent;
}

public void markAsSnapshotSent() {
snapshotSent = true;
}
}
}
Loading