other edits

Author: mabdinur

ddtrace/_version.py

@@ -18,6 +18,7 @@
 from tests.appsec.ai_guard.utils import find_ai_guard_span
 from tests.appsec.ai_guard.utils import mock_evaluate_response
 from tests.appsec.ai_guard.utils import random_string
+from tests.utils import TracerSpanContainer
 from tests.utils import override_global_config
 
 
@@ -255,7 +256,7 @@ def test_message_immutability(mock_execute_request, telemetry_mock, ai_guard_cli
             )
         )
 
-    span = tracer.get_spans()[1]  # AI Guard span
+    span = TracerSpanContainer(tracer).spans[1]  # AI Guard span
     meta = span._get_struct_tag(AI_GUARD.TAG)
     messages = meta["messages"]
     assert len(messages) == 1

tests/appsec/ai_guard/api/test_api_client.py

@@ -15,14 +15,15 @@
 from ddtrace.appsec.ai_guard._api_client import Message
 from ddtrace.internal.settings.asm import ai_guard_config
 from tests.utils import DummyTracer
+from tests.utils import TracerSpanContainer
 
 
 def random_string(length: int) -> str:
     return "".join(random.choice(string.ascii_letters) for _ in range(length))
 
 
 def find_ai_guard_span(tracer: DummyTracer) -> Span:
-    spans = tracer.get_spans()
+    spans = TracerSpanContainer(tracer).spans
     assert len(spans) == 1
     span = spans[0]
     assert span.name == AI_GUARD.RESOURCE_TYPE

tests/appsec/ai_guard/utils.py

@@ -20,6 +20,7 @@
 from ddtrace.internal.utils.http import _format_template
 import tests.appsec.rules as rules
 from tests.utils import DummyTracer
+from tests.utils import TracerSpanContainer
 from tests.utils import override_env
 from tests.utils import override_global_config
 
@@ -2090,7 +2091,7 @@ def test_tracer():
 
     # Yield to our test
     yield tracer
-    tracer.pop()
+    TracerSpanContainer(tracer).pop()
     ddtrace.tracer = original_tracer
     core.tracer = original_tracer
 

tests/appsec/contrib_appsec/utils.py

@@ -70,7 +70,7 @@ def tracer():
     core.tracer = tracer
     with override_config("django", dict(_tracer=tracer)):
         yield tracer
-    tracer.pop()
+    TracerSpanContainer(tracer).pop()
     core.tracer = original_tracer
     # Reset the tracer pinned to Django and unpatch
     # DEV: unable to properly unpatch and reload django app with each test

tests/appsec/integrations/django_tests/conftest.py

@@ -41,9 +41,10 @@
 from ddtrace.internal.telemetry import TelemetryWriter
 from ddtrace.internal.utils.formats import parse_tags_str  # noqa:F401
 from tests import utils
-from tests.utils import DummyTracer
+from tests.utils import DummyWriter
 from tests.utils import TracerSpanContainer
 from tests.utils import call_program
+from tests.utils import check_test_agent_status
 from tests.utils import request_token
 from tests.utils import snapshot_context as _snapshot_context
 
@@ -161,7 +162,7 @@ def pytest_configure(config):
 
 @pytest.fixture
 def use_dummy_writer():
-    yield False
+    yield True
 
 
 @pytest.fixture