Merge remote-tracking branch 'origin/main' into brettlangdon/core.rat…

…e_limiter
DataDog · May 10, 2024 · 349efa8 · 349efa8
2 parents 6504882 + 7f679b3
commit 349efa8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.gitlab/benchmarks.yml b/.gitlab/benchmarks.yml
@@ -103,10 +103,11 @@ appsec-iast-propagation:
   variables:
     SCENARIO: "appsec_iast_propagation"
 
-benchmark-encoder:
-  extends: .benchmarks
-  variables:
-    SCENARIO: "encoder"
+# Flaky benchmark test. Timeout errors
+#benchmark-encoder:
+#  extends: .benchmarks
+#  variables:
+#    SCENARIO: "encoder"
 
 benchmark-http-propagation-extract:
   extends: .benchmarks

diff --git a/releasenotes/notes/asm-gprc-import-not-crash-e13c48dcbcc1985e.yaml b/releasenotes/notes/asm-gprc-import-not-crash-e13c48dcbcc1985e.yaml