opentelemetry-instrumentation-tornado 0.46b0__py3-none-any.whl → 0.48b0__py3-none-any.whl

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/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/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.dist-info → opentelemetry_instrumentation_tornado-0.48b0.dist-info}/METADATA

@@ -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.48b0.dist-info/RECORD

@@ -0,0 +1,9 @@
+opentelemetry/instrumentation/tornado/__init__.py,sha256=287JyPXWJfuF7Rdeq_yUypcKXLAJIRnStOflX4jLNng,23139
+opentelemetry/instrumentation/tornado/client.py,sha256=GmCilVnjXQAyXqGDAZsTT8CDhVTmRtczXgFzYLmpMto,5082
+opentelemetry/instrumentation/tornado/package.py,sha256=mv-OUOrDF54kFoP_Epb3Pv8aufliZTMOwLWL5oAV_hY,649
+opentelemetry/instrumentation/tornado/version.py,sha256=wOX_9uGRBIlLks98mTGJZnnmD1Zez4rGVQNmP23fWEc,608
+opentelemetry_instrumentation_tornado-0.48b0.dist-info/METADATA,sha256=DwyIBBkR4dagRQHeDJMXSV08eh_NF0CWD3a2D84hOWM,1983
+opentelemetry_instrumentation_tornado-0.48b0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+opentelemetry_instrumentation_tornado-0.48b0.dist-info/entry_points.txt,sha256=oDTErilMYHHuN6bv9XNAU1Avoy8f_nfCx91bASSkpgg,97
+opentelemetry_instrumentation_tornado-0.48b0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentelemetry_instrumentation_tornado-0.48b0.dist-info/RECORD,,

{opentelemetry_instrumentation_tornado-0.46b0.dist-info → opentelemetry_instrumentation_tornado-0.48b0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.24.2
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any

opentelemetry_instrumentation_tornado-0.46b0.dist-info/RECORD

@@ -1,9 +0,0 @@
-opentelemetry/instrumentation/tornado/__init__.py,sha256=UrhGSHAvSo90eH7n8hECnhNxtHIyzvLOwK6LaXKFIhU,23139
-opentelemetry/instrumentation/tornado/client.py,sha256=xWNwdEjukG19jNTrfi4Rw8lS6rcRW3_RqOVTbXlTL2E,4586
-opentelemetry/instrumentation/tornado/package.py,sha256=mv-OUOrDF54kFoP_Epb3Pv8aufliZTMOwLWL5oAV_hY,649
-opentelemetry/instrumentation/tornado/version.py,sha256=asa7q2ly73330-K1Q7vujpvZk7hfhasEZUzSFDPu1N8,608
-opentelemetry_instrumentation_tornado-0.46b0.dist-info/METADATA,sha256=mi34aoPBU8II-lJi7fbVR6fXxbd5zTz3xN8IeQfiNjw,1932
-opentelemetry_instrumentation_tornado-0.46b0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-opentelemetry_instrumentation_tornado-0.46b0.dist-info/entry_points.txt,sha256=oDTErilMYHHuN6bv9XNAU1Avoy8f_nfCx91bASSkpgg,97
-opentelemetry_instrumentation_tornado-0.46b0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentelemetry_instrumentation_tornado-0.46b0.dist-info/RECORD,,