fix graphql unsupported operation errors and add support for mutations (

#180)
DataDog · Jul 11, 2018 · 1b90fd1 · 1b90fd1
1 parent 67f9506
commit 1b90fd1
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 2 deletions.
diff --git a/src/plugins/graphql.js b/src/plugins/graphql.js
@@ -21,6 +21,8 @@ function createWrapExecute (tracer, config, defaultFieldResolver, responsePathAs
 
       if (!schema._datadog_patched) {
         wrapFields(schema._queryType, tracer, config, responsePathAsArray)
+        wrapFields(schema._mutationType, tracer, config, responsePathAsArray)
+
         schema._datadog_patched = true
       }
 
@@ -53,7 +55,7 @@ function createWrapParse () {
 }
 
 function wrapFields (type, tracer, config, responsePathAsArray) {
-  if (type._datadog_patched) {
+  if (!type || type._datadog_patched) {
     return
   }
 
@@ -78,6 +80,10 @@ function wrapFields (type, tracer, config, responsePathAsArray) {
 
 function wrapResolve (resolve, tracer, config, responsePathAsArray) {
   function resolveWithTrace (source, args, contextValue, info) {
+    if (!contextValue || !contextValue._datadog_fields) {
+      return resolve.apply(arguments)
+    }
+
     const path = responsePathAsArray(info.path)
     const fieldParent = getFieldParent(contextValue, path)
 
@@ -254,7 +260,7 @@ function getOperation (document) {
     return
   }
 
-  const types = ['query', 'mutations']
+  const types = ['query', 'mutation']
   const definition = document.definitions.find(def => types.indexOf(def.operation) !== -1)
 
   return definition

diff --git a/test/plugins/graphql.spec.js b/test/plugins/graphql.spec.js
@@ -106,6 +106,30 @@ describe('Plugin', () => {
             }
           }
         }
+      }),
+
+      mutation: new graphql.GraphQLObjectType({
+        name: 'RootMutationType',
+        fields: {
+          human: {
+            type: Human,
+            resolve () {
+              return Promise.resolve({ name: 'human name' })
+            }
+          }
+        }
+      }),
+
+      subscription: new graphql.GraphQLObjectType({
+        name: 'RootSubscriptionType',
+        fields: {
+          human: {
+            type: Human,
+            resolve () {
+              return Promise.resolve({ name: 'human name' })
+            }
+          }
+        }
       })
     })
   }
@@ -324,6 +348,22 @@ describe('Plugin', () => {
         graphql.graphql(schema, source).catch(done)
       })
 
+      it('should instrument mutations', done => {
+        const source = `mutation { human { name } }`
+
+        agent
+          .use(traces => {
+            const spans = sort(traces[0])
+
+            expect(spans).to.have.length(5)
+            expect(spans[0]).to.have.property('name', 'graphql.mutation')
+          })
+          .then(done)
+          .catch(done)
+
+        graphql.graphql(schema, source).catch(done)
+      })
+
       it('should handle a circular schema', done => {
         const source = `{ human { pets { owner { name } } } }`
 
@@ -446,6 +486,17 @@ describe('Plugin', () => {
           })
       })
 
+      it('should handle unsupported operations', () => {
+        const query = `query MyQuery { hello(name: "world") }`
+        const subscription = `subscription { human { name } }`
+
+        return graphql.graphql(schema, query)
+          .then(() => graphql.graphql(schema, subscription))
+          .then(result => {
+            expect(result).to.not.have.property('errors')
+          })
+      })
+
       it('should handle calling low level APIs directly', done => {
         const source = `query MyQuery { hello(name: "world") }`
         const document = graphql.parse(source)