dd-trace 2.0.0-appsec-beta.4 → 2.0.1

package/MIGRATING.md

@@ -0,0 +1,65 @@
+# Migrating
+
+This guide describes the steps to upgrade dd-trace from a major version to the
+next. If you are having any issues related to migrating, please feel free to
+open an issue or contact our [support](https://www.datadoghq.com/support/) team.
+
+## 1.0 to 2.0
+
+### Configuration
+
+The following configuraton options are no longer available programmatically and
+must be configured using these environment variables:
+
+* `enabled` -> `DD_TRACE_ENABLED=true|false`
+* `debug` -> `DD_TRACE_DEBUG=true|false`
+
+If environment variables were already used for these options, no action is
+needed.
+
+The following configuration options were completely removed and will no longer
+have any effect:
+
+* `scope`
+
+Startup logs are now disabled by default and can be enabled if needed with
+`DD_TRACE_STARTUP_LOGS=true`.
+
+### Removed APIs
+
+The original scope manager has been replaced several years ago and has now been
+removed. Any code referencing `tracer.scopeManager()` should be removed or
+replaced with `tracer.scope()` which is documented
+[here](https://datadoghq.dev/dd-trace-js/#scope-manager).
+
+### Nested objects as tags
+
+Support for nested objects as tags as been removed. When adding an object as a
+tag value, only properties that exist on that object directly will be added as
+tags. If nested properties are also needed, these should be added by hand.
+
+For example:
+
+```js
+const obj = {
+  a: 'foo',
+  b: {
+    c: 'bar'
+  }
+}
+
+// 1.0
+span.setTag('test', obj) // add test.a and test.b.c
+
+// 2.0
+span.setTag('test', obj) // add test.a
+span.setTag('test.b', obj.b) // add test.b.c
+```
+
+Arrays are no longer supported and must be converted to string manually.
+
+### Outgoing request filtering
+
+Outgoing request filtering is no longer supported and is now only available for
+incoming requests. This means that the `blocklist` and `allowlist` options on
+the `http` integration no longer have any effect.

package/ci/init.js

@@ -1,7 +1,11 @@
 const tracer = require('../packages/dd-trace')
+const { ORIGIN_KEY } = require('../packages/dd-trace/src/constants')
 
 tracer.init({
-  startupLogs: false
+  startupLogs: false,
+  tags: {
+    [ORIGIN_KEY]: 'ciapp-test'
+  }
 })
 
 tracer.use('fs', false)

package/ci/jest/env.js

@@ -1,8 +1,12 @@
 const tracer = require('../../packages/dd-trace')
+const { ORIGIN_KEY } = require('../../packages/dd-trace/src/constants')
 
 tracer.init({
   startupLogs: false,
-  flushInterval: 400000
+  flushInterval: 400000,
+  tags: {
+    [ORIGIN_KEY]: 'ciapp-test'
+  }
 })
 
 tracer.use('fs', false)

package/index.d.ts

@@ -268,8 +268,7 @@ export declare interface TracerOptions {
   version?: string;
 
   /**
-   * Percentage of spans to sample as a float between 0 and 1.
-   * @default 1
+   * Controls the ingestion sample rate (between 0 and 1) between the agent and the backend.
    */
   sampleRate?: number;
 
@@ -358,12 +357,6 @@ export declare interface TracerOptions {
      * @default false
      */
     enableGetRumData?: boolean
-
-    /**
-     * Whether to set the error flag when an error occurs in an internal span.
-     * @default false
-     */
-    internalErrors?: boolean
   };
 
   /**
@@ -476,7 +469,6 @@ interface Plugins {
   "amqp10": plugins.amqp10;
   "amqplib": plugins.amqplib;
   "aws-sdk": plugins.aws_sdk;
-  "bluebird": plugins.bluebird;
   "bunyan": plugins.bunyan;
   "cassandra-driver": plugins.cassandra_driver;
   "connect": plugins.connect;
@@ -504,6 +496,7 @@ interface Plugins {
   "memcached": plugins.memcached;
   "microgateway-core": plugins.microgateway_core;
   "mocha": plugins.mocha;
+  "moleculer": plugins.moleculer;
   "mongodb-core": plugins.mongodb_core;
   "mongoose": plugins.mongoose;
   "mysql": plugins.mysql;
@@ -514,16 +507,12 @@ interface Plugins {
   "paperplane": plugins.paperplane;
   "pg": plugins.pg;
   "pino": plugins.pino;
-  "promise-js": plugins.promise_js;
-  "promise": plugins.promise;
-  "q": plugins.q;
   "redis": plugins.redis;
   "restify": plugins.restify;
   "rhea": plugins.rhea;
   "router": plugins.router;
   "sharedb": plugins.sharedb;
   "tedious": plugins.tedious;
-  "when": plugins.when;
   "winston": plugins.winston;
 }
 
@@ -707,6 +696,16 @@ declare namespace plugins {
     metadata?: string[] | ((variables: { [key: string]: any }) => { [key: string]: any });
   }
 
+  /** @hidden */
+  interface Moleculer extends Instrumentation {
+    /**
+     * Whether to include context meta as tags.
+     *
+     * @default false
+     */
+    meta?: boolean;
+  }
+
   /**
    * This plugin automatically instruments the
    * [amqp10](https://github.com/noodlefrenzy/node-amqp10) module.
@@ -750,12 +749,6 @@ declare namespace plugins {
     [key: string]: boolean | Object | undefined;
   }
 
-  /**
-   * This plugin patches the [bluebird](https://github.com/petkaantonov/bluebird)
-   * module to bind the promise callback the the caller context.
-   */
-  interface bluebird extends Integration {}
-
   /**
    * This plugin patches the [bunyan](https://github.com/trentm/node-bunyan)
    * to automatically inject trace identifiers in log records when the
@@ -786,7 +779,7 @@ declare namespace plugins {
    * This plugin automatically instruments the
    * [cucumber](https://www.npmjs.com/package/@cucumber/cucumber) module.
    */
-  interface cucumber extends Instrumentation {}
+  interface cucumber extends Integration {}
 
   /**
    * This plugin automatically instruments the
@@ -1107,6 +1100,24 @@ declare namespace plugins {
    */
   interface mocha extends Integration {}
 
+  /**
+   * This plugin automatically instruments the
+   * [moleculer](https://moleculer.services/) module.
+   */
+   interface moleculer extends Moleculer {
+    /**
+     * Configuration for Moleculer clients. Set to false to disable client
+     * instrumentation.
+     */
+    client?: boolean | Moleculer;
+
+    /**
+     * Configuration for Moleculer servers. Set to false to disable server
+     * instrumentation.
+     */
+    server?: boolean | Moleculer;
+  }
+
   /**
    * This plugin automatically instruments the
    * [mongodb-core](https://github.com/mongodb-js/mongodb-core) module.
@@ -1189,24 +1200,6 @@ declare namespace plugins {
    */
   interface pino extends Integration {}
 
-  /**
-   * This plugin patches the [promise-js](https://github.com/kevincennis/promise)
-   * module to bind the promise callback the the caller context.
-   */
-  interface promise_js extends Integration {}
-
-  /**
-   * This plugin patches the [promise](https://github.com/then/promise)
-   * module to bind the promise callback the the caller context.
-   */
-  interface promise extends Integration {}
-
-  /**
-   * This plugin patches the [q](https://github.com/kriskowal/q)
-   * module to bind the promise callback the the caller context.
-   */
-  interface q extends Integration {}
-
   /**
    * This plugin automatically instruments the
    * [redis](https://github.com/NodeRedis/node_redis) module.
@@ -1289,12 +1282,6 @@ declare namespace plugins {
    */
   interface tedious extends Instrumentation {}
 
-  /**
-   * This plugin patches the [when](https://github.com/cujojs/when)
-   * module to bind the promise callback the the caller context.
-   */
-  interface when extends Integration {}
-
   /**
    * This plugin patches the [winston](https://github.com/winstonjs/winston)
    * to automatically inject trace identifiers in log records when the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "2.0.0-appsec-beta.4",
+  "version": "2.0.1",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -10,6 +10,7 @@
     "bench": "node benchmark",
     "bench:profiler": "node benchmark/profiler",
     "bench:e2e": "SERVICES=mongo yarn services && cd benchmark/e2e && node benchmark-run.js --duration=30",
+    "bench:e2e:ci-visibility": "node benchmark/e2e-ci/benchmark-run.js",
     "type:doc": "cd docs && yarn && yarn build",
     "type:test": "cd docs && yarn && yarn test",
     "lint": "node scripts/check_licenses.js && eslint . && yarn audit --groups dependencies",
@@ -18,6 +19,8 @@
     "test": "SERVICES=* yarn services && mocha --exit --expose-gc 'packages/dd-trace/test/setup/node.js' 'packages/*/test/**/*.spec.js'",
     "test:trace:core": "mocha --exit --expose-gc --file packages/dd-trace/test/setup/core.js \"packages/dd-trace/test/**/*.spec.js\"",
     "test:trace:core:ci": "nyc --include \"packages/dd-trace/src/**/*.js\" -- npm run test:trace:core --  --reporter mocha-multi-reporters --reporter-options configFile=mocha-reporter-config.json",
+    "test:instrumentations": "mocha --file 'packages/dd-trace/test/setup/core.js' 'packages/datadog-instrumentations/test/**/*.spec.js'",
+    "test:instrumentations:ci": "nyc --include 'packages/datadog-instrumentations/src/**/*.js' -- npm run test:instrumentations -- --reporter mocha-multi-reporters --reporter-options configFile=mocha-reporter-config.json",
     "test:core": "mocha --file packages/datadog-core/test/setup.js 'packages/datadog-core/test/**/*.spec.js'",
     "test:core:ci": "nyc --include 'packages/datadog-core/src/**/*.js' -- npm run test:core -- --reporter mocha-multi-reporters --reporter-options configFile=mocha-reporter-config.json",
     "test:plugins": "mocha --exit --file \"packages/dd-trace/test/setup/core.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/**/*.spec.js\"",
@@ -58,7 +61,7 @@
     "node": ">=12"
   },
   "dependencies": {
-    "@datadog/native-appsec": "^0.7.0",
+    "@datadog/native-appsec": "^0.8.1",
     "@datadog/native-metrics": "^1.1.0",
     "@datadog/pprof": "^0.3.0",
     "@datadog/sketches-js": "^1.0.4",

package/packages/datadog-instrumentations/index.js

@@ -2,3 +2,9 @@
 
 require('./src/dns')
 require('./src/memcached')
+require('./src/mysql')
+require('./src/bluebird')
+require('./src/when')
+require('./src/promise')
+require('./src/q')
+require('./src/promise-js')

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

@@ -0,0 +1,26 @@
+'use strict'
+
+const { addHook } = require('./helpers/instrument')
+const { wrapThen } = require('./helpers/promise')
+const shimmer = require('../../datadog-shimmer')
+
+function createGetNewLibraryCopyWrap (originalLib) {
+  return function wrapGetNewLibraryCopy (getNewLibraryCopy) {
+    return function getNewLibraryCopyWithTrace () {
+      const libraryCopy = getNewLibraryCopy.apply(this, arguments)
+      shimmer.wrap(libraryCopy.prototype, '_then', wrapThen)
+      shimmer.wrap(libraryCopy, 'getNewLibraryCopy', createGetNewLibraryCopyWrap(originalLib))
+      return libraryCopy
+    }
+  }
+}
+
+addHook({ name: 'bluebird', versions: ['>=2.0.2'] }, Promise => {
+  shimmer.wrap(Promise.prototype, '_then', wrapThen)
+  return Promise
+})
+
+addHook({ name: 'bluebird', versions: ['^2.11.0', '^3.4.1'] }, Promise => {
+  shimmer.wrap(Promise, 'getNewLibraryCopy', createGetNewLibraryCopyWrap(Promise))
+  return Promise
+})

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const { channel, addHook, bind } = require('./helpers/instrument')
+const { channel, addHook, AsyncResource } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 
 const rrtypes = {
@@ -53,7 +53,7 @@ function wrap (prefix, fn, expectedArgs, rrtype) {
   const errorCh = channel(prefix + ':error')
 
   const wrapped = function () {
-    const cb = bind(arguments[arguments.length - 1])
+    const cb = AsyncResource.bind(arguments[arguments.length - 1])
     if (
       !startCh.hasSubscribers ||
       arguments.length < expectedArgs ||

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

@@ -90,32 +90,31 @@ function getBasedir (id) {
 }
 
 if (semver.satisfies(process.versions.node, '>=16.0.0')) {
-  exports.bind = AsyncResource.bind
-  exports.bindAsyncResource = AsyncResource.prototype.bind
+  exports.AsyncResource = AsyncResource
 } else {
-  exports.bindAsyncResource = function bindAsyncResource (fn, thisArg) {
-    thisArg = thisArg || this
-    const ret = this.runInAsyncScope.bind(this, fn, thisArg)
-    Object.defineProperties(ret, {
-      'length': {
-        configurable: true,
-        enumerable: false,
-        value: fn.length,
-        writable: false
-      },
-      'asyncResource': {
-        configurable: true,
-        enumerable: true,
-        value: this,
-        writable: true
-      }
-    })
-    return ret
-  }
+  exports.AsyncResource = class extends AsyncResource {
+    static bind (fn, type, thisArg) {
+      type = type || fn.name
+      return (new exports.AsyncResource(type || 'bound-anonymous-fn')).bind(fn, thisArg)
+    }
 
-  exports.bind = function bind (fn, type, thisArg) {
-    type = type || fn.name
-    const ar = new AsyncResource(type || 'bound-anonymous-fn')
-    return exports.bindAsyncResource.call(ar, fn, thisArg)
+    bind (fn, thisArg = this) {
+      const ret = this.runInAsyncScope.bind(this, fn, thisArg)
+      Object.defineProperties(ret, {
+        'length': {
+          configurable: true,
+          enumerable: false,
+          value: fn.length,
+          writable: false
+        },
+        'asyncResource': {
+          configurable: true,
+          enumerable: true,
+          value: this,
+          writable: true
+        }
+      })
+      return ret
+    }
   }
 }

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

@@ -0,0 +1,29 @@
+'use strict'
+
+const { AsyncResource } = require('async_hooks')
+
+exports.wrapThen = function wrapThen (origThen) {
+  return function then (onFulfilled, onRejected, onProgress) {
+    const ar = new AsyncResource('bound-anonymous-fn')
+
+    arguments[0] = wrapCallback(ar, onFulfilled)
+    arguments[1] = wrapCallback(ar, onRejected)
+
+    // not standard but sometimes supported
+    if (onProgress) {
+      arguments[2] = wrapCallback(ar, onProgress)
+    }
+
+    return origThen.apply(this, arguments)
+  }
+}
+
+function wrapCallback (ar, callback) {
+  if (typeof callback !== 'function') return callback
+
+  return function () {
+    return ar.runInAsyncScope(() => {
+      return callback.apply(this, arguments)
+    })
+  }
+}

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

@@ -1,11 +1,9 @@
 'use strict'
 
-const { AsyncResource } = require('async_hooks')
 const {
   channel,
   addHook,
-  bind,
-  bindAsyncResource
+  AsyncResource
 } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 
@@ -27,9 +25,9 @@ addHook({ name: 'memcached', versions: ['>=2.2'] }, Memcached => {
 
     const wrappedQueryCompiler = function () {
       const query = queryCompiler.apply(this, arguments)
-      const callback = bindAsyncResource.call(asyncResource, query.callback)
+      const callback = asyncResource.bind(query.callback)
 
-      query.callback = bind(function (err) {
+      query.callback = AsyncResource.bind(function (err) {
         if (err) {
           errorCh.publish(err)
         }

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

@@ -0,0 +1,67 @@
+'use strict'
+
+const {
+  channel,
+  addHook,
+  AsyncResource
+} = require('./helpers/instrument')
+const shimmer = require('../../datadog-shimmer')
+
+addHook({ name: 'mysql', file: 'lib/Connection.js', versions: ['>=2'] }, Connection => {
+  const startCh = channel('apm:mysql:query:start')
+  const asyncEndCh = channel('apm:mysql:query:async-end')
+  const endCh = channel('apm:mysql:query:end')
+  const errorCh = channel('apm:mysql:query:error')
+
+  shimmer.wrap(Connection.prototype, 'query', query => function () {
+    const asyncResource = new AsyncResource('bound-anonymous-fn')
+    if (!startCh.hasSubscribers) {
+      return query.apply(this, arguments)
+    }
+
+    const sql = arguments[0].sql ? arguments[0].sql : arguments[0]
+    const startArgs = [sql, this.config]
+
+    startCh.publish(startArgs)
+
+    try {
+      const res = query.apply(this, arguments)
+
+      if (res._callback) {
+        const cb = asyncResource.bind(res._callback)
+        res._callback = AsyncResource.bind(function (error, result) {
+          if (error) {
+            errorCh.publish(error)
+          }
+          asyncEndCh.publish(result)
+
+          return cb.apply(this, arguments)
+        })
+      } else {
+        const cb = AsyncResource.bind(function () {
+          asyncEndCh.publish(undefined)
+        })
+        res.on('end', cb)
+      }
+
+      return res
+    } catch (err) {
+      err.stack // trigger getting the stack at the original throwing point
+      errorCh.publish(err)
+
+      throw err
+    } finally {
+      endCh.publish(undefined)
+    }
+  })
+
+  return Connection
+})
+
+addHook({ name: 'mysql', file: 'lib/Pool.js', versions: ['>=2'] }, Pool => {
+  shimmer.wrap(Pool.prototype, 'getConnection', getConnection => function (cb) {
+    arguments[0] = AsyncResource.bind(cb)
+    return getConnection.apply(this, arguments)
+  })
+  return Pool
+})

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

@@ -0,0 +1,15 @@
+'use strict'
+
+const { addHook } = require('./helpers/instrument')
+const { wrapThen } = require('./helpers/promise')
+const shimmer = require('../../datadog-shimmer')
+
+addHook({
+  name: 'promise-js',
+  versions: ['>=0.0.3']
+}, Promise => {
+  if (Promise !== global.Promise) {
+    shimmer.wrap(Promise.prototype, 'then', wrapThen)
+  }
+  return Promise
+})

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

@@ -0,0 +1,14 @@
+'use strict'
+
+const { addHook } = require('./helpers/instrument')
+const { wrapThen } = require('./helpers/promise')
+const shimmer = require('../../datadog-shimmer')
+
+addHook({
+  name: 'promise',
+  file: 'lib/core.js',
+  versions: ['>=7']
+}, Promise => {
+  shimmer.wrap(Promise.prototype, 'then', wrapThen)
+  return Promise
+})

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

@@ -0,0 +1,21 @@
+'use strict'
+
+const { addHook } = require('./helpers/instrument')
+const { wrapThen } = require('./helpers/promise')
+const shimmer = require('../../datadog-shimmer')
+
+addHook({
+  name: 'q',
+  versions: ['1']
+}, Q => {
+  shimmer.wrap(Q.makePromise.prototype, 'then', wrapThen)
+  return Q
+})
+
+addHook({
+  name: 'q',
+  versions: ['>=2']
+}, Q => {
+  shimmer.wrap(Q.Promise.prototype, 'then', wrapThen)
+  return Q
+})

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

@@ -0,0 +1,14 @@
+'use strict'
+
+const { addHook } = require('./helpers/instrument')
+const { wrapThen } = require('./helpers/promise')
+const shimmer = require('../../datadog-shimmer')
+
+addHook({
+  name: 'when',
+  file: 'lib/Promise.js',
+  versions: ['>=3']
+}, Promise => {
+  shimmer.wrap(Promise.prototype, 'then', wrapThen)
+  return Promise
+})

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

@@ -103,8 +103,8 @@ module.exports = [
     name: '@cucumber/cucumber',
     versions: ['7.0.0 - 7.2.1'],
     file: 'lib/runtime/pickle_runner.js',
-    patch (PickleRunner, tracer) {
-      const testEnvironmentMetadata = getTestEnvironmentMetadata('cucumber')
+    patch (PickleRunner, tracer, config) {
+      const testEnvironmentMetadata = getTestEnvironmentMetadata('cucumber', config)
       const sourceRoot = process.cwd()
       const pl = PickleRunner.default
       this.wrap(
@@ -127,8 +127,8 @@ module.exports = [
     name: '@cucumber/cucumber',
     versions: ['>=7.3.0'],
     file: 'lib/runtime/test_case_runner.js',
-    patch (TestCaseRunner, tracer) {
-      const testEnvironmentMetadata = getTestEnvironmentMetadata('cucumber')
+    patch (TestCaseRunner, tracer, config) {
+      const testEnvironmentMetadata = getTestEnvironmentMetadata('cucumber', config)
       const sourceRoot = process.cwd()
       const pl = TestCaseRunner.default
       this.wrap(

package/packages/datadog-plugin-cypress/src/plugin.js

@@ -4,6 +4,7 @@ const {
   TEST_SUITE,
   TEST_STATUS,
   TEST_FRAMEWORK_VERSION,
+  TEST_IS_RUM_ACTIVE,
   getTestEnvironmentMetadata,
   CI_APP_ORIGIN,
   getTestParentSpan
@@ -66,19 +67,28 @@ module.exports = (on, config) => {
           }
         })
       }
-      return null
+      return activeSpan ? activeSpan._spanContext._traceId.toString(10) : null
     },
     'dd:afterEach': (test) => {
-      const { state, error } = test
+      const { state, error, isRUMActive } = test
       if (activeSpan) {
         activeSpan.setTag(TEST_STATUS, CYPRESS_STATUS_TO_TEST_STATUS[state])
         if (error) {
           activeSpan.setTag('error', error)
         }
+        if (isRUMActive) {
+          activeSpan.setTag(TEST_IS_RUM_ACTIVE, 'true')
+        }
         activeSpan.finish()
       }
       activeSpan = null
       return null
+    },
+    'dd:addTags': (tags) => {
+      if (activeSpan) {
+        activeSpan.addTags(tags)
+      }
+      return null
     }
   })
 }