Merge e5c2cff into e2d411c

Author: lrafeei

newrelic/api/cat_header_mixin.py

@@ -14,14 +14,14 @@
 
 import functools
 
-from newrelic.api.cat_header_mixin import CatHeaderMixin
+from newrelic.api.header_mixin import HeaderMixin
 from newrelic.api.time_trace import TimeTrace, current_trace
 from newrelic.common.async_wrapper import async_wrapper as get_async_wrapper
 from newrelic.common.object_wrapper import FunctionWrapper, wrap_object
 from newrelic.core.external_node import ExternalNode
 
 
-class ExternalTrace(CatHeaderMixin, TimeTrace):
+class ExternalTrace(HeaderMixin, TimeTrace):
     def __init__(self, library, url, method=None, **kwargs):
         parent = kwargs.pop("parent", None)
         source = kwargs.pop("source", None)
@@ -38,9 +38,8 @@ def __init__(self, library, url, method=None, **kwargs):
     def __repr__(self):
         return f"<{self.__class__.__name__} object at 0x{id(self):x} { {'library': self.library, 'url': self.url, 'method': self.method} }>"
 
-    def process_response(self, status_code, headers):
+    def process_response(self, status_code, headers=None):
         self._add_agent_attribute("http.statusCode", status_code)
-        self.process_response_headers(headers)
 
     def terminal_node(self):
         return True

newrelic/api/external_trace.py

@@ -0,0 +1,51 @@
+# Copyright 2010 New Relic, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# HeaderMixin assumes the mixin class also inherits from TimeTrace
+class HeaderMixin:
+    synthetics_key = "X-NewRelic-Synthetics"
+    synthetics_info_key = "X-NewRelic-Synthetics-Info"
+    settings = None
+
+    def __enter__(self):
+        result = super().__enter__()
+        if result is self and self.transaction:
+            self.settings = self.transaction.settings or None
+        return result
+
+    @classmethod
+    def generate_request_headers(cls, transaction):
+        """
+        Return a list of NewRelic specific headers as tuples
+        [(HEADER_NAME0, HEADER_VALUE0), (HEADER_NAME1, HEADER_VALUE1)]
+
+        """
+
+        if transaction is None or transaction.settings is None:
+            return []
+
+        settings = transaction.settings
+
+        nr_headers = []
+
+        if settings.distributed_tracing.enabled:
+            transaction.insert_distributed_trace_headers(nr_headers)
+
+        if transaction.synthetics_header:
+            nr_headers.append((cls.synthetics_key, transaction.synthetics_header))
+            if transaction.synthetics_info_header:
+                nr_headers.append((cls.synthetics_info_key, transaction.synthetics_info_header))
+
+        return nr_headers

newrelic/api/header_mixin.py

@@ -14,19 +14,16 @@
 
 import functools
 
-from newrelic.api.cat_header_mixin import CatHeaderMixin
+from newrelic.api.header_mixin import HeaderMixin
 from newrelic.api.time_trace import TimeTrace, current_trace
 from newrelic.common.async_wrapper import async_wrapper as get_async_wrapper
 from newrelic.common.object_wrapper import FunctionWrapper, wrap_object
 from newrelic.core.message_node import MessageNode
 
 
-class MessageTrace(CatHeaderMixin, TimeTrace):
-    cat_id_key = "NewRelicID"
-    cat_transaction_key = "NewRelicTransaction"
-    cat_appdata_key = "NewRelicAppData"
-    cat_synthetics_key = "NewRelicSynthetics"
-    cat_synthetics_info_key = "NewRelicSyntheticsInfo"
+class MessageTrace(HeaderMixin, TimeTrace):
+    synthetics_key = "NewRelicSynthetics"
+    synthetics_info_key = "NewRelicSyntheticsInfo"
 
     def __init__(self, library, operation, destination_type, destination_name, params=None, terminal=True, **kwargs):
         parent = kwargs.pop("parent", None)

newrelic/api/message_trace.py

@@ -16,7 +16,6 @@
 
 from newrelic.api.application import Application, application_instance
 from newrelic.api.background_task import BackgroundTask
-from newrelic.api.message_trace import MessageTrace
 from newrelic.api.transaction import current_transaction
 from newrelic.common.async_proxy import TransactionContext, async_proxy
 from newrelic.common.object_wrapper import FunctionWrapper, wrap_object
@@ -47,10 +46,6 @@ def __init__(
         if headers is not None and self.settings is not None:
             if self.settings.distributed_tracing.enabled:
                 self.accept_distributed_trace_headers(headers, transport_type=transport_type)
-            elif self.settings.cross_application_tracer.enabled:
-                self._process_incoming_cat_headers(
-                    headers.pop(MessageTrace.cat_id_key, None), headers.pop(MessageTrace.cat_transaction_key, None)
-                )
 
         self.routing_key = routing_key
         self.exchange_type = exchange_type