dd-trace 5.67.0 → 5.68.0

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

@@ -482,8 +482,12 @@ class CypressPlugin {
         this.isEarlyFlakeDetectionEnabled = false
         this.isKnownTestsEnabled = false
       } else {
-        // We use TEST_FRAMEWORK_NAME for the name of the module
-        this.knownTestsByTestSuite = knownTestsResponse.knownTests[TEST_FRAMEWORK_NAME]
+        if (knownTestsResponse.knownTests[TEST_FRAMEWORK_NAME]) {
+          this.knownTestsByTestSuite = knownTestsResponse.knownTests[TEST_FRAMEWORK_NAME]
+        } else {
+          this.isEarlyFlakeDetectionEnabled = false
+          this.isKnownTestsEnabled = false
+        }
       }
     }
 

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

@@ -26,6 +26,10 @@ function safeGetRum (window) {
 }
 
 function isNewTest (test) {
+  // If for whatever reason the worker does not receive valid known tests, we don't consider it as new
+  if (!Array.isArray(knownTestsForSuite)) {
+    return false
+  }
   return !knownTestsForSuite.includes(test.fullTitle())
 }
 

package/packages/datadog-plugin-express/src/code_origin.js

@@ -15,7 +15,7 @@ class ExpressCodeOriginForSpansPlugin extends Plugin {
     this.addSub('apm:express:middleware:enter', ({ req, layer }) => {
       const tags = layerTags.get(layer)
       if (!tags) return
-      web.getContext(req).span?.addTags(tags)
+      web.getContext(req)?.span?.addTags(tags)
     })
 
     this.addSub('apm:express:route:added', ({ topOfStackFunc, layer }) => {
@@ -26,7 +26,7 @@ class ExpressCodeOriginForSpansPlugin extends Plugin {
     this.addSub('apm:router:middleware:enter', ({ req, layer }) => {
       const tags = layerTags.get(layer)
       if (!tags) return
-      web.getContext(req).span?.addTags(tags)
+      web.getContext(req)?.span?.addTags(tags)
     })
 
     this.addSub('apm:router:route:added', ({ topOfStackFunc, layer }) => {

package/packages/datadog-plugin-fastify/src/code_origin.js

@@ -15,8 +15,7 @@ class FastifyCodeOriginForSpansPlugin extends Plugin {
     this.addSub('apm:fastify:request:handle', ({ req, routeConfig }) => {
       const tags = routeConfig?.[kCodeOriginForSpansTagsSym]
       if (!tags) return
-      const context = web.getContext(req)
-      context.span?.addTags(tags)
+      web.getContext(req)?.span?.addTags(tags)
     })
 
     this.addSub('apm:fastify:route:added', ({ routeOptions, onRoute }) => {

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

@@ -261,21 +261,6 @@ class JestPlugin extends CiPlugin {
       }
     })
 
-    this.addSub('ci:jest:worker-report:trace', traces => {
-      const formattedTraces = JSON.parse(traces).map(trace =>
-        trace.map(span => ({
-          ...span,
-          span_id: id(span.span_id),
-          trace_id: id(span.trace_id),
-          parent_id: id(span.parent_id)
-        }))
-      )
-
-      formattedTraces.forEach(trace => {
-        this.tracer._exporter.export(trace)
-      })
-    })
-
     this.addSub('ci:jest:worker-report:coverage', data => {
       const formattedCoverages = JSON.parse(data).map(coverage => ({
         sessionId: id(coverage.sessionId),
@@ -287,12 +272,6 @@ class JestPlugin extends CiPlugin {
       })
     })
 
-    this.addSub('ci:jest:worker-report:logs', (logsPayloads) => {
-      JSON.parse(logsPayloads).forEach(({ testConfiguration, logMessage }) => {
-        this.tracer._exporter.exportDiLogs(testConfiguration, logMessage)
-      })
-    })
-
     this.addSub('ci:jest:test-suite:finish', ({ status, errorMessage, error }) => {
       this.testSuiteSpan.setTag(TEST_STATUS, status)
       if (error) {

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

@@ -22,12 +22,6 @@ const {
   TEST_IS_RETRY,
   TEST_EARLY_FLAKE_ENABLED,
   TEST_EARLY_FLAKE_ABORT_REASON,
-  TEST_SESSION_ID,
-  TEST_MODULE_ID,
-  TEST_MODULE,
-  TEST_SUITE_ID,
-  TEST_COMMAND,
-  TEST_SUITE,
   MOCHA_IS_PARALLEL,
   TEST_IS_RUM_ACTIVE,
   TEST_BROWSER_DRIVER,
@@ -54,32 +48,15 @@ const {
   TELEMETRY_CODE_COVERAGE_NUM_FILES,
   TELEMETRY_TEST_SESSION
 } = require('../../dd-trace/src/ci-visibility/telemetry')
-const id = require('../../dd-trace/src/id')
-const log = require('../../dd-trace/src/log')
 
 const BREAKPOINT_SET_GRACE_PERIOD_MS = 200
 
-function getTestSuiteLevelVisibilityTags (testSuiteSpan) {
-  const testSuiteSpanContext = testSuiteSpan.context()
-  const suiteTags = {
-    [TEST_SUITE_ID]: testSuiteSpanContext.toSpanId(),
-    [TEST_SESSION_ID]: testSuiteSpanContext.toTraceId(),
-    [TEST_COMMAND]: testSuiteSpanContext._tags[TEST_COMMAND],
-    [TEST_MODULE]: 'mocha'
-  }
-  if (testSuiteSpanContext._parentId) {
-    suiteTags[TEST_MODULE_ID] = testSuiteSpanContext._parentId.toString(10)
-  }
-  return suiteTags
-}
-
 class MochaPlugin extends CiPlugin {
   static id = 'mocha'
 
   constructor (...args) {
     super(...args)
 
-    this._testSuites = new Map()
     this._testTitleToParams = {}
     this.sourceRoot = process.cwd()
 
@@ -88,7 +65,7 @@ class MochaPlugin extends CiPlugin {
         return
       }
       const testSuite = getTestSuitePath(suiteFile, this.sourceRoot)
-      const testSuiteSpan = this._testSuites.get(testSuite)
+      const testSuiteSpan = this._testSuiteSpansByTestSuite.get(testSuite)
 
       if (!coverageFiles.length) {
         this.telemetry.count(TELEMETRY_CODE_COVERAGE_EMPTY)
@@ -163,7 +140,7 @@ class MochaPlugin extends CiPlugin {
       const store = storage('legacy').getStore()
       ctx.parentStore = store
       ctx.currentStore = { ...store, testSuiteSpan }
-      this._testSuites.set(testSuite, testSuiteSpan)
+      this._testSuiteSpansByTestSuite.set(testSuite, testSuiteSpan)
     })
 
     this.addSub('ci:mocha:test-suite:finish', ({ testSuiteSpan, status }) => {
@@ -436,37 +413,6 @@ class MochaPlugin extends CiPlugin {
       this.tracer._exporter.flush()
     })
 
-    this.addSub('ci:mocha:worker-report:trace', (traces) => {
-      const formattedTraces = JSON.parse(traces).map(trace =>
-        trace.map(span => {
-          const formattedSpan = {
-            ...span,
-            span_id: id(span.span_id),
-            trace_id: id(span.trace_id),
-            parent_id: id(span.parent_id)
-          }
-          if (formattedSpan.name === 'mocha.test') {
-            const testSuite = span.meta[TEST_SUITE]
-            const testSuiteSpan = this._testSuites.get(testSuite)
-            if (!testSuiteSpan) {
-              log.warn('Test suite span not found for test span with test suite', testSuite)
-              return formattedSpan
-            }
-            const suiteTags = getTestSuiteLevelVisibilityTags(testSuiteSpan)
-            formattedSpan.meta = {
-              ...formattedSpan.meta,
-              ...suiteTags
-            }
-          }
-          return formattedSpan
-        })
-      )
-
-      formattedTraces.forEach(trace => {
-        this.tracer._exporter.export(trace)
-      })
-    })
-
     this.addBind('ci:mocha:global:run', (ctx) => {
       return ctx.currentStore
     })
@@ -522,7 +468,7 @@ class MochaPlugin extends CiPlugin {
     }
 
     const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.sourceRoot)
-    const testSuiteSpan = this._testSuites.get(testSuite)
+    const testSuiteSpan = this._testSuiteSpansByTestSuite.get(testSuite)
 
     extraTags[TEST_SOURCE_FILE] = this.repositoryRoot !== this.sourceRoot && !!this.repositoryRoot
       ? getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)

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

@@ -2,7 +2,6 @@
 
 const { isTrue } = require('../../dd-trace/src/util')
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
-const coalesce = require('koalas')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 class MongodbCorePlugin extends DatabasePlugin {
@@ -17,16 +16,13 @@ class MongodbCorePlugin extends DatabasePlugin {
 
     const heartbeatFromEnv = getEnvironmentVariable('DD_TRACE_MONGODB_HEARTBEAT_ENABLED')
 
-    this.config.heartbeatEnabled = coalesce(
-      config.heartbeatEnabled,
-      heartbeatFromEnv && isTrue(heartbeatFromEnv),
+    this.config.heartbeatEnabled = config.heartbeatEnabled ??
+      (heartbeatFromEnv && isTrue(heartbeatFromEnv)) ??
       true
-    )
   }
 
   bindStart (ctx) {
     const { ns, ops, options = {}, name } = ctx
-
     // heartbeat commands can be disabled if this.config.heartbeatEnabled is false
     if (!this.config.heartbeatEnabled && isHeartbeat(ops, this.config)) {
       return
@@ -90,11 +86,28 @@ function sanitizeBigInt (data) {
   return JSON.stringify(data, (_key, value) => typeof value === 'bigint' ? value.toString() : value)
 }
 
+function extractQuery (statements) {
+  if (statements.length === 1 && statements[0].q) return statements[0].q
+
+  const extractedQueries = []
+  for (let i = 0; i < statements.length; i++) {
+    if (statements[i].q) {
+      extractedQueries.push(limitDepth(statements[i].q))
+    }
+  }
+
+  return extractedQueries
+}
+
 function getQuery (cmd) {
-  if (!cmd || typeof cmd !== 'object' || Array.isArray(cmd)) return
+  if (!cmd || (typeof cmd !== 'object' && !Array.isArray(cmd))) return
+
+  if (Array.isArray(cmd)) return sanitizeBigInt(extractQuery(cmd))
   if (cmd.query) return sanitizeBigInt(limitDepth(cmd.query))
   if (cmd.filter) return sanitizeBigInt(limitDepth(cmd.filter))
   if (cmd.pipeline) return sanitizeBigInt(limitDepth(cmd.pipeline))
+  if (cmd.deletes) return sanitizeBigInt(extractQuery(cmd.deletes))
+  if (cmd.updates) return sanitizeBigInt(extractQuery(cmd.updates))
 }
 
 function getResource (plugin, ns, query, operationName) {

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

@@ -17,6 +17,7 @@ const {
   TEST_IS_NEW,
   TEST_IS_RETRY,
   TEST_EARLY_FLAKE_ENABLED,
+  TEST_EARLY_FLAKE_ABORT_REASON,
   TELEMETRY_TEST_SESSION,
   TEST_RETRY_REASON,
   TEST_MANAGEMENT_IS_QUARANTINED,
@@ -53,7 +54,7 @@ class PlaywrightPlugin extends CiPlugin {
   constructor (...args) {
     super(...args)
 
-    this._testSuites = new Map()
+    this._testSuiteSpansByTestSuiteAbsolutePath = new Map()
     this.numFailedTests = 0
     this.numFailedSuites = 0
 
@@ -70,6 +71,7 @@ class PlaywrightPlugin extends CiPlugin {
     this.addSub('ci:playwright:session:finish', ({
       status,
       isEarlyFlakeDetectionEnabled,
+      isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
       onDone
     }) => {
@@ -79,7 +81,9 @@ class PlaywrightPlugin extends CiPlugin {
       if (isEarlyFlakeDetectionEnabled) {
         this.testSessionSpan.setTag(TEST_EARLY_FLAKE_ENABLED, 'true')
       }
-
+      if (isEarlyFlakeDetectionFaulty) {
+        this.testSessionSpan.setTag(TEST_EARLY_FLAKE_ABORT_REASON, 'faulty')
+      }
       if (this.numFailedSuites > 0) {
         let errorMessage = `Test suites failed: ${this.numFailedSuites}.`
         if (this.numFailedTests > 0) {
@@ -142,7 +146,7 @@ class PlaywrightPlugin extends CiPlugin {
       ctx.parentStore = store
       ctx.currentStore = { ...store, testSuiteSpan }
 
-      this._testSuites.set(testSuiteAbsolutePath, testSuiteSpan)
+      this._testSuiteSpansByTestSuiteAbsolutePath.set(testSuiteAbsolutePath, testSuiteSpan)
 
       return ctx.currentStore
     })
@@ -247,7 +251,9 @@ class PlaywrightPlugin extends CiPlugin {
             formattedSpan.meta[TEST_COMMAND] = this.command
             formattedSpan.meta[TEST_MODULE] = this.constructor.id
             // MISSING _trace.startTime and _trace.ticks - because by now the suite is already serialized
-            const testSuite = this._testSuites.get(formattedSpan.meta.test_suite_absolute_path)
+            const testSuite = this._testSuiteSpansByTestSuiteAbsolutePath.get(
+              formattedSpan.meta.test_suite_absolute_path
+            )
             if (testSuite) {
               formattedSpan.meta[TEST_SUITE_ID] = testSuite.context().toSpanId()
             }
@@ -391,7 +397,7 @@ class PlaywrightPlugin extends CiPlugin {
 
   // TODO: this runs both in worker and main process (main process: skipped tests that do not go through _runTest)
   startTestSpan (testName, testSuiteAbsolutePath, testSuite, testSourceFile, testSourceLine, browserName) {
-    const testSuiteSpan = this._testSuites.get(testSuiteAbsolutePath)
+    const testSuiteSpan = this._testSuiteSpansByTestSuiteAbsolutePath.get(testSuiteAbsolutePath)
 
     const extraTags = {
       [TEST_SOURCE_START]: testSourceLine

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

@@ -55,8 +55,12 @@ class VitestPlugin extends CiPlugin {
     this.taskToFinishTime = new WeakMap()
 
     this.addSub('ci:vitest:test:is-new', ({ knownTests, testSuiteAbsolutePath, testName, onDone }) => {
+      // if for whatever reason the worker does not receive valid known tests, we don't consider it as new
+      if (!knownTests.vitest) {
+        return onDone(false)
+      }
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
-      const testsForThisTestSuite = knownTests[testSuite] || []
+      const testsForThisTestSuite = knownTests.vitest[testSuite] || []
       onDone(!testsForThisTestSuite.includes(testName))
     })
 

package/packages/datadog-plugin-ws/src/close.js

@@ -60,7 +60,7 @@ class WSClosePlugin extends TracingPlugin {
   end (ctx) {
     if (!Object.hasOwn(ctx, 'result')) return
 
-    if (ctx.socket.spanContext) ctx.span.addLink(ctx.socket.spanContext)
+    if (ctx.socket.spanContext) ctx.span.addLink({ context: ctx.socket.spanContext })
 
     ctx.span.finish()
   }

package/packages/datadog-plugin-ws/src/producer.js

@@ -50,7 +50,12 @@ class WSProducerPlugin extends TracingPlugin {
   end (ctx) {
     if (!Object.hasOwn(ctx, 'result')) return
 
-    if (ctx.socket.spanContext) ctx.span.addLink(ctx.socket.spanContext, { 'dd.kind': 'resuming' })
+    if (ctx.socket.spanContext) {
+      ctx.span.addLink({
+        context: ctx.socket.spanContext,
+        attributes: { 'dd.kind': 'resuming' },
+      })
+    }
 
     ctx.span.finish()
     return ctx.parentStore

package/packages/datadog-plugin-ws/src/receiver.js

@@ -60,7 +60,12 @@ class WSReceiverPlugin extends TracingPlugin {
   end (ctx) {
     if (!Object.hasOwn(ctx, 'result')) return
 
-    if (ctx.socket.spanContext) ctx.span.addLink(ctx.socket.spanContext, { 'dd.kind': 'executed_by' })
+    if (ctx.socket.spanContext) {
+      ctx.span.addLink({
+        context: ctx.socket.spanContext,
+        attributes: { 'dd.kind': 'executed_by' },
+      })
+    }
 
     ctx.span.finish()
     return ctx.parentStore

package/packages/dd-trace/src/appsec/iast/security-controls/parser.js

@@ -15,7 +15,7 @@ const validTypes = new Set([INPUT_VALIDATOR_TYPE, SANITIZER_TYPE])
 function parse (securityControlsConfiguration) {
   const controls = new Map()
 
-  securityControlsConfiguration?.replace(/[\r\n\t\v\f]*/g, '')
+  securityControlsConfiguration?.replaceAll(/[\r\n\t\v\f]*/g, '')
     .split(SECURITY_CONTROL_DELIMITER)
     .map(parseControl)
     .filter(control => !!control)

package/packages/dd-trace/src/appsec/telemetry/waf.js

@@ -96,7 +96,7 @@ function incrementWafInit (wafVersion, rulesVersion, success) {
   appsecMetrics.count('waf.init', { ...versionsTags, success }).inc()
 
   if (!success) {
-    appsecMetrics.count('waf.config_errors', versionsTags).inc()
+    appsecMetrics.count('waf.config_errors', { ...versionsTags, action: 'init' }).inc()
   }
 }
 
@@ -107,7 +107,7 @@ function incrementWafUpdates (wafVersion, rulesVersion, success) {
 
 function incrementWafConfigErrors (wafVersion, rulesVersion) {
   const versionsTags = getVersionsTags(wafVersion, rulesVersion)
-  appsecMetrics.count('waf.config_errors', versionsTags).inc()
+  appsecMetrics.count('waf.config_errors', { ...versionsTags, action: 'update' }).inc()
 }
 
 function incrementWafRequests (store) {

package/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js

@@ -287,11 +287,11 @@ class CiVisibilityExporter extends AgentInfoExporter {
     this._export(formattedCoverage, this._coverageWriter, '_coverageTimer')
   }
 
-  formatLogMessage (testConfiguration, logMessage) {
+  formatLogMessage (testEnvironmentMetadata, logMessage) {
     const {
       [GIT_REPOSITORY_URL]: gitRepositoryUrl,
       [GIT_COMMIT_SHA]: gitCommitSha
-    } = testConfiguration
+    } = testEnvironmentMetadata
 
     const { service, env, version } = this._config
 
@@ -315,14 +315,14 @@ class CiVisibilityExporter extends AgentInfoExporter {
   }
 
   // DI logs
-  exportDiLogs (testConfiguration, logMessage) {
+  exportDiLogs (testEnvironmentMetadata, logMessage) {
     // TODO: could we lose logs if it's not initialized?
     if (!this._config.isTestDynamicInstrumentationEnabled || !this._isInitialized || !this._canForwardLogs) {
       return
     }
 
     this._export(
-      this.formatLogMessage(testConfiguration, logMessage),
+      this.formatLogMessage(testEnvironmentMetadata, logMessage),
       this._logsWriter,
       '_logsTimer'
     )

package/packages/dd-trace/src/ci-visibility/exporters/test-worker/index.js

@@ -7,7 +7,9 @@ const {
   CUCUMBER_WORKER_TRACE_PAYLOAD_CODE,
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,
   JEST_WORKER_LOGS_PAYLOAD_CODE,
-  PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE
+  PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE,
+  VITEST_WORKER_TRACE_PAYLOAD_CODE,
+  VITEST_WORKER_LOGS_PAYLOAD_CODE
 } = require('../../../plugins/util/test')
 const { getEnvironmentVariable } = require('../../../config-helper')
 
@@ -24,6 +26,9 @@ function getInterprocessTraceCode () {
   if (getEnvironmentVariable('DD_PLAYWRIGHT_WORKER')) {
     return PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE
   }
+  if (getEnvironmentVariable('TINYPOOL_WORKER_ID')) {
+    return VITEST_WORKER_TRACE_PAYLOAD_CODE
+  }
   return null
 }
 
@@ -39,6 +44,9 @@ function getInterprocessLogsCode () {
   if (getEnvironmentVariable('JEST_WORKER_ID')) {
     return JEST_WORKER_LOGS_PAYLOAD_CODE
   }
+  if (getEnvironmentVariable('TINYPOOL_WORKER_ID')) {
+    return VITEST_WORKER_LOGS_PAYLOAD_CODE
+  }
   return null
 }
 
@@ -66,8 +74,8 @@ class TestWorkerCiVisibilityExporter {
     this._coverageWriter.append(formattedCoverage)
   }
 
-  exportDiLogs (testConfiguration, logMessage) {
-    this._logsWriter.append({ testConfiguration, logMessage })
+  exportDiLogs (testEnvironmentMetadata, logMessage) {
+    this._logsWriter.append({ testEnvironmentMetadata, logMessage })
   }
 
   // TODO: add to other writers

package/packages/dd-trace/src/ci-visibility/exporters/test-worker/writer.js

@@ -1,5 +1,6 @@
 'use strict'
 const { JSONEncoder } = require('../../encode/json-encoder')
+const { getEnvironmentVariable } = require('../../../config-helper')
 
 class Writer {
   constructor (interprocessCode) {
@@ -34,9 +35,17 @@ class Writer {
     // See cucumber code:
     // https://github.com/cucumber/cucumber-js/blob/5ce371870b677fe3d1a14915dc535688946f734c/src/runtime/parallel/run_worker.ts#L13
     if (process.send) { // it only works if process.send is available
-      process.send([this._interprocessCode, data], () => {
+      const isVitestWorker = !!getEnvironmentVariable('TINYPOOL_WORKER_ID')
+
+      const payload = isVitestWorker
+        ? { __tinypool_worker_message__: true, interprocessCode: this._interprocessCode, data }
+        : [this._interprocessCode, data]
+
+      process.send(payload, () => {
         onDone()
       })
+    } else {
+      onDone()
     }
   }
 }