Merge branch 'main' into yunkim/llmobs-context

.github/CODEOWNERS

@@ -115,6 +115,8 @@ ddtrace/contrib/flask_login/        @DataDog/asm-python
 ddtrace/contrib/webbrowser          @DataDog/asm-python
 ddtrace/contrib/urllib              @DataDog/asm-python
 ddtrace/internal/_exceptions.py     @DataDog/asm-python
+ddtrace/internal/appsec/            @DataDog/asm-python
+ddtrace/internal/iast/              @DataDog/asm-python
 tests/appsec/                       @DataDog/asm-python
 tests/contrib/dbapi/test_dbapi_appsec.py    @DataDog/asm-python
 tests/contrib/subprocess            @DataDog/asm-python

.github/workflows/rust-ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        extension: ["src/core"]
+        extension: ["src/native"]
     steps:
       - uses: actions/checkout@v4
         with:

.gitlab-ci.yml

@@ -6,6 +6,7 @@ stages:
   - shared-pipeline
   - benchmarks
   - macrobenchmarks
+  - benchmarks-report
   - release
 
 variables:
@@ -59,18 +60,20 @@ onboarding_tests_installer:
     matrix:
       - ONBOARDING_FILTER_WEBLOG: [test-app-python,test-app-python-container,test-app-python-alpine]
 
-
 onboarding_tests_k8s_injection:
   parallel:
     matrix:
-      - WEBLOG_VARIANT:
-          - dd-lib-python-init-test-django
-          - dd-lib-python-init-test-django-gunicorn
-          - dd-lib-python-init-test-django-gunicorn-alpine
-          - dd-lib-python-init-test-django-preinstalled
-          - dd-lib-python-init-test-django-unsupported-package-force
-          - dd-lib-python-init-test-django-uvicorn
-          - dd-lib-python-init-test-protobuf-old
+      - WEBLOG_VARIANT: [dd-lib-python-init-test-django, ]
+        SCENARIO: [K8S_LIB_INJECTION, K8S_LIB_INJECTION_UDS, K8S_LIB_INJECTION_NO_AC, K8S_LIB_INJECTION_NO_AC_UDS, K8S_LIB_INJECTION_PROFILING_DISABLED, K8S_LIB_INJECTION_PROFILING_ENABLED, K8S_LIB_INJECTION_PROFILING_OVERRIDE]
+        K8S_CLUSTER_VERSION: ['7.56.2', '7.59.0']
+
+      - WEBLOG_VARIANT: [dd-lib-python-init-test-django-gunicorn, dd-lib-python-init-test-django-gunicorn-alpine, dd-lib-python-init-test-django-unsupported-package-force, dd-lib-python-init-test-django-uvicorn, dd-lib-python-init-test-protobuf-old ]
+        SCENARIO: [K8S_LIB_INJECTION, K8S_LIB_INJECTION_PROFILING_ENABLED]
+        K8S_CLUSTER_VERSION: ['7.56.2', '7.59.0']
+
+      - WEBLOG_VARIANT: [dd-lib-python-init-test-django-preinstalled]
+        SCENARIO: [K8S_LIB_INJECTION, K8S_LIB_INJECTION_UDS, K8S_LIB_INJECTION_NO_AC, K8S_LIB_INJECTION_NO_AC_UDS]
+        K8S_CLUSTER_VERSION: ['7.56.2', '7.59.0']
 
 deploy_to_di_backend:manual:
   stage: shared-pipeline

.gitlab/benchmarks.yml

@@ -25,7 +25,6 @@ variables:
     paths:
       - reports/
     expire_in: 3 months
-  allow_failure: true  # Allow failure, so partial results are uploaded
   variables:
     UPSTREAM_PROJECT_ID: $CI_PROJECT_ID # The ID of the current project. This ID is unique across all projects on the GitLab instance.
     UPSTREAM_PROJECT_NAME: $CI_PROJECT_NAME # "dd-trace-py"
@@ -60,8 +59,7 @@ microbenchmarks:
 benchmarks-pr-comment:
   image: $MICROBENCHMARKS_CI_IMAGE
   tags: ["arch:amd64"]
-  stage: benchmarks
-  needs: [ "microbenchmarks" ]
+  stage: benchmarks-report
   when: always
   script:
     - export REPORTS_DIR="$(pwd)/reports/" && (mkdir "${REPORTS_DIR}" || :)
@@ -78,6 +76,20 @@ benchmarks-pr-comment:
     UPSTREAM_COMMIT_SHA: $CI_COMMIT_SHA # The commit revision the project is built for.
     KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: dd-trace-py
 
+check-big-regressions:
+  stage: benchmarks-report
+  when: always
+  tags: ["arch:amd64"]
+  image: $MICROBENCHMARKS_CI_IMAGE
+  script:
+    - export ARTIFACTS_DIR="$(pwd)/reports/"
+    - git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/".insteadOf "https://github.com/DataDog/"
+    - git clone --branch dd-trace-py https://github.com/DataDog/benchmarking-platform /platform && cd /platform
+    - bp-runner bp-runner.fail-on-regression.yml --debug
+  variables:
+    # Gitlab and BP specific env vars. Do not modify.
+    KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: dd-trace-py
+
 benchmark-serverless:
   stage: benchmarks
   image: $SLS_CI_IMAGE

.riot/requirements/107d8f2.txt

@@ -0,0 +1,54 @@
+#
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
+#
+#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/107d8f2.in
+#
+annotated-types==0.7.0
+anyio==4.8.0
+attrs==24.3.0
+certifi==2024.12.14
+coverage[toml]==7.6.10
+distro==1.9.0
+exceptiongroup==1.2.2
+h11==0.14.0
+httpcore==1.0.7
+httpx==0.27.2
+hypothesis==6.45.0
+idna==3.10
+importlib-metadata==8.6.1
+iniconfig==2.0.0
+mock==5.1.0
+multidict==6.1.0
+numpy==2.0.2
+openai[datalib,embeddings]==1.30.1
+opentracing==2.4.0
+packaging==24.2
+pandas==2.2.3
+pandas-stubs==2.2.2.240807
+pillow==9.5.0
+pluggy==1.5.0
+propcache==0.2.1
+pydantic==2.10.5
+pydantic-core==2.27.2
+pytest==8.3.4
+pytest-asyncio==0.21.1
+pytest-cov==6.0.0
+pytest-mock==3.14.0
+pytest-randomly==3.16.0
+python-dateutil==2.9.0.post0
+pytz==2024.2
+pyyaml==6.0.2
+six==1.17.0
+sniffio==1.3.1
+sortedcontainers==2.4.0
+tomli==2.2.1
+tqdm==4.67.1
+types-pytz==2024.2.0.20241221
+typing-extensions==4.12.2
+tzdata==2025.1
+urllib3==1.26.20
+vcrpy==4.2.1
+wrapt==1.17.2
+yarl==1.18.3
+zipp==3.21.0

.riot/requirements/130158f.txt

@@ -0,0 +1,48 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --no-annotate .riot/requirements/130158f.in
+#
+annotated-types==0.7.0
+anyio==4.8.0
+attrs==24.3.0
+certifi==2024.12.14
+charset-normalizer==3.4.1
+coverage[toml]==7.6.10
+distro==1.9.0
+h11==0.14.0
+httpcore==1.0.7
+httpx==0.28.1
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.0.0
+jiter==0.8.2
+mock==5.1.0
+multidict==6.1.0
+openai==1.60.0
+opentracing==2.4.0
+packaging==24.2
+pillow==11.1.0
+pluggy==1.5.0
+propcache==0.2.1
+pydantic==2.10.5
+pydantic-core==2.27.2
+pytest==8.3.4
+pytest-asyncio==0.21.1
+pytest-cov==6.0.0
+pytest-mock==3.14.0
+pytest-randomly==3.16.0
+pyyaml==6.0.2
+regex==2024.11.6
+requests==2.32.3
+six==1.17.0
+sniffio==1.3.1
+sortedcontainers==2.4.0
+tiktoken==0.8.0
+tqdm==4.67.1
+typing-extensions==4.12.2
+urllib3==1.26.20
+vcrpy==4.2.1
+wrapt==1.17.2
+yarl==1.18.3

.riot/requirements/1825740.txt

@@ -9,13 +9,13 @@ aiosignal==1.3.1
 async-timeout==4.0.3
 asynctest==0.13.0
 attrs==24.2.0
-certifi==2024.7.4
-charset-normalizer==3.3.2
+certifi==2024.12.14
+charset-normalizer==3.4.1
 coverage[toml]==7.2.7
 exceptiongroup==1.2.2
 frozenlist==1.3.3
 hypothesis==6.45.0
-idna==3.8
+idna==3.10
 importlib-metadata==6.7.0
 iniconfig==2.0.0
 joblib==1.3.2
@@ -36,13 +36,13 @@ pyyaml==6.0.1
 requests==2.31.0
 scikit-learn==1.0.2
 scipy==1.7.3
-six==1.16.0
+six==1.17.0
 sortedcontainers==2.4.0
 threadpoolctl==3.1.0
 tomli==2.0.1
-tqdm==4.66.5
+tqdm==4.67.1
 typing-extensions==4.7.1
-urllib3==1.26.19
+urllib3==1.26.20
 vcrpy==4.2.1
 wrapt==1.16.0
 yarl==1.9.4

.riot/requirements/18de44f.txt

@@ -0,0 +1,52 @@
+#
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
+#
+#    pip-compile --no-annotate --resolver=backtracking .riot/requirements/18de44f.in
+#
+annotated-types==0.7.0
+anyio==4.5.2
+attrs==24.3.0
+certifi==2024.12.14
+charset-normalizer==3.4.1
+coverage[toml]==7.6.1
+distro==1.9.0
+exceptiongroup==1.2.2
+h11==0.14.0
+httpcore==1.0.7
+httpx==0.28.1
+hypothesis==6.45.0
+idna==3.10
+importlib-metadata==8.5.0
+iniconfig==2.0.0
+jiter==0.8.2
+mock==5.1.0
+multidict==6.1.0
+openai==1.60.0
+opentracing==2.4.0
+packaging==24.2
+pillow==10.4.0
+pluggy==1.5.0
+propcache==0.2.0
+pydantic==2.10.5
+pydantic-core==2.27.2
+pytest==8.3.4
+pytest-asyncio==0.21.1
+pytest-cov==5.0.0
+pytest-mock==3.14.0
+pytest-randomly==3.15.0
+pyyaml==6.0.2
+regex==2024.11.6
+requests==2.32.3
+six==1.17.0
+sniffio==1.3.1
+sortedcontainers==2.4.0
+tiktoken==0.7.0
+tomli==2.2.1
+tqdm==4.67.1
+typing-extensions==4.12.2
+urllib3==1.26.20
+vcrpy==4.2.1
+wrapt==1.17.2
+yarl==1.15.2
+zipp==3.20.2