dd-trace 5.0.0-pre-58d2e20 → 5.0.0-pre-efa6609

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.0.0-pre-58d2e20",
+  "version": "5.0.0-pre-efa6609",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -68,7 +68,7 @@
   "dependencies": {
     "@datadog/native-appsec": "^3.2.0",
     "@datadog/native-iast-rewriter": "2.0.1",
-    "@datadog/native-iast-taint-tracking": "^1.5.0",
+    "@datadog/native-iast-taint-tracking": "1.5.0",
     "@datadog/native-metrics": "^2.0.0",
     "@datadog/pprof": "3.1.0",
     "@datadog/sketches-js": "^2.1.0",

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/couchbase.js

@@ -160,7 +160,7 @@ function wrapV3Query (query) {
 }
 
 // semver >=2 <3
-addHook({ name: 'couchbase', file: 'lib/bucket.js', versions: ['^2.6.5'] }, Bucket => {
+addHook({ name: 'couchbase', file: 'lib/bucket.js', versions: ['^2.6.12'] }, Bucket => {
   const startCh = channel('apm:couchbase:query:start')
   const finishCh = channel('apm:couchbase:query:finish')
   const errorCh = channel('apm:couchbase:query:error')
@@ -208,7 +208,7 @@ addHook({ name: 'couchbase', file: 'lib/bucket.js', versions: ['^2.6.5'] }, Buck
   return Bucket
 })
 
-addHook({ name: 'couchbase', file: 'lib/cluster.js', versions: ['^2.6.5'] }, Cluster => {
+addHook({ name: 'couchbase', file: 'lib/cluster.js', versions: ['^2.6.12'] }, Cluster => {
   Cluster.prototype._maybeInvoke = wrapMaybeInvoke(Cluster.prototype._maybeInvoke)
   Cluster.prototype.query = wrapQuery(Cluster.prototype.query)
 
@@ -217,7 +217,7 @@ addHook({ name: 'couchbase', file: 'lib/cluster.js', versions: ['^2.6.5'] }, Clu
 
 // semver >=3 <3.2.0
 
-addHook({ name: 'couchbase', file: 'lib/collection.js', versions: ['>=3.0.0 <3.2.0'] }, Collection => {
+addHook({ name: 'couchbase', file: 'lib/collection.js', versions: ['^3.0.7', '^3.1.3'] }, Collection => {
   wrapAllNames(['upsert', 'insert', 'replace'], name => {
     shimmer.wrap(Collection.prototype, name, wrapWithName(name))
   })
@@ -225,7 +225,7 @@ addHook({ name: 'couchbase', file: 'lib/collection.js', versions: ['>=3.0.0 <3.2
   return Collection
 })
 
-addHook({ name: 'couchbase', file: 'lib/cluster.js', versions: ['>=3.0.0 <3.2.0'] }, Cluster => {
+addHook({ name: 'couchbase', file: 'lib/cluster.js', versions: ['^3.0.7', '^3.1.3'] }, Cluster => {
   shimmer.wrap(Cluster.prototype, 'query', wrapV3Query)
   return Cluster
 })

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-cassandra-driver/src/index.js

@@ -14,7 +14,7 @@ class CassandraDriverPlugin extends DatabasePlugin {
     }
 
     this.startSpan(this.operationName(), {
-      service: this.serviceName(this.config, this.system),
+      service: this.serviceName({ pluginConfig: this.config, system: this.system }),
       resource: trim(query, 5000),
       type: 'cassandra',
       kind: 'client',

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

@@ -9,7 +9,7 @@ class ElasticsearchPlugin extends DatabasePlugin {
     const body = getBody(params.body || params.bulkBody)
 
     this.startSpan(this.operationName(), {
-      service: this.serviceName(this.config),
+      service: this.serviceName({ pluginConfig: this.config }),
       resource: `${params.method} ${quantizePath(params.path)}`,
       type: 'elasticsearch',
       kind: 'client',

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-graphql/src/execute.js

@@ -7,6 +7,8 @@ let tools
 class GraphQLExecutePlugin extends TracingPlugin {
   static get id () { return 'graphql' }
   static get operation () { return 'execute' }
+  static get type () { return 'graphql' }
+  static get kind () { return 'server' }
 
   start ({ operation, args, docSource }) {
     const type = operation && operation.operation
@@ -14,11 +16,11 @@ class GraphQLExecutePlugin extends TracingPlugin {
     const document = args.document
     const source = this.config.source && document && docSource
 
-    const span = this.startSpan('graphql.execute', {
-      service: this.config.service,
+    const span = this.startSpan(this.operationName(), {
+      service: this.config.service || this.serviceName(),
       resource: getSignature(document, name, type, this.config.signature),
-      kind: 'server',
-      type: 'graphql',
+      kind: this.constructor.kind,
+      type: this.constructor.type,
       meta: {
         'graphql.operation.type': type,
         'graphql.operation.name': name,

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/datadog-plugin-memcached/src/index.js

@@ -10,7 +10,7 @@ class MemcachedPlugin extends CachePlugin {
     const address = getAddress(client, server, query)
 
     this.startSpan({
-      service: this.serviceName(this.config, this.system),
+      service: this.serviceName({ pluginConfig: this.config, system: this.system }),
       resource: query.type,
       type: 'memcached',
       meta: {

package/packages/datadog-plugin-mongodb-core/src/index.js

@@ -12,7 +12,7 @@ class MongodbCorePlugin extends DatabasePlugin {
     const query = getQuery(ops)
     const resource = truncate(getResource(this, ns, query, name))
     this.startSpan(this.operationName(), {
-      service: this.serviceName(this.config),
+      service: this.serviceName({ pluginConfig: this.config }),
       resource,
       type: 'mongodb',
       kind: 'client',

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

@@ -8,7 +8,7 @@ class MySQLPlugin extends DatabasePlugin {
   static get system () { return 'mysql' }
 
   start (payload) {
-    const service = this.serviceName(this.config, payload.conf, this.system)
+    const service = this.serviceName({ pluginConfig: this.config, dbConfig: payload.conf, system: this.system })
     this.startSpan(this.operationName(), {
       service,
       resource: payload.sql,

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

@@ -8,6 +8,10 @@ const services = require('./services')
 const Sampler = require('../../dd-trace/src/sampler')
 const { MEASURED } = require('../../../ext/tags')
 
+// String#replaceAll unavailable on Node.js@v14 (dd-trace@<=v3)
+const RE_NEWLINE = /\n/g
+const RE_TAB = /\t/g
+
 // TODO: In the future we should refactor config.js to make it requirable
 let MAX_TEXT_LEN = 128
 
@@ -26,7 +30,9 @@ class OpenApiPlugin extends TracingPlugin {
     this.sampler = new Sampler(0.1) // default 10% log sampling
 
     // hoist the max length env var to avoid making all of these functions a class method
-    MAX_TEXT_LEN = this._tracerConfig.openaiSpanCharLimit
+    if (this._tracerConfig) {
+      MAX_TEXT_LEN = this._tracerConfig.openaiSpanCharLimit
+    }
   }
 
   configure (config) {
@@ -83,11 +89,11 @@ class OpenApiPlugin extends TracingPlugin {
       store.prompt = prompt
       if (typeof prompt === 'string' || (Array.isArray(prompt) && typeof prompt[0] === 'number')) {
         // This is a single prompt, either String or [Number]
-        tags[`openai.request.prompt`] = normalizeStringOrTokenArray(prompt)
+        tags[`openai.request.prompt`] = normalizeStringOrTokenArray(prompt, true)
       } else if (Array.isArray(prompt)) {
         // This is multiple prompts, either [String] or [[Number]]
         for (let i = 0; i < prompt.length; i++) {
-          tags[`openai.request.prompt.${i}`] = normalizeStringOrTokenArray(prompt[i])
+          tags[`openai.request.prompt.${i}`] = normalizeStringOrTokenArray(prompt[i], true)
         }
       }
     }
@@ -547,7 +553,7 @@ function usageExtraction (tags, body) {
 }
 
 function truncateApiKey (apiKey) {
-  return `sk-...${apiKey.substr(apiKey.length - 4)}`
+  return apiKey && `sk-...${apiKey.substr(apiKey.length - 4)}`
 }
 
 /**
@@ -557,8 +563,8 @@ function truncateText (text) {
   if (!text) return
 
   text = text
-    .replaceAll('\n', '\\n')
-    .replaceAll('\t', '\\t')
+    .replace(RE_NEWLINE, '\\n')
+    .replace(RE_TAB, '\\t')
 
   if (text.length > MAX_TEXT_LEN) {
     return text.substring(0, MAX_TEXT_LEN) + '...'
@@ -688,7 +694,7 @@ function normalizeRequestPayload (methodName, args) {
  * "foo" -> "foo"
  * [1,2,3] -> "[1, 2, 3]"
  */
-function normalizeStringOrTokenArray (input, truncate = true) {
+function normalizeStringOrTokenArray (input, truncate) {
   const normalized = Array.isArray(input)
     ? `[${input.join(', ')}]` // "[1, 2, 999]"
     : input // "foo"

package/packages/datadog-plugin-openai/src/services.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { DogStatsDClient, NoopDogStatsDClient } = require('../../dd-trace/src/dogstatsd')
-const ExternalLogger = require('../../dd-trace/src/external-logger/src')
+const { ExternalLogger, NoopExternalLogger } = require('../../dd-trace/src/external-logger/src')
 
 const FLUSH_INTERVAL = 10 * 1000
 
@@ -10,7 +10,7 @@ let logger = null
 let interval = null
 
 module.exports.init = function (tracerConfig) {
-  if (tracerConfig.dogstatsd) {
+  if (tracerConfig && tracerConfig.dogstatsd) {
     metrics = new DogStatsDClient({
       host: tracerConfig.dogstatsd.hostname,
       port: tracerConfig.dogstatsd.port,
@@ -24,13 +24,17 @@ module.exports.init = function (tracerConfig) {
     metrics = new NoopDogStatsDClient()
   }
 
-  logger = new ExternalLogger({
-    ddsource: 'openai',
-    hostname: tracerConfig.hostname,
-    service: tracerConfig.service,
-    apiKey: tracerConfig.apiKey,
-    interval: FLUSH_INTERVAL
-  })
+  if (tracerConfig && tracerConfig.apiKey) {
+    logger = new ExternalLogger({
+      ddsource: 'openai',
+      hostname: tracerConfig.hostname,
+      service: tracerConfig.service,
+      apiKey: tracerConfig.apiKey,
+      interval: FLUSH_INTERVAL
+    })
+  } else {
+    logger = new NoopExternalLogger()
+  }
 
   interval = setInterval(() => {
     metrics.flush()

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

@@ -10,7 +10,7 @@ class OracledbPlugin extends DatabasePlugin {
   static get peerServicePrecursors () { return ['db.instance', 'db.hostname'] }
 
   start ({ query, connAttrs }) {
-    const service = this.serviceName(this.config, connAttrs)
+    const service = this.serviceName({ pluginConfig: this.config, params: connAttrs })
     const url = getUrl(connAttrs.connectString)
 
     this.startSpan(this.operationName(), {

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 = this.serviceName(this.config, params)
+    const service = this.serviceName({ pluginConfig: this.config, params })
     const originalStatement = query.text
 
     this.startSpan(this.operationName(), {

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

@@ -15,7 +15,7 @@ class RedisPlugin extends CachePlugin {
 
     this.startSpan({
       resource,
-      service: this.serviceName(this.config, this.system, connectionName),
+      service: this.serviceName({ pluginConfig: this.config, system: this.system, connectionName }),
       type: 'redis',
       meta: {
         'db.type': 'redis',

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

@@ -10,7 +10,7 @@ class TediousPlugin extends DatabasePlugin {
 
   start ({ queryOrProcedure, connectionConfig }) {
     this.startSpan(this.operationName(), {
-      service: this.serviceName(this.config, this.system),
+      service: this.serviceName({ pluginConfig: this.config, system: this.system }),
       resource: queryOrProcedure,
       type: 'sql',
       kind: 'client',