Fix bug in span_event inheritance

Author: hmstepanek

newrelic/core/external_node.py

@@ -180,4 +180,4 @@ def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dic
         if self.method:
             _, i_attrs["http.method"] = attribute.process_user_attribute("http.method", self.method)
 
-        return super().span_event(settings, base_attrs=base_attrs, parent_guid=parent_guid, attr_class=attr_class, *args, **kwargs)
+        return super().span_event(settings, base_attrs=i_attrs, parent_guid=parent_guid, attr_class=attr_class, *args, **kwargs)

newrelic/core/function_node.py

@@ -118,4 +118,4 @@ def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dic
         i_attrs = base_attrs and base_attrs.copy() or attr_class()
         i_attrs["name"] = f"{self.group}/{self.name}"
 
-        return super().span_event(settings, base_attrs=base_attrs, parent_guid=parent_guid, attr_class=attr_class, *args, **kwargs)
+        return super().span_event(settings, base_attrs=i_attrs, parent_guid=parent_guid, attr_class=attr_class, *args, **kwargs)

newrelic/core/loop_node.py

@@ -83,4 +83,4 @@ def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dic
         i_attrs = base_attrs and base_attrs.copy() or attr_class()
         i_attrs["name"] = f"EventLoop/Wait/{self.name}"
 
-        return super().span_event(settings, base_attrs=base_attrs, parent_guid=parent_guid, attr_class=attr_class, *args, **kwargs)
+        return super().span_event(settings, base_attrs=i_attrs, parent_guid=parent_guid, attr_class=attr_class, *args, **kwargs)

newrelic/core/node_mixin.py

@@ -57,11 +57,11 @@ def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dic
             ct_exit_spans = {}
         i_attrs = base_attrs and base_attrs.copy() or attr_class()
         i_attrs["type"] = "Span"
-        i_attrs["name"] = self.name
+        i_attrs["name"] = i_attrs.get("name") or self.name
         i_attrs["guid"] = self.guid
         i_attrs["timestamp"] = int(self.start_time * 1000)
         i_attrs["duration"] = self.duration
-        i_attrs["category"] = "generic"
+        i_attrs["category"] = i_attrs.get("category") or "generic"
         # TODO: limit intrinsic attributes but this likely requires changes in the pipeline.
         #if settings.distributed_tracing.minimize_attributes.enabled:
         #    i_ct_attrs = {"type", "name", "guid", "parentId", "transaction.name", "traceId", "timestamp", "duration", "nr.entryPoint", "transactionId"}
@@ -86,7 +86,7 @@ def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dic
         if settings.distributed_tracing.drop_inprocess_spans.enabled or settings.distributed_tracing.unique_spans.enabled:
             exit_span_attrs_present = attribute.SPAN_ENTITY_RELATIONSHIP_ATTRIBUTES & set(a_attrs)
             # If this is the entry node, always return it.
-            if self.__class__.__name__ == "RootNode":
+            if i_attrs.get("nr.entryPoint"):
                 ct_processing_time[0] += (time.time() - start_time)
                 return [i_attrs, u_attrs, {}] if settings.distributed_tracing.minimize_attributes.enabled else [i_attrs, u_attrs, a_attrs]
             # If the span is not an exit span, skip it by returning None.
@@ -192,4 +192,4 @@ def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dic
         except Exception:
             pass
 
-        return super().span_event(settings, base_attrs=base_attrs, parent_guid=parent_guid, attr_class=attr_class, *args, **kwargs)
+        return super().span_event(settings, i_attrs=base_attrs, parent_guid=parent_guid, attr_class=attr_class, *args, **kwargs)

newrelic/core/root_node.py

@@ -46,7 +46,7 @@ def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dic
         if self.tracing_vendors:
             i_attrs["tracingVendors"] = self.tracing_vendors
 
-        return super().span_event(settings, base_attrs=base_attrs, parent_guid=parent_guid, attr_class=attr_class, *args, **kwargs)
+        return super().span_event(settings, base_attrs=i_attrs, parent_guid=parent_guid, attr_class=attr_class, *args, **kwargs)
 
     def trace_node(self, stats, root, connections):
         name = self.path