Add back processing of response status & headers

Author: hmstepanek

newrelic/api/transaction.py

@@ -265,7 +265,7 @@ def __init__(self, application, enabled=None, source=None):
         # 32-digit random hex. Padded with zeros in the front.
         self._trace_id = trace_id
 
-        # This may be overridden by processing an inbound CAT header
+        # This may be overridden by processing an inbound DT header
         self.parent_type = None
         self.parent_span = None
         self.trusted_parent_span = None

newrelic/api/web_transaction.py

@@ -302,10 +302,8 @@ def _process_context_headers(self):
             self.accept_distributed_trace_headers(self._request_headers)
 
     def process_response(self, status_code, response_headers):
-        """Processes response status and headers, extracting any
-        details required and returning a set of additional headers
-        to merge into that being returned for the web transaction.
-
+        """
+        Processes response status and headers; extracting any details required.
         """
 
         if not self.enabled:
@@ -325,16 +323,9 @@ def process_response(self, status_code, response_headers):
 
         try:
             self._response_code = int(status_code)
-
-            # If response code is 304 do not insert CAT headers. See:
-            # https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3.5
-            if self._response_code == 304:
-                return
         except Exception:
             pass
 
-        return
-
     def _update_agent_attributes(self):
         if "accept" in self._request_headers:
             self._add_agent_attribute("request.headers.accept", self._request_headers["accept"])

newrelic/hooks/external_httpx.py

@@ -77,7 +77,7 @@ def sync_send_wrapper(wrapped, instance, args, kwargs):
             request._nr_trace = tracer
             outgoing_headers = tracer.generate_request_headers(tracer.transaction)
             for header_name, header_value in outgoing_headers:
-                # User headers should override our CAT headers
+                # User headers should override our DT headers
                 if header_name not in request.headers:
                     request.headers[header_name] = header_value
 
@@ -92,7 +92,7 @@ async def async_send_wrapper(wrapped, instance, args, kwargs):
             request._nr_trace = tracer
             outgoing_headers = tracer.generate_request_headers(tracer.transaction)
             for header_name, header_value in outgoing_headers:
-                # User headers should override our CAT headers
+                # User headers should override our DT headers
                 if header_name not in request.headers:
                     request.headers[header_name] = header_value
 

newrelic/hooks/framework_aiohttp.py

@@ -59,10 +59,6 @@ def _is_expected(exc, value, tb):
     return _is_expected
 
 
-def _nr_process_response(response, transaction):
-    transaction.process_response(response.status, response.headers)
-
-
 @function_wrapper
 def _nr_aiohttp_view_wrapper_(wrapped, instance, args, kwargs):
     transaction = current_transaction()
@@ -240,8 +236,23 @@ def _nr_aiohttp_request_wrapper_(wrapped, instance, args, kwargs):
 
     method, url = _bind_request(*args, **kwargs)
     trace = ExternalTrace("aiohttp", str(url), method)
-    with trace:
-        return wrapped(*args, **kwargs)
+
+    async def _coro():
+        try:
+            response = await wrapped(*args, **kwargs)
+
+            try:
+                trace.process_response(status_code=response.status)
+            except:
+                pass
+
+            return response
+        except Exception:
+            notice_error()
+
+            raise
+
+    return async_wrapper(wrapped)(_coro, trace)()
 
 
 def instrument_aiohttp_client(module):
@@ -303,13 +314,13 @@ async def _coro(*_args, **_kwargs):
         try:
             response = await coro
         except _web.HTTPException as e:
-            _nr_process_response(e, transaction)
+            transaction.process_response(e.status, e.headers)
             raise
         except Exception:
             transaction.process_response(500, ())
             raise
 
-        _nr_process_response(response, transaction)
+        transaction.process_response(response.status, response.headers)
         return response
 
     _coro = web_transaction(