Factorize the line probe condition for evluateAt

DataDog · Nov 2, 2023 · 810c321 · 810c321
1 parent 69b777a
commit 810c321
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/...er/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java b/...er/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java
@@ -327,22 +327,14 @@ public Status evaluate(
           ValueReferences.DURATION_EXTENSION_NAME, duration / 1_000_000.0); // convert to ms
     }
     this.thisClassName = thisClassName;
-    boolean shouldEvaluate = resolveEvaluateAt(probeImplementation, methodLocation);
+    boolean shouldEvaluate =
+        MethodLocation.isSame(methodLocation, probeImplementation.getEvaluateAt());
     if (shouldEvaluate) {
       probeImplementation.evaluate(this, status, methodLocation);
     }
     return status;
   }
 
-  private static boolean resolveEvaluateAt(
-      ProbeImplementation probeImplementation, MethodLocation methodLocation) {
-    if (methodLocation == MethodLocation.DEFAULT) {
-      // line probe, no evaluation of probe's evaluateAt
-      return true;
-    }
-    return MethodLocation.isSame(methodLocation, probeImplementation.getEvaluateAt());
-  }
-
   public Status getStatus(String probeId) {
     Status result = statusByProbeId.get(probeId);
     if (result == null) {

diff --git a/...ger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/MethodLocation.java b/...ger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/MethodLocation.java
@@ -7,7 +7,7 @@ public enum MethodLocation {
 
   public static boolean isSame(MethodLocation methodLocation, MethodLocation evaluateAt) {
     if (methodLocation == MethodLocation.DEFAULT) {
-      // line probe always assume we are the right location
+      // line probe, no evaluation of probe's evaluateAt
       return true;
     }
     if (methodLocation == MethodLocation.ENTRY) {