Merge branch 'main' into wantsui/fix-should-skip

Author: wantsui

.circleci/config.templ.yml

@@ -404,19 +404,6 @@ jobs:
           paths:
             - "."
 
-  appsec_iast_packages:
-    <<: *machine_executor
-    parallelism: 5
-    steps:
-      - when:
-          condition:
-            matches: { pattern: "main", value: << pipeline.git.branch >> }
-          steps:
-            - run_test:
-                pattern: 'appsec_iast_packages'
-                snapshot: true
-      - run: echo "This test is skipped outside of main branch"
-
   appsec_integrations:
     <<: *machine_executor
     parallelism: 13

.github/CODEOWNERS

@@ -110,6 +110,7 @@ benchmarks/base/aspects_benchmarks_generate.py @DataDog/asm-python
 ddtrace/appsec/                     @DataDog/asm-python
 ddtrace/settings/asm.py             @DataDog/asm-python
 ddtrace/contrib/subprocess/         @DataDog/asm-python
+ddtrace/contrib/internal/subprocess/         @DataDog/asm-python
 ddtrace/contrib/flask_login/        @DataDog/asm-python
 ddtrace/contrib/webbrowser          @DataDog/asm-python
 ddtrace/contrib/urllib              @DataDog/asm-python

.github/ISSUE_TEMPLATE/config.yaml .github/ISSUE_TEMPLATE/config.yml

@@ -132,6 +132,10 @@ jobs:
           CIBW_BEFORE_ALL_WINDOWS: rustup target add i686-pc-windows-msvc
           CIBW_BEFORE_ALL_MACOS: rustup target add aarch64-apple-darwin
           CIBW_ENVIRONMENT_LINUX: PATH=$HOME/.cargo/bin:$PATH CMAKE_BUILD_PARALLEL_LEVEL=24
+          # 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
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: |
             mkdir ./tempwheelhouse &&
             unzip -l {wheel} | grep '\.so' &&

.github/workflows/build_python_3.yml

@@ -47,6 +47,7 @@ jobs:
           - weblog-variant: fastapi
           # runs django-poc for 3.12
           - weblog-variant: python3.12
+          - weblog-variant: django-py3.13
       fail-fast: false
     env:
       TEST_LIBRARY: python
@@ -96,7 +97,7 @@ jobs:
     needs: [system-tests-build-agent, system-tests-build-weblog]
     strategy:
       matrix:
-        weblog-variant: [flask-poc, uwsgi-poc , django-poc, fastapi, python3.12]
+        weblog-variant: [flask-poc, uwsgi-poc , django-poc, fastapi, python3.12, django-py3.13]
         scenario: [remote-config, appsec, appsec-1, other, debugger-1, debugger-2]
 
       fail-fast: false

.github/workflows/system-tests.yml

@@ -111,68 +111,6 @@ jobs:
         if: needs.needs-run.outputs.outcome == 'success'
         run: cat debugger-expl.txt
 
-  sanic-testsuite:
-    strategy:
-      matrix:
-        include:
-          # TODO: profiling fails with a timeout error
-          #- suffix: Profiling
-          #  profiling: 1
-          #  iast: 0
-          #  appsec: 0
-          - suffix: IAST
-            profiling: 0
-            iast: 1
-            appsec: 0
-          - suffix: APPSEC
-            profiling: 0
-            iast: 0
-            appsec: 1
-          - suffix: Tracer only
-            profiling: 0
-            iast: 0
-            appsec: 0
-    name: Sanic 24.6 (with ${{ matrix.suffix }})
-    runs-on: ubuntu-20.04
-    needs: needs-run
-    timeout-minutes: 15
-    env:
-      DD_PROFILING_ENABLED: ${{ matrix.profiling }}
-      DD_IAST_ENABLED: ${{ matrix.iast }}
-      DD_APPSEC_ENABLED: ${{ matrix.appsec }}
-      DD_TESTING_RAISE: true
-      CMAKE_BUILD_PARALLEL_LEVEL: 12
-      DD_DEBUGGER_EXPL_OUTPUT_FILE: debugger-expl.txt
-    defaults:
-      run:
-        working-directory: sanic
-    steps:
-      - uses: actions/checkout@v4
-        if: needs.needs-run.outputs.outcome == 'success'
-        with:
-          persist-credentials: false
-          path: ddtrace
-      - uses: actions/checkout@v4
-        if: needs.needs-run.outputs.outcome == 'success'
-        with:
-          persist-credentials: false
-          repository: sanic-org/sanic
-          ref: v24.6.0
-          path: sanic
-      - uses: actions/setup-python@v5
-        if: needs.needs-run.outputs.outcome == 'success'
-        with:
-          python-version: "3.11"
-      - name: Install sanic and dependencies required to run tests
-        if: needs.needs-run.outputs.outcome == 'success'
-        run: pip3 install '.[test]' aioquic
-      - name: Install ddtrace
-        if: needs.needs-run.outputs.outcome == 'success'
-        run: pip3 install ../ddtrace
-      - name: Run tests
-        if: needs.needs-run.outputs.outcome == 'success'
-        run: ddtrace-run pytest -k "not test_reloader and not test_reload_listeners and not test_no_exceptions_when_cancel_pending_request and not test_add_signal and not test_ode_removes and not test_skip_touchup and not test_dispatch_signal_triggers and not test_keep_alive_connection_context and not test_redirect_with_params and not test_keep_alive_client_timeout and not test_logger_vhosts and not test_ssl_in_multiprocess_mode"
-
   django-testsuite:
     strategy:
       matrix:
@@ -963,58 +901,3 @@ jobs:
       - name: Debugger exploration results
         if: needs.needs-run.outputs.outcome == 'success'
         run: cat debugger-expl.txt
-
-  beautifulsoup-testsuite-4_12_3:
-    strategy:
-      matrix:
-        include:
-          # TODO: profiling is disabled due to a bug in the profiler paths
-          # - suffix: Profiling
-          #   profiling: 1
-          #   iast: 0
-          #   appsec: 0
-          - suffix: IAST
-            profiling: 0
-            iast: 1
-            appsec: 0
-          - suffix: APPSEC
-            profiling: 0
-            iast: 0
-            appsec: 1
-          - suffix: Tracer only
-            profiling: 0
-            iast: 0
-            appsec: 0
-    name: Beautifulsoup 4.12.3 (with ${{ matrix.suffix }})
-    runs-on: "ubuntu-latest"
-    needs: needs-run
-    env:
-      DD_TESTING_RAISE: true
-      DD_PROFILING_ENABLED: ${{ matrix.profiling }}
-      DD_IAST_ENABLED: ${{ matrix.iast }}
-      DD_APPSEC_ENABLED: ${{ matrix.appsec }}
-      CMAKE_BUILD_PARALLEL_LEVEL: 12
-      DD_DEBUGGER_EXPL_OUTPUT_FILE: debugger-expl.txt
-    steps:
-      - uses: actions/setup-python@v5
-        if: needs.needs-run.outputs.outcome == 'success'
-        with:
-          python-version: '3.9'
-      - uses: actions/checkout@v4
-        if: needs.needs-run.outputs.outcome == 'success'
-        with:
-          persist-credentials: false
-          path: ddtrace
-      - name: Checkout beautifulsoup
-        if: needs.needs-run.outputs.outcome == 'success'
-        run:  |
-          git clone -b 4.12.3 https://git.launchpad.net/beautifulsoup
-      - name: Install ddtrace
-        if: needs.needs-run.outputs.outcome == 'success'
-        run: pip3 install ./ddtrace
-      - name: Pytest fix
-        if: needs.needs-run.outputs.outcome == 'success'
-        run: pip install pytest==8.2.1
-      - name: Run tests
-        if: needs.needs-run.outputs.outcome == 'success'
-        run: cd beautifulsoup && ddtrace-run pytest

.github/workflows/test_frameworks.yml

@@ -4,23 +4,23 @@
 #
 #    pip-compile --allow-unsafe --no-annotate .riot/requirements/1053dce.in
 #
-attrs==24.2.0
-coverage[toml]==7.6.1
-gevent==24.2.1
+attrs==24.3.0
+coverage[toml]==7.6.10
+gevent==24.11.1
 greenlet==3.1.1
 hypothesis==6.45.0
 iniconfig==2.0.0
 mock==5.1.0
 opentracing==2.4.0
-packaging==24.1
+packaging==24.2
 pluggy==1.5.0
-pytest==8.3.3
-pytest-cov==5.0.0
+pytest==8.3.4
+pytest-cov==6.0.0
 pytest-mock==3.14.0
-pytest-randomly==3.15.0
+pytest-randomly==3.16.0
 sortedcontainers==2.4.0
 zope-event==5.0
-zope-interface==7.0.3
+zope-interface==7.2
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==75.1.0
+setuptools==75.7.0

.riot/requirements/1053dce.txt

@@ -0,0 +1,74 @@
+#
+# This file is autogenerated by pip-compile with Python 3.13
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/105b4fa.in
+#
+arrow==1.3.0
+asgiref==3.8.1
+attrs==24.3.0
+autobahn==24.4.2
+automat==24.8.1
+bcrypt==4.2.1
+blessed==1.20.0
+certifi==2024.12.14
+cffi==1.17.1
+channels==4.2.0
+charset-normalizer==3.4.0
+constantly==23.10.4
+coverage[toml]==7.6.9
+cryptography==44.0.0
+daphne==4.1.2
+django==4.2.17
+django-configurations==2.5.1
+django-picklefield==3.2
+django-pylibmc==0.6.1
+django-q==1.3.6
+django-redis==4.5.0
+hyperlink==21.0.0
+hypothesis==6.45.0
+idna==3.10
+incremental==24.7.2
+iniconfig==2.0.0
+isodate==0.7.2
+lxml==5.3.0
+mock==5.1.0
+opentracing==2.4.0
+packaging==24.2
+platformdirs==4.3.6
+pluggy==1.5.0
+psycopg==3.2.3
+psycopg2-binary==2.9.10
+pyasn1==0.6.1
+pyasn1-modules==0.4.1
+pycparser==2.22
+pylibmc==1.6.3
+pyopenssl==24.3.0
+pytest==8.3.4
+pytest-cov==6.0.0
+pytest-django[testing]==3.10.0
+pytest-mock==3.14.0
+pytest-randomly==3.16.0
+python-dateutil==2.9.0.post0
+python-memcached==1.62
+pytz==2024.2
+redis==2.10.6
+requests==2.32.3
+requests-file==2.1.0
+requests-toolbelt==1.0.0
+service-identity==24.2.0
+six==1.17.0
+sortedcontainers==2.4.0
+spyne==2.14.0
+sqlparse==0.5.3
+twisted[tls]==24.11.0
+txaio==23.1.1
+types-python-dateutil==2.9.0.20241206
+typing-extensions==4.12.2
+urllib3==2.3.0
+wcwidth==0.2.13
+zeep==4.3.1
+zope-interface==7.2
+
+# The following packages are considered to be unsafe in a requirements file:
+setuptools==75.6.0

.riot/requirements/105b4fa.txt

@@ -2,37 +2,37 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --allow-unsafe --no-annotate .riot/requirements/108f9cf.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1069d71.in
 #
 aiofiles==24.1.0
-anyio==4.6.2.post1
-attrs==24.2.0
-certifi==2024.8.30
+anyio==4.7.0
+attrs==24.3.0
+certifi==2024.12.14
 charset-normalizer==3.4.0
-coverage[toml]==7.6.3
+coverage[toml]==7.6.9
 exceptiongroup==1.2.2
 fastapi==0.90.1
 h11==0.14.0
-httpcore==1.0.6
+httpcore==1.0.7
 httpx==0.27.2
 hypothesis==6.45.0
 idna==3.10
 iniconfig==2.0.0
 mock==5.1.0
 opentracing==2.4.0
-packaging==24.1
+packaging==24.2
 pluggy==1.5.0
-pydantic==1.10.18
-pytest==8.3.3
+pydantic==1.10.19
+pytest==8.3.4
 pytest-asyncio==0.21.1
-pytest-cov==5.0.0
+pytest-cov==6.0.0
 pytest-mock==3.14.0
-pytest-randomly==3.15.0
-python-multipart==0.0.12
+pytest-randomly==3.16.0
+python-multipart==0.0.20
 requests==2.32.3
 sniffio==1.3.1
 sortedcontainers==2.4.0
 starlette==0.23.1
-tomli==2.0.2
+tomli==2.2.1
 typing-extensions==4.12.2
 urllib3==2.2.3

.riot/requirements/108f9cf.txt .riot/requirements/1069d71.txt

@@ -0,0 +1,27 @@
+#
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1078c3b.in
+#
+attrs==24.3.0
+coverage[toml]==7.6.1
+exceptiongroup==1.2.2
+greenlet==3.0.3
+hypothesis==6.45.0
+importlib-metadata==8.5.0
+iniconfig==2.0.0
+mock==5.1.0
+mysql-connector-python==9.0.0
+opentracing==2.4.0
+packaging==24.2
+pluggy==1.5.0
+psycopg2-binary==2.9.10
+pytest==8.3.4
+pytest-cov==5.0.0
+pytest-mock==3.14.0
+pytest-randomly==3.15.0
+sortedcontainers==2.4.0
+sqlalchemy==1.3.24
+tomli==2.2.1
+zipp==3.20.2