clean router handle instrumentation

packages/datadog-instrumentations/src/express.js

@@ -58,6 +58,8 @@ function wrapResponseRender (render) {
 }
 
 addHook({ name: 'express', versions: ['>=4'] }, 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)
@@ -66,30 +68,28 @@ addHook({ name: 'express', versions: ['>=4'] }, express => {
 })
 
 addHook({ name: 'express', versions: ['>=4.0.0 <5.0.0'] }, express => {
-  shimmer.wrap(express.application, 'handle', wrapHandle)
   shimmer.wrap(express.Router, 'use', wrapRouterMethod)
   shimmer.wrap(express.Router, 'route', wrapRouterMethod)
 
   return express
 })
 
 addHook({ name: 'express', versions: ['>=5.0.0'] }, express => {
-  shimmer.wrap(express.application, 'handle', wrapHandle)
   shimmer.wrap(express.Router.prototype, 'use', wrapRouterMethod)
   shimmer.wrap(express.Router.prototype, 'route', wrapRouterMethod)
 
   return express
 })
 
-const queryReaderReadCh = channel('datadog:query:read:finish')
+const queryParserReadCh = channel('datadog:query:read:finish')
 
 function publishQueryParsedAndNext (req, res, next) {
   return shimmer.wrapFunction(next, next => function () {
-    if (queryReaderReadCh.hasSubscribers && req) {
+    if (queryParserReadCh.hasSubscribers && req) {
       const abortController = new AbortController()
       const query = req.query
 
-      queryReaderReadCh.publish({ req, res, query, abortController })
+      queryParserReadCh.publish({ req, res, query, abortController })
 
       if (abortController.signal.aborted) return
     }
@@ -146,7 +146,7 @@ addHook({ name: 'express', versions: ['>=4.3.0 <5.0.0'] }, express => {
   return express
 })
 
-const queryParserReadCh = channel('datadog:query:parse:finish')
+const queryReadCh = channel('datadog:express:query:finish')
 
 addHook({ name: 'express', file: ['lib/request.js'], versions: ['>=5.0.0'] }, request => {
   const requestDescriptor = Object.getOwnPropertyDescriptor(request, 'query')
@@ -155,8 +155,8 @@ addHook({ name: 'express', file: ['lib/request.js'], versions: ['>=5.0.0'] }, re
     return function wrappedGet () {
       const query = originalGet.apply(this, arguments)
 
-      if (queryParserReadCh.hasSubscribers && query) {
-        queryParserReadCh.publish({ query })
+      if (queryReadCh.hasSubscribers && query) {
+        queryReadCh.publish({ query })
       }
 
       return query

packages/datadog-instrumentations/src/router.js

@@ -183,11 +183,8 @@ addHook({ name: 'router', versions: ['>=2'] }, Router => {
     return function wrappedMethod (options) {
       const router = originalRouter.call(this, options)
 
-      if (!router._queryParsingWrapped) {
-        router._queryParsingWrapped = true
-        const originalHandle = router.handle
-
-        router.handle = function (req, res, next) {
+      shimmer.wrap(router, 'handle', function wrapHandle (originalHandle) {
+        return function wrappedHandle (req, res, next) {
           const abortController = new AbortController()
 
           if (queryParserReadCh.hasSubscribers && req) {
@@ -198,7 +195,7 @@ addHook({ name: 'router', versions: ['>=2'] }, Router => {
 
           return originalHandle.apply(this, arguments)
         }
-      }
+      })
 
       return router
     }

packages/dd-trace/src/appsec/iast/taint-tracking/plugin.js

@@ -51,7 +51,7 @@ class TaintTrackingPlugin extends SourceIastPlugin {
     )
 
     this.addSub(
-      { channelName: 'datadog:query:parse:finish', tag: HTTP_REQUEST_PARAMETER },
+      { channelName: 'datadog:express:query:finish', tag: HTTP_REQUEST_PARAMETER },
       ({ query }) => this._taintTrackingHandler(HTTP_REQUEST_PARAMETER, query)
     )
 

packages/dd-trace/test/appsec/iast/taint-tracking/plugin.spec.js

@@ -47,7 +47,7 @@ describe('IAST Taint tracking plugin', () => {
     expect(taintTrackingPlugin._subscriptions[0]._channel.name).to.equals('datadog:body-parser:read:finish')
     expect(taintTrackingPlugin._subscriptions[1]._channel.name).to.equals('datadog:multer:read:finish')
     expect(taintTrackingPlugin._subscriptions[2]._channel.name).to.equals('datadog:query:read:finish')
-    expect(taintTrackingPlugin._subscriptions[3]._channel.name).to.equals('datadog:query:parse:finish')
+    expect(taintTrackingPlugin._subscriptions[3]._channel.name).to.equals('datadog:express:query:finish')
     expect(taintTrackingPlugin._subscriptions[4]._channel.name).to.equals('apm:express:middleware:next')
     expect(taintTrackingPlugin._subscriptions[5]._channel.name).to.equals('datadog:cookie:parse:finish')
     expect(taintTrackingPlugin._subscriptions[6]._channel.name).to.equals('datadog:express:process_params:start')

packages/dd-trace/test/appsec/iast/taint-tracking/sources/taint-tracking.express.plugin.spec.js

@@ -189,8 +189,7 @@ describe('Path params sourcing with express', () => {
         res.status(200).send()
       })
 
-      app.param('parameter1', checkParamIsTaintedAndNext)
-      app.param('parameter2', checkParamIsTaintedAndNext)
+      app.param(['parameter1', 'parameter2'], checkParamIsTaintedAndNext)
 
       appListener = app.listen(0, 'localhost', () => {
         const port = appListener.address().port
@@ -209,8 +208,7 @@ describe('Path params sourcing with express', () => {
         res.status(200).send()
       })
 
-      app.param('parameter1', checkParamIsTaintedAndNext)
-      app.param('parameter2', checkParamIsTaintedAndNext)
+      app.param(['parameter1', 'parameter2'], checkParamIsTaintedAndNext)
 
       appListener = app.listen(0, 'localhost', () => {
         const port = appListener.address().port

packages/dd-trace/test/plugins/externals.json

@@ -332,7 +332,7 @@
     },
     {
       "name": "express",
-     "versions": [">=4", ">=4.0.0 <4.3.0", ">=4.0.0 <5.0.0", ">=4.3.0 <5.0.0", ">=5.0.0"]
+      "versions": [">=4", ">=4.0.0 <4.3.0", ">=4.0.0 <5.0.0", ">=4.3.0 <5.0.0", ">=5.0.0"]
     },
     {
       "name": "body-parser",