Merge branch 'master' into gary/llmobs-sdk-merge

Author: gary-huang

.circleci/collect_reports.sh

@@ -35,12 +35,12 @@ done
 
 mkdir -p $REPORTS_DIR >/dev/null 2>&1
 
-cp /tmp/hs_err_pid*.log $REPORTS_DIR || true
-cp /tmp/java_pid*.hprof $REPORTS_DIR || true
-cp /tmp/javacore.* $REPORTS_DIR || true
-cp /tmp/*.trc $REPORTS_DIR || true
-cp /tmp/*.dmp $REPORTS_DIR || true
-cp /tmp/dd-profiler/*.jfr $REPORTS_DIR || true
+cp /tmp/hs_err_pid*.log $REPORTS_DIR 2>/dev/null || true
+cp /tmp/java_pid*.hprof $REPORTS_DIR 2>/dev/null || true
+cp /tmp/javacore.* $REPORTS_DIR 2>/dev/null || true
+cp /tmp/*.trc $REPORTS_DIR 2>/dev/null || true
+cp /tmp/*.dmp $REPORTS_DIR 2>/dev/null || true
+cp /tmp/dd-profiler/*.jfr $REPORTS_DIR 2>/dev/null || true
 
 function process_reports () {
     project_to_save=$1
@@ -59,9 +59,9 @@ function process_reports () {
     else
       echo "copying reports for $project_to_save"
       mkdir -p $report_path
-      cp -r workspace/$project_to_save/build/reports/* $report_path/ || true
-      cp workspace/$project_to_save/build/hs_err_pid*.log $report_path/ || true
-      cp workspace/$project_to_save/build/javacore*.txt $report_path/ || true
+      cp -r workspace/$project_to_save/build/reports/* $report_path/ 2>/dev/null || true
+      cp workspace/$project_to_save/build/hs_err_pid*.log $report_path/ 2>/dev/null || true
+      cp workspace/$project_to_save/build/javacore*.txt $report_path/ 2>/dev/null || true
     fi
 }
 
@@ -73,4 +73,4 @@ for report_path in workspace/**/build/reports; do
     process_reports $report_path
 done
 
-tar -cvzf reports.tar $REPORTS_DIR
+tar -czf reports.tar $REPORTS_DIR

.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 761b9e7a82ffb136c4653a4d1623d120d67b005b
+default_system_tests_commit: &default_system_tests_commit 9049791de92dcb72b104e99a80f6f9914c1b96fb
 
 parameters:
   nightly:
@@ -744,79 +744,6 @@ jobs:
           path: ./reports
 
       - display_memory_usage
-  muzzle-dep-report:
-    <<: *defaults
-    resource_class: medium
-    steps:
-      - setup_code
-      - skip_unless_matching_files_changed:
-          pattern: "dd-java-agent/instrumentation"
-      - restore_dependency_cache:
-          cacheType: inst
-      - restore_build_cache:
-          cacheType: inst
-      - run:
-          name: Generate muzzle dep report
-          command: >-
-            SKIP_BUILDSCAN="true"
-            GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
-            ./gradlew generateMuzzleReport muzzleInstrumentationReport
-      - run:
-          name: Collect Reports
-          command: .circleci/collect_muzzle_deps.sh
-      - store_artifacts:
-          path: ./reports
-
-  muzzle:
-    <<: *defaults
-    resource_class: medium+
-    parallelism: 4
-    steps:
-      - setup_code
-
-      - skip_unless_matching_files_changed:
-          pattern: "dd-java-agent/instrumentation"
-
-      # We are not running with a separate cache of all muzzle artifacts here because it gets very big and
-      # ends up taking more time restoring/saving than the actual increase in time it takes just
-      # downloading the artifacts each time.
-      #
-      # Let's at least restore the build cache to have something to start from.
-      - restore_dependency_cache:
-          cacheType: inst
-      - restore_build_cache:
-          cacheType: inst
-
-      - run:
-          name: Gather muzzle tasks
-          command: >-
-            SKIP_BUILDSCAN="true"
-            GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx2G -Xms2G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
-            ./gradlew writeMuzzleTasksToFile
-            << pipeline.parameters.gradle_flags >>
-            --max-workers=3
-
-      - run:
-          name: Verify Muzzle
-          command: >-
-            SKIP_BUILDSCAN="true"
-            GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx3G -Xms2G -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
-            ./gradlew `circleci tests split --split-by=timings workspace/build/muzzleTasks | xargs`
-            << pipeline.parameters.gradle_flags >>
-            --max-workers=4
-
-      - run:
-          name: Collect Reports
-          when: on_fail
-          command: .circleci/collect_reports.sh
-
-      - store_artifacts:
-          path: ./reports
-
-      - store_test_results:
-          path: workspace/build/muzzle-test-results
-
-      - display_memory_usage
 
   system-tests:
     machine:
@@ -850,8 +777,6 @@ jobs:
             (
             echo "
             DEFAULT
-            APM_TRACING_E2E
-            APM_TRACING_E2E_SINGLE_SPAN
             TRACING_CONFIG_NONDEFAULT
             TRACING_CONFIG_NONDEFAULT_2
             TRACING_CONFIG_NONDEFAULT_3
@@ -875,14 +800,8 @@ jobs:
               "
             fi
             ) | circleci tests split > scenarios.list
+            export DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY
             for scenario in $(<scenarios.list); do
-              if [[ $scenario =~ .*_E2E.* ]]; then
-                export DD_SITE=datadoghq.com
-                export DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY
-                export DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY
-              else
-                export DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY
-              fi
               echo "Running scenario $scenario"
               ./run.sh $scenario
             done
@@ -922,27 +841,11 @@ jobs:
 
       - run:
           name: Run APM Integrations tests
-          environment:
-            - AWS_ACCESS_KEY_ID: $SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID
-            - AWS_SECRET_ACCESS_KEY: $SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY
-            - AWS_REGION: us-east-1
-            - AWS_DEFAULT_REGION: us-east-1  # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION`
           # Stop the job after 5m to avoid excessive overhead. Will need adjustment as more tests are added.
           no_output_timeout: 5m
           command: |
             cd system-tests
-            DD_SITE=datadoghq.com DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY ./run.sh INTEGRATIONS
-
-      - run:
-          name: Run IDM Crossed Tracing Libraries propagation tests for messaging
-          environment:
-            - AWS_ACCESS_KEY_ID: $SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID
-            - AWS_SECRET_ACCESS_KEY: $SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY
-            - AWS_REGION: us-east-1
-            - AWS_DEFAULT_REGION: us-east-1  # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION`
-          command: |
-            cd system-tests
-            DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh CROSSED_TRACING_LIBRARIES
+            DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh INTEGRATIONS
 
       - store_test_results:
           path: system-tests/logs_integrations
@@ -975,7 +878,7 @@ jobs:
           no_output_timeout: 5m
           command: |
             cd system-tests
-            export DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY
+            export DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY
             ./run.sh DEBUGGER_SCENARIOS
 
       - run:
@@ -1361,6 +1264,24 @@ build_test_jobs: &build_test_jobs
       cacheType: smoke
       testJvm: "semeru8"
 
+  - tests:
+      requires:
+        - ok_to_test
+      name: test_graalvm17_smoke
+      gradleTarget: "stageMainDist :dd-smoke-test:quarkus-native:test"
+      stage: smoke
+      cacheType: smoke
+      testJvm: "graalvm17"
+
+  - tests:
+      requires:
+        - ok_to_test
+      name: test_graalvm21_smoke
+      gradleTarget: "stageMainDist :dd-smoke-test:quarkus-native:test"
+      stage: smoke
+      cacheType: smoke
+      testJvm: "graalvm21"
+
   - tests:
       requires:
         - ok_to_test
@@ -1451,20 +1372,6 @@ build_test_jobs: &build_test_jobs
       requires:
         - ok_to_test
 
-  - muzzle:
-      requires:
-        - ok_to_test
-      filters:
-        branches:
-          ignore:
-            - master
-            - project/*
-            - release/*
-
-  - muzzle-dep-report:
-      requires:
-        - ok_to_test
-
   - system-tests:
       requires:
         - ok_to_test
@@ -1512,7 +1419,6 @@ build_test_jobs: &build_test_jobs
         - "test_{{ jdk }}"
 {% endfor %}
         - test_inst_latest
-        - muzzle
         - profiling
         - debugger
         - system-tests

.circleci/upload_ciapp.sh

@@ -33,10 +33,5 @@ junit_upload() {
         ./results
 }
 
-# Make sure we do not use DATADOG_API_KEY from the environment
-unset DATADOG_API_KEY
-
 # Upload test results to production environment like all other CI jobs
 junit_upload "$DATADOG_API_KEY_PROD"
-# And also upload to staging environment to benefit from the new features not yet released
-junit_upload "$DATADOG_API_KEY_DDSTAGING"

.github/dependabot.yml

@@ -8,7 +8,13 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "monthly"
+      interval: "weekly"
+    labels:
+      - "comp: tooling"
+      - "tag: dependencies"
+      - "tag: no release notes"
+    commit-message:
+      prefix: "chore(ci): "
     groups:
       gh-actions-packages:
         patterns:

.github/workflows/README.md

@@ -110,12 +110,21 @@ _Trigger:_ When pushing commits to `master` or any pull request targeting `maste
 
 _Action:_
 
-* Run [DataDog Static Analysis](https://docs.datadoghq.com/static_analysis/) and upload result to DataDog Code Analysis,
 * Run [GitHub CodeQL](https://codeql.github.com/) action, upload result to GitHub security tab -- do not apply to pull request, only when pushing to `master`,
 * Run [Trivy security scanner](https://github.com/aquasecurity/trivy) on built artifacts and upload result to GitHub security tab and Datadog Code Analysis.
 
 _Notes:_ Results are sent on both production and staging environments.
 
+### check-ci-pipelines [🔗](check-ci-pipelines.yaml)
+
+_Trigger:_ When opening or updating a PR.
+
+_Action:_ This action will check all other continuous integration jobs (Github action, Gitlab, CircleCi), and will fail if any of them fails.
+The purpose of this job is to be required for PR merges, achieving Green CI Policy.
+It got an `ignored` parameters to exclude some jobs if they are temprorary failing.
+
+_Recovery:_ Manually trigger the action on the desired branch.
+
 ### comment-on-submodule-update [🔗](comment-on-submodule-update.yaml)
 
 _Trigger:_ When creating a PR commits to `master` or a `release/*` branch with a Git Submodule update.
@@ -130,6 +139,13 @@ _Action:_ Create a PR updating the Grade dependencies and their locking files.
 
 _Recovery:_ Manually trigger the action again.
 
+### run-system-tests [🔗](run-system-tests.yaml)
+
+_Trigger:_ When pushing commits to `master` or manually.
+
+_Action:_ Build the Java Client Library and runs [the system tests](https://github.com/DataDog/system-tests) against.
+
+_Recovery:_ Manually trigger the action on the desired branch.
 
 ## Maintenance
 

.github/workflows/add-release-to-cloudfoundry.yaml

@@ -43,7 +43,7 @@ jobs:
         run: |
           echo "${{ steps.get-release-version.outputs.VERSION }}: ${{ steps.get-release-url.outputs.URL }}" >> index.yml
       - name: Commit and push changes
-        uses: planetscale/ghcommit-action@9400254a26464337cbe5af17c5f25075134e0089 # v0.2.7
+        uses: planetscale/ghcommit-action@5b20c92facae8dbf8a3836dc65b8503dda378573 # v0.2.13
         with:
           commit_message: "chore: Add version ${{ steps.get-release-version.outputs.VERSION }} to Cloud Foundry"
           repo: ${{ github.repository }}