dd-trace 3.18.0 → 3.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "3.18.0",
+  "version": "3.20.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -15,10 +15,10 @@
     "lint": "node scripts/check_licenses.js && eslint . && yarn audit --groups dependencies",
     "services": "node ./scripts/install_plugin_modules && node packages/dd-trace/test/setup/services",
     "test": "SERVICES=* yarn services && mocha --colors --exit --expose-gc 'packages/dd-trace/test/setup/node.js' 'packages/*/test/**/*.spec.js'",
-    "test:appsec": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" --exclude \"packages/dd-trace/test/appsec/iast/**/*.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/iast/**/*.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/iast/**/*.@($(echo $PLUGINS)).plugin.spec.js\"",
-    "test:appsec:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/test/appsec/iast/**/*.@($(echo $PLUGINS)).plugin.spec.js\" -- npm run test:appsec:plugins",
+    "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:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,encode,exporters,opentracing,plugins,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'",
@@ -65,7 +65,7 @@
     "node": ">=14"
   },
   "dependencies": {
-    "@datadog/native-appsec": "2.0.0",
+    "@datadog/native-appsec": "^3.1.0",
     "@datadog/native-iast-rewriter": "2.0.1",
     "@datadog/native-iast-taint-tracking": "^1.4.0",
     "@datadog/native-metrics": "^1.6.0",

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

@@ -1,14 +1,21 @@
 'use strict'
 
-const { channel, addHook, AsyncResource } = require('./helpers/instrument')
+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 bodyParserReadCh = channel('datadog:body-parser:read:finish')
 
-function publishRequestBodyAndNext (request, next) {
+function publishRequestBodyAndNext (req, res, next) {
   return function () {
-    if (bodyParserReadCh.hasSubscribers && request) {
-      bodyParserReadCh.publish({ request })
+    if (bodyParserReadCh.hasSubscribers && req) {
+      const abortController = new AbortController()
+
+      bodyParserReadCh.publish({ req, res, abortController })
+
+      if (abortController.signal.aborted) return
     }
+
     next.apply(this, arguments)
   }
 }
@@ -16,11 +23,10 @@ function publishRequestBodyAndNext (request, next) {
 addHook({
   name: 'body-parser',
   file: 'lib/read.js',
-  versions: ['>=1']
+  versions: ['>=1.4.0']
 }, read => {
-  return function (req, res, next) {
-    const nextResource = new AsyncResource('bound-anonymous-fn')
-    arguments[2] = nextResource.bind(publishRequestBodyAndNext(req, next))
+  return shimmer.wrap(read, function (req, res, next) {
+    arguments[2] = publishRequestBodyAndNext(req, res, next)
     read.apply(this, arguments)
-  }
+  })
 })

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

@@ -3,6 +3,7 @@
 const { createWrapRouterMethod } = require('./router')
 const shimmer = require('../../datadog-shimmer')
 const { addHook, channel } = require('./helpers/instrument')
+const { AbortController } = require('node-abort-controller')
 
 const handleChannel = channel('apm:express:request:handle')
 
@@ -25,3 +26,34 @@ addHook({ name: 'express', versions: ['>=4'] }, express => {
 
   return express
 })
+
+const queryParserReadCh = channel('datadog:query:read:finish')
+
+function publishQueryParsedAndNext (req, res, next) {
+  return function () {
+    if (queryParserReadCh.hasSubscribers && req) {
+      const abortController = new AbortController()
+
+      queryParserReadCh.publish({ req, res, abortController })
+
+      if (abortController.signal.aborted) return
+    }
+
+    next.apply(this, arguments)
+  }
+}
+
+addHook({
+  name: 'express',
+  versions: ['>=4'],
+  file: 'lib/middleware/query.js'
+}, query => {
+  return shimmer.wrap(query, function () {
+    const queryMiddleware = query.apply(this, arguments)
+
+    return shimmer.wrap(queryMiddleware, function (req, res, next) {
+      arguments[2] = publishQueryParsedAndNext(req, res, next)
+      return queryMiddleware.apply(this, arguments)
+    })
+  })
+})

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

@@ -55,7 +55,8 @@ function wrapEmit (emit) {
 
       try {
         if (abortController.signal.aborted) {
-          return res.end()
+          // TODO: should this always return true ?
+          return this.listenerCount(eventName) > 0
         }
         return emit.apply(this, arguments)
       } catch (err) {

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

@@ -10,7 +10,7 @@ const {
   mergeCoverage,
   getTestSuitePath,
   fromCoverageMapToCoverage,
-  getTestLineStart
+  getCallSites
 } = require('../../dd-trace/src/plugins/util/test')
 
 const testStartCh = channel('ci:mocha:test:start')
@@ -393,9 +393,13 @@ addHook({
   file: 'lib/suite.js'
 }, (Suite) => {
   shimmer.wrap(Suite.prototype, 'addTest', addTest => function (test) {
-    // In here, the test definition is in the stack, so we search for it.
-    const startLine = getTestLineStart(new Error(), test.file)
-    testToStartLine.set(test, startLine)
+    const callSites = getCallSites()
+    let startLine
+    const testCallSite = callSites.find(site => site.getFileName() === test.file)
+    if (testCallSite) {
+      startLine = testCallSite.getLineNumber()
+      testToStartLine.set(test, startLine)
+    }
     return addTest.apply(this, arguments)
   })
   return Suite

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

@@ -30,9 +30,8 @@ function wrapQuery (query) {
     const callbackResource = new AsyncResource('bound-anonymous-fn')
     const asyncResource = new AsyncResource('bound-anonymous-fn')
     const processId = this.processID
-    let pgQuery = {
-      text: arguments[0]
-    }
+
+    let pgQuery = arguments[0] && typeof arguments[0] === 'object' ? arguments[0] : { text: arguments[0] }
 
     return asyncResource.runInAsyncScope(() => {
       startCh.publish({
@@ -41,7 +40,7 @@ function wrapQuery (query) {
         processId
       })
 
-      arguments[0] = pgQuery.text
+      arguments[0] = pgQuery
 
       const finish = asyncResource.bind(function (error) {
         if (error) {

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

@@ -72,6 +72,9 @@ function getRootDir (playwrightRunner) {
   if (playwrightRunner._configDir) {
     return playwrightRunner._configDir
   }
+  if (playwrightRunner._config && playwrightRunner._config.config) {
+    return playwrightRunner._config.config.rootDir
+  }
   return process.cwd()
 }
 
@@ -211,10 +214,20 @@ function runnerHook (runnerExport, playwrightVersion) {
     })
 
     const runAllTestsReturn = await runAllTests.apply(this, arguments)
+
+    Object.values(remainingTestsByFile).forEach(tests => {
+      // `tests` should normally be empty, but if it isn't,
+      // there were tests that did not go through `testBegin` or `testEnd`,
+      // because they were skipped
+      tests.forEach(test => {
+        testBeginHandler(test)
+        testEndHandler(test, 'skip')
+      })
+    })
+
     const sessionStatus = runAllTestsReturn.status || runAllTestsReturn
 
     let onDone
-
     const flushWait = new Promise(resolve => {
       onDone = resolve
     })

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

@@ -3,7 +3,7 @@
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 const { storage } = require('../../datadog-core')
 const web = require('../../dd-trace/src/plugins/util/web')
-const { incomingHttpRequestStart, incomingHttpRequestEnd } = require('../../dd-trace/src/appsec/gateway/channels')
+const { incomingHttpRequestStart, incomingHttpRequestEnd } = require('../../dd-trace/src/appsec/channels')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 
 class HttpServerPlugin extends Plugin {
@@ -33,7 +33,7 @@ class HttpServerPlugin extends Plugin {
       }
 
       if (incomingHttpRequestStart.hasSubscribers) {
-        incomingHttpRequestStart.publish({ req, res, abortController })
+        incomingHttpRequestStart.publish({ req, res, abortController }) // TODO: no need to make a new object here
       }
     })
 

package/packages/datadog-plugin-http2/src/server.js

@@ -5,7 +5,6 @@
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 const { storage } = require('../../datadog-core')
 const web = require('../../dd-trace/src/plugins/util/web')
-const { incomingHttpRequestStart } = require('../../dd-trace/src/appsec/gateway/channels')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 
 class Http2ServerPlugin extends Plugin {
@@ -30,10 +29,6 @@ class Http2ServerPlugin extends Plugin {
         context.res.writeHead = web.wrapWriteHead(context)
         context.instrumented = true
       }
-
-      if (incomingHttpRequestStart.hasSubscribers) {
-        incomingHttpRequestStart.publish({ req, res })
-      }
     })
 
     this.addSub('apm:http2:server:request:error', (error) => {

package/packages/datadog-plugin-kafkajs/src/consumer.js

@@ -33,6 +33,8 @@ function extract (tracer, bufferMap) {
   const textMap = {}
 
   for (const key of Object.keys(bufferMap)) {
+    if (bufferMap[key] === null || bufferMap[key] === undefined) continue
+
     textMap[key] = bufferMap[key].toString()
   }
 

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

@@ -9,7 +9,7 @@ class PGPlugin extends DatabasePlugin {
   static get system () { return 'postgres' }
 
   start ({ params = {}, query, processId }) {
-    const service = getServiceName(this.config, params)
+    const service = getServiceName(this, params)
     const originalStatement = query.text
 
     this.startSpan('pg.query', {
@@ -31,12 +31,12 @@ class PGPlugin extends DatabasePlugin {
   }
 }
 
-function getServiceName (config, params) {
-  if (typeof config.service === 'function') {
-    return config.service(params)
+function getServiceName (tracer, params) {
+  if (typeof tracer.config.service === 'function') {
+    return tracer.config.service(params)
   }
 
-  return config.service
+  return tracer.config.service || `${tracer._tracer._tracer._service}-postgres`
 }
 
 module.exports = PGPlugin

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

@@ -7,14 +7,11 @@ module.exports = {
   // TODO: 'server.request.trailers',
   HTTP_INCOMING_URL: 'server.request.uri.raw',
   HTTP_INCOMING_METHOD: 'server.request.method',
-  HTTP_INCOMING_ENDPOINT: 'server.request.framework_endpoint',
   HTTP_INCOMING_PARAMS: 'server.request.path_params',
   HTTP_INCOMING_COOKIES: 'server.request.cookies',
   HTTP_INCOMING_RESPONSE_CODE: 'server.response.status',
   HTTP_INCOMING_RESPONSE_HEADERS: 'server.response.headers.no_cookies',
   // TODO: 'server.response.trailers',
-  HTTP_INCOMING_REMOTE_IP: 'server.request.client_ip',
-  HTTP_INCOMING_REMOTE_PORT: 'server.request.client_port',
 
   HTTP_CLIENT_IP: 'http.client_ip',
 

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

@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 'use strict'
 
-const html = `<!-- Sorry, you've been blocked -->
+const html = `<!-- Sorry, you’ve been blocked -->
 <!DOCTYPE html>
 <html lang="en">
 
@@ -102,14 +102,7 @@ const html = `<!-- Sorry, you've been blocked -->
 </html>
 `
 
-const json = `{
-  "errors": [
-    {
-      "title": "You've been blocked",
-      "detail": "Sorry, you cannot access this page. Please contact the customer service team. Security provided by Datadog."
-    }
-  ]
-}`
+const json = `{"errors": [{"title": "You've been blocked", "detail": "Sorry, you cannot access this page. Please contact the customer service team. Security provided by Datadog."}]}`
 
 module.exports = {
   html,

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

@@ -19,7 +19,7 @@ function block (req, res, rootSpan, abortController) {
   const accept = req.headers.accept && req.headers.accept.split(',').map((str) => str.split(';', 1)[0].trim())
 
   if (accept && accept.includes('text/html') && !accept.includes('application/json')) {
-    type = 'text/html'
+    type = 'text/html; charset=utf-8'
     body = templateHtml
   } else {
     type = 'application/json'

package/packages/dd-trace/src/appsec/{gateway/channels.js → channels.js}

@@ -1,11 +1,11 @@
 'use strict'
 
-const dc = require('../../../../diagnostics_channel')
+const dc = require('../../../diagnostics_channel')
 
 // TODO: use TBD naming convention
-//       or directly use http plugin's channels
-//       when it gets converted to new plugin system
 module.exports = {
   incomingHttpRequestStart: dc.channel('dd-trace:incomingHttpRequestStart'),
-  incomingHttpRequestEnd: dc.channel('dd-trace:incomingHttpRequestEnd')
+  incomingHttpRequestEnd: dc.channel('dd-trace:incomingHttpRequestEnd'),
+  bodyParser: dc.channel('datadog:body-parser:read:finish'),
+  queryParser: dc.channel('datadog:query:read:finish')
 }

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

@@ -12,7 +12,7 @@ class TaintTrackingPlugin extends Plugin {
     this._type = 'taint-tracking'
     this.addSub(
       'datadog:body-parser:read:finish',
-      ({ request }) => this._taintTrackingHandler(HTTP_REQUEST_BODY, request, 'body')
+      ({ req }) => this._taintTrackingHandler(HTTP_REQUEST_BODY, req, 'body')
     )
     this.addSub(
       'datadog:qs:parse:finish',

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

@@ -3,8 +3,13 @@
 const log = require('../log')
 const RuleManager = require('./rule_manager')
 const remoteConfig = require('./remote_config')
-const { incomingHttpRequestStart, incomingHttpRequestEnd } = require('./gateway/channels')
-const Gateway = require('./gateway/engine')
+const {
+  incomingHttpRequestStart,
+  incomingHttpRequestEnd,
+  bodyParser,
+  queryParser
+} = require('./channels')
+const waf = require('./waf')
 const addresses = require('./addresses')
 const Reporter = require('./reporter')
 const web = require('../plugins/util/web')
@@ -21,39 +26,25 @@ function enable (_config) {
   try {
     setTemplates(_config)
 
-    // TODO: inline this function
-    enableFromRules(_config, _config.appsec.rules)
-  } catch (err) {
-    abortEnable(err)
-  }
-}
+    RuleManager.applyRules(_config.appsec.rules, _config.appsec)
 
-function enableFromRules (_config, rules) {
-  RuleManager.applyRules(rules, _config.appsec)
-  remoteConfig.enableAsmData(_config.appsec)
+    remoteConfig.enableWafUpdate(_config.appsec)
 
-  Reporter.setRateLimit(_config.appsec.rateLimit)
+    Reporter.setRateLimit(_config.appsec.rateLimit)
 
-  incomingHttpRequestStart.subscribe(incomingHttpStartTranslator)
-  incomingHttpRequestEnd.subscribe(incomingHttpEndTranslator)
-
-  // add fields needed for HTTP context reporting
-  Gateway.manager.addresses.add(addresses.HTTP_INCOMING_HEADERS)
-  Gateway.manager.addresses.add(addresses.HTTP_INCOMING_ENDPOINT)
-  Gateway.manager.addresses.add(addresses.HTTP_INCOMING_RESPONSE_HEADERS)
-  Gateway.manager.addresses.add(addresses.HTTP_INCOMING_REMOTE_IP)
-
-  isEnabled = true
-  config = _config
-}
+    incomingHttpRequestStart.subscribe(incomingHttpStartTranslator)
+    incomingHttpRequestEnd.subscribe(incomingHttpEndTranslator)
+    bodyParser.subscribe(onRequestBodyParsed)
+    queryParser.subscribe(onRequestQueryParsed)
 
-function abortEnable (err) {
-  log.error('Unable to start AppSec')
-  log.error(err)
+    isEnabled = true
+    config = _config
+  } catch (err) {
+    log.error('Unable to start AppSec')
+    log.error(err)
 
-  // abort AppSec start
-  RuleManager.clearAllRules()
-  remoteConfig.disableAsmData()
+    disable()
+  }
 }
 
 function incomingHttpStartTranslator ({ req, res, abortController }) {
@@ -68,78 +59,92 @@ function incomingHttpStartTranslator ({ req, res, abortController }) {
     [HTTP_CLIENT_IP]: clientIp
   })
 
-  const store = Gateway.startContext()
-
-  store.set('req', req)
-  store.set('res', res)
+  const requestHeaders = Object.assign({}, req.headers)
+  delete requestHeaders.cookie
 
-  const context = store.get('context')
+  const payload = {
+    [addresses.HTTP_INCOMING_URL]: req.url,
+    [addresses.HTTP_INCOMING_HEADERS]: requestHeaders,
+    [addresses.HTTP_INCOMING_METHOD]: req.method
+  }
 
   if (clientIp) {
-    const results = Gateway.propagate({
-      [addresses.HTTP_CLIENT_IP]: clientIp
-    }, context)
-
-    if (!results || !abortController) return
-
-    for (const entry of results) {
-      if (entry && entry.includes('block')) {
-        block(req, res, rootSpan, abortController)
-        break
-      }
-    }
+    payload[addresses.HTTP_CLIENT_IP] = clientIp
   }
-}
 
-function incomingHttpEndTranslator (data) {
-  const context = Gateway.getContext()
-  if (!context) return
+  const actions = waf.run(payload, req)
 
-  const requestHeaders = Object.assign({}, data.req.headers)
-  delete requestHeaders.cookie
+  handleResults(actions, req, res, rootSpan, abortController)
+}
 
+function incomingHttpEndTranslator ({ req, res }) {
   // TODO: this doesn't support headers sent with res.writeHead()
-  const responseHeaders = Object.assign({}, data.res.getHeaders())
+  const responseHeaders = Object.assign({}, res.getHeaders())
   delete responseHeaders['set-cookie']
 
   const payload = {
-    [addresses.HTTP_INCOMING_URL]: data.req.url,
-    [addresses.HTTP_INCOMING_HEADERS]: requestHeaders,
-    [addresses.HTTP_INCOMING_METHOD]: data.req.method,
-    [addresses.HTTP_INCOMING_REMOTE_IP]: data.req.socket.remoteAddress,
-    [addresses.HTTP_INCOMING_REMOTE_PORT]: data.req.socket.remotePort,
-    [addresses.HTTP_INCOMING_RESPONSE_CODE]: data.res.statusCode,
+    [addresses.HTTP_INCOMING_RESPONSE_CODE]: res.statusCode,
     [addresses.HTTP_INCOMING_RESPONSE_HEADERS]: responseHeaders
   }
 
-  // TODO: temporary express instrumentation, will use express plugin later
-  if (data.req.body !== undefined && data.req.body !== null) {
-    payload[addresses.HTTP_INCOMING_BODY] = data.req.body
-  }
-
-  if (data.req.query && typeof data.req.query === 'object') {
-    payload[addresses.HTTP_INCOMING_QUERY] = data.req.query
+  // we need to keep this to support other body parsers
+  // TODO: no need to analyze it if it was already done by the body-parser hook
+  if (req.body !== undefined && req.body !== null) {
+    payload[addresses.HTTP_INCOMING_BODY] = req.body
   }
 
-  if (data.req.route && typeof data.req.route.path === 'string') {
-    payload[addresses.HTTP_INCOMING_ENDPOINT] = data.req.route.path
-  }
-
-  if (data.req.params && typeof data.req.params === 'object') {
-    payload[addresses.HTTP_INCOMING_PARAMS] = data.req.params
+  // TODO: temporary express instrumentation, will use express plugin later
+  if (req.params && typeof req.params === 'object') {
+    payload[addresses.HTTP_INCOMING_PARAMS] = req.params
   }
 
-  if (data.req.cookies && typeof data.req.cookies === 'object') {
+  if (req.cookies && typeof req.cookies === 'object') {
     payload[addresses.HTTP_INCOMING_COOKIES] = {}
 
-    for (const k of Object.keys(data.req.cookies)) {
-      payload[addresses.HTTP_INCOMING_COOKIES][k] = [data.req.cookies[k]]
+    for (const k of Object.keys(req.cookies)) {
+      payload[addresses.HTTP_INCOMING_COOKIES][k] = [req.cookies[k]]
     }
   }
 
-  Gateway.propagate(payload, context)
+  waf.run(payload, req)
+
+  waf.disposeContext(req)
+
+  Reporter.finishRequest(req, res)
+}
+
+function onRequestBodyParsed ({ req, res, abortController }) {
+  const rootSpan = web.root(req)
+  if (!rootSpan) return
+
+  if (req.body === undefined || req.body === null) return
+
+  const results = waf.run({
+    [addresses.HTTP_INCOMING_BODY]: req.body
+  }, req)
 
-  Reporter.finishRequest(data.req, context)
+  handleResults(results, req, res, rootSpan, abortController)
+}
+
+function onRequestQueryParsed ({ req, res, abortController }) {
+  const rootSpan = web.root(req)
+  if (!rootSpan) return
+
+  if (!req.query || typeof req.query !== 'object') return
+
+  const results = waf.run({
+    [addresses.HTTP_INCOMING_QUERY]: req.query
+  }, req)
+
+  handleResults(results, req, res, rootSpan, abortController)
+}
+
+function handleResults (actions, req, res, rootSpan, abortController) {
+  if (!actions || !req || !res || !rootSpan || !abortController) return
+
+  if (actions.includes('block')) {
+    block(req, res, rootSpan, abortController)
+  }
 }
 
 function disable () {
@@ -147,11 +152,14 @@ function disable () {
   config = null
 
   RuleManager.clearAllRules()
-  remoteConfig.disableAsmData()
+
+  remoteConfig.disableWafUpdate()
 
   // Channel#unsubscribe() is undefined for non active channels
   if (incomingHttpRequestStart.hasSubscribers) incomingHttpRequestStart.unsubscribe(incomingHttpStartTranslator)
   if (incomingHttpRequestEnd.hasSubscribers) incomingHttpRequestEnd.unsubscribe(incomingHttpEndTranslator)
+  if (bodyParser.hasSubscribers) bodyParser.unsubscribe(onRequestBodyParsed)
+  if (queryParser.hasSubscribers) queryParser.unsubscribe(onRequestQueryParsed)
 }
 
 module.exports = {