opentelemetry-instrumentation-tornado 0.46b0__tar.gz → 0.48b0__tar.gz

{opentelemetry_instrumentation_tornado-0.46b0 → opentelemetry_instrumentation_tornado-0.48b0}/.gitignore

@@ -58,3 +58,6 @@ _build/
 # mypy
 .mypy_cache/
 target
+
+# Benchmark result files
+*-benchmark.json

{opentelemetry_instrumentation_tornado-0.46b0 → opentelemetry_instrumentation_tornado-0.48b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: opentelemetry-instrumentation-tornado
-Version: 0.46b0
+Version: 0.48b0
 Summary: Tornado instrumentation for OpenTelemetry
 Project-URL: Homepage, https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-tornado
 Author-email: OpenTelemetry Authors <cncf-opentelemetry-contributors@lists.cncf.io>
@@ -14,11 +14,12 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Requires-Dist: opentelemetry-api~=1.12
-Requires-Dist: opentelemetry-instrumentation==0.46b0
-Requires-Dist: opentelemetry-semantic-conventions==0.46b0
-Requires-Dist: opentelemetry-util-http==0.46b0
+Requires-Dist: opentelemetry-instrumentation==0.48b0
+Requires-Dist: opentelemetry-semantic-conventions==0.48b0
+Requires-Dist: opentelemetry-util-http==0.48b0
 Provides-Extra: instruments
 Requires-Dist: tornado>=5.1.1; extra == 'instruments'
 Description-Content-Type: text/x-rst

{opentelemetry_instrumentation_tornado-0.46b0 → opentelemetry_instrumentation_tornado-0.48b0}/pyproject.toml

@@ -21,12 +21,13 @@ classifiers = [
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.46b0",
-  "opentelemetry-semantic-conventions == 0.46b0",
-  "opentelemetry-util-http == 0.46b0",
+  "opentelemetry-instrumentation == 0.48b0",
+  "opentelemetry-semantic-conventions == 0.48b0",
+  "opentelemetry-util-http == 0.48b0",
 ]
 
 [project.optional-dependencies]

{opentelemetry_instrumentation_tornado-0.46b0 → opentelemetry_instrumentation_tornado-0.48b0}/src/opentelemetry/instrumentation/tornado/__init__.py

@@ -296,7 +296,7 @@ def _create_server_histograms(meter) -> Dict[str, Histogram]:
         MetricInstruments.HTTP_SERVER_DURATION: meter.create_histogram(
             name=MetricInstruments.HTTP_SERVER_DURATION,
             unit="ms",
-            description="Duration of HTTP client requests.",
+            description="Duration of HTTP server requests.",
         ),
         MetricInstruments.HTTP_SERVER_REQUEST_SIZE: meter.create_histogram(
             name=MetricInstruments.HTTP_SERVER_REQUEST_SIZE,

{opentelemetry_instrumentation_tornado-0.46b0 → opentelemetry_instrumentation_tornado-0.48b0}/src/opentelemetry/instrumentation/tornado/client.py

@@ -21,7 +21,7 @@ from opentelemetry import trace
 from opentelemetry.instrumentation.utils import http_status_to_status_code
 from opentelemetry.propagate import inject
 from opentelemetry.semconv.trace import SpanAttributes
-from opentelemetry.trace.status import Status
+from opentelemetry.trace.status import Status, StatusCode
 from opentelemetry.util.http import remove_url_credentials
 
 
@@ -105,37 +105,53 @@ def _finish_tracing_callback(
     request_size_histogram,
     response_size_histogram,
 ):
+    response = None
     status_code = None
+    status = None
     description = None
-    exc = future.exception()
-
-    response = future.result()
 
-    if span.is_recording() and exc:
+    exc = future.exception()
+    if exc:
+        description = f"{type(exc).__qualname__}: {exc}"
         if isinstance(exc, HTTPError):
+            response = exc.response
             status_code = exc.code
-        description = f"{type(exc).__name__}: {exc}"
+            status = Status(
+                status_code=http_status_to_status_code(status_code),
+                description=description,
+            )
+        else:
+            status = Status(
+                status_code=StatusCode.ERROR,
+                description=description,
+            )
+            span.record_exception(exc)
     else:
+        response = future.result()
         status_code = response.code
+        status = Status(
+            status_code=http_status_to_status_code(status_code),
+            description=description,
+        )
 
     if status_code is not None:
         span.set_attribute(SpanAttributes.HTTP_STATUS_CODE, status_code)
-        span.set_status(
-            Status(
-                status_code=http_status_to_status_code(status_code),
-                description=description,
-            )
-        )
+    span.set_status(status)
 
-    metric_attributes = _create_metric_attributes(response)
-    request_size = int(response.request.headers.get("Content-Length", 0))
-    response_size = int(response.headers.get("Content-Length", 0))
+    if response is not None:
+        metric_attributes = _create_metric_attributes(response)
+        request_size = int(response.request.headers.get("Content-Length", 0))
+        response_size = int(response.headers.get("Content-Length", 0))
 
-    duration_histogram.record(
-        response.request_time, attributes=metric_attributes
-    )
-    request_size_histogram.record(request_size, attributes=metric_attributes)
-    response_size_histogram.record(response_size, attributes=metric_attributes)
+        duration_histogram.record(
+            response.request_time, attributes=metric_attributes
+        )
+        request_size_histogram.record(
+            request_size, attributes=metric_attributes
+        )
+        response_size_histogram.record(
+            response_size, attributes=metric_attributes
+        )
 
     if response_hook:
         response_hook(span, future)

{opentelemetry_instrumentation_tornado-0.46b0 → opentelemetry_instrumentation_tornado-0.48b0}/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.46b0"
+__version__ = "0.48b0"

{opentelemetry_instrumentation_tornado-0.46b0 → opentelemetry_instrumentation_tornado-0.48b0}/tests/test_instrumentation.py

@@ -16,6 +16,7 @@
 from unittest.mock import Mock, patch
 
 from http_server_mock import HttpServerMock
+from tornado.httpclient import HTTPClientError
 from tornado.testing import AsyncHTTPTestCase
 
 from opentelemetry import trace
@@ -32,7 +33,7 @@ from opentelemetry.instrumentation.tornado import (
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.test.wsgitestutil import WsgiTestBase
-from opentelemetry.trace import SpanKind
+from opentelemetry.trace import SpanKind, StatusCode
 from opentelemetry.util.http import (
     OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_REQUEST,
     OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_RESPONSE,
@@ -493,7 +494,6 @@ class TestTornadoInstrumentation(TornadoTest, WsgiTestBase):
         self.assertEqual(len(spans), 3)
         self.assertTraceResponseHeaderMatchesSpan(response.headers, spans[1])
 
-        self.memory_exporter.clear()
         set_global_response_propagator(orig)
 
     def test_credential_removal(self):
@@ -602,6 +602,49 @@ class TornadoHookTest(TornadoTest):
         self.memory_exporter.clear()
 
 
+class TestTornadoHTTPClientInstrumentation(TornadoTest, WsgiTestBase):
+    def test_http_client_success_response(self):
+        response = self.fetch("/")
+        self.assertEqual(response.code, 201)
+
+        spans = self.memory_exporter.get_finished_spans()
+        self.assertEqual(len(spans), 3)
+        manual, server, client = self.sorted_spans(spans)
+        self.assertEqual(manual.name, "manual")
+        self.assertEqual(server.name, "GET /")
+        self.assertEqual(client.name, "GET")
+        self.assertEqual(client.status.status_code, StatusCode.UNSET)
+        self.memory_exporter.clear()
+
+    def test_http_client_failed_response(self):
+        # when an exception isn't thrown
+        response = self.fetch("/some-404")
+        self.assertEqual(response.code, 404)
+
+        spans = self.memory_exporter.get_finished_spans()
+        self.assertEqual(len(spans), 2)
+        server, client = self.sorted_spans(spans)
+        self.assertEqual(server.name, "GET /some-404")
+        self.assertEqual(client.name, "GET")
+        self.assertEqual(client.status.status_code, StatusCode.ERROR)
+        self.memory_exporter.clear()
+
+        # when an exception is thrown
+        try:
+            response = self.fetch("/some-404", raise_error=True)
+            self.assertEqual(response.code, 404)
+        except HTTPClientError:
+            pass  # expected exception - continue
+
+        spans = self.memory_exporter.get_finished_spans()
+        self.assertEqual(len(spans), 2)
+        server, client = self.sorted_spans(spans)
+        self.assertEqual(server.name, "GET /some-404")
+        self.assertEqual(client.name, "GET")
+        self.assertEqual(client.status.status_code, StatusCode.ERROR)
+        self.memory_exporter.clear()
+
+
 class TestTornadoUninstrument(TornadoTest):
     def test_uninstrument(self):
         response = self.fetch("/")