[WIP] Add Path to GraphQLResolverTrace

newrelic/api/graphql_trace.py

@@ -134,7 +134,7 @@ def wrap_graphql_operation_trace(module, object_path):
 
 
 class GraphQLResolverTrace(TimeTrace):
-    def __init__(self, field_name=None, **kwargs):
+    def __init__(self, field_name=None, field_parent_type=None, field_return_type=None, field_path=None, **kwargs):
         parent = kwargs.pop("parent", None)
         source = kwargs.pop("source", None)
         if kwargs:
@@ -143,6 +143,9 @@ def __init__(self, field_name=None, **kwargs):
         super(GraphQLResolverTrace, self).__init__(parent=parent, source=source)
 
         self.field_name = field_name
+        self.field_parent_type = field_parent_type
+        self.field_return_type = field_return_type
+        self.field_path = field_path
         self._product = None
 
     def __repr__(self):
@@ -170,12 +173,16 @@ def product(self):
 
     def finalize_data(self, *args, **kwargs):
         self._add_agent_attribute("graphql.field.name", self.field_name)
+        self._add_agent_attribute("graphql.field.parentType", self.field_parent_type)
+        self._add_agent_attribute("graphql.field.returnType", self.field_return_type)
+        self._add_agent_attribute("graphql.field.path", self.field_path)
 
         return super(GraphQLResolverTrace, self).finalize_data(*args, **kwargs)
 
     def create_node(self):
         return GraphQLResolverNode(
             field_name=self.field_name,
+            field_path=self.field_path,
             children=self.children,
             start_time=self.start_time,
             end_time=self.end_time,

newrelic/core/graphql_node.py

@@ -26,7 +26,7 @@
     'agent_attributes', 'user_attributes', 'product'])
 
 _GraphQLResolverNode = namedtuple('_GraphQLNode',
-    ['field_name', 'children', 'start_time', 'end_time', 'duration', 
+    ['field_name', 'field_path', 'children', 'start_time', 'end_time', 'duration', 
     'exclusive', 'guid', 'agent_attributes', 'user_attributes', 'product'])
 
 class GraphQLNodeMixin(GenericNodeMixin):
@@ -57,10 +57,10 @@ def trace_node(self, stats, root, connections):
 class GraphQLResolverNode(_GraphQLResolverNode, GraphQLNodeMixin):
     @property
     def name(self):
-        field_name = self.field_name or "<unknown>"
-        product = self.product
+        field_path = self.field_path or self.field_name or "<unknown>"
+        product = self.product or "GraphQL"
 
-        name = 'GraphQL/resolve/%s/%s' % (product, field_name)
+        name = 'GraphQL/resolve/%s/%s' % (product, field_path)
 
         return name
 
@@ -69,12 +69,9 @@ def time_metrics(self, stats, root, parent):
         database node as well as all the child nodes.
         """
 
-        field_name = self.field_name or "<unknown>"
-        product = self.product
-
         # Determine the scoped metric
 
-        field_resolver_metric_name = 'GraphQL/resolve/%s/%s' % (product, field_name)
+        field_resolver_metric_name = self.name
 
         yield TimeMetric(name=field_resolver_metric_name, scope=root.path, duration=self.duration,
                          exclusive=self.exclusive)

newrelic/hooks/framework_ariadne.py

@@ -29,9 +29,17 @@
 
 
 def framework_details():
-    import ariadne
-
-    return ("Ariadne", getattr(ariadne, "__version__", None))
+    try:
+        import ariadne
+        version = ariadne.__version__
+    except Exception:
+        try:
+            import pkg_resources
+            version = pkg_resources.get_distribution("ariadne").version
+        except Exception:
+            version = None
+
+    return ("Ariadne", version)
 
 
 def bind_graphql(schema, data, *args, **kwargs):