diff --git a/src/plugins/graphql.js b/src/plugins/graphql.js
index 0943af71394..d3af26cc103 100644
--- a/src/plugins/graphql.js
+++ b/src/plugins/graphql.js
@@ -2,7 +2,7 @@
 
 const platform = require('../platform')
 
-function createWrapExecute (tracer, config, defaultFieldResolver) {
+function createWrapExecute (tracer, config, defaultFieldResolver, responsePathAsArray) {
   return function wrapExecute (execute) {
     return function executeWithTrace () {
       const args = normalizeArgs(arguments)
@@ -10,26 +10,30 @@ function createWrapExecute (tracer, config, defaultFieldResolver) {
       const document = args.document
       const contextValue = args.contextValue || {}
       const fieldResolver = args.fieldResolver || defaultFieldResolver
+      const operation = getOperation(document)
 
-      if (!schema || !document || typeof fieldResolver !== 'function') {
+      if (!schema || !operation || typeof fieldResolver !== 'function') {
         return execute.apply(this, arguments)
       }
 
-      args.fieldResolver = wrapResolve(fieldResolver, tracer, config)
+      args.fieldResolver = wrapResolve(fieldResolver, tracer, config, responsePathAsArray)
       args.contextValue = contextValue
 
-      Object.defineProperties(contextValue, {
-        _datadog_operation: { value: {} },
-        _datadog_fields: { value: {} },
-        _datadog_source: { value: document._datadog_source }
-      })
-
       if (!schema._datadog_patched) {
-        wrapFields(schema._queryType._fields, tracer, config, [])
+        wrapFields(schema._queryType._fields, tracer, config, responsePathAsArray)
         schema._datadog_patched = true
       }
 
-      return call(execute, this, [args], defer(tracer), () => finishOperation(contextValue))
+      Object.defineProperties(contextValue, {
+        _datadog_operation: {
+          value: {
+            span: createOperationSpan(tracer, config, operation, document._datadog_source)
+          }
+        },
+        _datadog_fields: { value: {} }
+      })
+
+      return call(execute, this, [args], defer(tracer), err => finishOperation(contextValue, err))
     }
   }
 }
@@ -40,7 +44,7 @@ function createWrapParse () {
       const document = parse.apply(this, arguments)
 
       Object.defineProperties(document, {
-        _datadog_source: { value: source }
+        _datadog_source: { value: source.body || source }
       })
 
       return document
@@ -48,30 +52,30 @@ function createWrapParse () {
   }
 }
 
-function wrapFields (fields, tracer, config) {
+function wrapFields (fields, tracer, config, responsePathAsArray) {
   Object.keys(fields).forEach(key => {
     const field = fields[key]
 
     if (typeof field.resolve === 'function') {
-      field.resolve = wrapResolve(field.resolve, tracer, config)
+      field.resolve = wrapResolve(field.resolve, tracer, config, responsePathAsArray)
     }
 
     if (field.type && field.type._fields) {
-      wrapFields(field.type._fields, tracer, config)
+      wrapFields(field.type._fields, tracer, config, responsePathAsArray)
     }
   })
 }
 
-function wrapResolve (resolve, tracer, config) {
+function wrapResolve (resolve, tracer, config, responsePathAsArray) {
   return function resolveWithTrace (source, args, contextValue, info) {
-    const path = getPath(info.path)
-    const fieldParent = getFieldParent(tracer, config, contextValue, info, path)
+    const path = responsePathAsArray(info.path)
+    const fieldParent = getFieldParent(contextValue, path)
     const childOf = createSpan('graphql.field', tracer, config, fieldParent, path)
     const deferred = defer(tracer)
 
     let result
 
-    contextValue._datadog_fields[path] = {
+    contextValue._datadog_fields[path.join('.')] = {
       span: childOf,
       parent: fieldParent
     }
@@ -124,11 +128,7 @@ function defer (tracer) {
   return deferred
 }
 
-function getFieldParent (tracer, config, contextValue, info, path) {
-  if (!contextValue._datadog_operation.span) {
-    contextValue._datadog_operation.span = createOperationSpan(tracer, config, contextValue, info)
-  }
-
+function getFieldParent (contextValue, path) {
   if (path.length === 1) {
     return contextValue._datadog_operation.span
   }
@@ -152,19 +152,18 @@ function normalizeArgs (args) {
   }
 }
 
-function createOperationSpan (tracer, config, contextValue, info) {
-  const type = info.operation.operation
-  const name = info.operation.name && info.operation.name.value
+function createOperationSpan (tracer, config, operation, source) {
+  const type = operation.operation
+  const name = operation.name && operation.name.value
 
   let span
 
-  tracer.trace(`graphql.${info.operation.operation}`, parent => {
+  tracer.trace(`graphql.${operation.operation}`, parent => {
     span = parent
     span.addTags({
       'service.name': getService(tracer, config),
       'resource.name': [type, name].filter(val => val).join(' '),
-      'span.type': 'custom',
-      'graphql.document': contextValue._datadog_source
+      'graphql.document': source
     })
   })
 
@@ -185,8 +184,7 @@ function createSpan (name, tracer, config, childOf, path) {
 function addTags (span, tracer, config, path) {
   span.addTags({
     'service.name': getService(tracer, config),
-    'resource.name': path.join('.'),
-    'span.type': 'custom'
+    'resource.name': path.join('.')
   })
 }
 
@@ -195,16 +193,18 @@ function finish (span, contextValue, path, error) {
 
   span.finish()
 
-  for (let i = path.length - 2; i >= 0; i--) {
-    contextValue._datadog_fields[path[i]].finishTime = platform.now()
+  for (let i = path.length; i > 0; i--) {
+    contextValue._datadog_fields[path.slice(0, i).join('.')].finishTime = platform.now()
   }
 }
 
-function finishOperation (contextValue) {
+function finishOperation (contextValue, error) {
   for (const key in contextValue._datadog_fields) {
     contextValue._datadog_fields[key].span.finish(contextValue._datadog_fields[key].finishTime)
   }
 
+  addError(contextValue._datadog_operation.span, error)
+
   contextValue._datadog_operation.span.finish()
 }
 
@@ -212,12 +212,15 @@ function getService (tracer, config) {
   return config.service || `${tracer._service}-graphql`
 }
 
-function getPath (path) {
-  if (path.prev) {
-    return getPath(path.prev).concat(path.key)
-  } else {
-    return [path.key]
+function getOperation (document) {
+  if (!document || !Array.isArray(document.definitions)) {
+    return
   }
+
+  const types = ['query', 'mutations']
+  const definition = document.definitions.find(def => types.indexOf(def.operation) !== -1)
+
+  return definition
 }
 
 function addError (span, error) {
@@ -238,7 +241,12 @@ module.exports = [
     file: 'execution/execute.js',
     versions: ['0.13.x'],
     patch (execute, tracer, config) {
-      this.wrap(execute, 'execute', createWrapExecute(tracer, config, execute.defaultFieldResolver))
+      this.wrap(execute, 'execute', createWrapExecute(
+        tracer,
+        config,
+        execute.defaultFieldResolver,
+        execute.responsePathAsArray
+      ))
     },
     unpatch (execute) {
       this.unwrap(execute, 'execute')
diff --git a/test/plugins/graphql.spec.js b/test/plugins/graphql.spec.js
index 466e8587d8a..7148411b9ca 100644
--- a/test/plugins/graphql.spec.js
+++ b/test/plugins/graphql.spec.js
@@ -34,13 +34,25 @@ describe('Plugin', () => {
                 name: {
                   type: graphql.GraphQLString,
                   resolve (obj, args) {
-                    return obj
+                    return 'test'
+                  }
+                },
+                address: {
+                  type: new graphql.GraphQLObjectType({
+                    name: 'Address',
+                    fields: {
+                      civicNumber: { type: graphql.GraphQLString },
+                      street: { type: graphql.GraphQLString }
+                    }
+                  }),
+                  resolve (obj, args) {
+                    return {}
                   }
                 }
               }
             }),
             resolve (obj, args) {
-              return Promise.resolve('test')
+              return Promise.resolve({})
             }
           }
         }
@@ -125,19 +137,35 @@ describe('Plugin', () => {
       })
 
       it('should instrument nested field resolvers', done => {
-        const source = `{ human { name } }`
+        const source = `
+          {
+            human {
+              name
+              address {
+                civicNumber
+                street
+              }
+            }
+          }
+        `
 
         agent
           .use(traces => {
             const spans = sort(traces[0])
 
-            expect(spans).to.have.length(5)
+            expect(spans).to.have.length(11)
 
             const query = spans[0]
             const humanField = spans[1]
             const humanResolve = spans[2]
             const humanNameField = spans[3]
             const humanNameResolve = spans[4]
+            const addressField = spans[5]
+            const addressResolve = spans[6]
+            const addressCivicNumberField = spans[7]
+            const addressCivicNumberResolve = spans[8]
+            const addressStreetField = spans[9]
+            const addressStreetResolve = spans[10]
 
             expect(query).to.have.property('name', 'graphql.query')
             expect(query).to.have.property('resource', 'query')
@@ -157,6 +185,30 @@ describe('Plugin', () => {
             expect(humanNameResolve).to.have.property('name', 'graphql.resolve')
             expect(humanNameResolve).to.have.property('resource', 'human.name')
             expect(humanNameResolve.parent_id.toString()).to.equal(humanNameField.span_id.toString())
+
+            expect(addressField).to.have.property('name', 'graphql.field')
+            expect(addressField).to.have.property('resource', 'human.address')
+            expect(addressField.parent_id.toString()).to.equal(humanField.span_id.toString())
+
+            expect(addressResolve).to.have.property('name', 'graphql.resolve')
+            expect(addressResolve).to.have.property('resource', 'human.address')
+            expect(addressResolve.parent_id.toString()).to.equal(addressField.span_id.toString())
+
+            expect(addressCivicNumberField).to.have.property('name', 'graphql.field')
+            expect(addressCivicNumberField).to.have.property('resource', 'human.address.civicNumber')
+            expect(addressCivicNumberField.parent_id.toString()).to.equal(addressField.span_id.toString())
+
+            expect(addressCivicNumberResolve).to.have.property('name', 'graphql.resolve')
+            expect(addressCivicNumberResolve).to.have.property('resource', 'human.address.civicNumber')
+            expect(addressCivicNumberResolve.parent_id.toString()).to.equal(addressCivicNumberField.span_id.toString())
+
+            expect(addressStreetField).to.have.property('name', 'graphql.field')
+            expect(addressStreetField).to.have.property('resource', 'human.address.street')
+            expect(addressStreetField.parent_id.toString()).to.equal(addressField.span_id.toString())
+
+            expect(addressStreetResolve).to.have.property('name', 'graphql.resolve')
+            expect(addressStreetResolve).to.have.property('resource', 'human.address.street')
+            expect(addressStreetResolve.parent_id.toString()).to.equal(addressStreetField.span_id.toString())
           })
           .then(done)
           .catch(done)
@@ -314,7 +366,66 @@ describe('Plugin', () => {
         graphql.execute(schema, document)
       })
 
-      it('should handle exceptions', done => {
+      it('should handle Source objects', done => {
+        const source = `query MyQuery { hello(name: "world") }`
+        const document = graphql.parse(new graphql.Source(source))
+
+        agent
+          .use(traces => {
+            const spans = sort(traces[0])
+
+            expect(spans).to.have.length(3)
+            expect(spans[0]).to.have.property('service', 'test-graphql')
+            expect(spans[0]).to.have.property('name', 'graphql.query')
+            expect(spans[0]).to.have.property('resource', 'query MyQuery')
+            expect(spans[0].meta).to.have.property('graphql.document', source)
+          })
+          .then(done)
+          .catch(done)
+
+        graphql.execute(schema, document)
+      })
+
+      it('should handle executor exceptions', done => {
+        schema = new graphql.GraphQLSchema({
+          query: new graphql.GraphQLObjectType({
+            name: 'RootQueryType',
+            fields: {
+              hello: {}
+            }
+          })
+        })
+
+        const source = `{ hello }`
+        const document = graphql.parse(source)
+
+        let error
+
+        agent
+          .use(traces => {
+            const spans = sort(traces[0])
+
+            expect(spans).to.have.length(1)
+            expect(spans[0]).to.have.property('service', 'test-graphql')
+            expect(spans[0]).to.have.property('name', 'graphql.query')
+            expect(spans[0]).to.have.property('resource', 'query')
+            expect(spans[0].meta).to.have.property('graphql.document', source)
+            expect(spans[0]).to.have.property('error', 1)
+            expect(spans[0].meta).to.have.property('error.type', error.name)
+            expect(spans[0].meta).to.have.property('error.msg', error.message)
+            expect(spans[0].meta).to.have.property('error.stack', error.stack)
+          })
+          .then(done)
+          .catch(done)
+
+        try {
+          graphql.execute(schema, document)
+        } catch (e) {
+          error = e
+        }
+      })
+
+      it('should handle resolver exceptions', done => {
         const error = new Error('test')
 
         const schema = graphql.buildSchema(`