dd-trace 5.1.0 → 5.3.0

package/LICENSE-3rdparty.csv

@@ -17,10 +17,7 @@ require,istanbul-lib-coverage,BSD-3-Clause,Copyright 2012-2015 Yahoo! Inc.
 require,jest-docblock,MIT,Copyright Meta Platforms, Inc. and affiliates.
 require,koalas,MIT,Copyright 2013-2017 Brian Woodward
 require,limiter,MIT,Copyright 2011 John Hurliman
-require,lodash.kebabcase,MIT,Copyright JS Foundation and other contributors
-require,lodash.pick,MIT,Copyright JS Foundation and other contributors
 require,lodash.sortby,MIT,Copyright JS Foundation and other contributors
-require,lodash.uniq,MIT,Copyright JS Foundation and other contributors
 require,lru-cache,ISC,Copyright (c) 2010-2022 Isaac Z. Schlueter and Contributors
 require,methods,MIT,Copyright 2013-2014 TJ Holowaychuk
 require,module-details-from-path,MIT,Copyright 2016 Thomas Watson Steen
@@ -33,6 +30,7 @@ require,protobufjs,BSD-3-Clause,Copyright 2016 Daniel Wirtz
 require,tlhunter-sorted-set,MIT,Copyright (c) 2023 Datadog Inc.
 require,retry,MIT,Copyright 2011 Tim Koschützki Felix Geisendörfer
 require,semver,ISC,Copyright Isaac Z. Schlueter and Contributors
+require,shell-quote,mit,Copyright (c) 2013 James Halliday
 dev,@types/node,MIT,Copyright Authors
 dev,autocannon,MIT,Copyright 2016 Matteo Collina
 dev,aws-sdk,Apache 2.0,Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.

package/README.md

@@ -194,38 +194,7 @@ Regardless of where you open the issue, someone at Datadog will try to help.
 
 ## Bundling
 
-Generally, `dd-trace` works by intercepting `require()` calls that a Node.js application makes when loading modules. This includes modules that are built-in to Node.js, like the `fs` module for accessing the filesystem, as well as modules installed from the npm registry, like the `pg` database module.
-
-Also generally, bundlers work by crawling all of the `require()` calls that an application makes to files on disk, replacing the `require()` calls with custom code, and then concatenating all of the resulting JavaScript into one "bundled" file. When a built-in module is loaded, like `require('fs')`, that call can then remain the same in the resulting bundle.
-
-Fundamentally APM tools like `dd-trace` stop working at this point. Perhaps they continue to intercept the calls for built-in modules but don't intercept calls to third party libraries. This means that by default when you bundle a `dd-trace` app with a bundler it is likely to capture information about disk access (via `fs`) and outbound HTTP requests (via `http`), but will otherwise omit calls to third party libraries (like extracting incoming request route information for the `express` framework or showing which query is run for the `mysql` database client).
-
-To get around this, one can treat all third party modules, or at least third party modules that the APM needs to instrument, as being "external" to the bundler. With this setting the instrumented modules remain on disk and continue to be loaded via `require()` while the non-instrumented modules are bundled. Sadly this results in a build with many extraneous files and starts to defeat the purpose of bundling. 
-
-For these reasons it's necessary to have custom-built bundler plugins. Such plugins are able to instruct the bundler on how to behave, injecting intermediary code and otherwise intercepting the "translated" `require()` calls. The result is that many more packages are then included in the bundled JavaScript file. Some applications can have 100% of modules bundled, however native modules still need to remain external to the bundle.
-
-### ESBuild Support
-
-This library provides experimental ESBuild support in the form of an ESBuild plugin. Require the `dd-trace/esbuild` module when building your bundle to enable the plugin.
-
-Here's an example of how one might use `dd-trace` with ESBuild:
-
-```javascript
-const ddPlugin = require('dd-trace/esbuild')
-const esbuild = require('esbuild')
-
-esbuild.build({
-  entryPoints: ['app.js'], 
-  bundle: true,
-  outfile: 'out.js',
-  plugins: [ddPlugin],
-  platform: 'node', // allows built-in modules to be required
-  target: ['node18']
-}).catch((err) => {
-  console.error(err)
-  process.exit(1)
-})
-```
+If you would like to trace your bundled application then please read this page on [bundling and dd-trace](https://docs.datadoghq.com/tracing/trace_collection/automatic_instrumentation/dd_libraries/nodejs/#bundling). It includes information on how to use our ESBuild plugin and includes caveats for other bundlers.
 
 
 ## Security Vulnerabilities

package/ci/init.js

@@ -1,15 +1,11 @@
 /* eslint-disable no-console */
 const tracer = require('../packages/dd-trace')
-const { ORIGIN_KEY } = require('../packages/dd-trace/src/constants')
 const { isTrue } = require('../packages/dd-trace/src/util')
 
 const isJestWorker = !!process.env.JEST_WORKER_ID
 
 const options = {
   startupLogs: false,
-  tags: {
-    [ORIGIN_KEY]: 'ciapp-test'
-  },
   isCiVisibility: true,
   flushInterval: isJestWorker ? 0 : 5000
 }
@@ -44,6 +40,7 @@ if (isJestWorker) {
 if (shouldInit) {
   tracer.init(options)
   tracer.use('fs', false)
+  tracer.use('child_process', false)
 }
 
 module.exports = tracer

package/index.d.ts

@@ -143,6 +143,11 @@ export declare interface TraceOptions extends Analyzable {
    * The type of request.
    */
   type?: string
+
+  /**
+   * An array of span links
+   */
+  links?: Array<{ context: SpanContext, attributes?: Object }>
 }
 
 /**
@@ -154,6 +159,14 @@ export declare interface TraceOptions extends Analyzable {
  */
 export declare interface Span extends opentracing.Span {
   context (): SpanContext;
+
+  /**
+   * Causally links another span to the current span
+   * @param {SpanContext} context The context of the span to link to.
+   * @param {Object} attributes An optional key value pair of arbitrary values.
+   * @returns {void}
+   */
+  addLink (context: SpanContext, attributes?: Object): void;
 }
 
 /**
@@ -1903,6 +1916,14 @@ export namespace opentelemetry {
      *     use the current time.
      */
     recordException(exception: Exception, time?: TimeInput): void;
+
+    /**
+     * Causally links another span to the current span
+     * @param {otel.SpanContext} context The context of the span to link to.
+     * @param {SpanAttributes} attributes An optional key value pair of arbitrary values.
+     * @returns {void}
+     */
+    addLink (context: otel.SpanContext, attributes?: SpanAttributes): void;
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.1.0",
+  "version": "5.3.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -70,7 +70,7 @@
   },
   "dependencies": {
     "@datadog/native-appsec": "7.0.0",
-    "@datadog/native-iast-rewriter": "2.2.2",
+    "@datadog/native-iast-rewriter": "2.2.3",
     "@datadog/native-iast-taint-tracking": "1.6.4",
     "@datadog/native-metrics": "^2.0.0",
     "@datadog/pprof": "5.0.0",
@@ -78,7 +78,7 @@
     "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/core": "^1.14.0",
     "crypto-randomuuid": "^1.0.0",
-    "dc-polyfill": "^0.1.2",
+    "dc-polyfill": "^0.1.4",
     "ignore": "^5.2.4",
     "import-in-the-middle": "^1.7.3",
     "int64-buffer": "^0.1.9",
@@ -87,10 +87,7 @@
     "jest-docblock": "^29.7.0",
     "koalas": "^1.0.2",
     "limiter": "1.1.5",
-    "lodash.kebabcase": "^4.1.1",
-    "lodash.pick": "^4.4.0",
     "lodash.sortby": "^4.7.0",
-    "lodash.uniq": "^4.5.0",
     "lru-cache": "^7.14.0",
     "methods": "^1.1.2",
     "module-details-from-path": "^1.0.3",
@@ -102,13 +99,14 @@
     "protobufjs": "^7.2.5",
     "retry": "^0.13.1",
     "semver": "^7.5.4",
+    "shell-quote": "^1.8.1",
     "tlhunter-sorted-set": "^0.1.0"
   },
   "devDependencies": {
     "@types/node": ">=18",
     "autocannon": "^4.5.2",
     "aws-sdk": "^2.1446.0",
-    "axios": "^0.21.2",
+    "axios": "^1.6.7",
     "benchmark": "^2.1.4",
     "body-parser": "^1.20.2",
     "chai": "^4.3.7",
@@ -132,7 +130,7 @@
     "jszip": "^3.5.0",
     "knex": "^2.4.2",
     "mkdirp": "^3.0.1",
-    "mocha": "8",
+    "mocha": "^9",
     "multer": "^1.4.5-lts.1",
     "nock": "^11.3.3",
     "nyc": "^15.1.0",

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

@@ -5,7 +5,7 @@ const {
   addHook,
   AsyncResource
 } = require('./helpers/instrument')
-const kebabCase = require('lodash.kebabcase')
+const kebabCase = require('../../utils/src/kebabcase')
 const shimmer = require('../../datadog-shimmer')
 
 const startCh = channel('apm:amqplib:command:start')
@@ -28,7 +28,7 @@ addHook({ name: 'amqplib', file: 'lib/channel.js', versions: ['>=0.5'] }, channe
   })
 
   shimmer.wrap(channel.Channel.prototype, 'sendMessage', sendMessage => function (fields) {
-    return instrument(sendMessage, this, arguments, 'basic.publish', fields)
+    return instrument(sendMessage, this, arguments, 'basic.publish', fields, arguments[2])
   })
 
   shimmer.wrap(channel.BaseChannel.prototype, 'dispatchMessage', dispatchMessage => function (fields, message) {

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

@@ -0,0 +1,150 @@
+'use strict'
+
+const util = require('util')
+
+const {
+  addHook,
+  AsyncResource
+} = require('./helpers/instrument')
+const shimmer = require('../../datadog-shimmer')
+const dc = require('dc-polyfill')
+
+const childProcessChannel = dc.tracingChannel('datadog:child_process:execution')
+
+// ignored exec method because it calls to execFile directly
+const execAsyncMethods = ['execFile', 'spawn']
+const execSyncMethods = ['execFileSync', 'spawnSync']
+
+const names = ['child_process', 'node:child_process']
+
+// child_process and node:child_process returns the same object instance, we only want to add hooks once
+let patched = false
+names.forEach(name => {
+  addHook({ name }, childProcess => {
+    if (!patched) {
+      patched = true
+      shimmer.massWrap(childProcess, execAsyncMethods, wrapChildProcessAsyncMethod())
+      shimmer.massWrap(childProcess, execSyncMethods, wrapChildProcessSyncMethod())
+      shimmer.wrap(childProcess, 'execSync', wrapChildProcessSyncMethod(true))
+    }
+
+    return childProcess
+  })
+})
+
+function normalizeArgs (args, shell) {
+  const childProcessInfo = {
+    command: args[0]
+  }
+
+  if (Array.isArray(args[1])) {
+    childProcessInfo.command = childProcessInfo.command + ' ' + args[1].join(' ')
+    if (args[2] != null && typeof args[2] === 'object') {
+      childProcessInfo.options = args[2]
+    }
+  } else if (args[1] != null && typeof args[1] === 'object') {
+    childProcessInfo.options = args[1]
+  }
+  childProcessInfo.shell = shell ||
+    childProcessInfo.options?.shell === true ||
+    typeof childProcessInfo.options?.shell === 'string'
+
+  return childProcessInfo
+}
+
+function wrapChildProcessSyncMethod (shell = false) {
+  return function wrapMethod (childProcessMethod) {
+    return function () {
+      if (!childProcessChannel.start.hasSubscribers || arguments.length === 0) {
+        return childProcessMethod.apply(this, arguments)
+      }
+
+      const childProcessInfo = normalizeArgs(arguments, shell)
+
+      return childProcessChannel.traceSync(
+        childProcessMethod,
+        {
+          command: childProcessInfo.command,
+          shell: childProcessInfo.shell
+        },
+        this,
+        ...arguments)
+    }
+  }
+}
+
+function wrapChildProcessCustomPromisifyMethod (customPromisifyMethod, shell) {
+  return function () {
+    if (!childProcessChannel.start.hasSubscribers || arguments.length === 0) {
+      return customPromisifyMethod.apply(this, arguments)
+    }
+
+    const childProcessInfo = normalizeArgs(arguments, shell)
+
+    return childProcessChannel.tracePromise(
+      customPromisifyMethod,
+      {
+        command: childProcessInfo.command,
+        shell: childProcessInfo.shell
+      },
+      this,
+      ...arguments)
+  }
+}
+
+function wrapChildProcessAsyncMethod (shell = false) {
+  return function wrapMethod (childProcessMethod) {
+    function wrappedChildProcessMethod () {
+      if (!childProcessChannel.start.hasSubscribers || arguments.length === 0) {
+        return childProcessMethod.apply(this, arguments)
+      }
+
+      const childProcessInfo = normalizeArgs(arguments, shell)
+
+      const innerResource = new AsyncResource('bound-anonymous-fn')
+      return innerResource.runInAsyncScope(() => {
+        childProcessChannel.start.publish({ command: childProcessInfo.command, shell: childProcessInfo.shell })
+
+        const childProcess = childProcessMethod.apply(this, arguments)
+        if (childProcess) {
+          let errorExecuted = false
+
+          childProcess.on('error', (e) => {
+            errorExecuted = true
+            childProcessChannel.error.publish(e)
+          })
+
+          childProcess.on('close', (code) => {
+            code = code || 0
+            if (!errorExecuted && code !== 0) {
+              childProcessChannel.error.publish()
+            }
+            childProcessChannel.asyncEnd.publish({
+              command: childProcessInfo.command,
+              shell: childProcessInfo.shell,
+              result: code
+            })
+          })
+        }
+
+        return childProcess
+      })
+    }
+
+    if (childProcessMethod[util.promisify.custom]) {
+      const wrapedChildProcessCustomPromisifyMethod =
+        shimmer.wrap(childProcessMethod[util.promisify.custom],
+          wrapChildProcessCustomPromisifyMethod(childProcessMethod[util.promisify.custom]), shell)
+
+      // should do it in this way because the original property is readonly
+      const descriptor = Object.getOwnPropertyDescriptor(childProcessMethod, util.promisify.custom)
+      Object.defineProperty(wrappedChildProcessMethod,
+        util.promisify.custom,
+        {
+          ...descriptor,
+          value: wrapedChildProcessCustomPromisifyMethod
+        })
+    }
+    return wrappedChildProcessMethod
+  }
+}

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

@@ -16,7 +16,7 @@ const testSuiteStartCh = channel('ci:cucumber:test-suite:start')
 const testSuiteFinishCh = channel('ci:cucumber:test-suite:finish')
 const testSuiteCodeCoverageCh = channel('ci:cucumber:test-suite:code-coverage')
 
-const itrConfigurationCh = channel('ci:cucumber:itr-configuration')
+const libraryConfigurationCh = channel('ci:cucumber:library-configuration')
 const skippableSuitesCh = channel('ci:cucumber:test-suite:skippable')
 const sessionStartCh = channel('ci:cucumber:session:start')
 const sessionFinishCh = channel('ci:cucumber:session:finish')
@@ -96,11 +96,11 @@ function wrapRun (pl, isLatestVersion) {
 
     const asyncResource = new AsyncResource('bound-anonymous-fn')
     return asyncResource.runInAsyncScope(() => {
-      const testSuiteFullPath = this.pickle.uri
+      const testFileAbsolutePath = this.pickle.uri
 
-      if (!pickleResultByFile[testSuiteFullPath]) { // first test in suite
+      if (!pickleResultByFile[testFileAbsolutePath]) { // first test in suite
         isUnskippable = isMarkedAsUnskippable(this.pickle)
-        const testSuitePath = getTestSuitePath(testSuiteFullPath, process.cwd())
+        const testSuitePath = getTestSuitePath(testFileAbsolutePath, process.cwd())
         isForcedToRun = isUnskippable && skippableSuites.includes(testSuitePath)
 
         testSuiteStartCh.publish({ testSuitePath, isUnskippable, isForcedToRun, itrCorrelationId })
@@ -113,7 +113,7 @@ function wrapRun (pl, isLatestVersion) {
 
       testStartCh.publish({
         testName: this.pickle.name,
-        fullTestSuite: testSuiteFullPath,
+        testFileAbsolutePath,
         testSourceLine
       })
       try {
@@ -123,21 +123,21 @@ function wrapRun (pl, isLatestVersion) {
           const { status, skipReason, errorMessage } = isLatestVersion
             ? getStatusFromResultLatest(result) : getStatusFromResult(result)
 
-          if (!pickleResultByFile[testSuiteFullPath]) {
-            pickleResultByFile[testSuiteFullPath] = [status]
+          if (!pickleResultByFile[testFileAbsolutePath]) {
+            pickleResultByFile[testFileAbsolutePath] = [status]
           } else {
-            pickleResultByFile[testSuiteFullPath].push(status)
+            pickleResultByFile[testFileAbsolutePath].push(status)
           }
           testFinishCh.publish({ status, skipReason, errorMessage })
           // last test in suite
-          if (pickleResultByFile[testSuiteFullPath].length === pickleByFile[testSuiteFullPath].length) {
-            const testSuiteStatus = getSuiteStatusFromTestStatuses(pickleResultByFile[testSuiteFullPath])
+          if (pickleResultByFile[testFileAbsolutePath].length === pickleByFile[testFileAbsolutePath].length) {
+            const testSuiteStatus = getSuiteStatusFromTestStatuses(pickleResultByFile[testFileAbsolutePath])
             if (global.__coverage__) {
               const coverageFiles = getCoveredFilenamesFromCoverage(global.__coverage__)
 
               testSuiteCodeCoverageCh.publish({
                 coverageFiles,
-                suiteFile: testSuiteFullPath
+                suiteFile: testFileAbsolutePath
               })
               // We need to reset coverage to get a code coverage per suite
               // Before that, we preserve the original coverage
@@ -272,7 +272,7 @@ addHook({
     })
 
     asyncResource.runInAsyncScope(() => {
-      itrConfigurationCh.publish({ onDone })
+      libraryConfigurationCh.publish({ onDone })
     })
 
     await configPromise

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

@@ -19,11 +19,31 @@ function wrapHandle (handle) {
 
 const wrapRouterMethod = createWrapRouterMethod('express')
 
+const responseJsonChannel = channel('datadog:express:response:json:start')
+
+function wrapResponseJson (json) {
+  return function wrappedJson (obj) {
+    if (responseJsonChannel.hasSubscribers) {
+      // backward compat as express 4.x supports deprecated 3.x signature
+      if (arguments.length === 2 && typeof arguments[1] !== 'number') {
+        obj = arguments[1]
+      }
+
+      responseJsonChannel.publish({ req: this.req, body: obj })
+    }
+
+    return json.apply(this, arguments)
+  }
+}
+
 addHook({ name: 'express', versions: ['>=4'] }, express => {
   shimmer.wrap(express.application, 'handle', wrapHandle)
   shimmer.wrap(express.Router, 'use', wrapRouterMethod)
   shimmer.wrap(express.Router, 'route', wrapRouterMethod)
 
+  shimmer.wrap(express.response, 'json', wrapResponseJson)
+  shimmer.wrap(express.response, 'jsonp', wrapResponseJson)
+
   return express
 })
 

package/packages/datadog-instrumentations/src/grpc/client.js

@@ -15,54 +15,52 @@ const errorChannel = channel('apm:grpc:client:request:error')
 const finishChannel = channel('apm:grpc:client:request:finish')
 const emitChannel = channel('apm:grpc:client:request:emit')
 
-function createWrapMakeRequest (type) {
+function createWrapMakeRequest (type, hasPeer = false) {
   return function wrapMakeRequest (makeRequest) {
     return function (path) {
       const args = ensureMetadata(this, arguments, 4)
 
-      return callMethod(this, makeRequest, args, path, args[4], type)
+      return callMethod(this, makeRequest, args, path, args[4], type, hasPeer)
     }
   }
 }
 
-function createWrapLoadPackageDefinition () {
+function createWrapLoadPackageDefinition (hasPeer = false) {
   return function wrapLoadPackageDefinition (loadPackageDefinition) {
     return function (packageDef) {
       const result = loadPackageDefinition.apply(this, arguments)
 
       if (!result) return result
 
-      wrapPackageDefinition(result)
+      wrapPackageDefinition(result, hasPeer)
 
       return result
     }
   }
 }
 
-function createWrapMakeClientConstructor () {
+function createWrapMakeClientConstructor (hasPeer = false) {
   return function wrapMakeClientConstructor (makeClientConstructor) {
     return function (methods) {
       const ServiceClient = makeClientConstructor.apply(this, arguments)
-
-      wrapClientConstructor(ServiceClient, methods)
-
+      wrapClientConstructor(ServiceClient, methods, hasPeer)
       return ServiceClient
     }
   }
 }
 
-function wrapPackageDefinition (def) {
+function wrapPackageDefinition (def, hasPeer = false) {
   for (const name in def) {
     if (def[name].format) continue
     if (def[name].service && def[name].prototype) {
-      wrapClientConstructor(def[name], def[name].service)
+      wrapClientConstructor(def[name], def[name].service, hasPeer)
     } else {
-      wrapPackageDefinition(def[name])
+      wrapPackageDefinition(def[name], hasPeer)
     }
   }
 }
 
-function wrapClientConstructor (ServiceClient, methods) {
+function wrapClientConstructor (ServiceClient, methods, hasPeer = false) {
   const proto = ServiceClient.prototype
 
   if (typeof methods !== 'object' || 'format' in methods) return
@@ -76,24 +74,23 @@ function wrapClientConstructor (ServiceClient, methods) {
       const type = getType(methods[name])
 
       if (methods[name]) {
-        proto[name] = wrapMethod(proto[name], path, type)
+        proto[name] = wrapMethod(proto[name], path, type, hasPeer)
       }
 
       if (originalName) {
-        proto[originalName] = wrapMethod(proto[originalName], path, type)
+        proto[originalName] = wrapMethod(proto[originalName], path, type, hasPeer)
       }
     })
 }
 
-function wrapMethod (method, path, type) {
+function wrapMethod (method, path, type, hasPeer) {
   if (typeof method !== 'function' || patched.has(method)) {
     return method
   }
 
   const wrapped = function () {
     const args = ensureMetadata(this, arguments, 1)
-
-    return callMethod(this, method, args, path, args[1], type)
+    return callMethod(this, method, args, path, args[1], type, hasPeer)
   }
 
   Object.assign(wrapped, method)
@@ -117,7 +114,20 @@ function wrapCallback (ctx, callback = () => { }) {
   }
 }
 
-function createWrapEmit (ctx) {
+function createWrapEmit (ctx, hasPeer = false) {
+  const onStatusWithPeer = function (ctx, arg1, thisArg) {
+    ctx.result = arg1
+    ctx.peer = thisArg.getPeer()
+    finishChannel.publish(ctx)
+  }
+
+  const onStatusWithoutPeer = function (ctx, arg1, thisArg) {
+    ctx.result = arg1
+    finishChannel.publish(ctx)
+  }
+
+  const onStatus = hasPeer ? onStatusWithPeer : onStatusWithoutPeer
+
   return function wrapEmit (emit) {
     return function (event, arg1) {
       switch (event) {
@@ -126,8 +136,7 @@ function createWrapEmit (ctx) {
           errorChannel.publish(ctx)
           break
         case 'status':
-          ctx.result = arg1
-          finishChannel.publish(ctx)
+          onStatus(ctx, arg1, this)
           break
       }
 
@@ -138,7 +147,7 @@ function createWrapEmit (ctx) {
   }
 }
 
-function callMethod (client, method, args, path, metadata, type) {
+function callMethod (client, method, args, path, metadata, type, hasPeer = false) {
   if (!startChannel.hasSubscribers) return method.apply(client, args)
 
   const length = args.length
@@ -159,7 +168,7 @@ function callMethod (client, method, args, path, metadata, type) {
       const call = method.apply(client, args)
 
       if (call && typeof call.emit === 'function') {
-        shimmer.wrap(call, 'emit', createWrapEmit(ctx))
+        shimmer.wrap(call, 'emit', createWrapEmit(ctx, hasPeer))
       }
 
       return call
@@ -223,34 +232,45 @@ function getGrpc (client) {
   } while ((proto = Object.getPrototypeOf(proto)))
 }
 
-function patch (grpc) {
-  const proto = grpc.Client.prototype
+function patch (hasPeer = false) {
+  return function patch (grpc) {
+    const proto = grpc.Client.prototype
 
-  instances.set(proto, grpc)
+    instances.set(proto, grpc)
 
-  shimmer.wrap(proto, 'makeBidiStreamRequest', createWrapMakeRequest(types.bidi))
-  shimmer.wrap(proto, 'makeClientStreamRequest', createWrapMakeRequest(types.clientStream))
-  shimmer.wrap(proto, 'makeServerStreamRequest', createWrapMakeRequest(types.serverStream))
-  shimmer.wrap(proto, 'makeUnaryRequest', createWrapMakeRequest(types.unary))
+    shimmer.wrap(proto, 'makeBidiStreamRequest', createWrapMakeRequest(types.bidi, hasPeer))
+    shimmer.wrap(proto, 'makeClientStreamRequest', createWrapMakeRequest(types.clientStream, hasPeer))
+    shimmer.wrap(proto, 'makeServerStreamRequest', createWrapMakeRequest(types.serverStream, hasPeer))
+    shimmer.wrap(proto, 'makeUnaryRequest', createWrapMakeRequest(types.unary, hasPeer))
 
-  return grpc
+    return grpc
+  }
 }
 
 if (nodeMajor <= 14) {
-  addHook({ name: 'grpc', versions: ['>=1.24.3'] }, patch)
+  addHook({ name: 'grpc', versions: ['>=1.24.3'] }, patch(true))
 
   addHook({ name: 'grpc', versions: ['>=1.24.3'], file: 'src/client.js' }, client => {
-    shimmer.wrap(client, 'makeClientConstructor', createWrapMakeClientConstructor())
+    shimmer.wrap(client, 'makeClientConstructor', createWrapMakeClientConstructor(true))
 
     return client
   })
 }
 
-addHook({ name: '@grpc/grpc-js', versions: ['>=1.0.3'] }, patch)
+addHook({ name: '@grpc/grpc-js', versions: ['>=1.0.3 <1.1.4'] }, patch(false))
+
+addHook({ name: '@grpc/grpc-js', versions: ['>=1.0.3 <1.1.4'], file: 'build/src/make-client.js' }, client => {
+  shimmer.wrap(client, 'makeClientConstructor', createWrapMakeClientConstructor(false))
+  shimmer.wrap(client, 'loadPackageDefinition', createWrapLoadPackageDefinition(false))
+
+  return client
+})
+
+addHook({ name: '@grpc/grpc-js', versions: ['>=1.1.4'] }, patch(true))
 
-addHook({ name: '@grpc/grpc-js', versions: ['>=1.0.3'], file: 'build/src/make-client.js' }, client => {
-  shimmer.wrap(client, 'makeClientConstructor', createWrapMakeClientConstructor())
-  shimmer.wrap(client, 'loadPackageDefinition', createWrapLoadPackageDefinition())
+addHook({ name: '@grpc/grpc-js', versions: ['>=1.1.4'], file: 'build/src/make-client.js' }, client => {
+  shimmer.wrap(client, 'makeClientConstructor', createWrapMakeClientConstructor(true))
+  shimmer.wrap(client, 'loadPackageDefinition', createWrapLoadPackageDefinition(true))
 
   return client
 })