Merge branch 'main' into sanchda/make_contextvars_indirect

.github/workflows/build_deploy.yml

@@ -10,6 +10,7 @@ on:
       # before merging/releasing
       - build_deploy*
       - 'upgrade-latest-*'
+      - 'mq-working-branch**'
   pull_request:
   release:
     types:

.github/workflows/build_python_3.yml

@@ -1,9 +1,6 @@
 name: Build Python 3
 
 on:
-  merge_group:
-    # Trigger jobs when PR is added to merge queue
-    types: [checks_requested]
   workflow_call:
     inputs:
       cibw_build:

.github/workflows/codeql-analysis.yml

@@ -4,13 +4,11 @@ on:
   push:
     branches:
       - main
+      - 'mq-working-branch**'
   pull_request:
     # The branches below must be a subset of the branches above
     branches:
       - main
-  merge_group:
-    # Trigger jobs when PR is added to merge queue
-    types: [checks_requested]
 
 jobs:
   analyze:

.github/workflows/django-overhead-profile.yml

@@ -3,19 +3,19 @@ on:
   push:
     branches:
       - main
+      - 'mq-working-branch**'
   pull_request:
     paths:
       - 'ddtrace/**'
       - 'scripts/profiles/django-simple/**'
       - '.github/workflows/django-overhead-profile.yml'
-  merge_group:
-    # Trigger jobs when PR is added to merge queue
-    types: [checks_requested]
+
 jobs:
   django-overhead-profile:
     runs-on: ubuntu-latest
     env:
       PREFIX: ${{ github.workspace }}/prefix
+      DD_CODE_ORIGIN_FOR_SPANS_ENABLED: "1"
     defaults:
       run:
         working-directory: ddtrace

.github/workflows/encoders-profile.yml

@@ -3,14 +3,13 @@ on:
   push:
     branches:
       - main
+      - 'mq-working-branch**'
   pull_request:
     paths:
       - 'ddtrace/internal/_encoding.pyx'
       - 'scripts/profiles/encoders/**'
       - '.github/workflows/encoders-profile.yml'
-  merge_group:
-    # Trigger jobs when PR is added to merge queue
-    types: [checks_requested]
+
 jobs:
   encoders-profile:
     runs-on: ubuntu-latest

.github/workflows/flask-overhead-profile.yml

@@ -3,14 +3,13 @@ on:
   push:
     branches:
       - main
+      - 'mq-working-branch**'
   pull_request:
     paths:
       - 'ddtrace/**'
       - 'scripts/profiles/flask-simple/**'
       - '.github/workflows/flask-overhead-profile.yml'
-  merge_group:
-    # Trigger jobs when PR is added to merge queue
-    types: [checks_requested]
+
 jobs:
   flask-overhead-profile:
     runs-on: ubuntu-latest

.github/workflows/pypa_musllinux_1_2_i686.yml

@@ -5,11 +5,9 @@ on:
   push:
     branches:
       - 'main'
+      - 'mq-working-branch**'
     paths:
       - 'docker/**'
-  merge_group:
-    # Trigger jobs when PR is added to merge queue
-    types: [checks_requested]
 
 jobs:
   build-and-publish:

.github/workflows/requirements-locks.yml

@@ -3,11 +3,10 @@ on:
   push:
     branches:
       - main
+      - 'mq-working-branch**'
   pull_request:
     types: [opened, reopened, synchronize]
-  merge_group:
-    # Trigger jobs when PR is added to merge queue
-    types: [checks_requested]
+
 jobs:
   validate:
     name: Check requirements lockfiles

.github/workflows/rust-ci.yml

@@ -4,9 +4,6 @@ on:
   pull_request:
     paths:
       - src/**
-  merge_group:
-    # Trigger jobs when PR is added to merge queue
-    types: [checks_requested]
 
 jobs:
   check:

.github/workflows/system-tests.yml

@@ -4,13 +4,11 @@ on:
   push:
     branches:
       - main
+      - 'mq-working-branch**'
   pull_request:
   workflow_dispatch: {}
   schedule:
     - cron: '00 04 * * 2-6'
-  merge_group:
-    # Trigger jobs when PR is added to merge queue
-    types: [checks_requested]
 
 jobs:
   system-tests-build-agent:

.github/workflows/test_frameworks.yml

@@ -4,10 +4,8 @@ on:
   push:
     branches:
       - main
+      - 'mq-working-branch**'
   pull_request:
-  merge_group:
-    # Trigger jobs when PR is added to merge queue
-    types: [checks_requested]
 
 concurrency:
     group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/testrunner.yml

@@ -5,11 +5,9 @@ on:
   push:
     branches:
       - 'main'
+      - 'mq-working-branch**'
     paths:
       - 'docker/**'
-  merge_group:
-    # Trigger jobs when PR is added to merge queue
-    types: [checks_requested]
 
 jobs:
   build-and-publish:

.github/workflows/unit_tests.yml

@@ -4,38 +4,25 @@ on:
   push:
     branches:
       - main
+      - 'mq-working-branch**'
   pull_request:
   workflow_dispatch: {}
-  merge_group:
-    # Trigger jobs when PR is added to merge queue
-    types: [checks_requested]
 
 jobs:
   unit-tests:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        include:
-         - os: ubuntu-latest
-           archs: x86_64 i686
-         #- os: arm-4core-linux
-         #  archs: aarch64
-         - os: windows-latest
-           archs: AMD64 x86
-         - os: macos-latest
-           archs: arm64
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        # Keep this in sync with hatch.toml
+        python-version: ["3.7", "3.10", "3.12"]
     steps:
       - uses: actions/checkout@v4
         # Include all history and tags
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-python@v5
-        name: Install Python
-        with:
-          python-version: '3.12'
-
       - uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Install latest stable toolchain and rustfmt
         run: rustup update stable && rustup default stable && rustup component add rustfmt clippy
@@ -46,4 +33,4 @@ jobs:
           version: "1.12.0"
 
       - name: Run tests
-        run: hatch run ddtrace_unit_tests:test
+        run: hatch run +py=${{ matrix.python-version }} ddtrace_unit_tests:test

.gitignore

@@ -141,10 +141,21 @@ ddtrace/_version.py
 artifacts/
 
 # IAST cpp
+ddtrace/appsec/_iast/_taint_tracking/cmake_install.cmake
+ddtrace/appsec/_iast/_taint_tracking/CMakeCache.txt
+ddtrace/appsec/_iast/_taint_tracking/Makefile
 ddtrace/appsec/_iast/_taint_tracking/cmake-build-debug/*
 ddtrace/appsec/_iast/_taint_tracking/_deps/*
 ddtrace/appsec/_iast/_taint_tracking/CMakeFiles/*
-
+ddtrace/appsec/_iast/_taint_tracking/tests/CMakeFiles/*
+ddtrace/appsec/_iast/_taint_tracking/tests/cmake_install.cmake
+ddtrace/appsec/_iast/_taint_tracking/tests/CMakeCache.txt
+ddtrace/appsec/_iast/_taint_tracking/tests/Makefile
+ddtrace/appsec/_iast/_taint_tracking/tests/CTestTestfile.cmake
+ddtrace/appsec/_iast/_taint_tracking/tests/native_tests*
+ddtrace/appsec/_iast/_taint_tracking/_vendor/pybind11/Makefile
+ddtrace/appsec/_iast/_taint_tracking/_vendor/pybind11/CMakeFiles/*
+ddtrace/appsec/_iast/_taint_tracking/_vendor/pybind11/cmake_install.cmake
 # CircleCI generated config
 .circleci/config.gen.yml
 

.gitlab-ci.yml

@@ -38,7 +38,7 @@ package-oci:
 onboarding_tests_installer:
   parallel:
     matrix:
-      - ONBOARDING_FILTER_WEBLOG: [test-app-python,test-app-python-container,test-app-python-alpine-libgcc]
+      - ONBOARDING_FILTER_WEBLOG: [test-app-python,test-app-python-container,test-app-python-alpine]
 
 
 onboarding_tests_k8s_injection:

.riot/requirements/112dc22.txt

@@ -15,10 +15,10 @@ databases==0.8.0
 exceptiongroup==1.2.2
 greenlet==3.0.3
 h11==0.14.0
-httpcore==1.0.5
+httpcore==1.0.6
 httpx==0.27.2
 hypothesis==6.45.0
-idna==3.9
+idna==3.10
 importlib-metadata==8.5.0
 iniconfig==2.0.0
 mock==5.1.0
@@ -35,7 +35,7 @@ sniffio==1.3.1
 sortedcontainers==2.4.0
 sqlalchemy==1.4.54
 starlette==0.14.2
-tomli==2.0.1
+tomli==2.0.2
 typing-extensions==4.12.2
 urllib3==2.2.3
 zipp==3.20.2

.riot/requirements/115aba5.txt

@@ -2,12 +2,12 @@
 # This file is autogenerated by pip-compile with Python 3.7
 # by the following command:
 #
-#    pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/115aba5.in
+#    pip-compile --allow-unsafe --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/115aba5.in
 #
 async-timeout==4.0.3
-attrs==23.2.0
+attrs==24.2.0
 coverage[toml]==7.2.7
-exceptiongroup==1.2.1
+exceptiongroup==1.2.2
 hypothesis==6.45.0
 importlib-metadata==6.7.0
 iniconfig==2.0.0

.riot/requirements/1250d61.txt

@@ -18,7 +18,7 @@ h11==0.14.0
 httpcore==0.17.3
 httpx==0.24.1
 hypothesis==6.45.0
-idna==3.9
+idna==3.10
 importlib-metadata==6.7.0
 iniconfig==2.0.0
 mock==5.1.0

.riot/requirements/1280196.txt

@@ -2,28 +2,28 @@
 # This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/1280196.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1280196.in
 #
-attrs==23.1.0
-beautifulsoup4==4.12.2
-bottle==0.12.25
-coverage[toml]==7.3.4
-exceptiongroup==1.2.0
+attrs==24.2.0
+beautifulsoup4==4.12.3
+bottle==0.13.1
+coverage[toml]==7.6.1
+exceptiongroup==1.2.2
 hypothesis==6.45.0
-importlib-metadata==7.0.0
+importlib-metadata==8.5.0
 iniconfig==2.0.0
 mock==5.1.0
 opentracing==2.4.0
-packaging==23.2
-pluggy==1.3.0
-pytest==7.4.3
-pytest-cov==4.1.0
-pytest-mock==3.12.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
-soupsieve==2.5
-tomli==2.0.1
-waitress==2.1.2
-webob==1.8.7
-webtest==3.0.0
-zipp==3.17.0
+soupsieve==2.6
+tomli==2.0.2
+waitress==3.0.0
+webob==1.8.8
+webtest==3.0.1
+zipp==3.20.2

.riot/requirements/156e3cc.txt

@@ -14,10 +14,10 @@ coverage[toml]==7.6.1
 databases==0.8.0
 greenlet==3.0.3
 h11==0.14.0
-httpcore==1.0.5
+httpcore==1.0.6
 httpx==0.27.2
 hypothesis==6.45.0
-idna==3.9
+idna==3.10
 iniconfig==2.0.0
 mock==5.1.0
 opentracing==2.4.0