extract response from exception and record its info into span

Author: jgibo

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

@@ -105,17 +105,17 @@ def _finish_tracing_callback(
     request_size_histogram,
     response_size_histogram,
 ):
+    response = None
     status_code = None
     description = None
-    exc = future.exception()
 
-    if span.is_recording() and exc:
-        if isinstance(exc, HTTPError):
-            status_code = exc.code
+    exc = future.exception()
+    if exc:
         description = f"{type(exc).__name__}: {exc}"
-
-    response = None
-    if not exc:
+        if isinstance(exc, HTTPError):
+            response = exc.response
+            status_code = response.code
+    else:
         response = future.result()
         status_code = response.code
 

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

@@ -33,7 +33,7 @@
 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,
@@ -494,7 +494,6 @@ def test_response_headers(self):
         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):
@@ -614,6 +613,7 @@ def test_http_client_success_response(self):
         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):
@@ -626,20 +626,22 @@ def test_http_client_failed_response(self):
         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
+            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()