Merge remote-tracking branch 'origin/main' into munir/remove-asm-prop…

…erties-from-the-tracer

.github/workflows/build_deploy.yml

@@ -25,7 +25,7 @@ jobs:
   build_wheels:
     uses: ./.github/workflows/build_python_3.yml
     with:
-      cibw_build: 'cp37* cp38* cp39* cp310* cp311* cp312*'
+      cibw_build: 'cp37* cp38* cp39* cp310* cp311* cp312* cp313*'
 
   build_sdist:
     name: Build source distribution

.github/workflows/build_python_3.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3.8'
-      - run: pip install cibuildwheel==2.16.5
+      - run: pip install cibuildwheel==2.22.0
       - id: set-matrix
         env:
           CIBW_BUILD: ${{ inputs.cibw_build }}
@@ -34,7 +34,7 @@ jobs:
             {
               cibuildwheel --print-build-identifiers --platform linux --arch x86_64,i686 | jq -cR '{only: ., os: "ubuntu-latest"}' \
               && cibuildwheel --print-build-identifiers --platform linux --arch aarch64  | jq -cR '{only: ., os: "arm-4core-linux"}' \
-              && cibuildwheel --print-build-identifiers --platform windows --arch AMD64,x86 | jq -cR '{only: ., os: "windows-latest"}' \
+              && cibuildwheel --print-build-identifiers --platform windows --arch AMD64,x86 | grep -v 313 | jq -cR '{only: ., os: "windows-latest"}' \
               && cibuildwheel --print-build-identifiers --platform macos --arch x86_64,universal2 | jq -cR '{only: ., os: "macos-13"}'
             } | jq -sc
           )
@@ -83,7 +83,7 @@ jobs:
 
       - name: Build wheels arm64
         if: always() && matrix.os == 'arm-4core-linux'
-        run: /home/runner/.local/bin/pipx run cibuildwheel==2.16.5 --only ${{ matrix.only }}
+        run: /home/runner/.local/bin/pipx run cibuildwheel==2.22.0 --only ${{ matrix.only }}
         env:
           CIBW_SKIP: ${{ inputs.cibw_skip }}
           CIBW_PRERELEASE_PYTHONS: ${{ inputs.cibw_prerelease_pythons }}
@@ -107,7 +107,7 @@ jobs:
             rm -rf ./tempwheelhouse
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: |
             zip -d {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx &&
-            delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}
+            MACOSX_DEPLOYMENT_TARGET=12.7 delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}
           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS:
             choco install -y 7zip &&
             7z d -r "{wheel}" *.c *.cpp *.cc *.h *.hpp *.pyx &&
@@ -117,7 +117,7 @@ jobs:
 
       - name: Build wheels
         if: always() && matrix.os != 'arm-4core-linux'
-        uses: pypa/cibuildwheel@v2.16.5
+        uses: pypa/cibuildwheel@v2.22.0
         with:
           only: ${{ matrix.only }}
         env:
@@ -143,7 +143,7 @@ jobs:
             rm -rf ./tempwheelhouse
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: |
             zip -d {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx &&
-            delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}
+            MACOSX_DEPLOYMENT_TARGET=12.7 delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}
           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS:
             choco install -y 7zip &&
             7z d -r "{wheel}" *.c *.cpp *.cc *.h *.hpp *.pyx &&

.github/workflows/generate-package-versions.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   generate-package-versions:
     name: Generate package versions
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       actions: read
       contents: write
@@ -49,6 +49,11 @@ jobs:
         with:
           python-version: "3.12"
 
+      - name: Setup Python 3.13
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 

.github/workflows/requirements-locks.yml

@@ -11,7 +11,7 @@ jobs:
   validate:
     name: Check requirements lockfiles
     runs-on: ubuntu-latest
-    container: ghcr.io/datadog/dd-trace-py/testrunner:47c7b5287da25643e46652e6d222a40a52f2382a@sha256:3a02dafeff9cd72966978816d1b39b54f5517af4049396923b95c8452f604269
+    container: ghcr.io/datadog/dd-trace-py/testrunner:0a50e839f4b1600f02157518b8d016451b346578@sha256:5dae9bc7872f69b31b612690f0748c7ad71ab90ef28a754b2ae93d0ba505837b
     steps:
       - uses: actions/checkout@v4
         with:
@@ -23,7 +23,7 @@ jobs:
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Set python interpreters
-        run: pyenv global 3.10 3.7 3.8 3.9 3.11 3.12
+        run: pyenv global 3.10 3.7 3.8 3.9 3.11 3.12 3.13
 
       - name: Install Dependencies
         run: pip install --upgrade pip && pip install riot==0.20.1

.github/workflows/system-tests.yml

@@ -213,6 +213,10 @@ jobs:
         if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'appsec-1'
         run: ./run.sh IAST_STANDALONE
 
+      - name: Run SCA_STANDALONE
+        if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'appsec-1'
+        run: ./run.sh SCA_STANDALONE
+
       - name: Run APPSEC_RUNTIME_ACTIVATION
         if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'appsec-1'
         run: ./run.sh APPSEC_RUNTIME_ACTIVATION

.gitlab/download-dependency-wheels.sh

@@ -20,7 +20,7 @@ export PYTHONUNBUFFERED=TRUE
     --local-ddtrace \
     --arch x86_64 \
     --arch aarch64 \
-    --platform musllinux_1_1 \
+    --platform musllinux_1_2 \
     --platform manylinux2014 \
     --output-dir ../pywheels-dep \
     --verbose

.gitlab/package.yml

@@ -1,3 +1,22 @@
+build_base_venvs:
+  extends: .testrunner
+  stage: package
+  parallel:
+    matrix:
+      - PYTHON_VERSION: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+  variables:
+    CMAKE_BUILD_PARALLEL_LEVEL: 12
+    PIP_VERBOSE: 1
+  script:
+    - pip install riot==0.20.0
+    - riot -P -v generate --python=$PYTHON_VERSION
+  artifacts:
+    name: venv_$PYTHON_VERSION
+    paths:
+      - .riot/venv_*
+      - ddtrace/**/*.so*
+      - ddtrace/internal/datadog/profiling/crashtracker/crashtracker_exe*
+
 download_ddtrace_artifacts:
   image: registry.ddbuild.io/github-cli:v27480869-eafb11d-2.43.0
   tags: [ "arch:amd64" ]
@@ -31,6 +50,8 @@ download_dependency_wheels:
         PYTHON_VERSION: "3.11"
       - PYTHON_IMAGE_TAG: "3.12.0"
         PYTHON_VERSION: "3.12"
+      - PYTHON_IMAGE_TAG: "3.13.0"
+        PYTHON_VERSION: "3.13"
   script:
     - .gitlab/download-dependency-wheels.sh
   artifacts:

.gitlab/testrunner.yml

@@ -1,9 +1,9 @@
 .testrunner:
-  image: registry.ddbuild.io/images/mirror/dd-trace-py/testrunner:47c7b5287da25643e46652e6d222a40a52f2382a@sha256:3a02dafeff9cd72966978816d1b39b54f5517af4049396923b95c8452f604269
+  image: registry.ddbuild.io/images/mirror/dd-trace-py/testrunner:0a50e839f4b1600f02157518b8d016451b346578@sha256:5dae9bc7872f69b31b612690f0748c7ad71ab90ef28a754b2ae93d0ba505837b
   # DEV: we have a larger pool of amd64 runners, prefer that over arm64
   tags: [ "arch:amd64" ]
   timeout: 20m
   before_script:
     - ulimit -c unlimited
-    - pyenv global 3.12 3.7 3.8 3.9 3.10 3.11 3.13-dev
+    - pyenv global 3.12 3.7 3.8 3.9 3.10 3.11 3.13
     - export _CI_DD_AGENT_URL=http://${HOST_IP}:8126/

.gitlab/tests.yml

@@ -11,12 +11,12 @@ variables:
   # CI_DEBUG_SERVICES: "true"
 
 .testrunner:
-  image: registry.ddbuild.io/images/mirror/dd-trace-py/testrunner:47c7b5287da25643e46652e6d222a40a52f2382a@sha256:3a02dafeff9cd72966978816d1b39b54f5517af4049396923b95c8452f604269
+  image: registry.ddbuild.io/images/mirror/dd-trace-py/testrunner:0a50e839f4b1600f02157518b8d016451b346578@sha256:5dae9bc7872f69b31b612690f0748c7ad71ab90ef28a754b2ae93d0ba505837b
   # DEV: we have a larger pool of amd64 runners, prefer that over arm64
   tags: [ "arch:amd64" ]
   timeout: 20m
   before_script:
-    - pyenv global 3.12 3.7 3.8 3.9 3.10 3.11 3.13-dev
+    - pyenv global 3.12 3.7 3.8 3.9 3.10 3.11 3.13
     - export _CI_DD_AGENT_URL=http://${HOST_IP}:8126/
 
 
@@ -62,7 +62,7 @@ build_base_venvs:
   stage: riot
   parallel:
     matrix:
-      - PYTHON_VERSION: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+      - PYTHON_VERSION: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
   variables:
     CMAKE_BUILD_PARALLEL_LEVEL: 12
     PIP_VERBOSE: 1

.riot/requirements/102dfdd.txt

@@ -0,0 +1,20 @@
+#
+# This file is autogenerated by pip-compile with Python 3.13
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/102dfdd.in
+#
+attrs==24.2.0
+coverage[toml]==7.6.1
+hypothesis==6.45.0
+iniconfig==2.0.0
+mock==5.1.0
+opentracing==2.4.0
+packaging==24.1
+pluggy==1.5.0
+pytest==8.3.3
+pytest-cov==5.0.0
+pytest-mock==3.14.0
+pytest-randomly==3.15.0
+sortedcontainers==2.4.0
+structlog==20.2.0

.riot/requirements/104daf8.txt

@@ -0,0 +1,25 @@
+#
+# This file is autogenerated by pip-compile with Python 3.13
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/104daf8.in
+#
+attrs==24.2.0
+certifi==2024.8.30
+charset-normalizer==3.3.2
+coverage[toml]==7.6.1
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.0.0
+mock==5.1.0
+opensearch-py[requests]==1.1.0
+opentracing==2.4.0
+packaging==24.1
+pluggy==1.5.0
+pytest==8.3.3
+pytest-cov==5.0.0
+pytest-mock==3.14.0
+pytest-randomly==3.15.0
+requests==2.32.3
+sortedcontainers==2.4.0
+urllib3==1.26.20

.riot/requirements/104f450.txt

@@ -0,0 +1,20 @@
+#
+# This file is autogenerated by pip-compile with Python 3.13
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/104f450.in
+#
+attrs==24.2.0
+coverage[toml]==7.6.1
+hypothesis==6.45.0
+iniconfig==2.0.0
+logbook==1.0.0
+mock==5.1.0
+opentracing==2.4.0
+packaging==24.1
+pluggy==1.5.0
+pytest==8.3.3
+pytest-cov==5.0.0
+pytest-mock==3.14.0
+pytest-randomly==3.15.0
+sortedcontainers==2.4.0

.riot/requirements/1053dce.txt

@@ -0,0 +1,26 @@
+#
+# This file is autogenerated by pip-compile with Python 3.13
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1053dce.in
+#
+attrs==24.2.0
+coverage[toml]==7.6.1
+gevent==24.2.1
+greenlet==3.1.1
+hypothesis==6.45.0
+iniconfig==2.0.0
+mock==5.1.0
+opentracing==2.4.0
+packaging==24.1
+pluggy==1.5.0
+pytest==8.3.3
+pytest-cov==5.0.0
+pytest-mock==3.14.0
+pytest-randomly==3.15.0
+sortedcontainers==2.4.0
+zope-event==5.0
+zope-interface==7.0.3
+
+# The following packages are considered to be unsafe in a requirements file:
+setuptools==75.1.0

.riot/requirements/114bad8.txt

@@ -0,0 +1,29 @@
+#
+# This file is autogenerated by pip-compile with Python 3.13
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/114bad8.in
+#
+attrs==24.2.0
+blinker==1.8.2
+click==8.1.7
+coverage[toml]==7.6.1
+flask==3.0.3
+flask-caching==1.10.1
+hypothesis==6.45.0
+iniconfig==2.0.0
+itsdangerous==2.2.0
+jinja2==3.1.4
+markupsafe==2.1.5
+mock==5.1.0
+opentracing==2.4.0
+packaging==24.1
+pluggy==1.5.0
+pytest==8.3.3
+pytest-cov==5.0.0
+pytest-mock==3.14.0
+pytest-randomly==3.15.0
+python-memcached==1.62
+redis==5.1.1
+sortedcontainers==2.4.0
+werkzeug==3.0.4

.riot/requirements/11f2bd0.txt

@@ -0,0 +1,38 @@
+#
+# This file is autogenerated by pip-compile with Python 3.13
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/11f2bd0.in
+#
+annotated-types==0.7.0
+attrs==24.2.0
+blinker==1.8.2
+certifi==2024.8.30
+charset-normalizer==3.3.2
+click==8.1.7
+coverage[toml]==7.6.1
+flask==2.3.3
+flask-openapi3==4.0.1
+hypothesis==6.45.0
+idna==3.10
+importlib-metadata==8.5.0
+iniconfig==2.0.0
+itsdangerous==2.2.0
+jinja2==3.1.4
+markupsafe==2.1.5
+mock==5.1.0
+opentracing==2.4.0
+packaging==24.1
+pluggy==1.5.0
+pydantic==2.9.2
+pydantic-core==2.23.4
+pytest==8.3.3
+pytest-cov==5.0.0
+pytest-mock==3.14.0
+pytest-randomly==3.15.0
+requests==2.32.3
+sortedcontainers==2.4.0
+typing-extensions==4.12.2
+urllib3==1.26.20
+werkzeug==2.3.8
+zipp==3.20.2

.riot/requirements/11fd02a.txt

@@ -0,0 +1,19 @@
+#
+# This file is autogenerated by pip-compile with Python 3.13
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/11fd02a.in
+#
+attrs==24.2.0
+coverage[toml]==7.6.1
+hypothesis==6.45.0
+iniconfig==2.0.0
+mock==5.1.0
+opentracing==2.4.0
+packaging==24.1
+pluggy==1.5.0
+pytest==8.3.3
+pytest-cov==5.0.0
+pytest-mock==3.14.0
+pytest-randomly==3.15.0
+sortedcontainers==2.4.0