Revert "Synthetics Info Header Support (#896)" (#983)

This reverts commit 3980127.

Author: TimPansino

newrelic/api/cat_header_mixin.py

@@ -22,7 +22,6 @@ class CatHeaderMixin(object):
     cat_transaction_key = 'X-NewRelic-Transaction'
     cat_appdata_key = 'X-NewRelic-App-Data'
     cat_synthetics_key = 'X-NewRelic-Synthetics'
-    cat_synthetics_info_key = 'X-NewRelic-Synthetics-Info'
     cat_metadata_key = 'x-newrelic-trace'
     cat_distributed_trace_key = 'newrelic'
     settings = None
@@ -106,9 +105,8 @@ def generate_request_headers(cls, transaction):
                         (cls.cat_transaction_key, encoded_transaction))
 
         if transaction.synthetics_header:
-            nr_headers.append((cls.cat_synthetics_key, transaction.synthetics_header))
-            if transaction.synthetics_info_header:
-                nr_headers.append((cls.cat_synthetics_info_key, transaction.synthetics_info_header))
+            nr_headers.append(
+                    (cls.cat_synthetics_key, transaction.synthetics_header))
 
         return nr_headers
 

newrelic/api/message_trace.py

@@ -27,7 +27,6 @@ class MessageTrace(CatHeaderMixin, TimeTrace):
     cat_transaction_key = "NewRelicTransaction"
     cat_appdata_key = "NewRelicAppData"
     cat_synthetics_key = "NewRelicSynthetics"
-    cat_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/transaction.py

@@ -44,7 +44,6 @@
     json_decode,
     json_encode,
     obfuscate,
-    snake_case,
 )
 from newrelic.core.attribute import (
     MAX_ATTRIBUTE_LENGTH,
@@ -304,17 +303,10 @@ def __init__(self, application, enabled=None, source=None):
         self._alternate_path_hashes = {}
         self.is_part_of_cat = False
 
-        # Synthetics Header
         self.synthetics_resource_id = None
         self.synthetics_job_id = None
         self.synthetics_monitor_id = None
         self.synthetics_header = None
-        
-        # Synthetics Info Header
-        self.synthetics_type = None
-        self.synthetics_initiator = None
-        self.synthetics_attributes = None
-        self.synthetics_info_header = None
 
         self._custom_metrics = CustomMetrics()
         self._dimensional_metrics = DimensionalMetrics()
@@ -611,10 +603,6 @@ def __exit__(self, exc, value, tb):
             synthetics_job_id=self.synthetics_job_id,
             synthetics_monitor_id=self.synthetics_monitor_id,
             synthetics_header=self.synthetics_header,
-            synthetics_type=self.synthetics_type,
-            synthetics_initiator=self.synthetics_initiator,
-            synthetics_attributes=self.synthetics_attributes,
-            synthetics_info_header=self.synthetics_info_header,
             is_part_of_cat=self.is_part_of_cat,
             trip_id=self.trip_id,
             path_hash=self.path_hash,
@@ -852,16 +840,6 @@ def trace_intrinsics(self):
             i_attrs["synthetics_job_id"] = self.synthetics_job_id
         if self.synthetics_monitor_id:
             i_attrs["synthetics_monitor_id"] = self.synthetics_monitor_id
-        if self.synthetics_type:
-            i_attrs["synthetics_type"] = self.synthetics_type
-        if self.synthetics_initiator:
-            i_attrs["synthetics_initiator"] = self.synthetics_initiator
-        if self.synthetics_attributes:
-            # Add all synthetics attributes
-            for k, v in self.synthetics_attributes.items():
-                if k:
-                    i_attrs["synthetics_%s" % snake_case(k)] = v
-
         if self.total_time:
             i_attrs["totalTime"] = self.total_time
         if self._loop_time:

newrelic/api/web_transaction.py

@@ -125,27 +125,6 @@ def _parse_synthetics_header(header):
     return synthetics
 
 
-def _parse_synthetics_info_header(header):
-    # Return a dictionary of values from SyntheticsInfo header
-    # Returns empty dict, if version is not supported.
-
-    synthetics_info = {}
-    version = None
-
-    try:
-        version = int(header.get("version"))
-
-        if version == 1:
-            synthetics_info['version'] = version
-            synthetics_info['type'] = header.get("type")
-            synthetics_info['initiator'] = header.get("initiator")
-            synthetics_info['attributes'] = header.get("attributes")
-    except Exception:
-        return
-
-    return synthetics_info
-
-
 def _remove_query_string(url):
     url = ensure_str(url)
     out = urlparse.urlsplit(url)
@@ -252,7 +231,6 @@ def _process_synthetics_header(self):
                 settings.trusted_account_ids and \
                 settings.encoding_key:
 
-            # Synthetics Header
             encoded_header = self._request_headers.get('x-newrelic-synthetics')
             encoded_header = encoded_header and ensure_str(encoded_header)
             if not encoded_header:
@@ -263,33 +241,18 @@ def _process_synthetics_header(self):
                     settings.encoding_key)
             synthetics = _parse_synthetics_header(decoded_header)
 
-            # Synthetics Info Header
-            encoded_info_header = self._request_headers.get('x-newrelic-synthetics-info')
-            encoded_info_header = encoded_info_header and ensure_str(encoded_info_header)
-
-            decoded_info_header = decode_newrelic_header(
-                    encoded_info_header,
-                    settings.encoding_key)
-            synthetics_info = _parse_synthetics_info_header(decoded_info_header)
-
             if synthetics and \
                     synthetics['account_id'] in \
                     settings.trusted_account_ids:
 
-                # Save obfuscated headers, because we will pass them along
+                # Save obfuscated header, because we will pass it along
                 # unchanged in all external requests.
 
                 self.synthetics_header = encoded_header
                 self.synthetics_resource_id = synthetics['resource_id']
                 self.synthetics_job_id = synthetics['job_id']
                 self.synthetics_monitor_id = synthetics['monitor_id']
 
-                if synthetics_info:
-                    self.synthetics_info_header = encoded_info_header
-                    self.synthetics_type = synthetics_info['type']
-                    self.synthetics_initiator = synthetics_info['initiator']
-                    self.synthetics_attributes = synthetics_info['attributes']
-
     def _process_context_headers(self):
         # Process the New Relic cross process ID header and extract
         # the relevant details.

newrelic/common/encoding_utils.py

@@ -571,46 +571,3 @@ def decode(cls, payload, tk):
                     data['pr'] = None
 
             return data
-
-
-def capitalize(string):
-    """Capitalize the first letter of a string."""
-    if not string:
-        return string
-    elif len(string) == 1:
-        return string.capitalize()
-    else:
-        return "".join((string[0].upper(), string[1:]))
-
-
-def camel_case(string, upper=False):
-    """
-    Convert a string of snake case to camel case.
-    
-    Setting upper=True will capitalize the first letter. Defaults to False, where no change is made to the first letter.
-    """
-    string = ensure_str(string)
-    split_string = list(string.split("_"))
-
-    if len(split_string) < 2:
-        if upper:
-            return capitalize(string)
-        else:
-            return string
-    else:
-        if upper:
-            camel_cased_string = "".join([capitalize(substr) for substr in split_string])
-        else:
-            camel_cased_string = split_string[0] + "".join([capitalize(substr) for substr in split_string[1:]])
-
-    return camel_cased_string
-
-
-_snake_case_re = re.compile(r"([A-Z]+[a-z]*)")
-def snake_case(string):
-    """Convert a string of camel case to snake case. Assumes no repeated runs of capital letters."""
-    string = ensure_str(string)
-    if "_" in string:
-        return string  # Don't touch strings that are already snake cased
-
-    return "_".join([s for s in _snake_case_re.split(string) if s]).lower()

newrelic/core/transaction_node.py

@@ -22,7 +22,6 @@
 
 import newrelic.core.error_collector
 import newrelic.core.trace_node
-from newrelic.common.encoding_utils import camel_case
 from newrelic.common.streaming_utils import SpanProtoAttrs
 from newrelic.core.attribute import create_agent_attributes, create_user_attributes
 from newrelic.core.attribute_filter import (
@@ -77,10 +76,6 @@
         "synthetics_job_id",
         "synthetics_monitor_id",
         "synthetics_header",
-        "synthetics_type",
-        "synthetics_initiator",
-        "synthetics_attributes",
-        "synthetics_info_header",
         "is_part_of_cat",
         "trip_id",
         "path_hash",
@@ -591,15 +586,6 @@ def _event_intrinsics(self, stats_table):
             intrinsics["nr.syntheticsJobId"] = self.synthetics_job_id
             intrinsics["nr.syntheticsMonitorId"] = self.synthetics_monitor_id
 
-        if self.synthetics_type:
-            intrinsics["nr.syntheticsType"] = self.synthetics_type
-            intrinsics["nr.syntheticsInitiator"] = self.synthetics_initiator
-            if self.synthetics_attributes:
-                # Add all synthetics attributes
-                for k, v in self.synthetics_attributes.items():
-                    if k:
-                        intrinsics["nr.synthetics%s" % camel_case(k, upper=True)] = v
-
         def _add_call_time(source, target):
             # include time for keys previously added to stats table via
             # stats_engine.record_transaction

tests/agent_features/test_error_events.py

@@ -20,7 +20,7 @@
 from testing_support.fixtures import (
     cat_enabled,
     make_cross_agent_headers,
-    make_synthetics_headers,
+    make_synthetics_header,
     override_application_settings,
     reset_core_stats_engine,
     validate_error_event_sample_data,
@@ -43,9 +43,6 @@
 SYNTHETICS_RESOURCE_ID = "09845779-16ef-4fa7-b7f2-44da8e62931c"
 SYNTHETICS_JOB_ID = "8c7dd3ba-4933-4cbb-b1ed-b62f511782f4"
 SYNTHETICS_MONITOR_ID = "dc452ae9-1a93-4ab5-8a33-600521e9cd00"
-SYNTHETICS_TYPE = "scheduled"
-SYNTHETICS_INITIATOR = "graphql"
-SYNTHETICS_ATTRIBUTES = {"exampleAttribute": "1"}
 
 ERR_MESSAGE = "Transaction had bad value"
 ERROR = ValueError(ERR_MESSAGE)
@@ -138,9 +135,6 @@ def test_transaction_error_cross_agent():
     "nr.syntheticsResourceId": SYNTHETICS_RESOURCE_ID,
     "nr.syntheticsJobId": SYNTHETICS_JOB_ID,
     "nr.syntheticsMonitorId": SYNTHETICS_MONITOR_ID,
-    "nr.syntheticsType": SYNTHETICS_TYPE,
-    "nr.syntheticsInitiator": SYNTHETICS_INITIATOR,
-    "nr.syntheticsExampleAttribute": "1",
 }
 
 
@@ -150,15 +144,12 @@ def test_transaction_error_with_synthetics():
         "err_message": ERR_MESSAGE,
     }
     settings = application_settings()
-    headers = make_synthetics_headers(
-        settings.encoding_key,
+    headers = make_synthetics_header(
         settings.trusted_account_ids[0],
         SYNTHETICS_RESOURCE_ID,
         SYNTHETICS_JOB_ID,
         SYNTHETICS_MONITOR_ID,
-        SYNTHETICS_TYPE,
-        SYNTHETICS_INITIATOR,
-        SYNTHETICS_ATTRIBUTES,
+        settings.encoding_key,
     )
     response = fully_featured_application.get("/", headers=headers, extra_environ=test_environ)