Merge branch '3.19' into sabrenner/mcp-server-info

Author: emmettbutler

.gitlab/benchmarks/bp-runner.microbenchmarks.fail-on-breach.yml

@@ -723,22 +723,22 @@ experiments:
               - max_rss_usage < 41.00 MB
 
           # iastpropagation
-          - name: iastpropagation-no-propagation
-            thresholds:
-              - execution_time < 0.06 ms
-              - max_rss_usage < 40.50 MB
-          - name: iastpropagation-propagation_enabled
-            thresholds:
-              - execution_time < 0.19 ms
-              - max_rss_usage < 40.00 MB
-          - name: iastpropagation-propagation_enabled_100
-            thresholds:
-              - execution_time < 2.30 ms
-              - max_rss_usage < 40.00 MB
-          - name: iastpropagation-propagation_enabled_1000
-            thresholds:
-              - execution_time < 34.55 ms
-              - max_rss_usage < 40.00 MB
+          # - name: iastpropagation-no-propagation
+          #   thresholds:
+          #     - execution_time < 0.06 ms
+          #     - max_rss_usage < 40.50 MB
+          # - name: iastpropagation-propagation_enabled
+          #   thresholds:
+          #     - execution_time < 0.19 ms
+          #     - max_rss_usage < 40.00 MB
+          # - name: iastpropagation-propagation_enabled_100
+          #   thresholds:
+          #     - execution_time < 2.30 ms
+          #     - max_rss_usage < 40.00 MB
+          # - name: iastpropagation-propagation_enabled_1000
+          #   thresholds:
+          #     - execution_time < 34.55 ms
+          #     - max_rss_usage < 40.00 MB
 
           # otelsdkspan
           - name: otelsdkspan-add-event

.gitlab/benchmarks/microbenchmarks.yml

@@ -159,7 +159,9 @@ microbenchmarks:
         - "appsec_iast_aspects_split"
         # Flaky timeouts on starting up
         # - "appsec_iast_django_startup"
-        - "appsec_iast_propagation"
+        # TOOD: Re-enable when this issue is resolved:
+        #   AttributeError: 'OverheadControl' object has no attribute 'release_request'
+        # - "appsec_iast_propagation"
         - "errortracking_django_simple"
         # They take a long time to run and frequently time out
         # TODO: Make benchmarks faster, or run less frequently, or as macrobenchmarks