dd-trace 4.8.0 → 4.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "4.8.0",
+  "version": "4.8.1",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",

package/packages/datadog-instrumentations/src/aws-sdk.js

@@ -177,7 +177,6 @@ addHook({ name: '@aws-sdk/smithy-client', versions: ['>=3'] }, smithy => {
 })
 
 addHook({ name: 'aws-sdk', versions: ['>=2.3.0'] }, AWS => {
-  shimmer.wrap(AWS.Request.prototype, 'promise', wrapRequest)
   shimmer.wrap(AWS.config, 'setPromisesDependency', setPromisesDependency => {
     return function wrappedSetPromisesDependency (dep) {
       const result = setPromisesDependency.apply(this, arguments)
@@ -188,9 +187,14 @@ addHook({ name: 'aws-sdk', versions: ['>=2.3.0'] }, AWS => {
   return AWS
 })
 
+addHook({ name: 'aws-sdk', file: 'lib/core.js', versions: ['>=2.3.0'] }, AWS => {
+  shimmer.wrap(AWS.Request.prototype, 'promise', wrapRequest)
+  return AWS
+})
+
 // <2.1.35 has breaking changes for instrumentation
 // https://github.com/aws/aws-sdk-js/pull/629
-addHook({ name: 'aws-sdk', versions: ['>=2.1.35'] }, AWS => {
+addHook({ name: 'aws-sdk', file: 'lib/core.js', versions: ['>=2.1.35'] }, AWS => {
   shimmer.wrap(AWS.Request.prototype, 'send', wrapRequest)
   return AWS
 })

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

@@ -17,29 +17,32 @@ function wrapFetch (fetch, Request) {
     const headers = req.headers
     const message = { req, headers }
 
-    startChannel.publish(message)
-
-    // Request object is read-only so we need new objects to change headers.
-    arguments[0] = message.req
-    arguments[1] = { headers: message.headers }
-
-    return fetch.apply(this, arguments)
-      .then(
-        res => {
-          finishChannel.publish({ req, res })
-
-          return res
-        },
-        err => {
-          if (err.name !== 'AbortError') {
-            errorChannel.publish(err)
-          }
+    return startChannel.runStores(message, () => {
+      // Request object is read-only so we need new objects to change headers.
+      arguments[0] = message.req
+      arguments[1] = { headers: message.headers }
+
+      return fetch.apply(this, arguments)
+        .then(
+          res => {
+            message.res = res
+
+            finishChannel.publish(message)
 
-          finishChannel.publish({ req })
+            return res
+          },
+          err => {
+            if (err.name !== 'AbortError') {
+              message.error = err
+              errorChannel.publish(message)
+            }
 
-          throw err
-        }
-      )
+            finishChannel.publish(message)
+
+            throw err
+          }
+        )
+    })
   }
 }
 

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

@@ -10,6 +10,7 @@ module.exports = {
   '@grpc/grpc-js': () => require('../grpc'),
   '@hapi/hapi': () => require('../hapi'),
   '@jest/core': () => require('../jest'),
+  '@jest/transform': () => require('../jest'),
   '@jest/reporters': () => require('../jest'),
   '@koa/router': () => require('../koa'),
   '@node-redis/client': () => require('../redis'),

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

@@ -3,18 +3,16 @@
 /* eslint-disable no-fallthrough */
 
 const url = require('url')
-const {
-  channel,
-  addHook,
-  AsyncResource
-} = require('../helpers/instrument')
+const { channel, addHook } = require('../helpers/instrument')
 const shimmer = require('../../../datadog-shimmer')
 
 const log = require('../../../dd-trace/src/log')
 
-const startClientCh = channel('apm:http:client:request:start')
-const finishClientCh = channel('apm:http:client:request:finish')
-const errorClientCh = channel('apm:http:client:request:error')
+const startChannel = channel('apm:http:client:request:start')
+const finishChannel = channel('apm:http:client:request:finish')
+const endChannel = channel('apm:http:client:request:end')
+const asyncStartChannel = channel('apm:http:client:request:asyncStart')
+const errorChannel = channel('apm:http:client:request:error')
 
 addHook({ name: 'https' }, hookFn)
 
@@ -32,7 +30,7 @@ function patch (http, methodName) {
 
   function instrumentRequest (request) {
     return function () {
-      if (!startClientCh.hasSubscribers) {
+      if (!startChannel.hasSubscribers) {
         return request.apply(this, arguments)
       }
 
@@ -45,57 +43,68 @@ function patch (http, methodName) {
         return request.apply(this, arguments)
       }
 
-      const callbackResource = new AsyncResource('bound-anonymous-fn')
-      const asyncResource = new AsyncResource('bound-anonymous-fn')
-
-      return asyncResource.runInAsyncScope(() => {
-        startClientCh.publish({ args, http })
+      const ctx = { args, http }
 
+      return startChannel.runStores(ctx, () => {
         let finished = false
         let callback = args.callback
 
         if (callback) {
-          callback = callbackResource.bind(callback)
+          callback = function () {
+            return asyncStartChannel.runStores(ctx, () => {
+              return args.callback.apply(this, arguments)
+            })
+          }
         }
 
         const options = args.options
-        const req = request.call(this, options, callback)
-        const emit = req.emit
-
-        const finish = (req, res) => {
+        const finish = () => {
           if (!finished) {
             finished = true
-            finishClientCh.publish({ req, res })
+            finishChannel.publish(ctx)
           }
         }
 
-        req.emit = function (eventName, arg) {
-          asyncResource.runInAsyncScope(() => {
+        try {
+          const req = request.call(this, options, callback)
+          const emit = req.emit
+
+          ctx.req = req
+
+          req.emit = function (eventName, arg) {
             switch (eventName) {
               case 'response': {
                 const res = arg
-                const listener = asyncResource.bind(() => finish(req, res))
-                res.on('end', listener)
-                res.on('error', listener)
+                ctx.res = res
+                res.on('end', finish)
+                res.on('error', finish)
                 break
               }
               case 'connect':
               case 'upgrade':
-                finish(req, arg)
+                ctx.res = arg
+                finish()
                 break
               case 'error':
               case 'timeout':
-                errorClientCh.publish(arg)
+                ctx.error = arg
+                errorChannel.publish(ctx)
               case 'abort': // deprecated and replaced by `close` in node 17
               case 'close':
-                finish(req)
+                finish()
             }
-          })
 
-          return emit.apply(this, arguments)
-        }
+            return emit.apply(this, arguments)
+          }
 
-        return req
+          return req
+        } catch (e) {
+          ctx.error = e
+          errorChannel.publish(ctx)
+          throw e
+        } finally {
+          endChannel.publish(ctx)
+        }
       })
     }
   }

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

@@ -42,6 +42,7 @@ function createWrapRequest (authority, options) {
         } catch (e) {
           ctx.error = e
           errorChannel.publish(ctx)
+          throw e
         } finally {
           endChannel.publish(ctx)
         }

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

@@ -410,6 +410,32 @@ function jestConfigSyncWrapper (jestConfig) {
   return jestConfig
 }
 
+addHook({
+  name: '@jest/transform',
+  versions: ['>=24.8.0'],
+  file: 'build/ScriptTransformer.js'
+}, transformPackage => {
+  const originalCreateScriptTransformer = transformPackage.createScriptTransformer
+
+  transformPackage.createScriptTransformer = async function (config) {
+    const { testEnvironmentOptions, ...restOfConfig } = config
+    const {
+      _ddTestModuleId,
+      _ddTestSessionId,
+      _ddTestCommand,
+      ...restOfTestEnvironmentOptions
+    } = testEnvironmentOptions
+
+    restOfConfig.testEnvironmentOptions = restOfTestEnvironmentOptions
+
+    arguments[0] = restOfConfig
+
+    return originalCreateScriptTransformer.apply(this, arguments)
+  }
+
+  return transformPackage
+})
+
 /**
  * Hook to remove the test paths (test suite) that are part of `skippableSuites`
  */

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

@@ -1,35 +1,29 @@
 'use strict'
 
 const HttpClientPlugin = require('../../datadog-plugin-http/src/client')
-const { HTTP_HEADERS } = require('../../../ext/formats')
 
 class FetchPlugin extends HttpClientPlugin {
   static get id () { return 'fetch' }
+  static get prefix () { return `apm:fetch:request` }
 
   addTraceSub (eventName, handler) {
     this.addSub(`apm:${this.constructor.id}:${this.operation}:${eventName}`, handler)
   }
 
-  start (message) {
+  bindStart (message) {
     const req = message.req
     const options = new URL(req.url)
     const headers = options.headers = Object.fromEntries(req.headers.entries())
 
-    const args = { options }
+    options.method = req.method
 
-    super.start({ args })
+    message.args = { options }
 
-    message.req = new globalThis.Request(req, { headers })
-  }
+    const store = super.bindStart(message)
 
-  _inject (span, headers) {
-    const carrier = {}
-
-    this.tracer.inject(span, HTTP_HEADERS, carrier)
+    message.req = new globalThis.Request(req, { headers })
 
-    for (const name in carrier) {
-      headers.append(name, carrier[name])
-    }
+    return store
   }
 }
 

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

@@ -16,15 +16,11 @@ const HTTP_REQUEST_HEADERS = tags.HTTP_REQUEST_HEADERS
 const HTTP_RESPONSE_HEADERS = tags.HTTP_RESPONSE_HEADERS
 
 class HttpClientPlugin extends ClientPlugin {
-  static get id () {
-    return 'http'
-  }
-
-  addTraceSub (eventName, handler) {
-    this.addSub(`apm:${this.constructor.id}:client:${this.operation}:${eventName}`, handler)
-  }
+  static get id () { return 'http' }
+  static get prefix () { return `apm:http:client:request` }
 
-  start ({ args, http = {} }) {
+  bindStart (message) {
+    const { args, http = {} } = message
     const store = storage.getStore()
     const options = args.options
     const agent = options.agent || options._defaultAgent || http.globalAgent || {}
@@ -55,7 +51,7 @@ class HttpClientPlugin extends ClientPlugin {
       metrics: {
         [CLIENT_PORT_KEY]: parseInt(options.port)
       }
-    })
+    }, false)
 
     // TODO: Figure out a better way to do this for any span.
     if (!allowed) {
@@ -67,11 +63,19 @@ class HttpClientPlugin extends ClientPlugin {
     }
 
     analyticsSampler.sample(span, this.config.measured)
-    this.enter(span, store)
+
+    message.span = span
+    message.parentStore = store
+    message.currentStore = { ...store, span }
+
+    return message.currentStore
   }
 
-  finish ({ req, res }) {
-    const span = storage.getStore().span
+  bindAsyncStart ({ parentStore }) {
+    return parentStore
+  }
+
+  finish ({ req, res, span }) {
     if (res) {
       const status = res.status || res.statusCode
 
@@ -87,17 +91,18 @@ class HttpClientPlugin extends ClientPlugin {
     addRequestHeaders(req, span, this.config)
 
     this.config.hooks.request(span, req, res)
-    super.finish()
-  }
 
-  error (err) {
-    const span = storage.getStore().span
+    this.tagPeerService(span)
+
+    span.finish()
+  }
 
-    if (err) {
+  error ({ span, error }) {
+    if (error) {
       span.addTags({
-        [ERROR_TYPE]: err.name,
-        [ERROR_MESSAGE]: err.message || err.code,
-        [ERROR_STACK]: err.stack
+        [ERROR_TYPE]: error.name,
+        [ERROR_MESSAGE]: error.message || error.code,
+        [ERROR_STACK]: error.stack
       })
     } else {
       span.setTag('error', 1)

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

@@ -10,6 +10,7 @@ module.exports = {
   get '@grpc/grpc-js' () { return require('../../../datadog-plugin-grpc/src') },
   get '@hapi/hapi' () { return require('../../../datadog-plugin-hapi/src') },
   get '@jest/core' () { return require('../../../datadog-plugin-jest/src') },
+  get '@jest/transform' () { return require('../../../datadog-plugin-jest/src') },
   get '@koa/router' () { return require('../../../datadog-plugin-koa/src') },
   get '@node-redis/client' () { return require('../../../datadog-plugin-redis/src') },
   get '@opensearch-project/opensearch' () { return require('../../../datadog-plugin-opensearch/src') },

package/packages/diagnostics_channel/src/index.js

@@ -64,7 +64,7 @@ if (!Channel.prototype.runStores) {
     this._stores.set(store, transform)
   }
 
-  Channel.prototype.unbindStore = ActiveChannelPrototype.runStores = function (store) {
+  Channel.prototype.unbindStore = ActiveChannelPrototype.unbindStore = function (store) {
     if (!this._stores) return
     this._stores.delete(store)
   }