Merge branch 'master' into zarir/otel-http-remap-tag

zarirhamza · web-flow · commit 02dfa8e0323e · 2024-06-07T11:15:45.000-04:00
diff --git a/packages/datadog-plugin-graphql/src/resolve.js b/packages/datadog-plugin-graphql/src/resolve.js
@@ -80,6 +80,10 @@ class GraphQLResolvePlugin extends TracingPlugin {
     // this will disable resolve subscribers if `config.depth` is set to 0
     super.configure(config.depth === 0 ? false : config)
   }
+
+  finish (finishTime) {
+    this.activeSpan.finish(finishTime)
+  }
 }
 
 // helpers
diff --git a/packages/datadog-plugin-graphql/test/index.spec.js b/packages/datadog-plugin-graphql/test/index.spec.js
@@ -11,12 +11,18 @@ const getPort = require('get-port')
 const dc = require('dc-polyfill')
 const plugin = require('../src')
 
+const { performance } = require('perf_hooks')
+
 describe('Plugin', () => {
   let tracer
   let graphql
   let schema
   let sort
 
+  let markFast
+  let markSlow
+  let markSync
+
   function buildSchema () {
     const Human = new graphql.GraphQLObjectType({
       name: 'Human',
@@ -80,6 +86,31 @@ describe('Plugin', () => {
           resolve (obj, args) {
             return [{}, {}, {}]
           }
+        },
+        fastAsyncField: {
+          type: graphql.GraphQLString,
+          resolve (obj, args) {
+            return new Promise((resolve) => {
+              markFast = performance.now()
+              resolve('fast field')
+            })
+          }
+        },
+        slowAsyncField: {
+          type: graphql.GraphQLString,
+          resolve (obj, args) {
+            return new Promise((resolve) => {
+              markSlow = performance.now()
+              resolve('slow field')
+            })
+          }
+        },
+        syncField: {
+          type: graphql.GraphQLString,
+          resolve (obj, args) {
+            markSync = performance.now()
+            return 'sync field'
+          }
         }
       }
     })
@@ -380,6 +411,73 @@ describe('Plugin', () => {
           graphql.graphql({ schema, source }).catch(done)
         })
 
+        it('should instrument each field resolver duration independently', done => {
+          const source = `
+            {
+              human {
+                fastAsyncField
+                slowAsyncField
+                syncField
+              }
+            }
+          `
+
+          let foundFastFieldSpan = false
+          let foundSlowFieldSpan = false
+          let foundSyncFieldSpan = false
+
+          let fastAsyncTime
+          let slowAsyncTime
+          let syncTime
+
+          const processTraces = (traces) => {
+            try {
+              for (const trace of traces) {
+                for (const span of trace) {
+                  if (span.name !== 'graphql.resolve') {
+                    continue
+                  }
+
+                  if (span.resource === 'fastAsyncField:String') {
+                    expect(fastAsyncTime).to.be.lessThan(slowAsyncTime)
+                    foundFastFieldSpan = true
+                  } else if (span.resource === 'slowAsyncField:String') {
+                    expect(slowAsyncTime).to.be.lessThan(syncTime)
+                    foundSlowFieldSpan = true
+                  } else if (span.resource === 'syncField:String') {
+                    expect(syncTime).to.be.greaterThan(slowAsyncTime)
+                    foundSyncFieldSpan = true
+                  }
+
+                  if (foundFastFieldSpan && foundSlowFieldSpan && foundSyncFieldSpan) {
+                    agent.unsubscribe(processTraces)
+                    done()
+                    return
+                  }
+                }
+              }
+            } catch (e) {
+              agent.unsubscribe(processTraces)
+              done(e)
+            }
+          }
+
+          agent.subscribe(processTraces)
+
+          const markStart = performance.now()
+
+          graphql.graphql({ schema, source })
+            .then((result) => {
+              fastAsyncTime = markFast - markStart
+              slowAsyncTime = markSlow - markStart
+              syncTime = markSync - markStart
+            })
+            .catch((e) => {
+              agent.unsubscribe(processTraces)
+              done(e)
+            })
+        })
+
         it('should instrument nested field resolvers', done => {
           const source = `
             {

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,10 @@ class GraphQLResolvePlugin extends TracingPlugin {`
`80`	`80`	// this will disable resolve subscribers if `config.depth` is set to 0
`81`	`81`	`super.configure(config.depth === 0 ? false : config)`
`82`	`82`	`}`
	`83`	`+`
	`84`	`+ finish (finishTime) {`
	`85`	`+ this.activeSpan.finish(finishTime)`
	`86`	`+ }`
`83`	`87`	`}`
`84`	`88`
`85`	`89`	`// helpers`