opentelemetry-instrumentation-tornado 0.57b0__tar.gz → 0.58b0__tar.gz

{opentelemetry_instrumentation_tornado-0.57b0 → opentelemetry_instrumentation_tornado-0.58b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opentelemetry-instrumentation-tornado
-Version: 0.57b0
+Version: 0.58b0
 Summary: Tornado instrumentation for OpenTelemetry
 Project-URL: Homepage, https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-tornado
 Project-URL: Repository, https://github.com/open-telemetry/opentelemetry-python-contrib
@@ -18,9 +18,9 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
 Requires-Dist: opentelemetry-api~=1.12
-Requires-Dist: opentelemetry-instrumentation==0.57b0
-Requires-Dist: opentelemetry-semantic-conventions==0.57b0
-Requires-Dist: opentelemetry-util-http==0.57b0
+Requires-Dist: opentelemetry-instrumentation==0.58b0
+Requires-Dist: opentelemetry-semantic-conventions==0.58b0
+Requires-Dist: opentelemetry-util-http==0.58b0
 Provides-Extra: instruments
 Requires-Dist: tornado>=5.1.1; extra == 'instruments'
 Description-Content-Type: text/x-rst

{opentelemetry_instrumentation_tornado-0.57b0 → opentelemetry_instrumentation_tornado-0.58b0}/pyproject.toml

@@ -25,9 +25,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.57b0",
-  "opentelemetry-semantic-conventions == 0.57b0",
-  "opentelemetry-util-http == 0.57b0",
+  "opentelemetry-instrumentation == 0.58b0",
+  "opentelemetry-semantic-conventions == 0.58b0",
+  "opentelemetry-util-http == 0.58b0",
 ]
 
 [project.optional-dependencies]

{opentelemetry_instrumentation_tornado-0.57b0 → opentelemetry_instrumentation_tornado-0.58b0}/src/opentelemetry/instrumentation/tornado/__init__.py

@@ -211,6 +211,7 @@ from .client import fetch_async  # pylint: disable=E0401
 
 _logger = getLogger(__name__)
 _TraceContext = namedtuple("TraceContext", ["activation", "span", "token"])
+_HANDLER_STATE_KEY = "_otel_state_key"
 _HANDLER_CONTEXT_KEY = "_otel_trace_context_key"
 _OTEL_PATCHED_KEY = "_otel_patched_key"
 
@@ -402,10 +403,14 @@ def _wrap(cls, method_name, wrapper):
 def _prepare(
     tracer, server_histograms, request_hook, func, handler, args, kwargs
 ):
-    server_histograms[_START_TIME] = default_timer()
-
     request = handler.request
-    if _excluded_urls.url_disabled(request.uri):
+    otel_handler_state = {
+        _START_TIME: default_timer(),
+        "exclude_request": _excluded_urls.url_disabled(request.uri),
+    }
+    setattr(handler, _HANDLER_STATE_KEY, otel_handler_state)
+
+    if otel_handler_state["exclude_request"]:
         return func(*args, **kwargs)
 
     _record_prepare_metrics(server_histograms, handler)
@@ -622,9 +627,11 @@ def _record_prepare_metrics(server_histograms, handler):
 
 
 def _record_on_finish_metrics(server_histograms, handler, error=None):
-    elapsed_time = round(
-        (default_timer() - server_histograms[_START_TIME]) * 1000
-    )
+    otel_handler_state = getattr(handler, _HANDLER_STATE_KEY, None) or {}
+    if otel_handler_state.get("exclude_request"):
+        return
+    start_time = otel_handler_state.get(_START_TIME, None) or default_timer()
+    elapsed_time = round((default_timer() - start_time) * 1000)
 
     response_size = int(handler._headers.get("Content-Length", 0))
     metric_attributes = _create_metric_attributes(handler)

{opentelemetry_instrumentation_tornado-0.57b0 → opentelemetry_instrumentation_tornado-0.58b0}/src/opentelemetry/instrumentation/tornado/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.57b0"
+__version__ = "0.58b0"

{opentelemetry_instrumentation_tornado-0.57b0 → opentelemetry_instrumentation_tornado-0.58b0}/tests/test_metrics_instrumentation.py

@@ -13,8 +13,11 @@
 # limitations under the License.
 
 
+import asyncio
 from timeit import default_timer
 
+import tornado.testing
+
 from opentelemetry.instrumentation.tornado import TornadoInstrumentor
 from opentelemetry.sdk.metrics.export import HistogramDataPoint
 
@@ -165,6 +168,78 @@ class TestTornadoMetricsInstrumentation(TornadoTest):
             ),
         )
 
+    @tornado.testing.gen_test
+    async def test_metrics_concurrent_requests(self):
+        """
+        Test that metrics can handle concurrent requests and calculate in an async-safe way.
+        """
+        req1 = self.http_client.fetch(self.get_url("/slow?duration=1.0"))
+        req2 = self.http_client.fetch(self.get_url("/async"))
+        await asyncio.gather(req1, req2)
+
+        metrics = self.get_sorted_metrics()
+        self.assertEqual(len(metrics), 7)
+
+        client_duration = metrics[0]
+        server_duration = metrics[4]
+        self.assertEqual(client_duration.name, "http.client.duration")
+        self.assertEqual(server_duration.name, "http.server.duration")
+
+        # Calculating duration requires tracking state via `_HANDLER_STATE_KEY`, so we want to make sure
+        # duration is calculated properly per request, and doesn't affect concurrent requests.
+        req1_client_duration_data_point = next(
+            dp
+            for dp in client_duration.data.data_points
+            if "/slow" in dp.attributes.get("http.url")
+        )
+        req1_server_duration_data_point = next(
+            dp
+            for dp in server_duration.data.data_points
+            if "/slow" in dp.attributes.get("http.target")
+        )
+        req2_client_duration_data_point = next(
+            dp
+            for dp in client_duration.data.data_points
+            if "/async" in dp.attributes.get("http.url")
+        )
+        req2_server_duration_data_point = next(
+            dp
+            for dp in server_duration.data.data_points
+            if "/async" in dp.attributes.get("http.target")
+        )
+
+        # Server and client durations should be similar (adjusting for msecs vs secs)
+        self.assertAlmostEqual(
+            abs(
+                req1_server_duration_data_point.sum / 1000.0
+                - req1_client_duration_data_point.sum
+            ),
+            0.0,
+            delta=0.01,
+        )
+        self.assertAlmostEqual(
+            abs(
+                req2_server_duration_data_point.sum / 1000.0
+                - req2_client_duration_data_point.sum
+            ),
+            0.0,
+            delta=0.01,
+        )
+
+        # Make sure duration is roughly equivalent to expected (req1/slow) should be around 1 second
+        self.assertAlmostEqual(
+            req1_server_duration_data_point.sum / 1000.0,
+            1.0,
+            delta=0.1,
+            msg="Should have been about 1 second",
+        )
+        self.assertAlmostEqual(
+            req2_server_duration_data_point.sum / 1000.0,
+            0.0,
+            delta=0.1,
+            msg="Should have been really short",
+        )
+
     def test_metric_uninstrument(self):
         self.fetch("/")
         TornadoInstrumentor().uninstrument()
@@ -177,3 +252,16 @@ class TestTornadoMetricsInstrumentation(TornadoTest):
             for point in list(metric.data.data_points):
                 if isinstance(point, HistogramDataPoint):
                     self.assertEqual(point.count, 1)
+
+    def test_exclude_lists(self):
+        def test_excluded(path):
+            self.fetch(path)
+
+            # Verify no server metrics written (only client ones should exist)
+            metrics = self.get_sorted_metrics()
+            for metric in metrics:
+                self.assertTrue("http.server" not in metric.name, metric)
+            self.assertEqual(len(metrics), 3, metrics)
+
+        test_excluded("/healthz")
+        test_excluded("/ping")

{opentelemetry_instrumentation_tornado-0.57b0 → opentelemetry_instrumentation_tornado-0.58b0}/tests/tornado_test_app.py

@@ -1,4 +1,5 @@
 # pylint: disable=W0223,R0201
+import asyncio
 import time
 
 import tornado.web
@@ -106,6 +107,13 @@ class CustomResponseHeaderHandler(tornado.web.RequestHandler):
         self.set_status(200)
 
 
+class SlowHandler(tornado.web.RequestHandler):
+    async def get(self):
+        with self.application.tracer.start_as_current_span("slow"):
+            duration = float(self.get_argument("duration", "1.0"))
+            await asyncio.sleep(duration)
+
+
 class RaiseHTTPErrorHandler(tornado.web.RequestHandler):
     def get(self):
         raise tornado.web.HTTPError(403)
@@ -133,6 +141,7 @@ def make_app(tracer):
             (r"/ping", HealthCheckHandler),
             (r"/test_custom_response_headers", CustomResponseHeaderHandler),
             (r"/raise_403", RaiseHTTPErrorHandler),
+            (r"/slow", SlowHandler),
             (r"/echo_socket", EchoWebSocketHandler),
         ]
     )