Merge branch 'master' into ygree/snakeyaml-engine-migration

Author: ygree

.github/workflows/analyze-changes.yaml

@@ -40,7 +40,7 @@ jobs:
             ${{ runner.os }}-gradle-
         
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+        uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
         with:
           languages: 'java'
           build-mode: 'manual'
@@ -57,7 +57,7 @@ jobs:
             --build-cache --parallel --stacktrace --no-daemon --max-workers=4
 
       - name: Perform CodeQL Analysis and upload results to GitHub Security tab
-        uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+        uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
 
   trivy:
     name: Analyze changes with Trivy
@@ -120,7 +120,7 @@ jobs:
           TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
         if: always()
         with:
           sarif_file: 'trivy-results.sarif'

.gitlab-ci.yml

@@ -414,6 +414,8 @@ muzzle-dep-report:
     - .circleci/collect_results.sh
     - .circleci/upload_ciapp.sh tests $testJvm
     - gitlab_section_end "collect-reports"
+    - URL_ENCODED_JOB_NAME=$(jq -rn --arg x "$CI_JOB_NAME" '$x|@uri')
+    - echo -e "${TEXT_BOLD}${TEXT_YELLOW}See test results in Datadog:${TEXT_CLEAR} https://app.datadoghq.com/ci/test/runs?query=test_level%3Atest%20%40test.service%3Add-trace-java%20%40ci.pipeline.id%3A${CI_PIPELINE_ID}%20%40ci.job.name%3A%22${URL_ENCODED_JOB_NAME}%22"
   artifacts:
     when: always
     paths:

.gitlab/gitlab-utils.sh

@@ -15,3 +15,13 @@ function gitlab_section_end () {
 
   echo -e "section_end:`date +%s`:${section_title}\r\e[0K"
 }
+
+# A subset of ansi color/formatting codes https://misc.flogisoft.com/bash/tip_colors_and_formatting
+export TEXT_RED="\e[31m"
+export TEXT_GREEN="\e[32m"
+export TEXT_YELLOW="\e[33m"
+export TEXT_BLUE="\e[34m"
+export TEXT_MAGENTA="\e[35m"
+export TEXT_CYAN="\e[36m"
+export TEXT_CLEAR="\e[0m"
+export TEXT_BOLD="\e[1m"

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<T extends Expression> {

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"}}}

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"}}
         ]
       }
     ]

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerAgent.java

@@ -212,7 +212,8 @@ public static void startExceptionReplay() {
             configurationUpdater,
             classNameFilter,
             Duration.ofSeconds(config.getDebuggerExceptionCaptureInterval()),
-            config.getDebuggerMaxExceptionPerSecond());
+            config.getDebuggerMaxExceptionPerSecond(),
+            config.getDebuggerExceptionMaxCapturedFrames());
     DebuggerContext.initExceptionDebugger(exceptionDebugger);
     LOGGER.info("Started Exception Replay");
   }

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/DefaultExceptionDebugger.java

@@ -38,28 +38,33 @@ public class DefaultExceptionDebugger implements DebuggerContext.ExceptionDebugg
   private final ConfigurationUpdater configurationUpdater;
   private final ClassNameFilter classNameFiltering;
   private final CircuitBreaker circuitBreaker;
+  private final int maxCapturedFrames;
 
   public DefaultExceptionDebugger(
       ConfigurationUpdater configurationUpdater,
       ClassNameFilter classNameFiltering,
       Duration captureInterval,
-      int maxExceptionPerSecond) {
+      int maxExceptionPerSecond,
+      int maxCapturedFrames) {
     this(
         new ExceptionProbeManager(classNameFiltering, captureInterval),
         configurationUpdater,
         classNameFiltering,
-        maxExceptionPerSecond);
+        maxExceptionPerSecond,
+        maxCapturedFrames);
   }
 
   DefaultExceptionDebugger(
       ExceptionProbeManager exceptionProbeManager,
       ConfigurationUpdater configurationUpdater,
       ClassNameFilter classNameFiltering,
-      int maxExceptionPerSecond) {
+      int maxExceptionPerSecond,
+      int maxCapturedFrames) {
     this.exceptionProbeManager = exceptionProbeManager;
     this.configurationUpdater = configurationUpdater;
     this.classNameFiltering = classNameFiltering;
     this.circuitBreaker = new CircuitBreaker(maxExceptionPerSecond, Duration.ofSeconds(1));
+    this.maxCapturedFrames = maxCapturedFrames;
   }
 
   @Override
@@ -91,7 +96,8 @@ public void handleException(Throwable t, AgentSpan span) {
         LOGGER.debug("Unable to find state for throwable: {}", innerMostException.toString());
         return;
       }
-      processSnapshotsAndSetTags(t, span, state, chainedExceptionsList, fingerprint);
+      processSnapshotsAndSetTags(
+          t, span, state, chainedExceptionsList, fingerprint, maxCapturedFrames);
       exceptionProbeManager.updateLastCapture(fingerprint);
     } else {
       // climb up the exception chain to find the first exception that has instrumented frames
@@ -128,7 +134,8 @@ private static void processSnapshotsAndSetTags(
       AgentSpan span,
       ThrowableState state,
       List<Throwable> chainedExceptions,
-      String fingerprint) {
+      String fingerprint,
+      int maxCapturedFrames) {
     if (span.getTag(DD_DEBUG_ERROR_EXCEPTION_ID) != null) {
       LOGGER.debug("Clear previous frame tags");
       // already set for this span, clear the frame tags
@@ -142,7 +149,8 @@ private static void processSnapshotsAndSetTags(
     }
     boolean snapshotAssigned = false;
     List<Snapshot> snapshots = state.getSnapshots();
-    for (int i = 0; i < snapshots.size(); i++) {
+    int maxSnapshotSize = Math.min(snapshots.size(), maxCapturedFrames);
+    for (int i = 0; i < maxSnapshotSize; i++) {
       Snapshot snapshot = snapshots.get(i);
       Throwable currentEx = chainedExceptions.get(snapshot.getChainedExceptionIdx());
       int[] mapping = createThrowableMapping(currentEx, t);

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/DefaultExceptionDebuggerTest.java

@@ -67,7 +67,7 @@ public void setUp() {
             new HashSet<>(singletonList("com.datadog.debugger.exception.ThirdPartyCode")));
     exceptionDebugger =
         new DefaultExceptionDebugger(
-            configurationUpdater, classNameFiltering, Duration.ofHours(1), 100);
+            configurationUpdater, classNameFiltering, Duration.ofHours(1), 100, 3);
     listener = new TestSnapshotListener(createConfig(), mock(ProbeStatusSink.class));
     DebuggerAgentHelper.injectSink(listener);
   }
@@ -275,7 +275,7 @@ public void nestedExceptionFullThirdParty() {
   public void filteringOutErrors() {
     ExceptionProbeManager manager = mock(ExceptionProbeManager.class);
     exceptionDebugger =
-        new DefaultExceptionDebugger(manager, configurationUpdater, classNameFiltering, 100);
+        new DefaultExceptionDebugger(manager, configurationUpdater, classNameFiltering, 100, 3);
     exceptionDebugger.handleException(new AssertionError("test"), mock(AgentSpan.class));
     verify(manager, times(0)).isAlreadyInstrumented(any());
   }

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/ExceptionProbeInstrumentationTest.java

@@ -17,7 +17,6 @@
 import com.datadog.debugger.agent.ClassesToRetransformFinder;
 import com.datadog.debugger.agent.Configuration;
 import com.datadog.debugger.agent.ConfigurationUpdater;
-import com.datadog.debugger.agent.DebuggerAgent;
 import com.datadog.debugger.agent.DebuggerAgentHelper;
 import com.datadog.debugger.agent.DebuggerTransformer;
 import com.datadog.debugger.agent.JsonSnapshotSerializer;
@@ -99,7 +98,10 @@ public void before() {
     ProbeRateLimiter.setSamplerSupplier(rate -> rate < 101 ? probeSampler : globalSampler);
     ProbeRateLimiter.setGlobalSnapshotRate(1000);
     // to activate the call to DebuggerContext.handleException
-    DebuggerAgent.startExceptionReplay();
+    DebuggerContext.ProductConfigUpdater mockProductConfigUpdater =
+        mock(DebuggerContext.ProductConfigUpdater.class);
+    when(mockProductConfigUpdater.isExceptionReplayEnabled()).thenReturn(true);
+    DebuggerContext.initProductConfigUpdater(mockProductConfigUpdater);
     setFieldInConfig(Config.get(), "debuggerExceptionEnabled", true);
     setFieldInConfig(Config.get(), "dynamicInstrumentationClassFileDumpEnabled", true);
   }
@@ -224,7 +226,8 @@ public void recursive() throws Exception {
     callMethodFiboException(testClass); // generate snapshots
     Map<String, Set<String>> probeIdsByMethodName =
         extractProbeIdsByMethodName(exceptionProbeManager);
-    assertEquals(10, listener.snapshots.size());
+    // limited by Config::getDebuggerExceptionMaxCapturedFrames
+    assertEquals(3, listener.snapshots.size());
     Snapshot snapshot0 = listener.snapshots.get(0);
     assertProbeId(probeIdsByMethodName, "fiboException", snapshot0.getProbe().getId());
     assertEquals(
@@ -234,8 +237,6 @@ public void recursive() throws Exception {
     assertEquals("2", getValue(snapshot1.getCaptures().getReturn().getArguments().get("n")));
     Snapshot snapshot2 = listener.snapshots.get(2);
     assertEquals("3", getValue(snapshot2.getCaptures().getReturn().getArguments().get("n")));
-    Snapshot snapshot9 = listener.snapshots.get(9);
-    assertEquals("10", getValue(snapshot9.getCaptures().getReturn().getArguments().get("n")));
     // sampling happens only once ont he first snapshot then forced for coordinated sampling
     assertEquals(1, probeSampler.getCallCount());
     assertEquals(1, globalSampler.getCallCount());
@@ -382,7 +383,7 @@ private TestSnapshotListener setupExceptionDebugging(
     DebuggerContext.initValueSerializer(new JsonSnapshotSerializer());
     DefaultExceptionDebugger exceptionDebugger =
         new DefaultExceptionDebugger(
-            exceptionProbeManager, configurationUpdater, classNameFiltering, 100);
+            exceptionProbeManager, configurationUpdater, classNameFiltering, 100, 3);
     DebuggerContext.initExceptionDebugger(exceptionDebugger);
     configurationUpdater.accept(REMOTE_CONFIG, definitions);
     return listener;