other edits

Author: mabdinur

ddtrace/_version.py

@@ -138,14 +138,14 @@ services:
             - ENABLED_CHECKS=trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service
             - SNAPSHOT_IGNORED_ATTRS=span_id,trace_id,parent_id,duration,start,metrics.system.pid,metrics.system.process_id,metrics.process_id,meta.runtime-id,meta._dd.p.tid,meta.pathway.hash,metrics._dd.tracer_kr,meta._dd.parent_id,meta.kafka.cluster_id
 
-    vertica:
-        image: vertica/vertica-ce
-        environment:
-          - VP_TEST_USER=dbadmin
-          - VP_TEST_PASSWORD=abc123
-          - VP_TEST_DATABASE=docker
-        ports:
-          - "127.0.0.1:5433:5433"
+    # vertica:
+    #     image: vertica/vertica-ce
+    #     environment:
+    #       - VP_TEST_USER=dbadmin
+    #       - VP_TEST_PASSWORD=abc123
+    #       - VP_TEST_DATABASE=docker
+    #     ports:
+    #       - "127.0.0.1:5433:5433"
     azureeventhubsemulator:
         image: mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.1.0
         ports:
@@ -180,27 +180,27 @@ services:
             - "127.0.0.1:10002:10002"
 
 
-    testrunner:
-        # DEV uncomment to test local changes to the Dockerfile
-        # build:
-        #  context: ./docker
-        #  dockerfile: Dockerfile
-        image: ghcr.io/datadog/dd-trace-py/testrunner:1802bf8a83c7826f8414f7dcc18cb29067f7e690@sha256:8ca2c0c6b34db4e0ef7f5ab55f717908ed2b9ae197b2c11b48b7359a1549a202
-        command: bash
-        environment:
-          DD_FAST_BUILD: "1"
-          CMAKE_BUILD_PARALLEL_LEVEL: "12"
-          CARGO_BUILD_JOBS: "12"
-          CYTHON_CACHE_DIR: "/home/bits/.cache/cython"
-          DD_USE_SCCACHE: "1"
-          SCCACHE_DIR: "/home/bits/.cache/sccache"
-        network_mode: host
-        userns_mode: host
-        working_dir: /home/bits/project/
-        volumes:
-          - ddagent:/tmp/ddagent
-          - ./.cache:/home/bits/.cache
-          - ./:/home/bits/project
+    # testrunner:
+    #     # DEV uncomment to test local changes to the Dockerfile
+    #     # build:
+    #     #  context: ./docker
+    #     #  dockerfile: Dockerfile
+    #     image: ghcr.io/datadog/dd-trace-py/testrunner:1802bf8a83c7826f8414f7dcc18cb29067f7e690@sha256:8ca2c0c6b34db4e0ef7f5ab55f717908ed2b9ae197b2c11b48b7359a1549a202
+    #     command: bash
+    #     environment:
+    #       DD_FAST_BUILD: "1"
+    #       CMAKE_BUILD_PARALLEL_LEVEL: "12"
+    #       CARGO_BUILD_JOBS: "12"
+    #       CYTHON_CACHE_DIR: "/home/bits/.cache/cython"
+    #       DD_USE_SCCACHE: "1"
+    #       SCCACHE_DIR: "/home/bits/.cache/sccache"
+    #     network_mode: host
+    #     userns_mode: host
+    #     working_dir: /home/bits/project/
+    #     volumes:
+    #       - ddagent:/tmp/ddagent
+    #       - ./.cache:/home/bits/.cache
+    #       - ./:/home/bits/project
 
     localstack:
         image: localstack/localstack:1.4.0

docker-compose.yml

@@ -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