update Tornado implementation

Author: macieyng

instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py

@@ -454,10 +454,12 @@ def _get_attributes_from_request(request):
     )
 
 
-def _get_operation_name(handler, request):
-    full_class_name = type(handler).__name__
-    class_name = full_class_name.rsplit(".")[-1]
-    return f"{class_name}.{request.method.lower()}"
+def _get_default_span_name(request):
+    path = request.path
+    method = request.method
+    if method and path:
+        return f"{method} {path}"
+    return f"{method}"
 
 
 def _get_full_handler_name(handler):
@@ -468,7 +470,7 @@ def _get_full_handler_name(handler):
 def _start_span(tracer, handler) -> _TraceContext:
     span, token = _start_internal_or_server_span(
         tracer=tracer,
-        span_name=_get_operation_name(handler, handler.request),
+        span_name=_get_default_span_name(handler.request),
         start_time=time_ns(),
         context_carrier=handler.request.headers,
         context_getter=textmap.default_getter,

instrumentation/opentelemetry-instrumentation-tornado/tests/test_instrumentation.py

@@ -135,7 +135,7 @@ def _test_http_method_call(self, method):
         self.assertEqual(manual.parent, server.context)
         self.assertEqual(manual.context.trace_id, client.context.trace_id)
 
-        self.assertEqual(server.name, "MainHandler." + method.lower())
+        self.assertEqual(server.name, f"{method} /")
         self.assertTrue(server.parent.is_remote)
         self.assertNotEqual(server.parent, client.context)
         self.assertEqual(server.parent.span_id, client.context.span_id)
@@ -196,7 +196,7 @@ def _test_async_handler(self, url, handler_name):
         self.assertEqual(len(spans), 5)
 
         client = spans.by_name("GET")
-        server = spans.by_name(handler_name + ".get")
+        server = spans.by_name(f"GET {url}")
         sub_wrapper = spans.by_name("sub-task-wrapper")
 
         sub2 = spans.by_name("sub-task-2")
@@ -213,7 +213,7 @@ def _test_async_handler(self, url, handler_name):
         self.assertEqual(sub_wrapper.parent, server.context)
         self.assertEqual(sub_wrapper.context.trace_id, client.context.trace_id)
 
-        self.assertEqual(server.name, handler_name + ".get")
+        self.assertEqual(server.name, f"GET {url}")
         self.assertTrue(server.parent.is_remote)
         self.assertNotEqual(server.parent, client.context)
         self.assertEqual(server.parent.span_id, client.context.span_id)
@@ -229,6 +229,7 @@ def _test_async_handler(self, url, handler_name):
                 SpanAttributes.HTTP_TARGET: url,
                 SpanAttributes.HTTP_CLIENT_IP: "127.0.0.1",
                 SpanAttributes.HTTP_STATUS_CODE: 201,
+                "tornado.handler": f"tests.tornado_test_app.{handler_name}"
             },
         )
 
@@ -253,9 +254,9 @@ def test_500(self):
         self.assertEqual(len(spans), 2)
 
         client = spans.by_name("GET")
-        server = spans.by_name("BadHandler.get")
+        server = spans.by_name("GET /error")
 
-        self.assertEqual(server.name, "BadHandler.get")
+        self.assertEqual(server.name, "GET /error")
         self.assertEqual(server.kind, SpanKind.SERVER)
         self.assertSpanHasAttributes(
             server,
@@ -290,7 +291,7 @@ def test_404(self):
         self.assertEqual(len(spans), 2)
         server, client = spans
 
-        self.assertEqual(server.name, "ErrorHandler.get")
+        self.assertEqual(server.name, "GET /missing-url")
         self.assertEqual(server.kind, SpanKind.SERVER)
         self.assertSpanHasAttributes(
             server,
@@ -325,7 +326,7 @@ def test_http_error(self):
         self.assertEqual(len(spans), 2)
         server, client = spans
 
-        self.assertEqual(server.name, "RaiseHTTPErrorHandler.get")
+        self.assertEqual(server.name, "GET /raise_403")
         self.assertEqual(server.kind, SpanKind.SERVER)
         self.assertSpanHasAttributes(
             server,
@@ -366,7 +367,7 @@ def test_dynamic_handler(self):
         self.assertEqual(len(spans), 2)
         server, client = spans
 
-        self.assertEqual(server.name, "DynamicHandler.get")
+        self.assertEqual(server.name, "GET /dyna")
         self.assertTrue(server.parent.is_remote)
         self.assertNotEqual(server.parent, client.context)
         self.assertEqual(server.parent.span_id, client.context.span_id)
@@ -407,7 +408,7 @@ def test_handler_on_finish(self):
         self.assertEqual(len(spans), 3)
         auditor, server, client = spans
 
-        self.assertEqual(server.name, "FinishedHandler.get")
+        self.assertEqual(server.name, "GET /on_finish")
         self.assertTrue(server.parent.is_remote)
         self.assertNotEqual(server.parent, client.context)
         self.assertEqual(server.parent.span_id, client.context.span_id)
@@ -531,7 +532,7 @@ def test_xheaders(self):
         self.assertEqual(response.code, 201)
         spans = self.get_finished_spans()
         self.assertSpanHasAttributes(
-            spans.by_name("MainHandler.get"),
+            spans.by_name("GET /"),
             {
                 SpanAttributes.HTTP_METHOD: "GET",
                 SpanAttributes.HTTP_SCHEME: "http",
@@ -605,7 +606,7 @@ def test_uninstrument(self):
         self.assertEqual(len(spans), 3)
         manual, server, client = self.sorted_spans(spans)
         self.assertEqual(manual.name, "manual")
-        self.assertEqual(server.name, "MainHandler.get")
+        self.assertEqual(server.name, "GET /")
         self.assertEqual(client.name, "GET")
         self.memory_exporter.clear()