Merge branch 'main' into erikayasuda/tracer-flare-subscribe

riotfile.py

@@ -133,7 +133,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
         Venv(
             name="appsec_iast",
             pys=select_pys(),
-            command="pytest {cmdargs} tests/appsec/iast/",
+            command="pytest -v {cmdargs} tests/appsec/iast/",
             pkgs={
                 "requests": latest,
                 "pycryptodome": latest,

tests/contrib/celery/test_integration.py

@@ -17,6 +17,7 @@
 import ddtrace.internal.forksafe as forksafe
 from ddtrace.propagation.http import HTTPPropagator
 from tests.opentracer.utils import init_tracer
+from tests.utils import flaky
 
 from ...utils import override_global_config
 from .base import CeleryBaseTestCase
@@ -209,6 +210,7 @@ def fn_task_parameters(user, force_logout=False):
         assert run_span.get_tag("component") == "celery"
         assert run_span.get_tag("span.kind") == "consumer"
 
+    @flaky(1722529274)
     def test_fn_task_delay(self):
         # using delay shorthand must preserve arguments
         @self.app.task

tests/internal/test_tracer_flare.py

@@ -13,6 +13,7 @@
 from ddtrace.internal.flare.flare import Flare
 from ddtrace.internal.flare.flare import FlareSendRequest
 from ddtrace.internal.logger import get_logger
+from tests.utils import flaky
 
 
 DEBUG_LEVEL_INT = logging.DEBUG
@@ -120,6 +121,7 @@ def handle_agent_task():
         for p in processes:
             p.join()
 
+    @flaky(1722529274)
     def test_multiple_process_partial_failure(self):
         """
         Validte that even if the tracer flare fails for one process, we should