fix(tracing): fix express instrumentation for v5

packages/datadog-instrumentations/src/express.js

@@ -57,7 +57,7 @@ function wrapResponseRender (render) {
   }
 }
 
-addHook({ name: 'express', versions: ['>=4'] }, express => {
+addHook({ name: 'express', versions: ['>=4 <5.0.0'] }, express => {
   shimmer.wrap(express.application, 'handle', wrapHandle)
   shimmer.wrap(express.Router, 'use', wrapRouterMethod)
   shimmer.wrap(express.Router, 'route', wrapRouterMethod)
@@ -69,6 +69,16 @@ addHook({ name: 'express', versions: ['>=4'] }, express => {
   return express
 })
 
+addHook({ name: 'express', versions: ['>=5.0.0'] }, express => {
+  shimmer.wrap(express.application, 'handle', wrapHandle)
+
+  shimmer.wrap(express.response, 'json', wrapResponseJson)
+  shimmer.wrap(express.response, 'jsonp', wrapResponseJson)
+  shimmer.wrap(express.response, 'render', wrapResponseRender)
+
+  return express
+})
+
 const queryParserReadCh = channel('datadog:query:read:finish')
 
 function publishQueryParsedAndNext (req, res, next) {
@@ -129,7 +139,7 @@ addHook({ name: 'express', versions: ['>=4.0.0 <4.3.0'] }, express => {
   return express
 })
 
-addHook({ name: 'express', versions: ['>=4.3.0'] }, express => {
+addHook({ name: 'express', versions: ['>=4.3.0 <5.0.0'] }, express => {
   shimmer.wrap(express.Router, 'process_params', wrapProcessParamsMethod(2))
   return express
 })

packages/datadog-instrumentations/src/router.js

@@ -25,6 +25,7 @@
       const lastIndex = arguments.length - 1
       const name = original._name || original.name
       const req = arguments[arguments.length > 3 ? 1 : 0]
+      // wrapParams(req)
       const next = arguments[lastIndex]
 
       if (typeof next === 'function') {
@@ -167,12 +168,37 @@
   return wrapMethod
 }
 
+const processParamsStartCh = channel('datadog:express:process_params:start')
+function wrapParams (req) {
+  let params
+  Object.defineProperty(req, 'params', {
+    get () { return params },
+    set (val) {
+      params = val
+      if (val && processParamsStartCh.hasSubscribers) {
+        const abortController = new AbortController()
+
+        processParamsStartCh.publish({
+          req,
+          res: req?.res,
+          abortController,
+          params: req?.params
+        })
+      }
+    }
+  })
+}
+
 const wrapRouterMethod = createWrapRouterMethod('router')
+const wrapExpressRouterMethod = createWrapRouterMethod('express')
 
 addHook({ name: 'router', versions: ['>=1'] }, Router => {
   shimmer.wrap(Router.prototype, 'use', wrapRouterMethod)
   shimmer.wrap(Router.prototype, 'route', wrapRouterMethod)
 
+  shimmer.wrap(Router.prototype, 'use', wrapExpressRouterMethod)
+  shimmer.wrap(Router.prototype, 'route', wrapExpressRouterMethod)
+
   return Router
 })