Merge branch 'main' into chore/debugger-improve-flush-logging

Author: P403n1x87

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,21 +1,15 @@
-## Checklist
-- [ ] PR author has checked that all the criteria below are met
-- The PR description includes an overview of the change
-- The PR description articulates the motivation for the change
-- The change includes tests OR the PR description describes a testing strategy
-- The PR description notes risks associated with the change, if any
-- Newly-added code is easy to change
-- The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
-- The change includes or references documentation updates if necessary
-- Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))
+## Description
 
-## Reviewer Checklist
-- [ ] Reviewer has checked that all the criteria below are met 
-- Title is accurate
-- All changes are related to the pull request's stated goal
-- Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes
-- Testing strategy adequately addresses listed risks
-- Newly-added code is easy to change
-- Release note makes sense to a user of the library
-- If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment
-- Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
+<!-- Provide an overview of the change and motivation for the change -->
+
+## Testing
+
+<!-- Describe your testing strategy or note what tests are included -->
+
+## Risks
+
+<!-- Note any risks associated with this change, or "None" if no risks -->
+
+## Additional Notes
+
+<!-- Any other information that would be helpful for reviewers -->

.github/workflows/build_deploy.yml

@@ -24,15 +24,57 @@ on:
     - cron:  0 2 * * 2-6
 
 jobs:
+  compute_version:
+    name: Compute Library Version
+    runs-on: ubuntu-latest
+    outputs:
+      library_version: ${{ steps.compute-version.outputs.library_version }}
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        # Include all history and tags
+        with:
+          persist-credentials: false
+          fetch-depth: 0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        name: Install Python
+        with:
+          python-version: '3.12'
+      - name: Compute Version
+        id: compute-version
+        run: |
+          pip install "setuptools_scm[toml]>=4"
+
+          # If we are on the main or release branch, strip away the dev version
+          if [[ "$GITHUB_REF_NAME" == "main" || \
+                "$GITHUB_REF_NAME" =~ ^[0-9]+\.[0-9]+$ || \
+                "$GITHUB_REF_NAME" =~ ^[0-9]+\.x$ ]]; then
+            LIBRARY_VERSION=$(setuptools-scm --strip-dev)
+          else
+            # All else, maintain the dev version
+            LIBRARY_VERSION=$(setuptools-scm)
+          fi
+
+          echo "${LIBRARY_VERSION}" | tee version.txt
+          echo "library_version=${LIBRARY_VERSION}" >> $GITHUB_OUTPUT
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: library-version
+          path: version.txt
+
   build_wheels:
+    needs: [ "compute_version" ]
     uses: ./.github/workflows/build_python_3.yml
     with:
       cibw_build: 'cp38* cp39* cp310* cp311* cp312* cp313*'
       cibw_skip: 'cp38-win_arm64 cp39-win_arm64 cp310-win_arm64'
+      library_version: ${{ needs.compute_version.outputs.library_version }}
 
   build_sdist:
+    needs: [ "compute_version" ]
     name: Build source distribution
     runs-on: ubuntu-latest
+    env:
+      SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DDTRACE: ${{ needs.compute_version.outputs.library_version }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         # Include all history and tags

.github/workflows/build_python_3.yml

@@ -12,8 +12,39 @@ on:
       cibw_prerelease_pythons:
         required: false
         type: string
+      library_version:
+        required: false
+        type: string
 
 jobs:
+  compute_version:
+    name: Compute Library Version
+    runs-on: ubuntu-latest
+    outputs:
+      library_version: ${{ steps.compute-version.outputs.library_version }}
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        # Include all history and tags
+        with:
+          persist-credentials: false
+          fetch-depth: 0
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        name: Install Python
+        with:
+          python-version: '3.12'
+      - name: Compute Version
+        id: compute-version
+        run: |
+          if [ -n "${{ inputs.library_version}}" ]; then
+            LIBRARY_VERSION="${{ inputs.library_version}}"
+          else
+            pip install "setuptools_scm[toml]>=4"
+            LIBRARY_VERSION=$(setuptools-scm)
+          fi
+
+          echo "${LIBRARY_VERSION}"
+          echo "library_version=${LIBRARY_VERSION}" >> $GITHUB_OUTPUT
+
   build-wheels-matrix:
     runs-on: ubuntu-latest
     outputs:
@@ -32,26 +63,27 @@ jobs:
         run: |
           MATRIX_INCLUDE=$(
             {
-              cibuildwheel --print-build-identifiers --platform linux --archs x86_64,i686 | jq -cR '{only: ., os: "ubuntu-latest"}' \
-              && cibuildwheel --print-build-identifiers --platform linux --archs aarch64  | jq -cR '{only: ., os: "ubuntu-24.04-arm"}' \
+              cibuildwheel --print-build-identifiers --platform linux --archs x86_64,i686 | jq -cR '{only: ., os: "ubuntu-latest-16-cores"}' \
+              && cibuildwheel --print-build-identifiers --platform linux --archs aarch64  | jq -cR '{only: ., os: "arm-8core-linux"}' \
               && cibuildwheel --print-build-identifiers --platform windows --archs AMD64,x86 | jq -cR '{only: ., os: "windows-latest"}' \
               && cibuildwheel --print-build-identifiers --platform windows --archs ARM64    | jq -cR '{only: ., os: "windows-11-arm"}' \
-              && cibuildwheel --print-build-identifiers --platform macos --archs x86_64 | jq -cR '{only: ., os: "macos-13"}' \
-              && cibuildwheel --print-build-identifiers --platform macos --archs arm64 | jq -cR '{only: ., os: "macos-latest"}'
+              && cibuildwheel --print-build-identifiers --platform macos --archs x86_64 | jq -cR '{only: ., os: "macos-15-large"}' \
+              && cibuildwheel --print-build-identifiers --platform macos --archs arm64 | jq -cR '{only: ., os: "macos-15-xlarge"}'
             } | jq -sc
           )
           echo $MATRIX_INCLUDE
           echo "include=${MATRIX_INCLUDE}" >> $GITHUB_OUTPUT
 
   build:
-    needs: build-wheels-matrix
+    needs: ["compute_version", "build-wheels-matrix" ]
     runs-on: ${{ matrix.os }}
     name: Build ${{ matrix.only }}
     strategy:
       fail-fast: false
       matrix:
         include: ${{ fromJson(needs.build-wheels-matrix.outputs.include) }}
     env:
+      SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DDTRACE: ${{ needs.compute_version.outputs.library_version }}
       CIBW_SKIP: ${{ inputs.cibw_skip }}
       CIBW_PRERELEASE_PYTHONS: ${{ inputs.cibw_prerelease_pythons }}
       CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
@@ -66,11 +98,12 @@ jobs:
           fi
           curl -sSf https://sh.rustup.rs | sh -s -- -y;
         fi
-      CIBW_ENVIRONMENT_LINUX: PATH=$HOME/.cargo/bin:$PATH CMAKE_BUILD_PARALLEL_LEVEL=24 CMAKE_ARGS="-DNATIVE_TESTING=OFF"
+      CIBW_ENVIRONMENT_LINUX: PATH=$HOME/.cargo/bin:$PATH CMAKE_BUILD_PARALLEL_LEVEL=24 CMAKE_ARGS="-DNATIVE_TESTING=OFF" SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DDTRACE=${{ needs.compute_version.outputs.library_version }}
       # SYSTEM_VERSION_COMPAT is a workaround for versioning issue, a.k.a.
       # `platform.mac_ver()` reports incorrect MacOS version at 11.0
       # See: https://stackoverflow.com/a/65402241
-      CIBW_ENVIRONMENT_MACOS: CMAKE_BUILD_PARALLEL_LEVEL=24 SYSTEM_VERSION_COMPAT=0 CMAKE_ARGS="-DNATIVE_TESTING=OFF"
+      CIBW_ENVIRONMENT_MACOS: CMAKE_BUILD_PARALLEL_LEVEL=24 SYSTEM_VERSION_COMPAT=0 CMAKE_ARGS="-DNATIVE_TESTING=OFF" SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DDTRACE=${{ needs.compute_version.outputs.library_version }}
+      CIBW_ENVIRONMENT_WINDOWS: SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DDTRACE=${{ needs.compute_version.outputs.library_version }}
       # cibuildwheel repair will copy anything's under /output directory from the
       # build container to the host machine. This is a bit hacky way, but seems
       # to be the only way getting debug symbols out from the container while

.github/workflows/require-checklist.yaml

@@ -25,7 +25,7 @@ jobs:
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Set python interpreters
-        run: pyenv global 3.10 3.8 3.9 3.11 3.12 3.13
+        run: pyenv global 3.10 3.8 3.9 3.11 3.12 3.13 3.14.0rc1
 
       - name: Install Dependencies
         run: pip install --upgrade pip && pip install riot==0.20.1 && pip install toml==0.10.2

.github/workflows/requirements-locks.yml

@@ -47,7 +47,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: 'e13ccb562e9e060317b173e25b1e638d89f9df3b'
+          ref: '4bece37901d6241526eb788bdac6f2887251cdcd'
 
       - name: Download wheels to binaries directory
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
@@ -94,7 +94,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: 'e13ccb562e9e060317b173e25b1e638d89f9df3b'
+          ref: '4bece37901d6241526eb788bdac6f2887251cdcd'
 
       - name: Build runner
         uses: ./.github/actions/install_runner
@@ -225,6 +225,10 @@ jobs:
         if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'appsec-1'
         run: ./run.sh APPSEC_RASP
 
+      - name: Run APPSEC_STANDALONE_RASP
+        if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'appsec-1'
+        run: ./run.sh APPSEC_STANDALONE_RASP
+
       - name: Run DEBUGGER_PROBES_STATUS
         if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'debugger-1'
         run: ./run.sh DEBUGGER_PROBES_STATUS
@@ -279,7 +283,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: 'e13ccb562e9e060317b173e25b1e638d89f9df3b'
+          ref: '4bece37901d6241526eb788bdac6f2887251cdcd'
       - name: Download wheels to binaries directory
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:

.github/workflows/system-tests.yml

@@ -14,7 +14,7 @@ variables:
   DD_VPA_TEMPLATE: "vpa-template-cpu-p70-10percent-2x-oom-min-cap"
   # CI_DEBUG_SERVICES: "true"
   # Automatically managed, use scripts/update-system-tests-version to update
-  SYSTEM_TESTS_REF: "e13ccb562e9e060317b173e25b1e638d89f9df3b"
+  SYSTEM_TESTS_REF: "4bece37901d6241526eb788bdac6f2887251cdcd"
 
 default:
   interruptible: true