Skip to content

Proto update #95

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
merged 3 commits into from
Jan 18, 2024
Merged

Proto update #95

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
6e186ec
chore(update): update deep proto to 1.0.4
Umaaz Jan 8, 2024
89e4564
Apply suggestions from code review
Umaaz Jan 11, 2024
3df5d5a
Merge branch 'master' into proto_update
Umaaz Jan 18, 2024
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
6 changes: 3 additions & 3 deletions agent/src/main/java/com/intergral/deep/agent/tracepoint/handler/Callback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,20 +497,20 @@ public void decorate(final EventSnapshot eventSnapshot, final FrameProcessor fra
if (this.throwable != null) {
final List<VariableID> variableIds = frameProcessor.processVars(Collections.singletonMap("thrown", this.throwable));
final Map<String, Variable> watchLookup = frameProcessor.closeLookup();
eventSnapshot.addWatchResult(new WatchResult("thrown", variableIds.get(0), WatchResult.WATCH));
eventSnapshot.addWatchResult(new WatchResult("thrown", variableIds.get(0), WatchResult.CAPTURE));
eventSnapshot.mergeVariables(watchLookup);
}

if (this.isSet) {
final List<VariableID> variableIds = frameProcessor.processVars(Collections.singletonMap("return", this.value));
final Map<String, Variable> watchLookup = frameProcessor.closeLookup();
eventSnapshot.addWatchResult(new WatchResult("return", variableIds.get(0), WatchResult.WATCH));
eventSnapshot.addWatchResult(new WatchResult("return", variableIds.get(0), WatchResult.CAPTURE));
eventSnapshot.mergeVariables(watchLookup);
}

final List<VariableID> variableIds = frameProcessor.processVars(Collections.singletonMap("runtime", durationNs));
final Map<String, Variable> watchLookup = frameProcessor.closeLookup();
eventSnapshot.addWatchResult(new WatchResult("runtime", variableIds.get(0), WatchResult.WATCH));
eventSnapshot.addWatchResult(new WatchResult("runtime", variableIds.get(0), WatchResult.CAPTURE));
eventSnapshot.mergeVariables(watchLookup);
}
}
Expand Down
7 changes: 7 additions & 0 deletions agent/src/main/java/com/intergral/deep/agent/types/snapshot/WatchResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ public class WatchResult {
*/
public static final String LOG = "LOG";

/**
* Watch source is CAPTURE.
*
* @see com.intergral.deep.proto.tracepoint.v1.WatchSource
*/
public static final String CAPTURE = "CAPTURE";

private final String error;
private final VariableID result;
private final String expression;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</modules>

<properties>
<deep-proto.version>1.0.3</deep-proto.version>
<deep-proto.version>1.0.5</deep-proto.version>
<grpc.version>1.60.1</grpc.version>
<netty.version>4.1.100.Final</netty.version>
<tcnative.version>2.0.62.Final</tcnative.version>
Expand Down