Add attr to compressed spans

Author: hmstepanek

newrelic/_version.py

@@ -0,0 +1,34 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
+else:
+    VERSION_TUPLE = object
+    COMMIT_ID = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '11.0.1.dev11+g9c04efa33'
+__version_tuple__ = version_tuple = (11, 0, 1, 'dev11', 'g9c04efa33')
+
+__commit_id__ = commit_id = 'g9c04efa33'

newrelic/core/node_mixin.py

@@ -17,9 +17,6 @@
 
 
 class GenericNodeMixin:
-    def __init__(self, *args, **kwargs):
-        self.ids = []
-
     @property
     def processed_user_attributes(self):
         if hasattr(self, "_processed_user_attributes"):
@@ -76,7 +73,7 @@ def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dic
         u_attrs = self.processed_user_attributes
         if settings.distributed_tracing.unique_spans.enabled:
             # ids is the list of span guids that share this unqiue exit span.
-            u_attrs["nr.ids"] = self.ids
+            u_attrs["nr.ids"] = []
 
         u_attrs = attribute.resolve_user_attributes(
             u_attrs, settings.attribute_filter, DST_SPAN_EVENTS, attr_class=attr_class
@@ -108,14 +105,15 @@ def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dic
                 new_exit_span = span_attrs not in ct_exit_spans
                 # If this is a new exit span, add it to the known ct_exit_spans and return it.
                 if new_exit_span:
-                    ct_exit_spans[span_attrs] = [self.ids, i_attrs]
+                    u_attrs["nr.durations"] = self.duration
+                    ct_exit_spans[span_attrs] = [u_attrs]
                     ct_processing_time[0] += (time.time() - start_time)
                     return [i_attrs, u_attrs, a_minimized_attrs] if settings.distributed_tracing.minimize_attributes.enabled else [i_attrs, u_attrs, a_attrs]
                 # If this is an exit span we've already seen, add it's guid to the list
                 # of ids on the seen span and return None.
                 # For now add ids to user attributes list
-                ct_exit_spans[span_attrs][0].append(self.guid)
-                ct_exit_spans[span_attrs][1]["duration"] += self.duration
+                ct_exit_spans[span_attrs][0]["nr.ids"].append(self.guid)
+                ct_exit_spans[span_attrs][0]["nr.durations"] += self.duration
 
                 ct_processing_time[0] += (time.time() - start_time)
                 return None