Merge branch 'master' into mhlidd/pending_traces

Author: mhlidd

.circleci/collect_results.sh

@@ -4,7 +4,7 @@
 # This folder will be saved by circleci and available after test runs.
 
 set -e
-#Enable '**' support
+# Enable '**' support
 shopt -s globstar
 
 TEST_RESULTS_DIR=results
@@ -19,13 +19,36 @@ if [[ ${#TEST_RESULT_DIRS[@]} -eq 0 ]]; then
   exit 0
 fi
 
+function get_source_file () {
+  file_path="${RESULT_XML_FILE%%"/build"*}"
+  file_path="${file_path/#"$WORKSPACE_DIR"\//}/src"
+  if ! [[ $RESULT_XML_FILE == *"#"* ]]; then
+    class="${RESULT_XML_FILE%.xml}"
+    class="${class##*"TEST-"}"
+    class="${class##*"."}"
+    common_root=$(grep -rl "class $class" "$file_path" | head -n 1)
+    while IFS= read -r line; do
+      while [[ $line != "$common_root"* ]]; do
+        common_root=$(dirname "$common_root")
+        if [[ "$common_root" == "$common_root/.." ]]; then
+          break
+        fi
+      done
+    done < <(grep -rl "class $class" "$file_path")
+    file_path="$common_root"
+  fi
+}
+
 echo "Saving test results:"
 while IFS= read -r -d '' RESULT_XML_FILE
 do
   echo -n "- $RESULT_XML_FILE"
   AGGREGATED_FILE_NAME=$(echo "$RESULT_XML_FILE" | rev | cut -d "/" -f 1,2,5 | rev | tr "/" "_")
   echo -n " as $AGGREGATED_FILE_NAME"
   cp "$RESULT_XML_FILE" "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME"
+  # Insert file attribute to testcase XML nodes
+  get_source_file
+  sed -i "/<testcase/ s|\(time=\"[^\"]*\"\)|\1 file=\"$file_path\"|g" "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME"
   # Replace Java Object hashCode by marker in testcase XML nodes to get stable test names
   sed -i '/<testcase/ s/@[0-9a-f]\{5,\}/@HASHCODE/g' "$TEST_RESULTS_DIR/$AGGREGATED_FILE_NAME"
   # Replace random port numbers by marker in testcase XML nodes to get stable test names

.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 67fe30ac7504997685859d31feae1782f3527f39
+default_system_tests_commit: &default_system_tests_commit 8b05076e897fe62206d7704f2e8e650ed83ebd1f
 
 parameters:
   nightly:
@@ -273,6 +273,12 @@ commands:
             git fetch origin << parameters.systemTestsCommit >>
             git reset --hard FETCH_HEAD
 
+      - run:
+          name: Install dependencies
+          command: |
+            sudo apt-get update
+            sudo apt-get install -y python3.12-venv
+
 jobs:
   build:
     <<: *defaults
@@ -416,6 +422,7 @@ jobs:
             -PgitBaseRef=origin/{{ pr_base_ref }}
 {% endif %}
             -PrunBuildSrcTests
+            -PskipSpotless
             -PtaskPartitionCount=${CIRCLE_NODE_TOTAL} -PtaskPartition=${CIRCLE_NODE_INDEX}
             << pipeline.parameters.gradle_flags >>
             --max-workers=8
@@ -1101,12 +1108,20 @@ build_test_jobs: &build_test_jobs
       gradleTarget: ":profilingCheck"
       cacheType: profiling
 
+  - check:
+      requires:
+        - ok_to_test
+      name: check_debugger
+      gradleTarget: ":debuggerCheck"
+      cacheType: base
+
   - fan_in:
       requires:
         - check_base
         - check_inst
         - check_smoke
         - check_profiling
+        - check_debugger
       name: check
       stage: check
 

.github/CODEOWNERS

@@ -29,6 +29,7 @@ dd-java-agent/instrumentation/testng/      @DataDog/ci-app-libraries-java
 dd-java-agent/instrumentation/gradle-3.0/  @DataDog/ci-app-libraries-java
 dd-java-agent/instrumentation/gradle-8.3/  @DataDog/ci-app-libraries-java
 dd-java-agent/instrumentation/maven-3.2.1/ @DataDog/ci-app-libraries-java
+dd-java-agent/instrumentation/weaver/      @DataDog/ci-app-libraries-java
 dd-smoke-tests/gradle/                     @DataDog/ci-app-libraries-java
 dd-smoke-tests/maven/                      @DataDog/ci-app-libraries-java
 **/civisibility/                           @DataDog/ci-app-libraries-java

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,60 @@
+name: "Bug Report (Low Priority)"
+description: "Create a public Bug Report. Note that these may not be addressed as it depeonds on capacity and that looking up account information will be difficult."
+labels: "type: bug"
+body:
+  - type: input
+    attributes:
+      label: Tracer Version(s)
+      description: "Version(s) of the tracer affected by this bug"
+      placeholder: "1.44.0"
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Java Version(s)
+      description: "Version(s) of Java (`java --version`) that you've encountered this bug with"
+      placeholder: 21.0.4
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: JVM Vendor
+      description: "Which JVM vendor does your application use"
+      options:
+        - Oracle JDK
+        - Alibaba Dragonwell
+        - Amazon Corretto
+        - Azul Zing / Zulu
+        - BellSoft Liberica JDK
+        - Eclipse Adoptium / Temurin
+        - Eclipse OpenJ9
+        - IBM SDK / Semeru
+        - Oracle GraalVM
+        - RedHat JDK
+        - SapMachine
+        - Other (please specify in comments)
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Bug Report
+      description: Please add a clear and concise description of the bug here
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: What is the expected behavior
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Reproduction Code
+      description: Please add code here to help us reproduce the problem
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
-  - name: Bug Report
+  - name: Bug Report (High Priority)
     url: https://help.datadoghq.com/hc/en-us/requests/new?tf_1260824651490=pt_product_type:apm&tf_1900004146284=pt_apm_language:java
-    about: This option creates an expedited Bug Report via the helpdesk (no login required). This will allow us to look up your account and allows you to provide additional information in private.
-  - name: Feature Request
+    about: Create an expedited Bug Report via the helpdesk (no login required). This will allow us to look up your account and allows you to provide additional information in private.
+  - name: Feature Request (High Priority)
     url: https://help.datadoghq.com/hc/en-us/requests/new?tf_1260824651490=pt_product_type:apm&tf_1900004146284=pt_apm_language:java&tf_1260825272270=pt_apm_category_feature_request
-    about: This option creates an expedited Feature Request via the helpdesk (no login required). This helps with prioritization and allows you to provide additional information in private.
+    about: Create an expedited Feature Request via the helpdesk (no login required). This helps with prioritization and allows you to provide additional information in private.

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,49 @@
+name: Feature Request (Low Priority)
+description: Create a public Feature Request. Note that these may not be addressed as it depeonds on capacity and that looking up account information will be difficult.
+labels: "type: feature request"
+body:
+  - type: input
+    attributes:
+      label: Library Name
+      description: "If your feature request is to add instrumentation support for a library please provide the name here"
+      placeholder: "spring-boot"
+    validations:
+      required: false
+
+  - type: input
+    attributes:
+      label: Library Version(s)
+      description: "If your feature request is to add instrumentation support for a library please provide the version you use"
+      placeholder: "1.2"
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Describe the feature you'd like
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem?
+      description: |
+        Please add a clear and concise description of your problem.
+        E.g. I'm unable to instrument my database queries...
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here
+    validations:
+      required: false

.github/workflows/README.md

@@ -28,15 +28,6 @@ _Action:_ Check the pull request complies with [the contribution guidelines](htt
 
 _Recovery:_ Manually verify the guideline compliance.
 
-### create-next-milestone [🔗](create-next-milestone.yaml)
-
-_Trigger:_ When closing a milestone.
-
-_Action:_ Create a new milestone by incrementing minor version.
-
-_Comment:_ Disabled as also covered by increment-milestone-on-tag.
-This will be removed after some testing.  
-
 ### draft-release-notes-on-tag [🔗](draft-release-notes-on-tag.yaml)
 
 _Trigger:_ When creating a tag, or manually (providing a tag)
@@ -62,6 +53,16 @@ _Recovery:_ Manually [close the related milestone and create a new one](https://
 
 _Notes:_ This action will not apply to release candidate versions using `-RC` tags.
 
+### update-docker-build-image [🔗](update-docker-build-image.yaml)
+
+_Trigger:_ Quarterly released, loosely [a day after the new image tag is created](https://github.com/DataDog/dd-trace-java-docker-build/blob/master/.github/workflows/docker-tag.yml).
+
+_Action:_ Update the Docker build image used in CircleCI and GitLab CI with the latest tag.
+
+_Recovery:_ Download artifacts and upload them manually to the related _download release_.
+
+_Notes:_  Manually trigger the action again given the desired image tag as input.
+
 ### update-download-releases [🔗](update-download-releases.yaml)
 
 _Trigger:_ When a release is published.
@@ -103,7 +104,7 @@ _Recovery:_ Manually trigger the action again.
 
 ## Code Quality and Security
 
-### analyze-changes [🔗](analyze-changes-with-github-codeql.yaml)
+### analyze-changes [🔗](analyze-changes.yaml)
 
 _Trigger:_ When pushing commits to `master` or any pull request targeting `master`.
 
@@ -121,7 +122,7 @@ _Trigger:_ When creating a PR commits to `master` or a `release/*` branch with a
 
 _Action:_ Notify the PR author through comments that about the Git Submodule update.
 
-### update-gradle-dependencies [🔗](update-gradle-dependencies.yml)
+### update-gradle-dependencies [🔗](update-gradle-dependencies.yaml)
 
 _Trigger:_ Every week or manually.
 

.github/workflows/analyze-changes.yaml

@@ -7,6 +7,11 @@ on:
     # The branches below must be a subset of the branches above
     branches: [ master ]
 
+# Cancel long-running jobs when a new commit is pushed
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   datadog-static-analyzer:
     name: Analyze changes with DataDog Static Analyzer
@@ -46,7 +51,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: |
             ~/.gradle/caches
@@ -108,7 +113,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: |
             ~/.gradle/caches

.github/workflows/check-pull-requests.yaml

@@ -5,6 +5,9 @@ on:
     branches:
     - master
     - release/v*
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   check_pull_requests:
     name: Check pull requests