Fixup

Author: hmstepanek

THIRD_PARTY_NOTICES.md

@@ -62,11 +62,3 @@ Distributed under the following license(s):
 
 * [The BSD 2-Clause License](http://opensource.org/licenses/BSD-2-Clause)
 
-## [objsize](https://pypi.org/project/objsize)
-
-Copyright (c) 2006-2025, Liran Funaro
-All rights reserved.
-
-Distributed under the following license(s):
-
-* [The BSD 3-Clause "New" or "Revised" License](http://opensource.org/licenses/BSD-3-Clause)

newrelic/core/external_node.py

@@ -169,18 +169,15 @@ def trace_node(self, stats, root, connections):
             start_time=start_time, end_time=end_time, name=name, params=params, children=children, label=None
         )
 
-    def span_event(self, *args, **kwargs):
+    def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dict, *args, **kwargs):
         self.agent_attributes["http.url"] = self.http_url
-        attrs = super().span_event(*args, **kwargs)
-        if not attrs:
-            return None
-        i_attrs = attrs[0]
 
+        i_attrs = base_attrs and base_attrs.copy() or attr_class()
         i_attrs["category"] = "http"
         i_attrs["span.kind"] = "client"
         _, i_attrs["component"] = attribute.process_user_attribute("component", self.library)
 
         if self.method:
             _, i_attrs["http.method"] = attribute.process_user_attribute("http.method", self.method)
 
-        return attrs
+        return super().span_event(settings, base_attrs=base_attrs, parent_guid=parent_guid, attr_class=attr_class, *args, **kwargs)

newrelic/core/function_node.py

@@ -114,12 +114,8 @@ def trace_node(self, stats, root, connections):
             start_time=start_time, end_time=end_time, name=name, params=params, children=children, label=self.label
         )
 
-    def span_event(self, *args, **kwargs):
-        attrs = super().span_event(*args, **kwargs)
-        if not attrs:
-            return None
-        i_attrs = attrs[0]
-
+    def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dict, *args, **kwargs):
+        i_attrs = base_attrs and base_attrs.copy() or attr_class()
         i_attrs["name"] = f"{self.group}/{self.name}"
 
-        return attrs
+        return super().span_event(settings, base_attrs=base_attrs, parent_guid=parent_guid, attr_class=attr_class, *args, **kwargs)

newrelic/core/loop_node.py

@@ -79,12 +79,8 @@ def trace_node(self, stats, root, connections):
             start_time=start_time, end_time=end_time, name=name, params=params, children=children, label=None
         )
 
-    def span_event(self, *args, **kwargs):
-        attrs = super().span_event(*args, **kwargs)
-        if not attrs:
-            return None
-        i_attrs = attrs[0]
-
+    def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dict, *args, **kwargs):
+        i_attrs = base_attrs and base_attrs.copy() or attr_class()
         i_attrs["name"] = f"EventLoop/Wait/{self.name}"
 
-        return attrs
+        return super().span_event(settings, base_attrs=base_attrs, parent_guid=parent_guid, attr_class=attr_class, *args, **kwargs)

newrelic/core/node_mixin.py

@@ -149,11 +149,10 @@ def db_instance(self):
         self._db_instance = db_instance_attr
         return db_instance_attr
 
-    def span_event(self, *args, **kwargs):
-        self.agent_attributes["db.instance"] = self.db_instance
-        attrs = super().span_event(*args, **kwargs)
-        i_attrs = attrs[0]
-        a_attrs = attrs[2]
+    def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dict, *args, **kwargs):
+        a_attrs = self.agent_attributes
+        a_attrs["db.instance"] = self.db_instance
+        i_attrs = base_attrs and base_attrs.copy() or attr_class()
 
         i_attrs["category"] = "datastore"
         i_attrs["span.kind"] = "client"
@@ -182,18 +181,4 @@ def span_event(self, *args, **kwargs):
         except Exception:
             pass
 
-        # intrinsics, user attrs, agent attrs
-        if settings.core_tracing.drop_inprocess_spans or settings.core_tracing.enabled:
-            if not parent_guid:
-                return [i_attrs, u_attrs, a_attrs]
-            set_inprocess_attrs = set(attribute.SPAN_ENTITY_RELATIONSHIP_ATTRIBUTES)
-            set_a_attrs = set(a_attrs)
-            exit_span_attrs_present = set_inprocess_attrs & set_a_attrs
-            attrs[3] = exit_span_attrs_present
-            if not exit_span_attrs_present:
-                return None
-        set_inprocess_attrs = set(attribute.SPAN_ENTITY_RELATIONSHIP_ATTRIBUTES)
-        set_a_attrs = set(a_attrs)
-        exit_span_attrs_present = set_inprocess_attrs & set_a_attrs
-        attrs[3] = exit_span_attrs_present
-        return attrs
+        return super().span_event(settings, base_attrs=base_attrs, parent_guid=parent_guid, attr_class=attr_class, *args, **kwargs)

newrelic/core/root_node.py

@@ -37,16 +37,16 @@
 
 
 class RootNode(_RootNode, GenericNodeMixin):
-    def span_event(self, *args, **kwargs):
-        span = super().span_event(*args, **kwargs)
-        i_attrs = span[0]
+    def span_event(self, settings, base_attrs=None, parent_guid=None, attr_class=dict, *args, **kwargs):
+        i_attrs = base_attrs and base_attrs.copy() or attr_class()
         i_attrs["transaction.name"] = self.path
         i_attrs["nr.entryPoint"] = True
         if self.trusted_parent_span:
             i_attrs["trustedParentId"] = self.trusted_parent_span
         if self.tracing_vendors:
             i_attrs["tracingVendors"] = self.tracing_vendors
-        return span
+
+        return super().span_event(settings, base_attrs=base_attrs, parent_guid=parent_guid, attr_class=attr_class, *args, **kwargs)
 
     def trace_node(self, stats, root, connections):
         name = self.path