Merge branch 'master' into mhlidd/migrate_http_server_instrumentations

Author: mhlidd

.circleci/config.continue.yml.j2

@@ -36,7 +36,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation
 debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core"
 profiling_modules: &profiling_modules "dd-java-agent/agent-profiling"
 
-default_system_tests_commit: &default_system_tests_commit b0b2e1f212f8c483b52aa3adc6ffd4132b1ba9b8
+default_system_tests_commit: &default_system_tests_commit 9049791de92dcb72b104e99a80f6f9914c1b96fb
 
 parameters:
   nightly:

.github/workflows/check-ci-pipelines.yml

@@ -17,11 +17,13 @@ permissions:
 
 jobs:
   check-ci-pipelines:
-    name: Check CI Pipelines
+    # Do not change this name, it must be equal to job id
+    # https://github.com/DataDog/ensure-ci-success/blob/main/docs/limitations.md#do-not-set-a-name-to-the-job-shipping-ensure-ci-success
+    name: check-ci-pipelines  
     runs-on: ubuntu-latest
     steps:
       - name: Run Ensure CI Success
-        uses: DataDog/ensure-ci-success@f40e6ffd8e60280d478b9b92209aaa30d3d56895
+        uses: DataDog/ensure-ci-success@727e7fe39ae2e1ce7ea336ec85a7369ab0731754
         with:
           initial-delay-seconds: "1000"
           max-retries: "60"

.github/workflows/update-docker-build-image.yaml

@@ -55,7 +55,7 @@ jobs:
           sed -i 's|DOCKER_IMAGE_VERSION=.*|DOCKER_IMAGE_VERSION="${{ steps.define-tag.outputs.tag }}"|' .circleci/render_config.py
       - name: Update the Docker build image in GitLab CI config
         run: |
-          sed -i 's|image: ghcr.io/datadog/dd-trace-java-docker-build:.*|image: ghcr.io/datadog/dd-trace-java-docker-build:${{ steps.define-tag.outputs.tag }}-base|' .gitlab-ci.yml
+          sed -i 's|JAVA_BUILD_IMAGE_VERSION:.*|JAVA_BUILD_IMAGE_VERSION:"${{ steps.define-tag.outputs.tag }}"|' .gitlab-ci.yml
       - name: Commit and push changes
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

components/json/src/main/java/datadog/json/JsonMapper.java

@@ -1,6 +1,12 @@
 package datadog.json;
 
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 /** Utility class for simple Java structure mapping into JSON strings. */
@@ -103,4 +109,47 @@ public static String toJson(String[] items) {
       return writer.toString();
     }
   }
+
+  /**
+   * Parses a JSON string into a {@link Map}.
+   *
+   * @param json The JSON string to parse.
+   * @return A {@link Map} containing the parsed JSON object's key-value pairs.
+   * @throws IOException If the JSON is invalid or a reader error occurs.
+   */
+  @SuppressWarnings("unchecked")
+  public static Map<String, Object> fromJsonToMap(String json) throws IOException {
+    if (json == null || json.isEmpty() || "{}".equals(json) || "null".equals(json)) {
+      return emptyMap();
+    }
+    try (JsonReader reader = new JsonReader(json)) {
+      Object value = reader.nextValue();
+      if (!(value instanceof Map)) {
+        throw new IOException("Expected JSON object but was " + value.getClass().getSimpleName());
+      }
+      return (Map<String, Object>) value;
+    }
+  }
+
+  /**
+   * Parses a JSON string array into a {@link List<String>}.
+   *
+   * @param json The JSON string array to parse.
+   * @return A {@link List<String>} containing the parsed JSON strings.
+   * @throws IOException If the JSON is invalid or a reader error occurs.
+   */
+  public static List<String> fromJsonToList(String json) throws IOException {
+    if (json == null || json.isEmpty() || "[]".equals(json) || "null".equals(json)) {
+      return emptyList();
+    }
+    try (JsonReader reader = new JsonReader(json)) {
+      List<String> list = new ArrayList<>();
+      reader.beginArray();
+      while (reader.hasNext()) {
+        list.add(reader.nextString());
+      }
+      reader.endArray();
+      return list;
+    }
+  }
 }