dd-trace 6.0.0-pre-a99e5ea → 6.0.0-pre-c3e3d62

package/LICENSE-3rdparty.csv

@@ -48,7 +48,6 @@ dev,eslint-config-standard,MIT,Copyright Feross Aboukhadijeh
 dev,eslint-plugin-import,MIT,Copyright 2015 Ben Mosher
 dev,eslint-plugin-mocha,MIT,Copyright 2014 Mathias Schreck
 dev,eslint-plugin-n,MIT,Copyright 2015 Toru Nagashima
-dev,eslint-plugin-node,MIT,Copyright 2015 Toru Nagashima
 dev,eslint-plugin-promise,ISC,jden and other contributors
 dev,eslint-plugin-standard,MIT,Copyright 2015 Jamund Ferguson
 dev,express,MIT,Copyright 2009-2014 TJ Holowaychuk 2013-2014 Roman Shtylman 2014-2015 Douglas Christopher Wilson

package/ci/init.js

@@ -20,9 +20,9 @@ if (isAgentlessEnabled) {
       exporter: 'datadog'
     }
   } else {
-    console.error(`DD_CIVISIBILITY_AGENTLESS_ENABLED is set, \
-but neither DD_API_KEY nor DATADOG_API_KEY are set in your environment, \
-so dd-trace will not be initialized.`)
+    console.error('DD_CIVISIBILITY_AGENTLESS_ENABLED is set, but neither ' +
+      'DD_API_KEY nor DATADOG_API_KEY are set in your environment, so ' +
+      'dd-trace will not be initialized.')
     shouldInit = false
   }
 } else {

package/index.d.ts

@@ -1124,7 +1124,26 @@ declare namespace tracer {
      * This module uses graphql operations to service requests & thus generates graphql spans.
      * We recommend disabling the graphql plugin if you only want to trace @apollo/gateway
      */
-    interface apollo extends Instrumentation {}
+    interface apollo extends Instrumentation {
+      /**
+       * Whether to include the source of the operation within the query as a tag
+       * on every span. This may contain sensitive information and should only be
+       * enabled if sensitive data is always sent as variables and not in the
+       * query text.
+       *
+       * @default false
+       */
+      source?: boolean;
+
+      /**
+       * Whether to enable signature calculation for the resource name. This can
+       * be disabled if your apollo/gateway operations always have a name. Note that when
+       * disabled all queries will need to be named for this to work properly.
+       *
+       * @default true
+       */
+      signature?: boolean;
+    }
 
     /**
      * This plugin automatically instruments the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "6.0.0-pre-a99e5ea",
+  "version": "6.0.0-pre-c3e3d62",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -116,11 +116,10 @@
     "dotenv": "16.3.1",
     "esbuild": "0.16.12",
     "eslint": "^8.23.0",
-    "eslint-config-standard": "^11.0.0-beta.0",
+    "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-mocha": "^10.1.0",
     "eslint-plugin-n": "^15.7.0",
-    "eslint-plugin-node": "^5.2.1",
     "eslint-plugin-promise": "^3.6.0",
     "eslint-plugin-standard": "^3.0.1",
     "express": "^4.18.2",

package/packages/datadog-esbuild/index.js

@@ -89,7 +89,7 @@ module.exports.setup = function (build) {
 
       let pathToPackageJson
       try {
-        pathToPackageJson = require.resolve(`${extracted.pkg}/package.json`, { paths: [ args.resolveDir ] })
+        pathToPackageJson = require.resolve(`${extracted.pkg}/package.json`, { paths: [args.resolveDir] })
       } catch (err) {
         if (err.code === 'MODULE_NOT_FOUND') {
           if (!internal) {
@@ -173,7 +173,7 @@ function dotFriendlyResolve (path, directory) {
     path = '../'
   }
 
-  return require.resolve(path, { paths: [ directory ] })
+  return require.resolve(path, { paths: [directory] })
 }
 
 /**

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

@@ -37,7 +37,7 @@ function wrapExecuteHTTPGraphQLRequest (originalExecuteHTTPGraphQLRequest) {
         })
 
         resolve({
-          headers: headers,
+          headers,
           status: abortData.statusCode,
           body: {
             kind: 'complete',

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

@@ -14,14 +14,14 @@ const CHANNELS = {
   'gateway.postprocessing': tracingChannel('apm:apollo:gateway:postprocessing')
 }
 
-const executorCh = channel('apm:apollo:gateway:request:executor')
 const generalErrorCh = channel('apm:apollo:gateway:general:error')
 
 function wrapExecutor (executor) {
   return function (...args) {
+    const channel = CHANNELS['gateway.request']
     const ctx = { requestContext: args[0], gateway: this }
-    executorCh.publish(ctx)
-    return executor.apply(this, args)
+
+    return channel.tracePromise(executor, ctx, this, ...args)
   }
 }
 
@@ -67,7 +67,9 @@ function wrapStartActiveSpan (startActiveSpan) {
         }
         break
       }
+      // Patch `executor` instead so the requestContext can be captured.
       case 'gateway.request':
+        break
       case 'gateway.execute':
       case 'gateway.postprocessing' :
       case 'gateway.fetch': {

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

@@ -111,6 +111,7 @@ function wrapSmithySend (send) {
 }
 
 function wrapCb (cb, serviceName, request, ar) {
+  // eslint-disable-next-line n/handle-callback-err
   return function wrappedCb (err, response) {
     const obj = { request, response }
     return ar.runInAsyncScope(() => {
@@ -163,7 +164,9 @@ function getChannelSuffix (name) {
     's3',
     'sns',
     'sqs'
-  ].includes(name) ? name : 'default'
+  ].includes(name)
+    ? name
+    : 'default'
 }
 
 addHook({ name: '@smithy/smithy-client', versions: ['>=1.0.3'] }, smithy => {

package/packages/datadog-instrumentations/src/cassandra-driver.js

@@ -10,7 +10,7 @@ const shimmer = require('../../datadog-shimmer')
 const startCh = channel('apm:cassandra-driver:query:start')
 const finishCh = channel('apm:cassandra-driver:query:finish')
 const errorCh = channel('apm:cassandra-driver:query:error')
-const connectCh = channel(`apm:cassandra-driver:query:connect`)
+const connectCh = channel('apm:cassandra-driver:query:connect')
 
 addHook({ name: 'cassandra-driver', versions: ['>=3.0.0'] }, cassandra => {
   shimmer.wrap(cassandra.Client.prototype, 'batch', batch => function (queries, options, callback) {

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

@@ -132,7 +132,8 @@ function wrapRun (pl, isLatestVersion) {
         promise.finally(() => {
           const result = this.getWorstStepResult()
           const { status, skipReason, errorMessage } = isLatestVersion
-            ? getStatusFromResultLatest(result) : getStatusFromResult(result)
+            ? getStatusFromResultLatest(result)
+            : getStatusFromResult(result)
 
           if (lastStatusByPickleId.has(this.pickle.id)) {
             lastStatusByPickleId.get(this.pickle.id).push(status)
@@ -177,7 +178,8 @@ function wrapRun (pl, isLatestVersion) {
 
         promise.then((result) => {
           const { status, skipReason, errorMessage } = isLatestVersion
-            ? getStatusFromResultLatest(result) : getStatusFromResult(result)
+            ? getStatusFromResultLatest(result)
+            : getStatusFromResult(result)
 
           testFinishCh.publish({ isStep: true, status, skipReason, errorMessage })
         })

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

@@ -1,4 +1,3 @@
-
 'use strict'
 
 const {

package/packages/datadog-instrumentations/src/google-cloud-pubsub.js

@@ -11,7 +11,7 @@ const requestStartCh = channel('apm:google-cloud-pubsub:request:start')
 const requestFinishCh = channel('apm:google-cloud-pubsub:request:finish')
 const requestErrorCh = channel('apm:google-cloud-pubsub:request:error')
 
-const receiveStartCh = channel(`apm:google-cloud-pubsub:receive:start`)
+const receiveStartCh = channel('apm:google-cloud-pubsub:receive:start')
 const receiveFinishCh = channel('apm:google-cloud-pubsub:receive:finish')
 const receiveErrorCh = channel('apm:google-cloud-pubsub:receive:error')
 

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

@@ -23,62 +23,62 @@ module.exports = {
   '@opentelemetry/sdk-trace-node': () => require('../otel-sdk-trace'),
   '@redis/client': () => require('../redis'),
   '@smithy/smithy-client': () => require('../aws-sdk'),
-  'aerospike': () => require('../aerospike'),
-  'amqp10': () => require('../amqp10'),
-  'amqplib': () => require('../amqplib'),
+  aerospike: () => require('../aerospike'),
+  amqp10: () => require('../amqp10'),
+  amqplib: () => require('../amqplib'),
   'aws-sdk': () => require('../aws-sdk'),
-  'bluebird': () => require('../bluebird'),
+  bluebird: () => require('../bluebird'),
   'body-parser': () => require('../body-parser'),
-  'bunyan': () => require('../bunyan'),
+  bunyan: () => require('../bunyan'),
   'cassandra-driver': () => require('../cassandra-driver'),
-  'child_process': () => require('../child_process'),
-  'connect': () => require('../connect'),
-  'cookie': () => require('../cookie'),
+  child_process: () => require('../child_process'),
+  connect: () => require('../connect'),
+  cookie: () => require('../cookie'),
   'cookie-parser': () => require('../cookie-parser'),
-  'couchbase': () => require('../couchbase'),
-  'crypto': () => require('../crypto'),
-  'cypress': () => require('../cypress'),
-  'dns': () => require('../dns'),
-  'elasticsearch': () => require('../elasticsearch'),
-  'express': () => require('../express'),
+  couchbase: () => require('../couchbase'),
+  crypto: () => require('../crypto'),
+  cypress: () => require('../cypress'),
+  dns: () => require('../dns'),
+  elasticsearch: () => require('../elasticsearch'),
+  express: () => require('../express'),
   'express-mongo-sanitize': () => require('../express-mongo-sanitize'),
-  'fastify': () => require('../fastify'),
+  fastify: () => require('../fastify'),
   'find-my-way': () => require('../find-my-way'),
-  'fs': () => require('../fs'),
+  fs: () => require('../fs'),
   'generic-pool': () => require('../generic-pool'),
-  'graphql': () => require('../graphql'),
-  'grpc': () => require('../grpc'),
-  'hapi': () => require('../hapi'),
-  'http': () => require('../http'),
-  'http2': () => require('../http2'),
-  'https': () => require('../http'),
-  'ioredis': () => require('../ioredis'),
+  graphql: () => require('../graphql'),
+  grpc: () => require('../grpc'),
+  hapi: () => require('../hapi'),
+  http: () => require('../http'),
+  http2: () => require('../http2'),
+  https: () => require('../http'),
+  ioredis: () => require('../ioredis'),
   'jest-circus': () => require('../jest'),
   'jest-config': () => require('../jest'),
   'jest-environment-node': () => require('../jest'),
   'jest-environment-jsdom': () => require('../jest'),
   'jest-jasmine2': () => require('../jest'),
   'jest-worker': () => require('../jest'),
-  'knex': () => require('../knex'),
-  'koa': () => require('../koa'),
+  knex: () => require('../knex'),
+  koa: () => require('../koa'),
   'koa-router': () => require('../koa'),
-  'kafkajs': () => require('../kafkajs'),
-  'ldapjs': () => require('../ldapjs'),
+  kafkajs: () => require('../kafkajs'),
+  ldapjs: () => require('../ldapjs'),
   'limitd-client': () => require('../limitd-client'),
-  'mariadb': () => require('../mariadb'),
-  'memcached': () => require('../memcached'),
+  mariadb: () => require('../mariadb'),
+  memcached: () => require('../memcached'),
   'microgateway-core': () => require('../microgateway-core'),
-  'mocha': () => require('../mocha'),
+  mocha: () => require('../mocha'),
   'mocha-each': () => require('../mocha'),
-  'moleculer': () => require('../moleculer'),
-  'mongodb': () => require('../mongodb'),
+  moleculer: () => require('../moleculer'),
+  mongodb: () => require('../mongodb'),
   'mongodb-core': () => require('../mongodb-core'),
-  'mongoose': () => require('../mongoose'),
-  'mquery': () => require('../mquery'),
-  'mysql': () => require('../mysql'),
-  'mysql2': () => require('../mysql2'),
-  'net': () => require('../net'),
-  'next': () => require('../next'),
+  mongoose: () => require('../mongoose'),
+  mquery: () => require('../mquery'),
+  mysql: () => require('../mysql'),
+  mysql2: () => require('../mysql2'),
+  net: () => require('../net'),
+  next: () => require('../next'),
   'node:child_process': () => require('../child_process'),
   'node:crypto': () => require('../crypto'),
   'node:dns': () => require('../dns'),
@@ -86,26 +86,26 @@ module.exports = {
   'node:http2': () => require('../http2'),
   'node:https': () => require('../http'),
   'node:net': () => require('../net'),
-  'oracledb': () => require('../oracledb'),
-  'openai': () => require('../openai'),
-  'paperplane': () => require('../paperplane'),
+  oracledb: () => require('../oracledb'),
+  openai: () => require('../openai'),
+  paperplane: () => require('../paperplane'),
   'passport-http': () => require('../passport-http'),
   'passport-local': () => require('../passport-local'),
-  'pg': () => require('../pg'),
-  'pino': () => require('../pino'),
+  pg: () => require('../pg'),
+  pino: () => require('../pino'),
   'pino-pretty': () => require('../pino'),
-  'playwright': () => require('../playwright'),
+  playwright: () => require('../playwright'),
   'promise-js': () => require('../promise-js'),
-  'promise': () => require('../promise'),
-  'q': () => require('../q'),
-  'qs': () => require('../qs'),
-  'redis': () => require('../redis'),
-  'restify': () => require('../restify'),
-  'rhea': () => require('../rhea'),
-  'router': () => require('../router'),
-  'sharedb': () => require('../sharedb'),
-  'sequelize': () => require('../sequelize'),
-  'tedious': () => require('../tedious'),
-  'when': () => require('../when'),
-  'winston': () => require('../winston')
+  promise: () => require('../promise'),
+  q: () => require('../q'),
+  qs: () => require('../qs'),
+  redis: () => require('../redis'),
+  restify: () => require('../restify'),
+  rhea: () => require('../rhea'),
+  router: () => require('../router'),
+  sharedb: () => require('../sharedb'),
+  sequelize: () => require('../sequelize'),
+  tedious: () => require('../tedious'),
+  when: () => require('../when'),
+  winston: () => require('../winston')
 }

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

@@ -56,13 +56,13 @@ if (semver.satisfies(process.versions.node, '>=17.8.0')) {
         bound = this.runInAsyncScope.bind(this, fn, thisArg)
       }
       Object.defineProperties(bound, {
-        'length': {
+        length: {
           configurable: true,
           enumerable: false,
           value: fn.length,
           writable: false
         },
-        'asyncResource': {
+        asyncResource: {
           configurable: true,
           enumerable: true,
           value: this,

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

@@ -155,6 +155,7 @@ function patch (http, methodName) {
       try {
         return urlToOptions(new url.URL(inputURL))
       } catch (e) {
+        // eslint-disable-next-line n/no-deprecated-api
         return url.parse(inputURL)
       }
     } else if (inputURL instanceof url.URL) {

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

@@ -10,7 +10,7 @@ const {
   getTestLineStart,
   getTestSuitePath,
   getTestParametersString,
-  EFD_STRING,
+  addEfdStringToTestName,
   removeEfdStringFromTestName
 } = require('../../dd-trace/src/plugins/util/test')
 const {
@@ -63,11 +63,11 @@ let hasFilteredSkippableSuites = false
 const sessionAsyncResource = new AsyncResource('bound-anonymous-fn')
 
 const specStatusToTestStatus = {
-  'pending': 'skip',
-  'disabled': 'skip',
-  'todo': 'skip',
-  'passed': 'pass',
-  'failed': 'fail'
+  pending: 'skip',
+  disabled: 'skip',
+  todo: 'skip',
+  passed: 'pass',
+  failed: 'fail'
 }
 
 const asyncResources = new WeakMap()
@@ -101,10 +101,6 @@ function getTestEnvironmentOptions (config) {
   return {}
 }
 
-function getEfdTestName (testName, numAttempt) {
-  return `${EFD_STRING} (#${numAttempt}): ${testName}`
-}
-
 function getWrappedEnvironment (BaseEnvironment, jestVersion) {
   return class DatadogEnvironment extends BaseEnvironment {
     constructor (config, context) {
@@ -156,7 +152,8 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
     // we use its describe block to get the full name
     getTestNameFromAddTestEvent (event, state) {
       const describeSuffix = getJestTestName(state.currentDescribeBlock)
-      return removeEfdStringFromTestName(`${describeSuffix} ${event.testName}`).trim()
+      const fullTestName = describeSuffix ? `${describeSuffix} ${event.testName}` : event.testName
+      return removeEfdStringFromTestName(fullTestName)
     }
 
     async handleTestEvent (event, state) {
@@ -197,7 +194,6 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             retriedTestsToNumAttempts.set(originalTestName, numEfdRetry + 1)
           }
         }
-
         asyncResource.runInAsyncScope(() => {
           testStartCh.publish({
             name: removeEfdStringFromTestName(testName),
@@ -223,7 +219,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             retriedTestsToNumAttempts.set(testName, 0)
             for (let retryIndex = 0; retryIndex < earlyFlakeDetectionNumRetries; retryIndex++) {
               if (this.global.test) {
-                this.global.test(getEfdTestName(event.testName, retryIndex), event.fn, event.timeout)
+                this.global.test(addEfdStringToTestName(event.testName, retryIndex), event.fn, event.timeout)
               } else {
                 log.error('Early flake detection could not retry test because global.test is undefined')
               }

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

@@ -38,7 +38,8 @@ addHook({ name: 'kafkajs', file: 'src/index.js', versions: ['>=1.4'] }, (BaseKaf
     constructor (options) {
       super(options)
       this._brokers = (options.brokers && typeof options.brokers !== 'function')
-        ? options.brokers.join(',') : undefined
+        ? options.brokers.join(',')
+        : undefined
     }
   }
 

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

@@ -76,8 +76,9 @@ addHook({ name: 'ldapjs', versions: ['>=2'] }, ldapjs => {
     const callbackIndex = getCallbackArgIndex(arguments)
     if (callbackIndex > -1) {
       const callback = arguments[callbackIndex]
+      // eslint-disable-next-line n/handle-callback-err
       arguments[callbackIndex] = shimmer.wrap(callback, function (err, corkedEmitter) {
-        if (typeof corkedEmitter === 'object' && typeof corkedEmitter['on'] === 'function') {
+        if (typeof corkedEmitter === 'object' && typeof corkedEmitter.on === 'function') {
           wrapEmitter(corkedEmitter)
         }
         callback.apply(this, arguments)

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

@@ -483,7 +483,7 @@ addHook({
    */
   shimmer.wrap(Mocha.prototype, 'run', run => function () {
     if (this.options.parallel) {
-      log.warn(`Unable to initialize CI Visibility because Mocha is running in parallel mode.`)
+      log.warn('Unable to initialize CI Visibility because Mocha is running in parallel mode.')
       return run.apply(this, arguments)
     }
 

package/packages/datadog-instrumentations/src/mongodb-core.js

@@ -7,9 +7,9 @@ const {
 } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 
-const startCh = channel(`apm:mongodb:query:start`)
-const finishCh = channel(`apm:mongodb:query:finish`)
-const errorCh = channel(`apm:mongodb:query:error`)
+const startCh = channel('apm:mongodb:query:start')
+const finishCh = channel('apm:mongodb:query:finish')
+const errorCh = channel('apm:mongodb:query:error')
 
 addHook({ name: 'mongodb-core', versions: ['2 - 3.1.9'] }, Server => {
   const serverProto = Server.Server.prototype
@@ -197,7 +197,7 @@ function instrumentPromise (operation, command, ctx, args, server, ns, ops, opti
 
     const promise = command.apply(ctx, args)
 
-    promise.then(function (res) {
+    return promise.then(function (res) {
       finishCh.publish()
       return res
     }, function (err) {
@@ -206,7 +206,5 @@ function instrumentPromise (operation, command, ctx, args, server, ns, ops, opti
 
       return Promise.reject(err)
     })
-
-    return promise
   })
 }

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

@@ -15,7 +15,7 @@ const startTCPCh = channel('apm:net:tcp:start')
 const finishTCPCh = channel('apm:net:tcp:finish')
 const errorTCPCh = channel('apm:net:tcp:error')
 
-const connectionCh = channel(`apm:net:tcp:connection`)
+const connectionCh = channel('apm:net:tcp:connection')
 
 const names = ['net', 'node:net']
 

package/packages/datadog-instrumentations/src/passport-utils.js

@@ -10,6 +10,7 @@ function wrapVerifiedAndPublish (username, password, verified, type) {
     return verified
   }
 
+  // eslint-disable-next-line n/handle-callback-err
   return shimmer.wrap(verified, function (err, user, info) {
     const credentials = { type, username }
     passportVerifyChannel.publish({ credentials, user })