dd-trace 5.0.0-pre-cd5fbdb → 5.0.0-pre-4c05491

package/ext/tags.d.ts

@@ -9,6 +9,7 @@ declare const tags: {
   MANUAL_KEEP: 'manual.keep'
   MANUAL_DROP: 'manual.drop'
   MEASURED: '_dd.measured'
+  BASE_SERVICE: '_dd.base_service'
   HTTP_URL: 'http.url'
   HTTP_METHOD: 'http.method'
   HTTP_STATUS_CODE: 'http.status_code'

package/ext/tags.js

@@ -12,6 +12,7 @@ const tags = {
   MANUAL_KEEP: 'manual.keep',
   MANUAL_DROP: 'manual.drop',
   MEASURED: '_dd.measured',
+  BASE_SERVICE: '_dd.base_service',
 
   // HTTP
   HTTP_URL: 'http.url',

package/index.d.ts

@@ -649,7 +649,7 @@ export declare interface DogStatsD {
    * Increments a metric by the specified value, optionally specifying tags.
    * @param {string} stat The dot-separated metric name.
    * @param {number} value The amount to increment the stat by.
-   * @param {[tag:string]:string|number} tags Tags to pass along, such as `[ 'foo:bar' ]`. Values are combined with config.tags.
+   * @param {[tag:string]:string|number} tags Tags to pass along, such as `{ foo: 'bar' }`. Values are combined with config.tags.
    */
   increment(stat: string, value?: number, tags?: { [tag: string]: string|number }): void
 
@@ -657,7 +657,7 @@ export declare interface DogStatsD {
    * Decrements a metric by the specified value, optionally specifying tags.
    * @param {string} stat The dot-separated metric name.
    * @param {number} value The amount to decrement the stat by.
-   * @param {[tag:string]:string|number} tags Tags to pass along, such as `[ 'foo:bar' ]`. Values are combined with config.tags.
+   * @param {[tag:string]:string|number} tags Tags to pass along, such as `{ foo: 'bar' }`. Values are combined with config.tags.
    */
   decrement(stat: string, value?: number, tags?: { [tag: string]: string|number }): void
 
@@ -665,7 +665,7 @@ export declare interface DogStatsD {
    * Sets a distribution value, optionally specifying tags.
    * @param {string} stat The dot-separated metric name.
    * @param {number} value The amount to increment the stat by.
-   * @param {[tag:string]:string|number} tags Tags to pass along, such as `[ 'foo:bar' ]`. Values are combined with config.tags.
+   * @param {[tag:string]:string|number} tags Tags to pass along, such as `{ foo: 'bar' }`. Values are combined with config.tags.
    */
   distribution(stat: string, value?: number, tags?: { [tag: string]: string|number }): void
 
@@ -673,7 +673,7 @@ export declare interface DogStatsD {
    * Sets a gauge value, optionally specifying tags.
    * @param {string} stat The dot-separated metric name.
    * @param {number} value The amount to increment the stat by.
-   * @param {[tag:string]:string|number} tags Tags to pass along, such as `[ 'foo:bar' ]`. Values are combined with config.tags.
+   * @param {[tag:string]:string|number} tags Tags to pass along, such as `{ foo: 'bar' }`. Values are combined with config.tags.
    */
   gauge(stat: string, value?: number, tags?: { [tag: string]: string|number }): void
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.0.0-pre-cd5fbdb",
+  "version": "5.0.0-pre-4c05491",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -18,7 +18,7 @@
     "test:appsec": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" --exclude \"packages/dd-trace/test/appsec/**/*.plugin.spec.js\" \"packages/dd-trace/test/appsec/**/*.spec.js\"",
     "test:appsec:ci": "nyc --no-clean --include \"packages/dd-trace/src/appsec/**/*.js\" --exclude \"packages/dd-trace/test/appsec/**/*.plugin.spec.js\" -- npm run test:appsec",
     "test:appsec:plugins": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/appsec/**/*.@($(echo $PLUGINS)).plugin.spec.js\"",
-    "test:appsec:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/test/appsec/**/*.@($(echo $PLUGINS)).plugin.spec.js\" -- npm run test:appsec:plugins",
+    "test:appsec:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/src/appsec/**/*.js\" -- npm run test:appsec:plugins",
     "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,encode,exporters,opentelemetry,opentracing,plugins,service-naming,telemetry}/**/*.spec.js\"",
     "test:trace:core:ci": "npm run test:trace:core -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/**/*.js\"",
     "test:instrumentations": "mocha --colors -r 'packages/dd-trace/test/setup/mocha.js' 'packages/datadog-instrumentations/test/**/*.spec.js'",
@@ -38,6 +38,7 @@
     "test:integration:playwright": "mocha --colors --timeout 30000 \"integration-tests/playwright/*.spec.js\"",
     "test:integration:serverless": "mocha --colors --timeout 30000 \"integration-tests/serverless/*.spec.js\"",
     "test:integration:plugins": "mocha --colors --timeout 30000 \"packages/datadog-plugin-*/test/integration-test/*.spec.js\"",
+    "test:unit:plugins": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-instrumentations/test/@($(echo $PLUGINS)).spec.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/**/*.spec.js\" --exclude \"packages/datadog-plugin-@($(echo $PLUGINS))/test/integration-test/**/*.spec.js\"",
     "test:shimmer": "mocha --colors 'packages/datadog-shimmer/test/**/*.spec.js'",
     "test:shimmer:ci": "nyc --no-clean --include 'packages/datadog-shimmer/src/**/*.js' -- npm run test:shimmer",
     "leak:core": "node ./scripts/install_plugin_modules && (cd packages/memwatch && yarn) && NODE_PATH=./packages/memwatch/node_modules node --no-warnings ./node_modules/.bin/tape 'packages/dd-trace/test/leak/**/*.js'",
@@ -58,7 +59,7 @@
     "apm"
   ],
   "author": "Datadog Inc. <info@datadoghq.com>",
-  "license": "BSD-3-Clause",
+  "license": "(Apache-2.0 OR BSD-3-Clause)",
   "bugs": {
     "url": "https://github.com/DataDog/dd-trace-js/issues"
   },
@@ -67,8 +68,8 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@datadog/native-appsec": "^3.2.0",
-    "@datadog/native-iast-rewriter": "2.0.1",
+    "@datadog/native-appsec": "^4.0.0",
+    "@datadog/native-iast-rewriter": "2.1.3",
     "@datadog/native-iast-taint-tracking": "1.5.0",
     "@datadog/native-metrics": "^2.0.0",
     "@datadog/pprof": "3.2.0",

package/packages/datadog-instrumentations/src/body-parser.js

@@ -16,7 +16,7 @@ function publishRequestBodyAndNext (req, res, next) {
       if (abortController.signal.aborted) return
     }
 
-    next.apply(this, arguments)
+    return next.apply(this, arguments)
   }
 }
 
@@ -27,6 +27,6 @@ addHook({
 }, read => {
   return shimmer.wrap(read, function (req, res, next) {
     arguments[2] = publishRequestBodyAndNext(req, res, next)
-    read.apply(this, arguments)
+    return read.apply(this, arguments)
   })
 })

package/packages/datadog-instrumentations/src/cookie-parser.js

@@ -0,0 +1,37 @@
+'use strict'
+
+const { AbortController } = require('node-abort-controller') // AbortController is not available in node <15
+const shimmer = require('../../datadog-shimmer')
+const { channel, addHook } = require('./helpers/instrument')
+
+const cookieParserReadCh = channel('datadog:cookie-parser:read:finish')
+
+function publishRequestCookieAndNext (req, res, next) {
+  return function cookieParserWrapper () {
+    if (cookieParserReadCh.hasSubscribers && req) {
+      const abortController = new AbortController()
+
+      const mergedCookies = Object.assign({}, req.cookies, req.signedCookies)
+
+      cookieParserReadCh.publish({ req, res, abortController, cookies: mergedCookies })
+
+      if (abortController.signal.aborted) return
+    }
+
+    return next.apply(this, arguments)
+  }
+}
+
+addHook({
+  name: 'cookie-parser',
+  versions: ['>=1.0.0']
+}, cookieParser => {
+  return shimmer.wrap(cookieParser, function () {
+    const cookieMiddleware = cookieParser.apply(this, arguments)
+
+    return shimmer.wrap(cookieMiddleware, function (req, res, next) {
+      arguments[2] = publishRequestCookieAndNext(req, res, next)
+      return cookieMiddleware.apply(this, arguments)
+    })
+  })
+})

package/packages/datadog-instrumentations/src/express.js

@@ -39,7 +39,7 @@ function publishQueryParsedAndNext (req, res, next) {
       if (abortController.signal.aborted) return
     }
 
-    next.apply(this, arguments)
+    return next.apply(this, arguments)
   }
 }
 

package/packages/datadog-instrumentations/src/graphql.js

@@ -188,7 +188,7 @@ function wrapExecute (execute) {
             executeErrorCh.publish(error)
           }
 
-          finishExecuteCh.publish({ res, args })
+          finishExecuteCh.publish({ res, args, context })
         })
       })
     }
@@ -205,7 +205,7 @@ function wrapResolve (resolve) {
 
     if (!context) return resolve.apply(this, arguments)
 
-    const field = assertField(context, info)
+    const field = assertField(context, info, args)
 
     return callInAsyncScope(resolve, field.asyncResource, this, arguments, (err) => {
       updateFieldCh.publish({ field, info, err })
@@ -250,7 +250,7 @@ function pathToArray (path) {
   return flattened.reverse()
 }
 
-function assertField (context, info) {
+function assertField (context, info, args) {
   const pathInfo = info && info.path
 
   const path = pathToArray(pathInfo)
@@ -272,7 +272,8 @@ function assertField (context, info) {
       childResource.runInAsyncScope(() => {
         startResolveCh.publish({
           info,
-          context
+          context,
+          args
         })
       })
 

package/packages/datadog-instrumentations/src/helpers/hooks.js

@@ -30,6 +30,7 @@ module.exports = {
   'node:child_process': () => require('../child-process'),
   'connect': () => require('../connect'),
   'cookie': () => require('../cookie'),
+  'cookie-parser': () => require('../cookie-parser'),
   'couchbase': () => require('../couchbase'),
   'crypto': () => require('../crypto'),
   'cypress': () => require('../cypress'),
@@ -81,6 +82,7 @@ module.exports = {
   'pg': () => require('../pg'),
   'pino': () => require('../pino'),
   'pino-pretty': () => require('../pino'),
+  'playwright': () => require('../playwright'),
   'promise-js': () => require('../promise-js'),
   'promise': () => require('../promise'),
   'q': () => require('../q'),

package/packages/datadog-instrumentations/src/http/server.js

@@ -29,7 +29,7 @@ addHook({ name: 'http' }, http => {
 
 function wrapResponseEmit (emit) {
   return function (eventName, event) {
-    if (!startServerCh.hasSubscribers) {
+    if (!finishServerCh.hasSubscribers) {
       return emit.apply(this, arguments)
     }
 

package/packages/datadog-instrumentations/src/mysql.js

@@ -17,7 +17,7 @@ addHook({ name: 'mysql', file: 'lib/Connection.js', versions: ['>=2'] }, Connect
       return query.apply(this, arguments)
     }
 
-    const sql = arguments[0].sql ? arguments[0].sql : arguments[0]
+    const sql = arguments[0].sql || arguments[0]
     const conf = this.config
     const payload = { sql, conf }
 
@@ -66,9 +66,47 @@ addHook({ name: 'mysql', file: 'lib/Connection.js', versions: ['>=2'] }, Connect
 })
 
 addHook({ name: 'mysql', file: 'lib/Pool.js', versions: ['>=2'] }, Pool => {
+  const startPoolQueryCh = channel('datadog:mysql:pool:query:start')
+  const finishPoolQueryCh = channel('datadog:mysql:pool:query:finish')
+
   shimmer.wrap(Pool.prototype, 'getConnection', getConnection => function (cb) {
     arguments[0] = AsyncResource.bind(cb)
     return getConnection.apply(this, arguments)
   })
+
+  shimmer.wrap(Pool.prototype, 'query', query => function () {
+    if (!startPoolQueryCh.hasSubscribers) {
+      return query.apply(this, arguments)
+    }
+
+    const asyncResource = new AsyncResource('bound-anonymous-fn')
+
+    const sql = arguments[0].sql || arguments[0]
+
+    return asyncResource.runInAsyncScope(() => {
+      startPoolQueryCh.publish({ sql })
+
+      const finish = asyncResource.bind(function () {
+        finishPoolQueryCh.publish()
+      })
+
+      const cb = arguments[arguments.length - 1]
+      if (typeof cb === 'function') {
+        arguments[arguments.length - 1] = shimmer.wrap(cb, function () {
+          finish()
+          return cb.apply(this, arguments)
+        })
+      }
+
+      const retval = query.apply(this, arguments)
+
+      if (retval && retval.then) {
+        retval.then(finish).catch(finish)
+      }
+
+      return retval
+    })
+  })
+
   return Pool
 })

package/packages/datadog-instrumentations/src/next.js

@@ -12,7 +12,6 @@ const errorChannel = channel('apm:next:request:error')
 const pageLoadChannel = channel('apm:next:page:load')
 
 const requests = new WeakSet()
-const requestToNextjsPagePath = new WeakMap()
 
 function wrapHandleRequest (handleRequest) {
   return function (req, res, pathname, query) {
@@ -29,9 +28,9 @@ function wrapHandleApiRequest (handleApiRequest) {
         if (!handled) return handled
 
         return this.hasPage(pathname).then(pageFound => {
-          const page = pageFound ? pathname : getPageFromPath(pathname, this.dynamicRoutes)
+          const pageData = pageFound ? { page: pathname } : getPageFromPath(pathname, this.dynamicRoutes)
 
-          pageLoadChannel.publish({ page })
+          pageLoadChannel.publish(pageData)
 
           return handled
         })
@@ -84,15 +83,19 @@ function wrapFindPageComponents (findPageComponents) {
     const result = findPageComponents.apply(this, arguments)
 
     if (result) {
-      pageLoadChannel.publish({ page: getPagePath(pathname) })
+      pageLoadChannel.publish(getPagePath(pathname))
     }
 
     return result
   }
 }
 
-function getPagePath (page) {
-  return typeof page === 'object' ? page.pathname : page
+function getPagePath (maybePage) {
+  if (typeof maybePage !== 'object') return { page: maybePage }
+
+  const isAppPath = maybePage.isAppPath
+  const page = maybePage.pathname || maybePage.page
+  return { page, isAppPath }
 }
 
 function getPageFromPath (page, dynamicRoutes = []) {
@@ -133,57 +136,16 @@ function instrument (req, res, handler) {
   })
 }
 
-function wrapSetupServerWorker (setupServerWorker) {
-  return function (requestHandler) {
-    arguments[0] = shimmer.wrap(requestHandler, wrapRequestHandler(requestHandler))
-    return setupServerWorker.apply(this, arguments)
-  }
-}
-
-function wrapInitialize (initialize) {
-  return async function () {
-    const result = await initialize.apply(this, arguments)
-    if (Array.isArray(result)) {
-      const requestHandler = result[0]
-      result[0] = shimmer.wrap(requestHandler, wrapRequestHandler(requestHandler))
-    }
-    return result
-  }
-}
-
-function wrapRequestHandler (requestHandler) {
-  return function (req, res) {
-    return instrument(req, res, async () => {
-      const result = await requestHandler.apply(this, arguments) // apply here first to get page path association
-
-      const page = requestToNextjsPagePath.get(req)
-      if (page && pageLoadChannel.hasSubscribers) pageLoadChannel.publish({ page })
+function wrapServeStatic (serveStatic) {
+  return function (req, res, path) {
+    return instrument(req, res, () => {
+      if (pageLoadChannel.hasSubscribers && path) pageLoadChannel.publish({ page: path })
 
-      return result
+      return serveStatic.apply(this, arguments)
     })
   }
 }
 
-// these two functions make sure we get path groups for routes in standalone,
-// as it doesn't route through `next-server`/`base-server`
-function wrapGetResolveRoutes (getResolveRoutes) {
-  return function () {
-    const result = getResolveRoutes.apply(this, arguments)
-    return shimmer.wrap(result, wrapResolveRoutes(result))
-  }
-}
-
-function wrapResolveRoutes (resolveRoutes) {
-  return async function (req) {
-    const result = await resolveRoutes.apply(this, arguments)
-    if (result && result.matchedOutput) {
-      const path = result.matchedOutput.itemPath
-      requestToNextjsPagePath.set(req, path)
-    }
-    return result
-  }
-}
-
 function finish (ctx, result, err) {
   if (err) {
     ctx.error = err
@@ -201,25 +163,21 @@ function finish (ctx, result, err) {
 
 addHook({
   name: 'next',
-  versions: ['>=13.4.13'],
-  file: 'dist/server/lib/router-utils/resolve-routes.js'
-}, resolveRoutesModule => shimmer.wrap(resolveRoutesModule, 'getResolveRoutes', wrapGetResolveRoutes))
+  versions: ['>=11.1'],
+  file: 'dist/server/serve-static.js'
+}, serveStatic => shimmer.wrap(serveStatic, 'serveStatic', wrapServeStatic))
 
 addHook({
   name: 'next',
-  versions: ['13.4.13'],
-  file: 'dist/server/lib/setup-server-worker.js'
-}, setupServerWorker => shimmer.wrap(setupServerWorker, 'initializeServerWorker', wrapSetupServerWorker))
-
-addHook({
-  name: 'next',
-  versions: ['>=13.4.15'],
-  file: 'dist/server/lib/router-server.js'
-}, routerServer => shimmer.wrap(routerServer, 'initialize', wrapInitialize))
+  versions: DD_MAJOR >= 4 ? ['>=10.2 <11.1'] : ['>=9.5 <11.1'],
+  file: 'dist/next-server/server/serve-static.js'
+}, serveStatic => shimmer.wrap(serveStatic, 'serveStatic', wrapServeStatic))
 
 addHook({ name: 'next', versions: ['>=13.2'], file: 'dist/server/next-server.js' }, nextServer => {
   const Server = nextServer.default
 
+  shimmer.wrap(Server.prototype, 'handleRequest', wrapHandleRequest)
+  shimmer.wrap(Server.prototype, 'handleApiRequest', wrapHandleApiRequestWithMatch)
   shimmer.wrap(Server.prototype, 'renderToResponse', wrapRenderToResponse)
   shimmer.wrap(Server.prototype, 'renderErrorToResponse', wrapRenderErrorToResponse)
   shimmer.wrap(Server.prototype, 'findPageComponents', wrapFindPageComponents)
@@ -227,22 +185,6 @@ addHook({ name: 'next', versions: ['>=13.2'], file: 'dist/server/next-server.js'
   return nextServer
 })
 
-// these functions wrapped in all versions above 13.2 except:
-// 13.4.13 due to tests failing when these functions are wrapped
-// 13.4.14 due to it not being in the NPM registry/officially released
-addHook({
-  name: 'next',
-  versions: ['>=13.2 <13.4.13', '>=13.4.15'],
-  file: 'dist/server/next-server.js'
-}, nextServer => {
-  const Server = nextServer.default
-
-  shimmer.wrap(Server.prototype, 'handleRequest', wrapHandleRequest)
-  shimmer.wrap(Server.prototype, 'handleApiRequest', wrapHandleApiRequestWithMatch)
-
-  return nextServer
-})
-
 addHook({ name: 'next', versions: ['>=11.1 <13.2'], file: 'dist/server/next-server.js' }, nextServer => {
   const Server = nextServer.default
 

package/packages/datadog-instrumentations/src/pg.js

@@ -39,28 +39,27 @@ function wrapQuery (query) {
       ? arguments[0]
       : { text: arguments[0] }
 
-    // The query objects passed in can be pretty complex. They can be instances of EventEmitter.
-    //   For this reason we can't make a shallow clone of the object.
-    // Some libraries, such as sql-template-tags, can provide a getter .text property.
-    //   For this reason we can't replace the .text property.
-    // Instead, we create a new object, and set the original query as the prototype.
-    // This allows any existing methods to still work and lets us easily provide a new query.
-    let newQuery = {
-      __ddInjectableQuery: '',
-      get text () {
-        return this.__ddInjectableQuery || Object.getPrototypeOf(this).text
-      }
+    const textProp = Object.getOwnPropertyDescriptor(pgQuery, 'text')
+
+    // Only alter `text` property if safe to do so.
+    if (!textProp || textProp.configurable) {
+      const originalText = pgQuery.text
+
+      Object.defineProperty(pgQuery, 'text', {
+        get () {
+          return this?.__ddInjectableQuery || originalText
+        }
+      })
     }
-    Object.setPrototypeOf(newQuery, pgQuery)
 
     return asyncResource.runInAsyncScope(() => {
       startCh.publish({
         params: this.connectionParameters,
-        query: newQuery,
+        query: pgQuery,
         processId
       })
 
-      arguments[0] = newQuery
+      arguments[0] = pgQuery
 
       const finish = asyncResource.bind(function (error) {
         if (error) {
@@ -73,7 +72,7 @@ function wrapQuery (query) {
       const queryQueue = this.queryQueue || this._queryQueue
       const activeQuery = this.activeQuery || this._activeQuery
 
-      newQuery = queryQueue[queryQueue.length - 1] || activeQuery
+      const newQuery = queryQueue[queryQueue.length - 1] || activeQuery
 
       if (!newQuery) {
         return retval

package/packages/datadog-instrumentations/src/playwright.js

@@ -254,7 +254,7 @@ addHook({
 addHook({
   name: '@playwright/test',
   file: 'lib/dispatcher.js',
-  versions: ['>=1.18.0  <1.30.0']
+  versions: ['>=1.18.0 <1.30.0']
 }, dispatcherHook)
 
 addHook({
@@ -266,11 +266,23 @@ addHook({
 addHook({
   name: '@playwright/test',
   file: 'lib/runner/dispatcher.js',
-  versions: ['>=1.31.0']
+  versions: ['>=1.31.0 <1.38.0']
 }, (dispatcher) => dispatcherHookNew(dispatcher, dispatcherRunWrapperNew))
 
 addHook({
   name: '@playwright/test',
   file: 'lib/runner/runner.js',
-  versions: ['>=1.31.0']
+  versions: ['>=1.31.0 <1.38.0']
 }, runnerHook)
+
+// From >=1.38.0
+addHook({
+  name: 'playwright',
+  file: 'lib/runner/runner.js',
+  versions: ['>=1.38.0']
+}, runnerHook)
+addHook({
+  name: 'playwright',
+  file: 'lib/runner/dispatcher.js',
+  versions: ['>=1.38.0']
+}, (dispatcher) => dispatcherHookNew(dispatcher, dispatcherRunWrapperNew))

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

@@ -8,13 +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] = {}
@@ -108,4 +109,28 @@ function withCollapse (responsePathAsArray) {
   }
 }
 
+function addResolver (context, info, args) {
+  if (info.rootValue && !info.rootValue[info.fieldName]) {
+    return
+  }
+
+  if (!context.resolvers) {
+    context.resolvers = {}
+  }
+
+  const resolvers = context.resolvers
+
+  if (!resolvers[info.fieldName]) {
+    if (args && Object.keys(args).length) {
+      resolvers[info.fieldName] = [args]
+    } else {
+      resolvers[info.fieldName] = []
+    }
+  } else {
+    if (args && Object.keys(args).length) {
+      resolvers[info.fieldName].push(args)
+    }
+  }
+}
+
 module.exports = GraphQLResolvePlugin

package/packages/datadog-plugin-next/src/index.js

@@ -50,7 +50,6 @@ class NextPlugin extends ServerPlugin {
 
     const span = store.span
     const error = span.context()._tags['error']
-    const page = span.context()._tags['next.page']
 
     if (!this.config.validateStatus(res.statusCode) && !error) {
       span.setTag('error', true)
@@ -60,14 +59,12 @@ class NextPlugin extends ServerPlugin {
       'http.status_code': res.statusCode
     })
 
-    if (page) web.setRoute(req, page)
-
     this.config.hooks.request(span, req, res)
 
     span.finish()
   }
 
-  pageLoad ({ page }) {
+  pageLoad ({ page, isAppPath }) {
     const store = storage.getStore()
 
     if (!store) return
@@ -77,15 +74,27 @@ class NextPlugin extends ServerPlugin {
 
     // Only use error page names if there's not already a name
     const current = span.context()._tags['next.page']
-    if (current && (page === '/404' || page === '/500' || page === '/_error')) {
+    if (current && ['/404', '/500', '/_error', '/_not-found'].includes(page)) {
       return
     }
 
+    // remove ending /route or /page for appDir projects
+    if (isAppPath) page = page.substring(0, page.lastIndexOf('/'))
+
+    // This is for static files whose 'page' includes the whole file path
+    // For normal page matches, like /api/hello/[name] and a req.url like /api/hello/world,
+    // nothing should happen
+    // For page matches like /User/something/public/text.txt and req.url like /text.txt,
+    // it should disregard the extra absolute path Next.js sometimes sets
+    if (page.includes(req.url)) page = req.url
+
     span.addTags({
       [COMPONENT]: this.constructor.id,
       'resource.name': `${req.method} ${page}`.trim(),
       'next.page': page
     })
+
+    web.setRoute(req, page)
   }
 
   configure (config) {

package/packages/dd-trace/src/appsec/addresses.js

@@ -12,6 +12,7 @@ module.exports = {
   HTTP_INCOMING_RESPONSE_CODE: 'server.response.status',
   HTTP_INCOMING_RESPONSE_HEADERS: 'server.response.headers.no_cookies',
   // TODO: 'server.response.trailers',
+  HTTP_INCOMING_GRAPHQL_RESOLVERS: 'graphql.server.all_resolvers',
 
   HTTP_CLIENT_IP: 'http.client_ip',
 

package/packages/dd-trace/src/appsec/channels.js

@@ -5,6 +5,8 @@ const dc = require('../../../diagnostics_channel')
 // TODO: use TBD naming convention
 module.exports = {
   bodyParser: dc.channel('datadog:body-parser:read:finish'),
+  cookieParser: dc.channel('datadog:cookie-parser:read:finish'),
+  graphqlFinishExecute: dc.channel('apm:graphql:execute:finish'),
   incomingHttpRequestStart: dc.channel('dd-trace:incomingHttpRequestStart'),
   incomingHttpRequestEnd: dc.channel('dd-trace:incomingHttpRequestEnd'),
   passportVerify: dc.channel('datadog:passport:verify:finish'),