dd-trace 3.17.1 → 3.18.0

package/LICENSE-3rdparty.csv

@@ -41,6 +41,7 @@ dev,eslint,MIT,Copyright JS Foundation and other contributors https://js.foundat
 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
@@ -63,6 +64,5 @@ dev,sinon,BSD-3-Clause,Copyright 2010-2017 Christian Johansen
 dev,sinon-chai,WTFPL and BSD-2-Clause,Copyright 2004 Sam Hocevar 2012–2017 Domenic Denicola
 dev,tap,ISC,Copyright 2011-2022 Isaac Z. Schlueter and Contributors
 dev,tape,MIT,Copyright James Halliday
-dev,wait-on,MIT,Copyright 2015 Jeff Barczewski
 file,aws-lambda-nodejs-runtime-interface-client,Apache 2.0,Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 file,profile.proto,Apache license 2.0,Copyright 2016 Google Inc.

package/esbuild.js

@@ -0,0 +1,3 @@
+'use strict'
+
+module.exports = require('./packages/datadog-esbuild/index.js')

package/index.d.ts

@@ -871,7 +871,7 @@ declare namespace plugins {
       /**
        * Hook to execute just before the request span finishes.
        */
-      request?: (span?: opentracing.Span, req?: IncomingMessage, res?: ServerResponse) => any;
+      request?: (span?: Span, req?: IncomingMessage, res?: ServerResponse) => any;
     };
 
     /**
@@ -907,7 +907,7 @@ declare namespace plugins {
       /**
        * Hook to execute just before the request span finishes.
        */
-      request?: (span?: opentracing.Span, req?: ClientRequest, res?: IncomingMessage) => any;
+      request?: (span?: Span, req?: ClientRequest, res?: IncomingMessage) => any;
     };
 
     /**
@@ -997,7 +997,7 @@ declare namespace plugins {
       /**
        * Hook to execute just before the aws span finishes.
        */
-      request?: (span?: opentracing.Span, response?: anyObject) => any;
+      request?: (span?: Span, response?: anyObject) => any;
     };
 
     /**
@@ -1066,7 +1066,7 @@ declare namespace plugins {
       /**
        * Hook to execute just before the query span finishes.
        */
-      query?: (span?: opentracing.Span, params?: TransportRequestParams) => any;
+      query?: (span?: Span, params?: TransportRequestParams) => any;
     };
   }
 
@@ -1166,7 +1166,8 @@ declare namespace plugins {
 
     /**
      * Whether to enable signature calculation for the resource name. This can
-     * be disabled if your GraphQL operations always have a name.
+     * be disabled if your GraphQL operations always have a name. Note that when
+     * disabled all queries will need to be named for this to work properly.
      *
      * @default true
      */
@@ -1235,7 +1236,7 @@ declare namespace plugins {
        * Hook to execute just before the request span finishes.
        */
       request?: (
-        span?: opentracing.Span,
+        span?: Span,
         req?: IncomingMessage | ClientRequest,
         res?: ServerResponse | IncomingMessage
       ) => any;
@@ -1428,7 +1429,7 @@ declare namespace plugins {
       /**
        * Hook to execute just before the request span finishes.
        */
-      request?: (span?: opentracing.Span, req?: IncomingMessage, res?: ServerResponse) => any;
+      request?: (span?: Span, req?: IncomingMessage, res?: ServerResponse) => any;
     };
   }
 
@@ -1547,12 +1548,12 @@ declare namespace plugins {
       /**
        * Hook to execute just when the span is created.
        */
-      receive?: (span?: opentracing.Span, request?: any) => any;
+      receive?: (span?: Span, request?: any) => any;
 
       /**
        * Hook to execute just when the span is finished.
        */
-      reply?: (span?: opentracing.Span, request?: any, response?: any) => any;
+      reply?: (span?: Span, request?: any, response?: any) => any;
     };
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "3.17.1",
+  "version": "3.18.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -67,14 +67,14 @@
   "dependencies": {
     "@datadog/native-appsec": "2.0.0",
     "@datadog/native-iast-rewriter": "2.0.1",
-    "@datadog/native-iast-taint-tracking": "1.3.1",
-    "@datadog/native-metrics": "^1.5.0",
-    "@datadog/pprof": "^2.1.0",
+    "@datadog/native-iast-taint-tracking": "^1.4.0",
+    "@datadog/native-metrics": "^1.6.0",
+    "@datadog/pprof": "^2.2.0",
     "@datadog/sketches-js": "^2.1.0",
     "crypto-randomuuid": "^1.0.0",
     "diagnostics_channel": "^1.1.0",
     "ignore": "^5.2.0",
-    "import-in-the-middle": "^1.3.4",
+    "import-in-the-middle": "^1.3.5",
     "ipaddr.js": "^2.0.1",
     "istanbul-lib-coverage": "3.2.0",
     "koalas": "^1.0.2",
@@ -109,6 +109,7 @@
     "eslint-config-standard": "^11.0.0-beta.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",
@@ -130,7 +131,6 @@
     "sinon": "^11.1.2",
     "sinon-chai": "^3.7.0",
     "tap": "^16.3.4",
-    "tape": "^4.9.1",
-    "wait-on": "^5.0.0"
+    "tape": "^4.9.1"
   }
 }

package/packages/datadog-core/src/storage/async_resource.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { createHook, executionAsyncResource } = require('async_hooks')
-const { channel } = require('diagnostics_channel')
+const { channel } = require('../../../diagnostics_channel')
 
 const beforeCh = channel('dd-trace:storage:before')
 const afterCh = channel('dd-trace:storage:after')

package/packages/datadog-esbuild/index.js

@@ -93,11 +93,18 @@ module.exports.setup = function (build) {
   })
 }
 
+// Currently esbuild support requires Node.js >=v16.17 or >=v18.7
+// Better yet it would support Node >=v14.17 or >=v16
+// Of course, the most ideal would be to support all versions of Node that dd-trace supports.
+// Version constraints based on Node's diagnostics_channel support
 function warnIfUnsupported () {
   const [major, minor] = process.versions.node.split('.').map(Number)
-  if (major < 14 || (major === 14 && minor < 17)) {
+  if (
+    major < 16 ||
+    (major === 16 && minor < 17) ||
+    (major === 18 && minor < 7)) {
     console.error('WARNING: Esbuild support isn\'t available for older versions of Node.js.')
-    console.error(`Expected: Node.js >= v14.17. Actual: Node.js = ${process.version}.`)
+    console.error(`Expected: Node.js >=v16.17 or >=v18.7. Actual: Node.js = ${process.version}.`)
     console.error('This application may build properly with this version of Node.js, but unless a')
     console.error('more recent version is used at runtime, third party packages won\'t be instrumented.')
   }

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

@@ -90,7 +90,17 @@ function wrapRun (pl, isLatestVersion) {
       if (!pickleResultByFile[testSuiteFullPath]) { // first test in suite
         testSuiteStartCh.publish(testSuiteFullPath)
       }
-      testStartCh.publish({ testName: this.pickle.name, fullTestSuite: testSuiteFullPath })
+
+      const testSourceLine = this.gherkinDocument &&
+        this.gherkinDocument.feature &&
+        this.gherkinDocument.feature.location &&
+        this.gherkinDocument.feature.location.line
+
+      testStartCh.publish({
+        testName: this.pickle.name,
+        fullTestSuite: testSuiteFullPath,
+        testSourceLine
+      })
       try {
         const promise = run.apply(this, arguments)
         promise.finally(() => {

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const dc = require('diagnostics_channel')
+const dc = require('../../../diagnostics_channel')
 const semver = require('semver')
 const instrumentations = require('./instrumentations')
 const { AsyncResource } = require('async_hooks')

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const { channel } = require('diagnostics_channel')
+const { channel } = require('../../../diagnostics_channel')
 const path = require('path')
 const semver = require('semver')
 const Hook = require('./hook')

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

@@ -5,7 +5,8 @@ const log = require('../../dd-trace/src/log')
 const {
   getCoveredFilenamesFromCoverage,
   JEST_WORKER_TRACE_PAYLOAD_CODE,
-  JEST_WORKER_COVERAGE_PAYLOAD_CODE
+  JEST_WORKER_COVERAGE_PAYLOAD_CODE,
+  getTestLineStart
 } = require('../../dd-trace/src/plugins/util/test')
 
 const testSessionStartCh = channel('ci:jest:session:start')
@@ -125,7 +126,8 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             suite: this.testSuite,
             runner: 'jest-circus',
             testParameters,
-            frameworkVersion: jestVersion
+            frameworkVersion: jestVersion,
+            testStartLine: getTestLineStart(event.test.asyncError, this.testSuite)
           })
           originalTestFns.set(event.test, event.test.fn)
           event.test.fn = asyncResource.bind(event.test.fn)
@@ -152,7 +154,8 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             name: getJestTestName(event.test),
             suite: this.testSuite,
             runner: 'jest-circus',
-            frameworkVersion: jestVersion
+            frameworkVersion: jestVersion,
+            testStartLine: getTestLineStart(event.test.asyncError, this.testSuite)
           })
         })
       }

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

@@ -9,7 +9,8 @@ const {
   resetCoverage,
   mergeCoverage,
   getTestSuitePath,
-  fromCoverageMapToCoverage
+  fromCoverageMapToCoverage,
+  getTestLineStart
 } = require('../../dd-trace/src/plugins/util/test')
 
 const testStartCh = channel('ci:mocha:test:start')
@@ -35,6 +36,7 @@ const patched = new WeakSet()
 const testToAr = new WeakMap()
 const originalFns = new WeakMap()
 const testFileToSuiteAr = new Map()
+const testToStartLine = new WeakMap()
 
 // `isWorker` is true if it's a Mocha worker
 let isWorker = false
@@ -207,10 +209,11 @@ function mochaHook (Runner) {
       if (isRetry(test)) {
         return
       }
+      const testStartLine = testToStartLine.get(test)
       const asyncResource = new AsyncResource('bound-anonymous-fn')
       testToAr.set(test.fn, asyncResource)
       asyncResource.runInAsyncScope(() => {
-        testStartCh.publish(test)
+        testStartCh.publish({ test, testStartLine })
       })
     })
 
@@ -384,6 +387,20 @@ addHook({
   return Mocha
 })
 
+addHook({
+  name: 'mocha',
+  versions: ['>=5.2.0'],
+  file: 'lib/suite.js'
+}, (Suite) => {
+  shimmer.wrap(Suite.prototype, 'addTest', addTest => function (test) {
+    // In here, the test definition is in the stack, so we search for it.
+    const startLine = getTestLineStart(new Error(), test.file)
+    testToStartLine.set(test, startLine)
+    return addTest.apply(this, arguments)
+  })
+  return Suite
+})
+
 addHook({
   name: 'mocha',
   versions: ['>=5.2.0'],

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

@@ -76,7 +76,7 @@ function getRootDir (playwrightRunner) {
 }
 
 function testBeginHandler (test) {
-  const { _requireFile: testSuiteAbsolutePath, title: testName, _type } = test
+  const { _requireFile: testSuiteAbsolutePath, title: testName, _type, location: { line: testSourceLine } } = test
 
   if (_type === 'beforeAll' || _type === 'afterAll') {
     return
@@ -96,7 +96,7 @@ function testBeginHandler (test) {
   const testAsyncResource = new AsyncResource('bound-anonymous-fn')
   testToAr.set(test, testAsyncResource)
   testAsyncResource.runInAsyncScope(() => {
-    testStartCh.publish({ testName, testSuiteAbsolutePath })
+    testStartCh.publish({ testName, testSuiteAbsolutePath, testSourceLine })
   })
 }
 

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

@@ -6,6 +6,7 @@ const { storage } = require('../../datadog-core')
 const {
   TEST_SKIP_REASON,
   TEST_STATUS,
+  TEST_SOURCE_START,
   finishAllTraceSpans,
   getTestSuitePath,
   getTestSuiteCommonTags,
@@ -80,10 +81,10 @@ class CucumberPlugin extends CiPlugin {
       this.tracer._exporter.exportCoverage(formattedCoverage)
     })
 
-    this.addSub('ci:cucumber:test:start', ({ testName, fullTestSuite }) => {
+    this.addSub('ci:cucumber:test:start', ({ testName, fullTestSuite, testSourceLine }) => {
       const store = storage.getStore()
       const testSuite = getTestSuitePath(fullTestSuite, this.sourceRoot)
-      const testSpan = this.startTestSpan(testName, testSuite)
+      const testSpan = this.startTestSpan(testName, testSuite, testSourceLine)
 
       this.enter(testSpan, store)
     })
@@ -130,11 +131,12 @@ class CucumberPlugin extends CiPlugin {
     })
   }
 
-  startTestSpan (testName, testSuite) {
+  startTestSpan (testName, testSuite, testSourceLine) {
     return super.startTestSpan(
       testName,
       testSuite,
-      this.testSuiteSpan
+      this.testSuiteSpan,
+      { [TEST_SOURCE_START]: testSourceLine }
     )
   }
 }

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

@@ -16,6 +16,7 @@ const {
   TEST_SESSION_ID,
   TEST_COMMAND,
   TEST_MODULE,
+  TEST_SOURCE_START,
   finishAllTraceSpans
 } = require('../../dd-trace/src/plugins/util/test')
 
@@ -204,7 +205,7 @@ module.exports = (on, config) => {
       return activeSpan ? activeSpan.context().toTraceId() : null
     },
     'dd:afterEach': (test) => {
-      const { state, error, isRUMActive } = test
+      const { state, error, isRUMActive, testSourceLine } = test
       if (activeSpan) {
         activeSpan.setTag(TEST_STATUS, CYPRESS_STATUS_TO_TEST_STATUS[state])
         if (error) {
@@ -213,6 +214,9 @@ module.exports = (on, config) => {
         if (isRUMActive) {
           activeSpan.setTag(TEST_IS_RUM_ACTIVE, 'true')
         }
+        if (testSourceLine) {
+          activeSpan.setTag(TEST_SOURCE_START, testSourceLine)
+        }
         activeSpan.finish()
       }
       activeSpan = null

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

@@ -29,6 +29,10 @@ afterEach(() => {
       state: currentTest.state,
       error: currentTest.err,
     }
+    try {
+      testInfo.testSourceLine = Cypress.mocha.getRunner().currentRunnable.invocationDetails.line
+    } catch (e) {}
+
     if (win.DD_RUM) {
       testInfo.isRUMActive = true
     }

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

@@ -94,7 +94,7 @@ function errorHandler (err) {
   if (err) {
     span.addTags({
       [ERROR_TYPE]: err.name,
-      [ERROR_MESSAGE]: err.message,
+      [ERROR_MESSAGE]: err.message || err.code,
       [ERROR_STACK]: err.stack
     })
   } else {

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

@@ -9,7 +9,8 @@ const {
   addIntelligentTestRunnerSpanTags,
   TEST_PARAMETERS,
   TEST_COMMAND,
-  TEST_FRAMEWORK_VERSION
+  TEST_FRAMEWORK_VERSION,
+  TEST_SOURCE_START
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const id = require('../../dd-trace/src/id')
@@ -31,8 +32,11 @@ class JestPlugin extends CiPlugin {
       // Used to handle the end of a jest worker to be able to flush
       const handler = ([message]) => {
         if (message === CHILD_MESSAGE_END) {
-          this.testSuiteSpan.finish()
-          finishAllTraceSpans(this.testSuiteSpan)
+          // testSuiteSpan is not defined for older versions of jest, where jest-jasmine2 is still used
+          if (this.testSuiteSpan) {
+            this.testSuiteSpan.finish()
+            finishAllTraceSpans(this.testSuiteSpan)
+          }
           this.tracer._exporter.flush()
           process.removeListener('message', handler)
         }
@@ -187,12 +191,13 @@ class JestPlugin extends CiPlugin {
   }
 
   startTestSpan (test) {
-    const { suite, name, runner, testParameters, frameworkVersion } = test
+    const { suite, name, runner, testParameters, frameworkVersion, testStartLine } = test
 
     const extraTags = {
       [JEST_TEST_RUNNER]: runner,
       [TEST_PARAMETERS]: testParameters,
-      [TEST_FRAMEWORK_VERSION]: frameworkVersion
+      [TEST_FRAMEWORK_VERSION]: frameworkVersion,
+      [TEST_SOURCE_START]: testStartLine
     }
 
     return super.startTestSpan(name, suite, this.testSuiteSpan, extraTags)

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

@@ -10,7 +10,8 @@ const {
   getTestSuitePath,
   getTestParametersString,
   getTestSuiteCommonTags,
-  addIntelligentTestRunnerSpanTags
+  addIntelligentTestRunnerSpanTags,
+  TEST_SOURCE_START
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 
@@ -85,9 +86,9 @@ class MochaPlugin extends CiPlugin {
       }
     })
 
-    this.addSub('ci:mocha:test:start', (test) => {
+    this.addSub('ci:mocha:test:start', ({ test, testStartLine }) => {
       const store = storage.getStore()
-      const span = this.startTestSpan(test)
+      const span = this.startTestSpan(test, testStartLine)
 
       this.enter(span, store)
     })
@@ -153,7 +154,7 @@ class MochaPlugin extends CiPlugin {
     })
   }
 
-  startTestSpan (test) {
+  startTestSpan (test, testStartLine) {
     const testName = test.fullTitle()
     const { file: testSuiteAbsolutePath, title } = test
 
@@ -163,6 +164,10 @@ class MochaPlugin extends CiPlugin {
       extraTags[TEST_PARAMETERS] = testParametersString
     }
 
+    if (testStartLine) {
+      extraTags[TEST_SOURCE_START] = testStartLine
+    }
+
     const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.sourceRoot)
     const testSuiteSpan = this._testSuites.get(testSuiteAbsolutePath)
 

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

@@ -7,7 +7,8 @@ const {
   TEST_STATUS,
   finishAllTraceSpans,
   getTestSuitePath,
-  getTestSuiteCommonTags
+  getTestSuiteCommonTags,
+  TEST_SOURCE_START
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT } = require('../../dd-trace/src/constants')
@@ -64,10 +65,10 @@ class PlaywrightPlugin extends CiPlugin {
       span.finish()
     })
 
-    this.addSub('ci:playwright:test:start', ({ testName, testSuiteAbsolutePath }) => {
+    this.addSub('ci:playwright:test:start', ({ testName, testSuiteAbsolutePath, testSourceLine }) => {
       const store = storage.getStore()
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.rootDir)
-      const span = this.startTestSpan(testName, testSuite)
+      const span = this.startTestSpan(testName, testSuite, testSourceLine)
 
       this.enter(span, store)
     })
@@ -104,9 +105,9 @@ class PlaywrightPlugin extends CiPlugin {
     })
   }
 
-  startTestSpan (testName, testSuite) {
+  startTestSpan (testName, testSuite, testSourceLine) {
     const testSuiteSpan = this._testSuites.get(testSuite)
-    return super.startTestSpan(testName, testSuite, testSuiteSpan)
+    return super.startTestSpan(testName, testSuite, testSuiteSpan, { [TEST_SOURCE_START]: testSourceLine })
   }
 }
 

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

@@ -9,17 +9,19 @@ class RedisPlugin extends CachePlugin {
   static get system () { return 'redis' }
 
   start ({ db, command, args, connectionOptions = {}, connectionName }) {
-    if (!this.config.filter(command)) return this.skip()
+    const resource = command
+    const normalizedCommand = command.toUpperCase()
+    if (!this.config.filter(normalizedCommand)) return this.skip()
 
     this.startSpan('redis.command', {
       service: getService(this.config, connectionName),
-      resource: command,
+      resource,
       type: 'redis',
       kind: 'client',
       meta: {
         'db.type': 'redis',
         'db.name': db || '0',
-        'redis.raw_command': formatCommand(command, args),
+        'redis.raw_command': formatCommand(normalizedCommand, args),
         'out.host': connectionOptions.host,
         [CLIENT_PORT_KEY]: connectionOptions.port
       }
@@ -42,8 +44,6 @@ function getService (config, connectionName) {
 }
 
 function formatCommand (command, args) {
-  command = command.toUpperCase()
-
   if (!args || command === 'AUTH') return command
 
   for (let i = 0, l = args.length; i < l; i++) {
@@ -76,6 +76,11 @@ function trim (str, maxlen) {
 }
 
 function normalizeConfig (config) {
+  if (config.allowlist) uppercaseAllEntries(config.allowlist)
+  if (config.whitelist) uppercaseAllEntries(config.whitelist)
+  if (config.blocklist) uppercaseAllEntries(config.blocklist)
+  if (config.blacklist) uppercaseAllEntries(config.blacklist)
+
   const filter = urlFilter.getFilter(config)
 
   return Object.assign({}, config, {
@@ -83,4 +88,10 @@ function normalizeConfig (config) {
   })
 }
 
+function uppercaseAllEntries (entries) {
+  for (let i = 0; i < entries.length; i++) {
+    entries[i] = String(entries[i]).toUpperCase()
+  }
+}
+
 module.exports = RedisPlugin

package/packages/dd-trace/src/appsec/gateway/channels.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const dc = require('diagnostics_channel')
+const dc = require('../../../../diagnostics_channel')
 
 // TODO: use TBD naming convention
 //       or directly use http plugin's channels

package/packages/dd-trace/src/appsec/iast/index.js

@@ -3,7 +3,7 @@ const { enableAllAnalyzers, disableAllAnalyzers } = require('./analyzers')
 const web = require('../../plugins/util/web')
 const { storage } = require('../../../../datadog-core')
 const overheadController = require('./overhead-controller')
-const dc = require('diagnostics_channel')
+const dc = require('../../../../diagnostics_channel')
 const iastContextFunctions = require('./iast-context')
 const { enableTaintTracking, disableTaintTracking, createTransaction, removeTransaction } = require('./taint-tracking')
 

package/packages/dd-trace/src/appsec/iast/taint-tracking/operations.js

@@ -2,6 +2,7 @@
 
 const TaintedUtils = require('@datadog/native-iast-taint-tracking')
 const { IAST_TRANSACTION_ID } = require('../iast-context')
+const iastLog = require('../iast-log')
 const { TaintTracking, TaintTrackingDummy } = require('./taint-tracking-impl')
 
 function createTransaction (id, iastContext) {
@@ -37,20 +38,27 @@ function taintObject (iastContext, object, type) {
     const visited = new WeakSet()
     while (queue.length > 0) {
       const { parent, property, value } = queue.pop()
-      if (typeof value === 'string') {
-        const tainted = TaintedUtils.newTaintedString(transactionId, value, property, type)
-        if (!parent) {
-          result = tainted
-        } else {
-          parent[property] = tainted
-        }
-      } else if (typeof value === 'object' && !visited.has(value)) {
-        visited.add(value)
-        const keys = Object.keys(value)
-        for (let i = 0; i < keys.length; i++) {
-          const key = keys[i]
-          queue.push({ parent: value, property: property ? `${property}.${key}` : key, value: value[key] })
+      if (value === null) {
+        continue
+      }
+      try {
+        if (typeof value === 'string') {
+          const tainted = TaintedUtils.newTaintedString(transactionId, value, property, type)
+          if (!parent) {
+            result = tainted
+          } else {
+            parent[property] = tainted
+          }
+        } else if (typeof value === 'object' && !visited.has(value)) {
+          visited.add(value)
+          const keys = Object.keys(value)
+          for (let i = 0; i < keys.length; i++) {
+            const key = keys[i]
+            queue.push({ parent: value, property: property ? `${property}.${key}` : key, value: value[key] })
+          }
         }
+      } catch (e) {
+        iastLog.error(`Error visiting property : ${property}`).errorAndPublish(e)
       }
     }
   }

package/packages/dd-trace/src/appsec/iast/telemetry/logs.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const dc = require('diagnostics_channel')
+const dc = require('../../../../../diagnostics_channel')
 const logCollector = require('./log_collector')
 const { sendData } = require('../../../telemetry/send-data')
 const log = require('../../../log')

package/packages/dd-trace/src/appsec/remote_config/index.js

@@ -33,7 +33,7 @@ function enable (config) {
 }
 
 function enableAsmData (appsecConfig) {
-  if (rc && appsecConfig && appsecConfig.rules === undefined) {
+  if (rc && appsecConfig && !appsecConfig.customRulesProvided) {
     rc.updateCapabilities(RemoteConfigCapabilities.ASM_IP_BLOCKING, true)
     rc.updateCapabilities(RemoteConfigCapabilities.ASM_USER_BLOCKING, true)
     rc.on('ASM_DATA', _asmDataListener)