Merge branch 'master' into bdu/custom-auto-version

Author: bric3

build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
   id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 
   id("com.gradleup.shadow") version "8.3.6" apply false
-  id("me.champeau.jmh") version "0.7.0" apply false
+  id("me.champeau.jmh") version "0.7.3" apply false
   id("org.gradle.playframework") version "0.13" apply false
   id("info.solidsoft.pitest") version "1.9.11" apply false
 }

dd-java-agent/agent-bootstrap/build.gradle

@@ -63,7 +63,7 @@ idea {
 }
 
 jmh {
-  jmhVersion = '1.32'
+  jmhVersion = libs.versions.jmh.get()
   duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
 }
 

dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WellKnownClasses.java

@@ -107,6 +107,7 @@ public class WellKnownClasses {
               "java.time.LocalDate",
               "java.time.LocalDateTime",
               "java.util.UUID",
+              "java.net.URI",
               "java.io.File",
               "sun.nio.fs.UnixPath",
               "sun.nio.fs.WindowsPath"));

dd-java-agent/agent-debugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/SubStringExpression.java

@@ -20,17 +20,29 @@ public SubStringExpression(ValueExpression<?> source, int startIndex, int endInd
   @Override
   public Value<String> evaluate(ValueReferenceResolver valueRefResolver) {
     Value<?> sourceValue = source != null ? source.evaluate(valueRefResolver) : Value.nullValue();
+    if (sourceValue.isUndefined()) {
+      throw new EvaluationException(
+          "Cannot evaluate the expression for undefined value", PrettyPrintVisitor.print(this));
+    }
+    if (sourceValue.isNull()) {
+      throw new EvaluationException(
+          "Cannot evaluate the expression for null value", PrettyPrintVisitor.print(this));
+    }
     if (sourceValue.getValue() instanceof String) {
       String sourceStr = (String) sourceValue.getValue();
-      try {
-        return (Value<String>) Value.of(sourceStr.substring(startIndex, endIndex));
-      } catch (StringIndexOutOfBoundsException ex) {
-        throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this), ex);
-      }
+      return internalEvaluate(sourceStr);
     }
     return Value.undefined();
   }
 
+  private Value<String> internalEvaluate(String sourceStr) {
+    try {
+      return (Value<String>) Value.of(sourceStr.substring(startIndex, endIndex));
+    } catch (StringIndexOutOfBoundsException ex) {
+      throw new EvaluationException(ex.getMessage(), PrettyPrintVisitor.print(this), ex);
+    }
+  }
+
   @Override
   public <R> R accept(Visitor<R> visitor) {
     return visitor.visit(this);

dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/EndsWithExpressionTest.java

@@ -12,10 +12,13 @@
 import com.datadog.debugger.el.values.StringValue;
 import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver;
 import datadog.trace.bootstrap.debugger.el.Values;
+import java.net.URI;
 import org.junit.jupiter.api.Test;
 
 class EndsWithExpressionTest {
   private final ValueReferenceResolver resolver = RefResolverHelper.createResolver(this);
+  // used to ref lookup
+  URI uri = URI.create("https://www.datadoghq.com");
 
   @Test
   void nullExpression() {
@@ -46,4 +49,11 @@ void stringExpression() {
     assertFalse(expression.evaluate(resolver));
     assertEquals("endsWith(\"abc\", \"ab\")", print(expression));
   }
+
+  @Test
+  void stringPrimitives() {
+    EndsWithExpression expression = new EndsWithExpression(DSL.ref("uri"), new StringValue(".com"));
+    assertTrue(expression.evaluate(resolver));
+    assertEquals("endsWith(uri, \".com\")", print(expression));
+  }
 }

dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/MatchesExpressionTest.java

@@ -9,10 +9,13 @@
 import com.datadog.debugger.el.values.StringValue;
 import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver;
 import datadog.trace.bootstrap.debugger.el.Values;
+import java.net.URI;
 import org.junit.jupiter.api.Test;
 
 class MatchesExpressionTest {
   private final ValueReferenceResolver resolver = RefResolverHelper.createResolver(this);
+  // used to ref lookup
+  URI uri = URI.create("https://www.datadoghq.com");
 
   @Test
   void nullExpression() {
@@ -49,4 +52,12 @@ void stringExpression() {
     assertFalse(expression.evaluate(resolver));
     assertEquals("matches(\"abc\", \"[def]+\")", print(expression));
   }
+
+  @Test
+  void stringPrimitives() {
+    MatchesExpression expression =
+        new MatchesExpression(DSL.ref("uri"), new StringValue("^https?://w{3}\\.datadoghq\\.com$"));
+    assertTrue(expression.evaluate(resolver));
+    assertEquals("matches(uri, \"^https?://w{3}\\.datadoghq\\.com$\")", print(expression));
+  }
 }

dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/StartsWithExpressionTest.java

@@ -9,10 +9,13 @@
 import com.datadog.debugger.el.values.StringValue;
 import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver;
 import datadog.trace.bootstrap.debugger.el.Values;
+import java.net.URI;
 import org.junit.jupiter.api.Test;
 
 class StartsWithExpressionTest {
   private final ValueReferenceResolver resolver = RefResolverHelper.createResolver(this);
+  // used to ref lookup
+  URI uri = URI.create("https://www.datadoghq.com");
 
   @Test
   void nullExpression() {
@@ -44,4 +47,12 @@ void stringExpression() {
     assertFalse(expression.evaluate(resolver));
     assertEquals("startsWith(\"abc\", \"bc\")", print(expression));
   }
+
+  @Test
+  void stringPrimitives() {
+    StartsWithExpression expression =
+        new StartsWithExpression(DSL.ref("uri"), new StringValue("https"));
+    assertTrue(expression.evaluate(resolver));
+    assertEquals("startsWith(uri, \"https\")", print(expression));
+  }
 }

dd-java-agent/agent-debugger/debugger-el/src/test/java/com/datadog/debugger/el/expressions/SubStringExpressionTest.java

@@ -3,31 +3,40 @@
 import static com.datadog.debugger.el.PrettyPrintVisitor.print;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.datadog.debugger.el.DSL;
 import com.datadog.debugger.el.EvaluationException;
 import com.datadog.debugger.el.RefResolverHelper;
 import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver;
 import datadog.trace.bootstrap.debugger.el.Values;
+import java.net.URI;
 import org.junit.jupiter.api.Test;
 
 public class SubStringExpressionTest {
   private final ValueReferenceResolver resolver = RefResolverHelper.createResolver(this);
+  // used to ref lookup
+  URI uri = URI.create("https://www.datadoghq.com");
+  Object nullValue = null;
 
   @Test
   void nullExpression() {
-    SubStringExpression expression = new SubStringExpression(null, 0, 0);
-    assertTrue(expression.evaluate(resolver).isUndefined());
-    assertEquals("substring(null, 0, 0)", print(expression));
+    SubStringExpression expression1 = new SubStringExpression(null, 0, 0);
+    EvaluationException evaluationException =
+        assertThrows(EvaluationException.class, () -> expression1.evaluate(resolver));
+    assertEquals("substring(null, 0, 0)", evaluationException.getExpr());
+    SubStringExpression expression2 = new SubStringExpression(DSL.ref("nullValue"), 0, 0);
+    evaluationException =
+        assertThrows(EvaluationException.class, () -> expression2.evaluate(resolver));
+    assertEquals("substring(nullValue, 0, 0)", evaluationException.getExpr());
   }
 
   @Test
   void undefinedExpression() {
     SubStringExpression expression =
         new SubStringExpression(DSL.value(Values.UNDEFINED_OBJECT), 0, 0);
-    assertTrue(expression.evaluate(resolver).isUndefined());
-    assertEquals("substring(UNDEFINED, 0, 0)", print(expression));
+    EvaluationException evaluationException =
+        assertThrows(EvaluationException.class, () -> expression.evaluate(resolver));
+    assertEquals("substring(UNDEFINED, 0, 0)", evaluationException.getExpr());
   }
 
   @Test
@@ -44,4 +53,11 @@ void stringOutOfBoundsExpression() {
         assertThrows(EvaluationException.class, () -> expression.evaluate(resolver));
     assertEquals("substring(\"abc\", 0, 10)", evaluationException.getExpr());
   }
+
+  @Test
+  void stringPrimitives() {
+    SubStringExpression expression = new SubStringExpression(DSL.ref("uri"), 0, 5);
+    assertEquals("https", expression.evaluate(resolver).getValue());
+    assertEquals("substring(uri, 0, 5)", print(expression));
+  }
 }

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/DebuggerSink.java

@@ -23,6 +23,11 @@ public class DebuggerSink {
   private static final long LOW_RATE_INITIAL_FLUSH_INTERVAL = 1000;
   static final long LOW_RATE_STEP_SIZE = 200;
   private static final String PREFIX = "debugger.sink.";
+  private static final String DROPPED_REQ_METRIC = PREFIX + "dropped.requests";
+  private static final String UPLOAD_REMAINING_CAP_METRIC =
+      PREFIX + "upload.queue.remaining.capacity";
+  private static final String CURRENT_FLUSH_INTERVAL_METRIC = PREFIX + "current.flush.interval";
+  private static final String SKIP_METRIC = PREFIX + "skip";
 
   private final ProbeStatusSink probeStatusSink;
   private final SnapshotSink snapshotSink;
@@ -109,7 +114,7 @@ public SymbolSink getSymbolSink() {
   public void addSnapshot(Snapshot snapshot) {
     boolean added = snapshotSink.addLowRate(snapshot);
     if (!added) {
-      debuggerMetrics.count(PREFIX + "dropped.requests", 1);
+      debuggerMetrics.count(DROPPED_REQ_METRIC, 1);
     } else {
       probeStatusSink.addEmitting(snapshot.getProbe().getProbeId());
     }
@@ -120,7 +125,7 @@ public void addHighRateSnapshot(Snapshot snapshot) {
     if (!added) {
       long dropped = highRateDropped.incrementAndGet();
       if (dropped % 100 == 0) {
-        debuggerMetrics.count(PREFIX + "dropped.requests", 100);
+        debuggerMetrics.count(DROPPED_REQ_METRIC, 100);
       }
     } else {
       probeStatusSink.addEmitting(snapshot.getProbe().getProbeId());
@@ -151,9 +156,8 @@ void lowRateFlush(DebuggerSink ignored) {
   }
 
   private void reconsiderLowRateFlushInterval(DebuggerSink debuggerSink) {
-    debuggerMetrics.histogram(
-        PREFIX + "upload.queue.remaining.capacity", snapshotSink.remainingCapacity());
-    debuggerMetrics.histogram(PREFIX + "current.flush.interval", currentLowRateFlushInterval);
+    debuggerMetrics.histogram(UPLOAD_REMAINING_CAP_METRIC, snapshotSink.remainingCapacity());
+    debuggerMetrics.histogram(CURRENT_FLUSH_INTERVAL_METRIC, currentLowRateFlushInterval);
     doReconsiderLowRateFlushInterval();
   }
 
@@ -225,7 +229,7 @@ private void reportError(ProbeId probeId, DiagnosticMessage msg) {
 
   /** Notifies the snapshot was skipped for one of the SkipCause reason */
   public void skipSnapshot(String probeId, SkipCause cause) {
-    debuggerMetrics.incrementCounter(PREFIX + "skip", cause.tag(), "probe_id:" + probeId);
+    debuggerMetrics.incrementCounter(SKIP_METRIC, cause.tag(), "probe_id:" + probeId);
   }
 
   long getCurrentLowRateFlushInterval() {

dd-java-agent/agent-iast/build.gradle

@@ -112,7 +112,7 @@ spotless {
 }
 
 jmh {
-  jmhVersion = '1.28'
+  jmhVersion = libs.versions.jmh.get()
   duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
 }