Skip to content

fix freeze context only for capturing line probe #7456

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 1 commit into from
Aug 29, 2024
Merged

fix freeze context only for capturing line probe #7456

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,9 +553,6 @@ public void commit(CapturedContext lineContext, int line) {
if (status.shouldSend()) {
snapshot.setTraceId(lineContext.getTraceId());
snapshot.setSpanId(lineContext.getSpanId());
if (isCaptureSnapshot()) {
snapshot.addLine(lineContext, line);
}
snapshot.setMessage(status.getMessage());
shouldCommit = true;
}
Expand All @@ -564,9 +561,12 @@ public void commit(CapturedContext lineContext, int line) {
shouldCommit = true;
}
if (shouldCommit) {
// freeze context just before commit because line probes have only one context
Duration timeout = Duration.of(Config.get().getDebuggerCaptureTimeout(), ChronoUnit.MILLIS);
lineContext.freeze(new TimeoutChecker(timeout));
if (isCaptureSnapshot()) {
// freeze context just before commit because line probes have only one context
Duration timeout = Duration.of(Config.get().getDebuggerCaptureTimeout(), ChronoUnit.MILLIS);
lineContext.freeze(new TimeoutChecker(timeout));
snapshot.addLine(lineContext, line);
}
commitSnapshot(snapshot, sink);
return;
}
Expand Down