From a07df454f94addd5d70bb04b9522209c15a8e5d8 Mon Sep 17 00:00:00 2001 From: jean-philippe bempel Date: Wed, 21 May 2025 14:33:20 +0200 Subject: [PATCH] Add support for isDefined in log template Add isDefined as top level predicate for log template values --- .../com/datadog/debugger/el/JsonToExpressionConverter.java | 3 ++- .../src/test/resources/test_one_liner_value_expr_01.txt | 1 + .../debugger-el/src/test/resources/test_value_expr_01.json | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java index 18e1c5d989c..b9cad5b1ed7 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java +++ b/dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/JsonToExpressionConverter.java @@ -50,7 +50,8 @@ public class JsonToExpressionConverter { "endsWith", "contains", "matches", - "instanceof")); + "instanceof", + "isDefined")); @FunctionalInterface interface BinaryPredicateExpressionFunction { diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_one_liner_value_expr_01.txt b/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_one_liner_value_expr_01.txt index 38fcc2aa21e..7159ed85ee1 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_one_liner_value_expr_01.txt +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_one_liner_value_expr_01.txt @@ -19,3 +19,4 @@ {"dsl": "", "json": {"contains": [{"ref": "str"}, "ll"]}} {"dsl": "", "json": {"matches": [{"ref": "str"}, "[helo]+"]}} {"dsl": "", "json": {"instanceof": [{"ref": "str"}, "java.lang.String"]}} +{"dsl": "", "json": {"isDefined": {"ref": "str"}}} diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_value_expr_01.json b/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_value_expr_01.json index aaf88b79275..f19b01f7f57 100644 --- a/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_value_expr_01.json +++ b/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_value_expr_01.json @@ -24,7 +24,8 @@ {"endsWith": [{"ref": "str"}, "llo"]}, {"contains": [{"ref": "str"}, "ll"]}, {"matches": [{"ref": "str"}, "[helo]+"]}, - {"instanceof": [{"ref": "str"}, "java.lang.String"]} + {"instanceof": [{"ref": "str"}, "java.lang.String"]}, + {"isDefined": {"ref": "str"}} ] } ]