Fix datastore node mixin attributes

Author: TimPansino

newrelic/core/node_mixin.py

@@ -115,16 +115,30 @@ def span_event(self, *args, **kwargs):
         a_attrs = attrs[2]
 
         i_attrs["category"] = "datastore"
-        i_attrs["component"] = self.product
         i_attrs["span.kind"] = "client"
 
+        if self.product:
+            i_attrs["component"] = a_attrs["db.system"] = attribute.process_user_attribute("db.system", self.product)[1]
+        if self.operation:
+            a_attrs["db.operation"] = attribute.process_user_attribute("db.operation", self.operation)[1]
+        if self.target:
+            a_attrs["db.collection"] = attribute.process_user_attribute("db.collection", self.target)[1]
+
         if self.instance_hostname:
-            _, a_attrs["peer.hostname"] = attribute.process_user_attribute("peer.hostname", self.instance_hostname)
+            peer_hostname = attribute.process_user_attribute("peer.hostname", self.instance_hostname)[1]
         else:
-            a_attrs["peer.hostname"] = "Unknown"
+            peer_hostname = "Unknown"
+
+        a_attrs["peer.hostname"] = a_attrs["server.address"] = peer_hostname
+
+        peer_address = f"{peer_hostname}:{self.port_path_or_id or 'Unknown'}"
 
-        peer_address = f"{self.instance_hostname or 'Unknown'}:{self.port_path_or_id or 'Unknown'}"
+        a_attrs["peer.address"] = attribute.process_user_attribute("peer.address", peer_address)[1]
 
-        _, a_attrs["peer.address"] = attribute.process_user_attribute("peer.address", peer_address)
+        # Attempt to treat port_path_or_id as an integer, fallback to not including it
+        try:
+            a_attrs["server.port"] = int(self.port_path_or_id)
+        except Exception:
+            pass
 
         return attrs