dd-trace 3.54.0 → 3.56.0

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

@@ -4,6 +4,16 @@ let knownTestsForSuite = []
 let suiteTests = []
 let earlyFlakeDetectionNumRetries = 0
 
+// If the test is using multi domain with cy.origin, trying to access
+// window properties will result in a cross origin error.
+function safeGetRum (window) {
+  try {
+    return window.DD_RUM
+  } catch (e) {
+    return null
+  }
+}
+
 function isNewTest (test) {
   return !knownTestsForSuite.includes(test.fullTitle())
 }
@@ -62,7 +72,7 @@ before(function () {
 
 after(() => {
   cy.window().then(win => {
-    if (win.DD_RUM) {
+    if (safeGetRum(win)) {
       win.dispatchEvent(new Event('beforeunload'))
     }
   })
@@ -84,9 +94,15 @@ afterEach(function () {
       testInfo.testSourceLine = Cypress.mocha.getRunner().currentRunnable.invocationDetails.line
     } catch (e) {}
 
-    if (win.DD_RUM) {
+    if (safeGetRum(win)) {
       testInfo.isRUMActive = true
     }
-    cy.task('dd:afterEach', { test: testInfo, coverage: win.__coverage__ })
+    let coverage
+    try {
+      coverage = win.__coverage__
+    } catch (e) {
+      // ignore error and continue
+    }
+    cy.task('dd:afterEach', { test: testInfo, coverage })
   })
 })

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

@@ -4,28 +4,34 @@ const HttpClientPlugin = require('../../datadog-plugin-http/src/client')
 
 class FetchPlugin extends HttpClientPlugin {
   static get id () { return 'fetch' }
-  static get prefix () { return 'apm:fetch:request' }
+  static get prefix () { return 'tracing:apm:fetch:request' }
 
-  addTraceSub (eventName, handler) {
-    this.addSub(`apm:${this.constructor.id}:${this.operation}:${eventName}`, handler)
-  }
-
-  bindStart (message) {
-    const req = message.req
+  bindStart (ctx) {
+    const req = ctx.req
     const options = new URL(req.url)
     const headers = options.headers = Object.fromEntries(req.headers.entries())
 
     options.method = req.method
 
-    message.args = { options }
+    ctx.args = { options }
 
-    const store = super.bindStart(message)
+    const store = super.bindStart(ctx)
 
-    message.headers = headers
-    message.req = new globalThis.Request(req, { headers })
+    ctx.headers = headers
+    ctx.req = new globalThis.Request(req, { headers })
 
     return store
   }
+
+  error (ctx) {
+    if (ctx.error.name === 'AbortError') return
+    return super.error(ctx)
+  }
+
+  asyncEnd (ctx) {
+    ctx.res = ctx.result
+    return this.finish(ctx)
+  }
 }
 
 module.exports = FetchPlugin

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

@@ -18,7 +18,8 @@ const {
   TEST_SOURCE_FILE,
   TEST_IS_NEW,
   TEST_IS_RETRY,
-  TEST_EARLY_FLAKE_IS_ENABLED,
+  TEST_EARLY_FLAKE_ENABLED,
+  TEST_EARLY_FLAKE_ABORT_REASON,
   JEST_DISPLAY_NAME
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
@@ -89,6 +90,7 @@ class JestPlugin extends CiPlugin {
       hasForcedToRunSuites,
       error,
       isEarlyFlakeDetectionEnabled,
+      isEarlyFlakeDetectionFaulty,
       onDone
     }) => {
       this.testSessionSpan.setTag(TEST_STATUS, status)
@@ -115,7 +117,10 @@ class JestPlugin extends CiPlugin {
       )
 
       if (isEarlyFlakeDetectionEnabled) {
-        this.testSessionSpan.setTag(TEST_EARLY_FLAKE_IS_ENABLED, 'true')
+        this.testSessionSpan.setTag(TEST_EARLY_FLAKE_ENABLED, 'true')
+      }
+      if (isEarlyFlakeDetectionFaulty) {
+        this.testSessionSpan.setTag(TEST_EARLY_FLAKE_ABORT_REASON, 'faulty')
       }
 
       this.testModuleSpan.finish()

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

@@ -20,7 +20,7 @@ const {
   removeEfdStringFromTestName,
   TEST_IS_NEW,
   TEST_IS_RETRY,
-  TEST_EARLY_FLAKE_IS_ENABLED
+  TEST_EARLY_FLAKE_ENABLED
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const {
@@ -144,10 +144,9 @@ class MochaPlugin extends CiPlugin {
 
     this.addSub('ci:mocha:test:finish', (status) => {
       const store = storage.getStore()
+      const span = store?.span
 
-      if (store && store.span) {
-        const span = store.span
-
+      if (span) {
         span.setTag(TEST_STATUS, status)
 
         span.finish()
@@ -223,7 +222,7 @@ class MochaPlugin extends CiPlugin {
         )
 
         if (isEarlyFlakeDetectionEnabled) {
-          this.testSessionSpan.setTag(TEST_EARLY_FLAKE_IS_ENABLED, 'true')
+          this.testSessionSpan.setTag(TEST_EARLY_FLAKE_ENABLED, 'true')
         }
 
         this.testModuleSpan.finish()

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

@@ -1,6 +1,7 @@
 'use strict'
 
-const { DogStatsDClient, NoopDogStatsDClient } = require('../../dd-trace/src/dogstatsd')
+const { DogStatsDClient } = require('../../dd-trace/src/dogstatsd')
+const NoopDogStatsDClient = require('../../dd-trace/src/noop/dogstatsd')
 const { ExternalLogger, NoopExternalLogger } = require('../../dd-trace/src/external-logger/src')
 
 const FLUSH_INTERVAL = 10 * 1000

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

@@ -14,7 +14,7 @@ const {
   TEST_CONFIGURATION_BROWSER_NAME,
   TEST_IS_NEW,
   TEST_IS_RETRY,
-  TEST_EARLY_FLAKE_IS_ENABLED
+  TEST_EARLY_FLAKE_ENABLED
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT } = require('../../dd-trace/src/constants')
@@ -41,7 +41,7 @@ class PlaywrightPlugin extends CiPlugin {
       this.testSessionSpan.setTag(TEST_STATUS, status)
 
       if (isEarlyFlakeDetectionEnabled) {
-        this.testSessionSpan.setTag(TEST_EARLY_FLAKE_IS_ENABLED, 'true')
+        this.testSessionSpan.setTag(TEST_EARLY_FLAKE_ENABLED, 'true')
       }
 
       if (this.numFailedSuites > 0) {

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

@@ -0,0 +1,71 @@
+const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
+const { storage } = require('../../datadog-core')
+
+const {
+  TEST_IS_RUM_ACTIVE,
+  TEST_BROWSER_DRIVER,
+  TEST_BROWSER_DRIVER_VERSION,
+  TEST_BROWSER_NAME,
+  TEST_BROWSER_VERSION,
+  TEST_TYPE
+} = require('../../dd-trace/src/plugins/util/test')
+const { SPAN_TYPE } = require('../../../ext/tags')
+
+function isTestSpan (span) {
+  return span.context()._tags[SPAN_TYPE] === 'test'
+}
+
+function getTestSpanFromTrace (trace) {
+  for (const span of trace.started) {
+    if (isTestSpan(span)) {
+      return span
+    }
+  }
+  return null
+}
+
+class SeleniumPlugin extends CiPlugin {
+  static get id () {
+    return 'selenium'
+  }
+
+  constructor (...args) {
+    super(...args)
+
+    this.addSub('ci:selenium:driver:get', ({
+      setTraceId,
+      seleniumVersion,
+      browserName,
+      browserVersion,
+      isRumActive
+    }) => {
+      const store = storage.getStore()
+      const span = store?.span
+      if (!span) {
+        return
+      }
+      let testSpan
+      if (isTestSpan(span)) {
+        testSpan = span
+      } else {
+        testSpan = getTestSpanFromTrace(span.context()._trace)
+      }
+      if (!testSpan) {
+        return
+      }
+      if (setTraceId) {
+        setTraceId(testSpan.context().toTraceId())
+      }
+      if (isRumActive) {
+        testSpan.setTag(TEST_IS_RUM_ACTIVE, 'true')
+      }
+      testSpan.setTag(TEST_BROWSER_DRIVER, 'selenium')
+      testSpan.setTag(TEST_BROWSER_DRIVER_VERSION, seleniumVersion)
+      testSpan.setTag(TEST_BROWSER_NAME, browserName)
+      testSpan.setTag(TEST_BROWSER_VERSION, browserVersion)
+      testSpan.setTag(TEST_TYPE, 'browser')
+    })
+  }
+}
+
+module.exports = SeleniumPlugin

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

@@ -2,6 +2,7 @@
 
 module.exports = {
   COMMAND_INJECTION_ANALYZER: require('./command-injection-analyzer'),
+  HARCODED_PASSWORD_ANALYZER: require('./hardcoded-password-analyzer'),
   HARCODED_SECRET_ANALYZER: require('./hardcoded-secret-analyzer'),
   HEADER_INJECTION_ANALYZER: require('./header-injection-analyzer'),
   HSTS_HEADER_MISSING_ANALYZER: require('./hsts-header-missing-analyzer'),

package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-base-analyzer.js

@@ -0,0 +1,70 @@
+'use strict'
+
+const Analyzer = require('./vulnerability-analyzer')
+const { getRelativePath } = require('../path-line')
+
+class HardcodedBaseAnalyzer extends Analyzer {
+  constructor (type, allRules = [], valueOnlyRules = []) {
+    super(type)
+
+    this.allRules = allRules
+    this.valueOnlyRules = valueOnlyRules
+  }
+
+  onConfigure () {
+    this.addSub('datadog:secrets:result', (secrets) => { this.analyze(secrets) })
+  }
+
+  analyze (secrets) {
+    if (!secrets?.file || !secrets.literals) return
+
+    const { allRules, valueOnlyRules } = this
+
+    const matches = []
+    for (const literal of secrets.literals) {
+      const { value, locations } = literal
+      if (!value || !locations) continue
+
+      for (const location of locations) {
+        let match
+        if (location.ident) {
+          const fullValue = `${location.ident}=${value}`
+          match = allRules.find(rule => fullValue.match(rule.regex))
+        } else {
+          match = valueOnlyRules.find(rule => value.match(rule.regex))
+        }
+
+        if (match) {
+          matches.push({ location, ruleId: match.id })
+        }
+      }
+    }
+
+    if (matches.length) {
+      const file = getRelativePath(secrets.file)
+
+      matches
+        .forEach(match => this._report({
+          file,
+          line: match.location.line,
+          column: match.location.column,
+          data: match.ruleId
+        }))
+    }
+  }
+
+  _getEvidence (value) {
+    return { value: `${value.data}` }
+  }
+
+  _getLocation (value) {
+    return {
+      path: value.file,
+      line: value.line,
+      column: value.column,
+      isInternal: false
+    }
+  }
+}
+
+module.exports = HardcodedBaseAnalyzer

package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-password-analyzer.js

@@ -0,0 +1,14 @@
+'use strict'
+
+const { HARDCODED_PASSWORD } = require('../vulnerabilities')
+const HardcodedBaseAnalyzer = require('./hardcoded-base-analyzer')
+
+const allRules = require('./hardcoded-password-rules')
+
+class HardcodedPasswordAnalyzer extends HardcodedBaseAnalyzer {
+  constructor () {
+    super(HARDCODED_PASSWORD, allRules)
+  }
+}
+
+module.exports = new HardcodedPasswordAnalyzer()

package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-password-rules.js

@@ -0,0 +1,12 @@
+/* eslint-disable max-len */
+'use strict'
+
+const { NameAndValue } = require('./hardcoded-rule-type')
+
+module.exports = [
+  {
+    id: 'hardcoded-password',
+    regex: /(?:pwd|pswd|pass|secret)(?:[0-9a-z\-_\t.]{0,20})(?:[\s|']|[\s|""]){0,3}(?:=|>|:{1,3}=|\|\|:|<=|=>|:|\?=)(?:'|""|\s|=|\x60){0,5}([0-9a-z\-_.=]{10,150})(?:['"\s\x60;]|$)/i,
+    type: NameAndValue
+  }
+]

package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-rule-type.js

@@ -0,0 +1,6 @@
+'use strict'
+
+module.exports = {
+  ValueOnly: 'ValueOnly',
+  NameAndValue: 'NameAndValue'
+}

package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-secret-analyzer.js

@@ -1,59 +1,14 @@
 'use strict'
 
-const Analyzer = require('./vulnerability-analyzer')
 const { HARDCODED_SECRET } = require('../vulnerabilities')
-const { getRelativePath } = require('../path-line')
+const HardcodedBaseAnalyzer = require('./hardcoded-base-analyzer')
+const { ValueOnly } = require('./hardcoded-rule-type')
 
-const secretRules = require('./hardcoded-secrets-rules')
+const allRules = require('./hardcoded-secret-rules')
 
-class HardcodedSecretAnalyzer extends Analyzer {
+class HardcodedSecretAnalyzer extends HardcodedBaseAnalyzer {
   constructor () {
-    super(HARDCODED_SECRET)
-  }
-
-  onConfigure () {
-    this.addSub('datadog:secrets:result', (secrets) => { this.analyze(secrets) })
-  }
-
-  analyze (secrets) {
-    if (!secrets?.file || !secrets.literals) return
-
-    const matches = secrets.literals
-      .filter(literal => literal.value && literal.locations?.length)
-      .map(literal => {
-        const match = secretRules.find(rule => literal.value.match(rule.regex))
-
-        return match ? { locations: literal.locations, ruleId: match.id } : undefined
-      })
-      .filter(match => !!match)
-
-    if (matches.length) {
-      const file = getRelativePath(secrets.file)
-
-      matches.forEach(match => {
-        match.locations
-          .filter(location => location.line)
-          .forEach(location => this._report({
-            file,
-            line: location.line,
-            column: location.column,
-            data: match.ruleId
-          }))
-      })
-    }
-  }
-
-  _getEvidence (value) {
-    return { value: `${value.data}` }
-  }
-
-  _getLocation (value) {
-    return {
-      path: value.file,
-      line: value.line,
-      column: value.column,
-      isInternal: false
-    }
+    super(HARDCODED_SECRET, allRules, allRules.filter(rule => rule.type === ValueOnly))
   }
 }