Merge branch 'main' of github.com:DataDog/dd-trace-py into vitor-de-araujo/SDTEST-2663/telemetry-3

Author: vitor-de-araujo

.claude/skills/run-tests/SKILL.md

@@ -84,7 +84,7 @@ When you modify files like:
 #### For Test-Only Changes
 When you modify `tests/` files (but not test infrastructure):
 - Run only the specific test files/functions modified
-- Use pytest args: `-- -k test_name` or direct test file paths
+- Use pytest args: `-- -- -k test_name` or direct test file paths
 
 #### For Test Infrastructure Changes
 When you modify:
@@ -121,7 +121,7 @@ This will:
 
 For re-running specific tests:
 ```bash
-scripts/run-tests --venv <hash> -- -vv -k test_name
+scripts/run-tests --venv <hash> -- -- -vv -k test_name
 ```
 
 ## When Tests Fail
@@ -243,15 +243,15 @@ scripts/run-tests --list tests/contrib/flask/test_views.py
 # Output shows: contrib::flask suite
 
 # Run just the specific test:
-scripts/run-tests --venv flask_py311 -- -vv tests/contrib/flask/test_views.py
+scripts/run-tests --venv flask_py311 -- -- -vv tests/contrib/flask/test_views.py
 ```
 
 ### Example 4: Iterating on a Failing Test
 
 First run shows one test failing:
 
 ```bash
-scripts/run-tests --venv flask_py311 -- -vv -k test_view_called_twice
+scripts/run-tests --venv flask_py311 -- -- -vv -k test_view_called_twice
 # Focused on the specific failing test with verbose output
 ```
 
@@ -330,7 +330,7 @@ The `scripts/run-tests` system:
 - Uses `riot` to manage multiple Python/package combinations as venvs
 - Each venv is a self-contained environment
 - Docker services are managed per suite lifecycle
-- Tests can pass optional pytest arguments with `--`
+- Tests can pass optional pytest arguments with `-- --`
 
 ### Supported Suite Types
 

.github/workflows/system-tests.yml

@@ -45,7 +45,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: '31bc180ce87184c996400361ddb17c8743eec18f'
+          ref: '94529f681dcaf74382ed47c3b0c85acdb775b6c9'
 
       - name: Download wheels to binaries directory
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
@@ -90,7 +90,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: '31bc180ce87184c996400361ddb17c8743eec18f'
+          ref: '94529f681dcaf74382ed47c3b0c85acdb775b6c9'
 
       - name: Build runner
         uses: ./.github/actions/install_runner
@@ -217,6 +217,10 @@ jobs:
         if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'appsec-1'
         run: ./run.sh APPSEC_RASP
 
+      - name: Run APPSEC_RASP_NON_BLOCKING
+        if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'appsec-1'
+        run: ./run.sh APPSEC_RASP_NON_BLOCKING
+
       - name: Run APPSEC_RASP_WITHOUT_DOWNSTREAM_BODY_ANALYSIS_USING_MAX
         if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'appsec-1'
         run: ./run.sh APPSEC_RASP_WITHOUT_DOWNSTREAM_BODY_ANALYSIS_USING_MAX
@@ -283,7 +287,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: '31bc180ce87184c996400361ddb17c8743eec18f'
+          ref: '94529f681dcaf74382ed47c3b0c85acdb775b6c9'
       - name: Download wheels to binaries directory
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:

.gitlab-ci.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: "31bc180ce87184c996400361ddb17c8743eec18f"
+  SYSTEM_TESTS_REF: "94529f681dcaf74382ed47c3b0c85acdb775b6c9"
 
 default:
   interruptible: true

benchmarks/appsec_iast_aspects/config.yaml

@@ -1,234 +1,294 @@
 add_aspect: &add_aspect
   warmups: 1
   function_name: "iast_add_aspect"
+  iast_enabled: true
 
 add_noaspect:
   <<: *add_aspect
   function_name: "add_noaspect"
+  iast_enabled: false
 
 add_inplace_aspect: &add_inplace_aspect
   warmups: 1
   function_name: "iast_add_inplace_aspect"
+  iast_enabled: true
 
 add_inplace_noaspect:
   <<: *add_inplace_aspect
   function_name: "add_inplace_noaspect"
+  iast_enabled: false
 
 bytearray_aspect: &bytearray_aspect
   warmups: 1
   function_name: "iast_bytearray_aspect"
+  iast_enabled: true
 
 bytearray_noaspect:
   <<: *bytearray_aspect
   function_name: "bytearray_noaspect"
+  iast_enabled: false
 
 bytearray_extend_aspect: &bytearray_extend_aspect
   warmups: 1
   function_name: "iast_bytearray_extend_aspect"
+  iast_enabled: true
 
 bytearray_extend_noaspect:
   <<: *bytearray_extend_aspect
   function_name: "bytearray_extend_noaspect"
+  iast_enabled: false
 
 bytes_aspect: &bytes_aspect
   warmups: 1
   function_name: "iast_bytes_aspect"
+  iast_enabled: true
 
 bytes_noaspect:
   <<: *bytes_aspect
   function_name: "bytes_noaspect"
+  iast_enabled: false
 
 bytesio_aspect: &bytesio_aspect
   warmups: 1
   function_name: "iast_bytesio_aspect"
+  iast_enabled: true
 
 bytesio_noaspect:
   <<: *bytesio_aspect
   function_name: "bytesio_noaspect"
+  iast_enabled: false
 
 capitalize_aspect: &capitalize_aspect
   warmups: 1
   function_name: "iast_capitalize_aspect"
+  iast_enabled: true
 
 capitalize_noaspect:
   <<: *capitalize_aspect
   function_name: "capitalize_noaspect"
+  iast_enabled: false
 
 casefold_aspect: &casefold_aspect
   warmups: 1
   function_name: "iast_casefold_aspect"
+  iast_enabled: true
 
 casefold_noaspect:
   <<: *casefold_aspect
   function_name: "casefold_noaspect"
+  iast_enabled: false
 
 decode_aspect: &decode_aspect
   warmups: 1
   function_name: "iast_decode_aspect"
+  iast_enabled: true
 
 decode_noaspect:
   <<: *decode_aspect
   function_name: "decode_noaspect"
+  iast_enabled: false
 
 encode_aspect: &encode_aspect
   warmups: 1
   function_name: "iast_encode_aspect"
+  iast_enabled: true
 
 encode_noaspect:
   <<: *encode_aspect
   function_name: "encode_noaspect"
+  iast_enabled: false
 
 format_aspect: &format_aspect
   warmups: 1
   function_name: "iast_format_aspect"
+  iast_enabled: true
 
 format_noaspect:
   <<: *format_aspect
   function_name: "format_noaspect"
+  iast_enabled: false
 
 format_map_aspect: &format_map_aspect
   warmups: 1
   function_name: "iast_format_map_aspect"
+  iast_enabled: true
 
 format_map_noaspect:
   <<: *format_map_aspect
   function_name: "format_map_noaspect"
+  iast_enabled: false
 
 index_aspect: &index_aspect
   warmups: 1
   function_name: "iast_index_aspect"
+  iast_enabled: true
 
 index_noaspect:
   <<: *index_aspect
   function_name: "index_noaspect"
+  iast_enabled: false
 
 join_aspect: &join_aspect
   warmups: 1
   function_name: "iast_join_aspect"
+  iast_enabled: true
 
 join_noaspect:
   <<: *join_aspect
   function_name: "join_noaspect"
+  iast_enabled: false
 
 strip_aspect: &strip_aspect
   warmups: 1
   function_name: "iast_strip_aspect"
+  iast_enabled: true
 
 strip_noaspect:
   <<: *strip_aspect
   function_name: "strip_noaspect"
+  iast_enabled: false
 
 rstrip_aspect: &rstrip_aspect
   warmups: 1
   function_name: "iast_rstrip_aspect"
+  iast_enabled: true
 
 rstrip_noaspect:
   <<: *rstrip_aspect
   function_name: "rstrip_noaspect"
+  iast_enabled: false
 
 lstrip_aspect: &lstrip_aspect
   warmups: 1
   function_name: "iast_lstrip_aspect"
+  iast_enabled: true
 
 lstrip_noaspect:
   <<: *lstrip_aspect
   function_name: "lstrip_noaspect"
+  iast_enabled: false
 
 lower_aspect: &lower_aspect
   warmups: 1
   function_name: "iast_lower_aspect"
+  iast_enabled: true
 
 lower_noaspect:
   <<: *lower_aspect
   function_name: "lower_noaspect"
+  iast_enabled: false
 
 ljust_aspect: &ljust_aspect
   warmups: 1
   function_name: "iast_ljust_aspect"
+  iast_enabled: true
 
 ljust_noaspect:
   <<: *ljust_aspect
   function_name: "ljust_noaspect"
+  iast_enabled: false
 
 modulo_aspect: &modulo_aspect
   warmups: 1
   function_name: "iast_modulo_aspect"
+  iast_enabled: true
 
 modulo_aspect_for_bytes:
   <<: *modulo_aspect
   function_name: "iast_modulo_aspect_for_bytes"
+  iast_enabled: true
 
 modulo_aspect_for_bytes_bytearray:
   <<: *modulo_aspect
   function_name: "iast_modulo_aspect_for_bytes_bytearray"
+  iast_enabled: true
 
 modulo_aspect_for_bytearray_bytearray:
   <<: *modulo_aspect
   function_name: "iast_modulo_aspect_for_bytearray_bytearray"
+  iast_enabled: true
 
 modulo_noaspect:
   <<: *modulo_aspect
   function_name: "modulo_noaspect"
+  iast_enabled: false
 
 replace_aspect: &replace_aspect
   warmups: 1
   function_name: "iast_replace_aspect"
+  iast_enabled: true
 
 replace_noaspect:
   <<: *replace_aspect
   function_name: "replace_noaspect"
+  iast_enabled: false
 
 repr_aspect: &repr_aspect
   warmups: 1
   function_name: "iast_repr_aspect"
+  iast_enabled: true
 
 repr_noaspect:
   <<: *repr_aspect
   function_name: "repr_noaspect"
+  iast_enabled: false
+
 slice_aspect: &slice_aspect
   warmups: 1
   function_name: "iast_slice_aspect"
+  iast_enabled: true
 
 slice_noaspect:
   <<: *slice_aspect
   function_name: "slice_noaspect"
+  iast_enabled: false
 
 stringio_aspect: &stringio_aspect
   warmups: 1
   function_name: "iast_stringio_aspect"
+  iast_enabled: true
 
 stringio_noaspect:
   <<: *stringio_aspect
   function_name: "stringio_noaspect"
+  iast_enabled: false
 
 swapcase_aspect: &swapcase_aspect
   warmups: 1
   function_name: "iast_swapcase_aspect"
+  iast_enabled: true
 
 swapcase_noaspect:
   <<: *swapcase_aspect
   function_name: "swapcase_noaspect"
+  iast_enabled: false
 
 title_aspect: &title_aspect
   warmups: 1
   function_name: "iast_title_aspect"
+  iast_enabled: true
 
 title_noaspect:
   <<: *title_aspect
   function_name: "title_noaspect"
+  iast_enabled: false
 
 translate_aspect: &translate_aspect
   warmups: 1
   function_name: "iast_translate_aspect"
+  iast_enabled: true
 
 translate_noaspect:
   <<: *translate_aspect
   function_name: "translate_noaspect"
+  iast_enabled: false
 
 upper_aspect: &upper_aspect
   warmups: 1
   function_name: "iast_upper_aspect"
+  iast_enabled: true
 
 upper_noaspect:
   <<: *upper_aspect
   function_name: "upper_noaspect"
+  iast_enabled: false