Merge remote-tracking branch 'origin/main' into brettlangdon/simplify…

….flask_simple
DataDog · Apr 30, 2024 · 3a91539 · 3a91539
2 parents 26bdeab + 94cd2ee
commit 3a91539
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml
@@ -9,18 +9,6 @@ on:
       # before merging/releasing
       - build_deploy*
   pull_request:
-    paths:
-      - ".github/workflows/build_deploy.yml"
-      - ".github/workflows/build_python_3.yml"
-      - "setup.py"
-      - "setup.cfg"
-      - "pyproject.toml"
-      - "**.c"
-      - "**.h"
-      - "**.cpp"
-      - "**.hpp"
-      - "**.pyx"
-      - "ddtrace/vendor/**"
   release:
     types:
       - published

diff --git a/benchmarks/appsec_iast_propagation/scenario.py b/benchmarks/appsec_iast_propagation/scenario.py
@@ -1,8 +1,7 @@
 from typing import Any  # noqa:F401
 
 import bm
-
-from tests.utils import override_env
+from bm.utils import override_env
 
 
 with override_env({"DD_IAST_ENABLED": "True"}):
@@ -42,7 +41,7 @@ def aspect_function(internal_loop, tainted):
     value = ""
     res = value
     for _ in range(internal_loop):
-        res = add_aspect(res, join_aspect(str.join, 1, "_", (tainted, "_", tainted)))
+        res = add_aspect(res, join_aspect("_".join, 1, "_", (tainted, "_", tainted)))
         value = res
         res = add_aspect(res, tainted)
         value = res