add releasenote

change to False by default

Author: quinna-h

ddtrace/contrib/internal/asgi/middleware.py

@@ -36,7 +36,6 @@
         service_name=config._get_service(default="asgi"),
         request_span_name="asgi.request",
         distributed_tracing=True,
-        _trace_asgi_websocket=asbool(os.getenv("DD_ASGI_TRACE_WEBSOCKET", default=False)),
         # TODO: set as initially false until we gradually release feature
         _trace_asgi_websocket_messages=asbool(os.getenv("DD_TRACE_WEBSOCKET_MESSAGES_ENABLED", default=True)),
         _asgi_websockets_inherit_sampling=asbool(
@@ -139,7 +138,7 @@ async def __call__(self, scope, receive, send):
         if scope["type"] == "http":
             method = scope["method"]
         elif scope["type"] == "websocket":
-            if not self.integration_config._trace_asgi_websocket:
+            if not self.integration_config._trace_asgi_websocket_messages:
                 return await self.app(scope, receive, send)
 
             method = "websocket"

ddtrace/contrib/internal/django/patch.py

@@ -81,8 +81,7 @@
         ),
         use_handler_resource_format=asbool(os.getenv("DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT", default=False)),
         use_legacy_resource_format=asbool(os.getenv("DD_DJANGO_USE_LEGACY_RESOURCE_FORMAT", default=False)),
-        _trace_asgi_websocket=_get_config("DD_ASGI_TRACE_WEBSOCKET", False, asbool),
-        _trace_asgi_websocket_messages=_get_config("DD_TRACE_WEBSOCKET_MESSAGES_ENABLED", True, asbool),
+        _trace_asgi_websocket_messages=_get_config("DD_TRACE_WEBSOCKET_MESSAGES_ENABLED", False, asbool),
         _asgi_websockets_inherit_sampling=_get_config("DD_TRACE_WEBSOCKET_MESSAGES_INHERIT_SAMPLING", True, asbool),
         _websocket_messages_separate=_get_config("DD_TRACE_WEBSOCKET_MESSAGES_SEPARATE_TRACES", True, asbool),
     ),

ddtrace/contrib/internal/fastapi/patch.py

@@ -26,8 +26,7 @@
         request_span_name="fastapi.request",
         distributed_tracing=True,
         trace_query_string=None,  # Default to global config
-        _trace_asgi_websocket=_get_config("DD_ASGI_TRACE_WEBSOCKET", False, asbool),
-        _trace_asgi_websocket_messages=_get_config("DD_TRACE_WEBSOCKET_MESSAGES_ENABLED", True, asbool),
+        _trace_asgi_websocket_messages=_get_config("DD_TRACE_WEBSOCKET_MESSAGES_ENABLED", False, asbool),
         _asgi_websockets_inherit_sampling=_get_config("DD_TRACE_WEBSOCKET_MESSAGES_INHERIT_SAMPLING", True, asbool),
         _websocket_messages_separate=_get_config("DD_TRACE_WEBSOCKET_MESSAGES_SEPARATE_TRACES", True, asbool),
     ),

ddtrace/contrib/internal/starlette/patch.py

@@ -40,7 +40,6 @@
         _default_service=schematize_service_name("starlette"),
         request_span_name="starlette.request",
         distributed_tracing=True,
-        _trace_asgi_websocket=_get_config("DD_ASGI_TRACE_WEBSOCKET", False, asbool),
         _trace_asgi_websocket_messages=_get_config("DD_TRACE_WEBSOCKET_MESSAGES_ENABLED", True, asbool),
         _asgi_websockets_inherit_sampling=_get_config("DD_TRACE_WEBSOCKET_MESSAGES_INHERIT_SAMPLING", True, asbool),
         _websocket_messages_separate=_get_config("DD_TRACE_WEBSOCKET_MESSAGES_SEPARATE_TRACES", True, asbool),

releasenotes/notes/asgi-websocket-tracing-support-0b785b921385dfeb.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    asgi: Adds tracing on websocket spans with `DD_TRACE_WEBSOCKET_MESSAGES_ENABLED`, which replaces `DD_TRACE_WEBSOCKET_MESSAGES`.

tests/contrib/fastapi/test_fastapi.py

@@ -616,7 +616,7 @@ def test_websocket_not_separate_traces(test_spans, snapshot_app):
 def test_long_running_websocket_session(test_spans, snapshot_app):
     client = TestClient(snapshot_app)
 
-    with override_config("fastapi", dict(_trace_asgi_websocket=True)):
+    with override_config("fastapi", dict(_trace_asgi_websocket_messages=True)):
         with client.websocket_connect("/ws") as websocket:
             data = websocket.receive_json()
             assert data == {"test": "Hello WebSocket"}
@@ -637,7 +637,7 @@ def test_long_running_websocket_session(test_spans, snapshot_app):
 def test_websocket_sampling_inherited(test_spans, snapshot_app):
     client = TestClient(snapshot_app)
 
-    with override_config("fastapi", dict(_trace_asgi_websocket=True)):
+    with override_config("fastapi", dict(_trace_asgi_websocket_messages=True)):
         with client.websocket_connect("/ws") as websocket:
             websocket.send_text("message")
             websocket.receive_text()