Fix integer json parsing probe definition

jpbempel · jpbempel · commit fd1bd009d1c0 · 2024-11-14T17:54:43.000+01:00
Following #7676 issue, numbers parsed from the json probe definition are still considered as long value which still makes then unfittable to be used as key for Integer -> Integer map. Now we parse integers (without dot numbers) as long and see if they fit into an integer, then downgrade them as DSL value with integer type.
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
@@ -317,7 +317,12 @@ public static ValueExpression<?> asValueExpression(JsonReader reader) throws IOE
           if (numberStrValue.indexOf('.') > 0) {
             return DSL.value(Double.parseDouble(numberStrValue));
           }
-          return DSL.value(Long.parseLong(numberStrValue));
+          long longValue = Long.parseLong(numberStrValue);
+          // checks if the parsed number fits into integer range
+          if (longValue <= Integer.MAX_VALUE && longValue >= Integer.MIN_VALUE) {
+            return DSL.value((int) longValue);
+          }
+          return DSL.value(longValue);
         }
       case STRING:
         {
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ValueScriptTest.java b/dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/ValueScriptTest.java
@@ -62,7 +62,14 @@ public void topLevelPrimitives() {
           "el",
           Values.NULL_OBJECT,
           Boolean.TRUE,
-          Boolean.FALSE
+          Boolean.FALSE,
+          42,
+          Integer.MAX_VALUE,
+          -42,
+          Integer.MIN_VALUE,
+          17315993717L,
+          -17315993717L,
+          3.14
         };
     List<String> lines = loadLinesFromResource("/test_one_liner_value_expr_02.txt");
     int i = 0;
diff --git a/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_one_liner_value_expr_02.txt b/dd-java-agent/agent-debugger/debugger-el/src/test/resources/test_one_liner_value_expr_02.txt
@@ -12,3 +12,10 @@
 {"dsl": "", "json": null}
 {"dsl": "", "json": true}
 {"dsl": "", "json": false}
+{"dsl": "", "json": 42}
+{"dsl": "", "json": 2147483647}
+{"dsl": "", "json": -42}
+{"dsl": "", "json": -2147483648}
+{"dsl": "", "json": 17315993717}
+{"dsl": "", "json": -17315993717}
+{"dsl": "", "json": 3.14}

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,12 @@ public static ValueExpression<?> asValueExpression(JsonReader reader) throws IOE`
`317`	`317`	`if (numberStrValue.indexOf('.') > 0) {`
`318`	`318`	`return DSL.value(Double.parseDouble(numberStrValue));`
`319`	`319`	`}`
`320`		`- return DSL.value(Long.parseLong(numberStrValue));`
	`320`	`+ long longValue = Long.parseLong(numberStrValue);`
	`321`	`+ // checks if the parsed number fits into integer range`
	`322`	`+ if (longValue <= Integer.MAX_VALUE && longValue >= Integer.MIN_VALUE) {`
	`323`	`+ return DSL.value((int) longValue);`
	`324`	`+ }`
	`325`	`+ return DSL.value(longValue);`
`321`	`326`	`}`
`322`	`327`	`case STRING:`
`323`	`328`	`{`