Merge branch 'master' into dylan/sfn-trace-ctx

nhulston · web-flow · commit 2992508a8dac · 2025-02-07T10:01:49.000-05:00
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java
@@ -555,7 +555,6 @@ private boolean evaluateCondition(CapturedContext capture, LogStatus status) {
     if (probeCondition == null) {
       return true;
     }
-    long startTs = System.nanoTime();
     try {
       if (!probeCondition.execute(capture)) {
         return false;
@@ -564,9 +563,6 @@ private boolean evaluateCondition(CapturedContext capture, LogStatus status) {
       status.addError(new EvaluationError(ex.getExpr(), ex.getMessage()));
       status.setConditionErrors(true);
       return false;
-    } finally {
-      LOGGER.debug(
-          "ProbeCondition for probe[{}] evaluated in {}ns", id, (System.nanoTime() - startTs));
     }
     return true;
   }

Original file line number	Diff line number	Diff line change
`@@ -555,7 +555,6 @@ private boolean evaluateCondition(CapturedContext capture, LogStatus status) {`
`555`	`555`	`if (probeCondition == null) {`
`556`	`556`	`return true;`
`557`	`557`	`}`
`558`		`- long startTs = System.nanoTime();`
`559`	`558`	`try {`
`560`	`559`	`if (!probeCondition.execute(capture)) {`
`561`	`560`	`return false;`
`@@ -564,9 +563,6 @@ private boolean evaluateCondition(CapturedContext capture, LogStatus status) {`
`564`	`563`	`status.addError(new EvaluationError(ex.getExpr(), ex.getMessage()));`
`565`	`564`	`status.setConditionErrors(true);`
`566`	`565`	`return false;`
`567`		`- } finally {`
`568`		`- LOGGER.debug(`
`569`		`- "ProbeCondition for probe[{}] evaluated in {}ns", id, (System.nanoTime() - startTs));`
`570`	`566`	`}`
`571`	`567`	`return true;`
`572`	`568`	`}`