Move resover information resolution to plugin.

Author: hoolioh

packages/datadog-instrumentations/src/graphql.js

@@ -275,12 +275,11 @@ function assertField (context, info, args) {
       accesses the parent span from the storage unit in its own scope */
       const childResource = new AsyncResource('bound-anonymous-fn')
 
-      addResolver(context, info, args)
-
       childResource.runInAsyncScope(() => {
         startResolveCh.publish({
           info,
-          context
+          context,
+          args
         })
       })
 
@@ -344,37 +343,6 @@ function wrapFieldType (field) {
   wrapFields(unwrappedType)
 }
 
-function addResolver (context, info, args) {
-  context.resolver = null
-
-  const resolverInfo = {}
-
-  if (args && Object.keys(args).length) {
-    Object.assign(resolverInfo, args)
-  }
-
-  const directives = info.fieldNodes[0].directives
-  for (const directive of directives) {
-    const argList = {}
-    for (const argument of directive['arguments']) {
-      const arg = {}
-      arg[argument.name.value] = argument.value.value
-      Object.assign(argList, arg)
-    }
-
-    if (Object.keys(argList).length) {
-      const directiveInfo = {}
-      directiveInfo[directive.name.value] = argList
-      Object.assign(resolverInfo, directiveInfo)
-    }
-  }
-
-  if (Object.keys(resolverInfo).length) {
-    context.resolver = {}
-    context.resolver[info.fieldName] = resolverInfo
-  }
-}
-
 function finishResolvers ({ fields }) {
   Object.keys(fields).reverse().forEach(key => {
     const field = fields[key]

packages/datadog-plugin-graphql/src/resolve.js

@@ -8,12 +8,14 @@ class GraphQLResolvePlugin extends TracingPlugin {
   static get id () { return 'graphql' }
   static get operation () { return 'resolve' }
 
-  start ({ info, context }) {
+  start ({ info, context, args }) {
     const path = getPath(info, this.config)
 
     if (!shouldInstrument(this.config, path)) return
     const computedPathString = path.join('.')
 
+    addResolver(context, info, args)
+
     if (this.config.collapse) {
       if (!context[collapsedPathSym]) {
         context[collapsedPathSym] = {}
@@ -107,4 +109,36 @@ function withCollapse (responsePathAsArray) {
   }
 }
 
+function addResolver (context, info, args) {
+  context.resolver = null
+
+  const resolverInfo = {}
+
+  if (args && Object.keys(args).length) {
+    Object.assign(resolverInfo, args)
+  }
+
+  const directives = info.fieldNodes[0].directives
+  for (const directive of directives) {
+    const argList = {}
+    for (const argument of directive['arguments']) {
+      const arg = {}
+      arg[argument.name.value] = argument.value.value
+      Object.assign(argList, arg)
+    }
+
+    if (Object.keys(argList).length) {
+      const directiveInfo = {}
+      directiveInfo[directive.name.value] = argList
+      Object.assign(resolverInfo, directiveInfo)
+    }
+  }
+
+  if (Object.keys(resolverInfo).length) {
+    context.resolver = {}
+    context.resolver[info.fieldName] = resolverInfo
+  }
+}
+
+
 module.exports = GraphQLResolvePlugin