From 6e186ec83a2af139e28b45b2e86685a03077564a Mon Sep 17 00:00:00 2001 From: Ben Donnelly Date: Mon, 8 Jan 2024 17:22:37 +0000 Subject: [PATCH 1/2] chore(update): update deep proto to 1.0.4 --- .../intergral/deep/agent/tracepoint/handler/Callback.java | 6 +++--- .../intergral/deep/agent/types/snapshot/WatchResult.java | 7 +++++++ pom.xml | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/agent/src/main/java/com/intergral/deep/agent/tracepoint/handler/Callback.java b/agent/src/main/java/com/intergral/deep/agent/tracepoint/handler/Callback.java index b0587d1..9b0ef8c 100644 --- a/agent/src/main/java/com/intergral/deep/agent/tracepoint/handler/Callback.java +++ b/agent/src/main/java/com/intergral/deep/agent/tracepoint/handler/Callback.java @@ -497,20 +497,20 @@ public void decorate(final EventSnapshot eventSnapshot, final FrameProcessor fra if (this.throwable != null) { final List variableIds = frameProcessor.processVars(Collections.singletonMap("thrown", this.throwable)); final Map 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 variableIds = frameProcessor.processVars(Collections.singletonMap("return", this.value)); final Map 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 variableIds = frameProcessor.processVars(Collections.singletonMap("runtime", durationNs)); final Map 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); } } diff --git a/agent/src/main/java/com/intergral/deep/agent/types/snapshot/WatchResult.java b/agent/src/main/java/com/intergral/deep/agent/types/snapshot/WatchResult.java index 3d4e9fe..e37f638 100644 --- a/agent/src/main/java/com/intergral/deep/agent/types/snapshot/WatchResult.java +++ b/agent/src/main/java/com/intergral/deep/agent/types/snapshot/WatchResult.java @@ -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; diff --git a/pom.xml b/pom.xml index 8973e90..ce8ba93 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ - 1.0.3 + 1.0.4 1.60.0 4.1.100.Final 2.0.62.Final From 89e45645fd889709521cb9d8eff56bb9ad58652b Mon Sep 17 00:00:00 2001 From: Ben Donnelly Date: Thu, 11 Jan 2024 10:48:00 +0000 Subject: [PATCH 2/2] Apply suggestions from code review --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce8ba93..3c7da78 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ - 1.0.4 + 1.0.5 1.60.0 4.1.100.Final 2.0.62.Final