Changed span-names to asgi.{scope["type"]}.send/receive

Author: Skeen

ext/opentelemetry-ext-asgi/src/opentelemetry/ext/asgi/__init__.py

@@ -159,7 +159,7 @@ async def __call__(self, scope, receive, send):
         span_name = self.name_callback(scope)
 
         with self.tracer.start_as_current_span(
-            span_name + " (connection)",
+            span_name + " (asgi.connection)",
             parent_span,
             kind=trace.SpanKind.SERVER,
             attributes=collect_request_attributes(scope),
@@ -168,25 +168,21 @@ async def __call__(self, scope, receive, send):
             @wraps(receive)
             async def wrapped_receive():
                 with self.tracer.start_as_current_span(
-                    span_name + " (unknown-receive)"
+                    span_name + " (asgi." + scope["type"] + ".receive)"
                 ) as receive_span:
                     payload = await receive()
                     if payload["type"] == "websocket.receive":
                         set_status_code(receive_span, 200)
                         receive_span.set_attribute(
                             "http.status_text", payload["text"]
                         )
-
-                    receive_span.update_name(
-                        span_name + " (" + payload["type"] + ")"
-                    )
                     receive_span.set_attribute("type", payload["type"])
                 return payload
 
             @wraps(send)
             async def wrapped_send(payload):
                 with self.tracer.start_as_current_span(
-                    span_name + " (" + payload["type"] + ")"
+                    span_name + " (asgi." + scope["type"] + ".send)"
                 ) as send_span:
                     if payload["type"] == "http.response.start":
                         status_code = payload["status"]
@@ -196,7 +192,6 @@ async def wrapped_send(payload):
                         send_span.set_attribute(
                             "http.status_text", payload["text"]
                         )
-
                     send_span.set_attribute("type", payload["type"])
                     await send(payload)
 

ext/opentelemetry-ext-asgi/tests/test_asgi_middleware.py

@@ -91,25 +91,25 @@ def validate_outputs(self, outputs, error=None, modifiers=None):
         self.assertEqual(len(span_list), 4)
         expected = [
             {
-                "name": "HTTP GET (http.request)",
+                "name": "HTTP GET (asgi.http.receive)",
                 "kind": trace_api.SpanKind.INTERNAL,
                 "attributes": {"type": "http.request"},
             },
             {
-                "name": "HTTP GET (http.response.start)",
+                "name": "HTTP GET (asgi.http.send)",
                 "kind": trace_api.SpanKind.INTERNAL,
                 "attributes": {
                     "http.status_code": 200,
                     "type": "http.response.start",
                 },
             },
             {
-                "name": "HTTP GET (http.response.body)",
+                "name": "HTTP GET (asgi.http.send)",
                 "kind": trace_api.SpanKind.INTERNAL,
                 "attributes": {"type": "http.response.body"},
             },
             {
-                "name": "HTTP GET (connection)",
+                "name": "HTTP GET (asgi.connection)",
                 "kind": trace_api.SpanKind.SERVER,
                 "attributes": {
                     "component": "http",