rename test for separate traces

wip

Author: quinna-h

tests/contrib/fastapi/test_fastapi.py

@@ -541,6 +541,7 @@ def test_table_query_snapshot(snapshot_client):
     }
 
 
+
 @pytest.mark.subprocess(env=dict(DD_TRACE_WEBSOCKET_MESSAGES_ENABLED="true"))
 @snapshot(ignores=["meta._dd.span_links", "metrics.websocket.message.length"])
 # TODO: look into why one message is only 26 chars
@@ -587,16 +588,26 @@ def test_websocket_sampling_not_inherited(test_spans, snapshot_app):
     finally:
         fastapi_unpatch()
 
-
+@pytest.mark.subprocess(env=dict(DD_TRACE_WEBSOCKET_MESSAGES_ENABLED="true", DD_TRACE_WEBSOCKET_MESSAGES_SEPARATE_TRACES="false"))
 @snapshot(ignores=["meta._dd.span_links", "metrics.websocket.message.length"])
-def test_websocket_separate_traces(test_spans, snapshot_app):
-    client = TestClient(snapshot_app)
+def test_websocket_not_separate_traces(test_spans, snapshot_app):
+    import fastapi  # noqa: F401
+    from fastapi.testclient import TestClient
 
-    with override_config("fastapi", dict(_trace_asgi_websocket=True)):
-        with client.websocket_connect("/ws") as websocket:
-            websocket.send_text("message")
-            websocket.receive_text()
-            websocket.send_text("close")
+    from ddtrace.contrib.internal.fastapi.patch import patch as fastapi_patch
+    from ddtrace.contrib.internal.fastapi.patch import unpatch as fastapi_unpatch
+    from tests.contrib.fastapi import app
+
+    fastapi_patch()
+    try:
+        application = app.get_app()
+        with TestClient(application) as client:
+            with client.websocket_connect("/ws") as websocket:
+                websocket.send_text("message")
+                websocket.receive_text()
+                websocket.send_text("close")
+    finally:
+        fastapi_unpatch()
 
 
 @pytest.mark.snapshot(ignores=["meta._dd.span_links", "metrics.websocket.message.length"])

tests/snapshots/tests.contrib.fastapi.test_fastapi.test_websocket_separate_traces.json renamed to tests/snapshots/tests.contrib.fastapi.test_fastapi.test_websocket_not_separate_traces.json

@@ -11,23 +11,23 @@
     "meta": {
       "_dd.base_service": "tests.contrib.fastapi",
       "_dd.p.dm": "-0",
-      "_dd.p.tid": "68405e9100000000",
+      "_dd.p.tid": "68407af200000000",
       "component": "fastapi",
       "http.upgraded": "websocket",
       "http.url": "ws://testserver/ws",
       "http.useragent": "testclient",
       "language": "python",
-      "runtime-id": "46911d0351fd4628b8af947ce608ec73",
+      "runtime-id": "afb339b9b58445e6a35a9a4697b8a428",
       "span.kind": "server"
     },
     "metrics": {
       "_dd.top_level": 1,
       "_dd.tracer_kr": 1.0,
       "_sampling_priority_v1": 1,
-      "process_id": 66546
+      "process_id": 98361
     },
-    "duration": 736000,
-    "start": 1749048977947815000
+    "duration": 659000,
+    "start": 1749056242144119000
   },
      {
        "name": "websocket.send",
@@ -49,8 +49,8 @@
          "websocket.message.frames": 1,
          "websocket.message.length": 27
        },
-       "duration": 38000,
-       "start": 1749048977948151000
+       "duration": 36000,
+       "start": 1749056242144400000
      },
      {
        "name": "websocket.receive",
@@ -63,7 +63,7 @@
        "error": 0,
        "meta": {
          "_dd.base_service": "tests.contrib.fastapi",
-         "_dd.span_links": "[{\"trace_id\": \"68405e910000000015ed91abfe7bf691\", \"span_id\": \"9905a4b96a487d91\", \"attributes\": {\"dd.kind\": \"executed_by\"}}]",
+         "_dd.span_links": "[{\"trace_id\": \"68407af200000000efd8f30100773f55\", \"span_id\": \"06d2eec54da5c6f3\", \"attributes\": {\"dd.kind\": \"executed_by\"}}]",
          "component": "fastapi",
          "span.kind": "consumer",
          "websocket.message.type": "text"
@@ -72,8 +72,8 @@
          "websocket.message.frames": 1,
          "websocket.message.length": 7
        },
-       "duration": 66000,
-       "start": 1749048977948286000
+       "duration": 62000,
+       "start": 1749056242144523000
      },
      {
        "name": "websocket.send",
@@ -95,8 +95,8 @@
          "websocket.message.frames": 1,
          "websocket.message.length": 12
        },
-       "duration": 25000,
-       "start": 1749048977948379000
+       "duration": 26000,
+       "start": 1749056242144608000
      },
      {
        "name": "websocket.receive",
@@ -109,7 +109,7 @@
        "error": 0,
        "meta": {
          "_dd.base_service": "tests.contrib.fastapi",
-         "_dd.span_links": "[{\"trace_id\": \"68405e910000000015ed91abfe7bf691\", \"span_id\": \"9905a4b96a487d91\", \"attributes\": {\"dd.kind\": \"executed_by\"}}]",
+         "_dd.span_links": "[{\"trace_id\": \"68407af200000000efd8f30100773f55\", \"span_id\": \"06d2eec54da5c6f3\", \"attributes\": {\"dd.kind\": \"executed_by\"}}]",
          "component": "fastapi",
          "span.kind": "consumer",
          "websocket.message.type": "text"
@@ -119,7 +119,7 @@
          "websocket.message.length": 5
        },
        "duration": 25000,
-       "start": 1749048977948434000
+       "start": 1749056242144663000
      },
      {
        "name": "websocket.send",
@@ -142,7 +142,7 @@
          "websocket.message.length": 10
        },
        "duration": 23000,
-       "start": 1749048977948479000
+       "start": 1749056242144709000
      },
      {
        "name": "websocket.close",
@@ -161,6 +161,6 @@
        "metrics": {
          "websocket.close.code": 1000
        },
-       "duration": 27000,
-       "start": 1749048977948534000
+       "duration": 26000,
+       "start": 1749056242144761000
      }]]