dd-trace 5.96.0 → 5.97.0

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

@@ -1,5 +1,9 @@
 'use strict'
 
+// Capture real timers at module load time, before any test can install fake timers.
+const realDateNow = Date.now.bind(Date)
+const realSetTimeout = setTimeout
+
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
 const { getEnvironmentVariable, getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
@@ -229,7 +233,7 @@ class CucumberPlugin extends CiPlugin {
       // Time we give the breakpoint to be hit
       if (promises && this.runningTestProbe) {
         promises.hitBreakpointPromise = new Promise((resolve) => {
-          setTimeout(resolve, BREAKPOINT_HIT_GRACE_PERIOD_MS)
+          realSetTimeout(resolve, BREAKPOINT_HIT_GRACE_PERIOD_MS)
         })
       }
 
@@ -252,8 +256,8 @@ class CucumberPlugin extends CiPlugin {
           const { file, line, stackIndex } = probeInformation
           this.runningTestProbe = { file, line }
           this.testErrorStackIndex = stackIndex
-          const waitUntil = Date.now() + BREAKPOINT_SET_GRACE_PERIOD_MS
-          while (Date.now() < waitUntil) {
+          const waitUntil = realDateNow() + BREAKPOINT_SET_GRACE_PERIOD_MS
+          while (realDateNow() < waitUntil) {
             // TODO: To avoid a race condition, we should wait until `probeInformation.setProbePromise` has resolved.
             // However, Cucumber doesn't have a mechanism for waiting asyncrounously here, so for now, we'll have to
             // fall back to a fixed syncronous delay.

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

@@ -307,10 +307,55 @@ class CypressPlugin {
     }
   }
 
+  /**
+   * Resets state that is scoped to a single Cypress run so the singleton plugin
+   * can be reused safely across multiple programmatic cypress.run() calls.
+   *
+   * @returns {void}
+   */
+  resetRunState () {
+    this._isInit = false
+    this.finishedTestsByFile = {}
+    this.testStatuses = {}
+    this.isTestsSkipped = false
+    this.isSuitesSkippingEnabled = false
+    this.isCodeCoverageEnabled = false
+    this.isFlakyTestRetriesEnabled = false
+    this.flakyTestRetriesCount = 0
+    this.isEarlyFlakeDetectionEnabled = false
+    this.isKnownTestsEnabled = false
+    this.earlyFlakeDetectionNumRetries = 0
+    this.testsToSkip = []
+    this.skippedTests = []
+    this.hasForcedToRunSuites = false
+    this.hasUnskippableSuites = false
+    this.unskippableSuites = []
+    this.knownTests = []
+    this.knownTestsByTestSuite = undefined
+    this.isTestManagementTestsEnabled = false
+    this.testManagementAttemptToFixRetries = 0
+    this.testManagementTests = undefined
+    this.isImpactedTestsEnabled = false
+    this.modifiedFiles = []
+    this.activeTestSpan = null
+    this.testSuiteSpan = null
+    this.testModuleSpan = null
+    this.testSessionSpan = null
+    this.command = undefined
+    this.frameworkVersion = undefined
+    this.rootDir = undefined
+    this.itrCorrelationId = undefined
+    this.isTestIsolationEnabled = undefined
+    this.rumFlushWaitMillis = undefined
+    this._pendingRequestErrorTags = []
+    this.libraryConfigurationPromise = undefined
+  }
+
   // Init function returns a promise that resolves with the Cypress configuration
   // Depending on the received configuration, the Cypress configuration can be modified:
   // for example, to enable retries for failed tests.
   init (tracer, cypressConfig) {
+    this.resetRunState()
     this._isInit = true
     this.tracer = tracer
     this.cypressConfig = cypressConfig
@@ -694,20 +739,27 @@ class CypressPlugin {
     }
 
     return new Promise(resolve => {
+      const finishAfterRun = () => {
+        this._isInit = false
+        appClosingTelemetry()
+        resolve(null)
+      }
+
       const exporter = this.tracer._tracer._exporter
       if (!exporter) {
-        return resolve(null)
+        finishAfterRun()
+        return
       }
       if (exporter.flush) {
         exporter.flush(() => {
-          appClosingTelemetry()
-          resolve(null)
+          finishAfterRun()
         })
       } else if (exporter._writer) {
         exporter._writer.flush(() => {
-          appClosingTelemetry()
-          resolve(null)
+          finishAfterRun()
         })
+      } else {
+        finishAfterRun()
       }
     })
   }

package/packages/datadog-plugin-graphql/src/resolve.js

@@ -28,7 +28,7 @@ class GraphQLResolvePlugin extends TracingPlugin {
       if (rootCtx.fields[computedPathString]) return
 
       if (!rootCtx[collapsedPathSym]) {
-        rootCtx[collapsedPathSym] = {}
+        rootCtx[collapsedPathSym] = Object.create(null)
       } else if (rootCtx[collapsedPathSym][computedPathString]) {
         return
       }

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

@@ -1,5 +1,8 @@
 'use strict'
 
+// Capture real timers at module load time, before any test can install fake timers.
+const realSetTimeout = setTimeout
+
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
 const { getEnvironmentVariable, getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
@@ -60,8 +63,7 @@ const CHILD_MESSAGE_END = 2
 
 function withTimeout (promise, timeoutMs) {
   return new Promise(resolve => {
-    // Set a timeout to resolve after 1s
-    setTimeout(resolve, timeoutMs)
+    realSetTimeout(resolve, timeoutMs)
 
     // Also resolve if the original promise resolves
     promise.then(resolve)

package/packages/datadog-plugin-kafkajs/src/batch-consumer.js

@@ -8,20 +8,47 @@ class KafkajsBatchConsumerPlugin extends ConsumerPlugin {
   static id = 'kafkajs'
   static operation = 'consume-batch'
 
-  start (ctx) {
-    const { topic, messages, groupId, clusterId } = ctx.extractedArgs || ctx
+  bindStart (ctx) {
+    const { topic, partition, messages, groupId, clusterId } = ctx.extractedArgs || ctx
+
+    const span = this.startSpan({
+      resource: topic,
+      type: 'worker',
+      meta: {
+        component: this.constructor.id,
+        'kafka.topic': topic,
+        'kafka.cluster_id': clusterId,
+        'messaging.destination.name': topic,
+        'messaging.system': 'kafka',
+      },
+      metrics: {
+        'kafka.partition': partition,
+        'messaging.batch.message_count': messages.length,
+      },
+    }, ctx)
 
-    if (!this.config.dsmEnabled) return
     for (const message of messages) {
       if (!message || !message.headers) continue
+
+      const headers = convertToTextMap(message.headers)
+      if (headers) {
+        const childOf = this.tracer.extract('text_map', headers)
+        if (childOf) {
+          span.addLink(childOf)
+        }
+      }
+
+      if (!this.config.dsmEnabled) continue
       const payloadSize = getMessageSize(message)
-      this.tracer.decodeDataStreamsContext(convertToTextMap(message.headers))
+      this.tracer.decodeDataStreamsContext(headers)
       const edgeTags = ['direction:in', `group:${groupId}`, `topic:${topic}`, 'type:kafka']
       if (clusterId) {
         edgeTags.push(`kafka_cluster_id:${clusterId}`)
       }
       this.tracer.setCheckpoint(edgeTags, null, payloadSize)
     }
+
+    return ctx.currentStore
   }
 }
 

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

@@ -1,5 +1,8 @@
 'use strict'
 
+// Capture real Date.now at module load time, before any test can install fake timers.
+const realDateNow = Date.now.bind(Date)
+
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
 const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
@@ -323,8 +326,8 @@ class MochaPlugin extends CiPlugin {
             this.runningTestProbe = { file, line }
             this.testErrorStackIndex = stackIndex
             test._ddShouldWaitForHitProbe = true
-            const waitUntil = Date.now() + BREAKPOINT_SET_GRACE_PERIOD_MS
-            while (Date.now() < waitUntil) {
+            const waitUntil = realDateNow() + BREAKPOINT_SET_GRACE_PERIOD_MS
+            while (realDateNow() < waitUntil) {
               // TODO: To avoid a race condition, we should wait until `probeInformation.setProbePromise` has resolved.
               // However, Mocha doesn't have a mechanism for waiting asyncrounously here, so for now, we'll have to
               // fall back to a fixed syncronous delay.

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

@@ -10,7 +10,6 @@ const errorPages = new Set(['/404', '/500', '/_error', '/_not-found', '/_not-fou
 
 class NextPlugin extends ServerPlugin {
   static id = 'next'
-  #requestsBySpanId = new WeakMap()
 
   constructor (...args) {
     super(...args)
@@ -35,11 +34,7 @@ class NextPlugin extends ServerPlugin {
 
     analyticsSampler.sample(span, this.config.measured, true)
 
-    // Store request by span ID to handle cases where child spans are activated
-    const spanId = span.context()._spanId
-    this.#requestsBySpanId.set(spanId, req)
-
-    return { ...store, span }
+    return { ...store, span, req }
   }
 
   error ({ span, error }) {
@@ -90,14 +85,7 @@ class NextPlugin extends ServerPlugin {
 
     if (!store) return
 
-    const span = store.span
-
-    const spanId = span.context()._spanId
-    const parentSpanId = span.context()._parentId
-
-    // Try current span first, then parent span.
-    // This handles cases where pageLoad runs in a child span context
-    const req = this.#requestsBySpanId.get(spanId) ?? this.#requestsBySpanId.get(parentSpanId)
+    const { span, req } = store
 
     // safeguard against missing req in complicated timeout scenarios
     if (!req) return

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

@@ -20,6 +20,7 @@ module.exports.init = function (tracerConfig) {
         `env:${tracerConfig.tags.env}`,
         `version:${tracerConfig.tags.version}`,
       ],
+      lookup: tracerConfig.lookup,
     })
     : new NoopDogStatsDClient()
 

package/packages/datadog-webpack/index.js

@@ -21,12 +21,12 @@ for (const hook of Object.values(hooks)) {
 
 const modulesOfInterest = new Set()
 
-for (const instrumentation of Object.values(instrumentations)) {
+for (const [name, instrumentation] of Object.entries(instrumentations)) {
   for (const entry of instrumentation) {
     if (entry.file) {
-      modulesOfInterest.add(`${entry.name}/${entry.file}`) // e.g. "redis/my/file.js"
+      modulesOfInterest.add(`${name}/${entry.file}`) // e.g. "redis/my/file.js"
     } else {
-      modulesOfInterest.add(entry.name) // e.g. "redis"
+      modulesOfInterest.add(name) // e.g. "redis"
     }
   }
 }

package/packages/dd-trace/index.js

@@ -1,23 +1,16 @@
 'use strict'
 
 if (!global._ddtrace) {
-  const TracerProxy = require('./src')
-
-  Object.defineProperty(global, '_ddtrace', {
-    value: new TracerProxy(),
-    enumerable: false,
-    configurable: true,
-    writable: true,
-  })
-
   const ddTraceSymbol = Symbol.for('dd-trace')
 
+  // Set up beforeExitHandlers before loading the tracer so that modules loaded
+  // during require('./src') can register handlers.
   Object.defineProperty(globalThis, ddTraceSymbol, {
     value: {
       beforeExitHandlers: new Set(),
     },
     enumerable: false,
-    configurable: true, // Allow this to be overridden by loading the tracer
+    configurable: true,
     writable: false,
   })
 
@@ -29,6 +22,15 @@ if (!global._ddtrace) {
     }
   })
 
+  const TracerProxy = require('./src')
+
+  Object.defineProperty(global, '_ddtrace', {
+    value: new TracerProxy(),
+    enumerable: false,
+    configurable: true,
+    writable: true,
+  })
+
   global._ddtrace.default = global._ddtrace
   global._ddtrace.tracer = global._ddtrace
 }

package/packages/dd-trace/src/agent/url.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { URL, format } = require('url')
-const defaults = require('../config/defaults')
+const { defaults } = require('../config/defaults')
 
 module.exports = { getAgentUrl }
 
@@ -12,7 +12,7 @@ module.exports = { getAgentUrl }
 
 /**
  * Gets the agent URL from config, constructing it from hostname/port if needed
- * @param {ReturnType<import('../config')>} config - Tracer configuration object
+ * @param {Partial<import('../config/config-base')>} config - Tracer configuration object
  * @returns {URL} The agent URL
  */
 function getAgentUrl (config) {

package/packages/dd-trace/src/aiguard/sdk.js

@@ -57,6 +57,10 @@ class AIGuard extends NoopAIGuard {
   #maxContentSize
   #meta
 
+  /**
+   * @param {import('../tracer')} tracer - Tracer instance
+   * @param {import('../config/config-base')} config - Tracer configuration
+   */
   constructor (tracer, config) {
     super()
 

package/packages/dd-trace/src/appsec/blocking.js

@@ -164,6 +164,9 @@ function getBlockingAction (actions) {
   return actions?.redirect_request || actions?.block_request
 }
 
+/**
+ * @param {import('../config/config-base')} config - Tracer configuration
+ */
 function setTemplates (config) {
   templateHtml = config.appsec.blockedTemplateHtml || blockedTemplates.html
 

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

@@ -168,7 +168,7 @@ class IastPlugin extends Plugin {
     loadChannel.subscribe(this.onInstrumentationLoadedListener)
 
     // check for already instrumented modules
-    for (const name in instrumentations) {
+    for (const name of Object.keys(instrumentations)) {
       this._onInstrumentationLoaded(name)
     }
   }

package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-handler.js

@@ -3,7 +3,7 @@
 
 const log = require('../../../../log')
 const vulnerabilities = require('../../vulnerabilities')
-const defaults = require('../../../../config/defaults')
+const { defaults } = require('../../../../config/defaults')
 
 const { contains, intersects, remove } = require('./range-utils')
 

package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/utils.js

@@ -2,7 +2,7 @@
 
 const crypto = require('crypto')
 
-const defaults = require('../../../config/defaults')
+const { defaults } = require('../../../config/defaults')
 
 const STRINGIFY_RANGE_KEY = 'DD_' + crypto.randomBytes(20).toString('hex')
 const STRINGIFY_SENSITIVE_KEY = STRINGIFY_RANGE_KEY + 'SENSITIVE'

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

@@ -76,6 +76,7 @@ function enableOrDisableAppsec (action, rcConfig, config, appsec) {
       appsec.disable()
     }
 
+    // TODO: Use configWithOrigin /generateTelemetry instead of manually constructing the change.
     updateConfig([
       {
         name: 'appsec.enabled',

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

@@ -26,6 +26,10 @@ class EventTrackingV2 {
 }
 
 class AppsecSdk {
+  /**
+   * @param {import('../../tracer')} tracer - Tracer instance
+   * @param {import('../../config/config-base')} config - Tracer configuration
+   */
   constructor (tracer, config) {
     this._tracer = tracer
     if (config) {

package/packages/dd-trace/src/ci-visibility/dynamic-instrumentation/index.js

@@ -11,6 +11,9 @@ const probeIdToResolveBreakpointSet = new Map()
 const probeIdToResolveBreakpointRemove = new Map()
 
 class TestVisDynamicInstrumentation {
+  /**
+   * @param {import('../../config/config-base')} config - Tracer configuration
+   */
   constructor (config) {
     this._config = config
     this.worker = null
@@ -83,7 +86,6 @@ class TestVisDynamicInstrumentation {
           DD_TRACE_ENABLED: 'false',
           DD_TEST_FAILED_TEST_REPLAY_ENABLED: 'false',
           DD_CIVISIBILITY_MANUAL_API_ENABLED: 'false',
-          DD_TRACING_ENABLED: 'false',
           DD_INSTRUMENTATION_TELEMETRY_ENABLED: 'false',
         },
         workerData: {
@@ -150,6 +152,9 @@ class TestVisDynamicInstrumentation {
 
 let dynamicInstrumentation
 
+/**
+ * @param {import('../../config/config-base')} config - Tracer configuration
+ */
 module.exports = function createAndGetTestVisDynamicInstrumentation (config) {
   if (dynamicInstrumentation) {
     return dynamicInstrumentation

package/packages/dd-trace/src/ci-visibility/test-api-manual/test-api-manual-plugin.js

@@ -54,6 +54,10 @@ class TestApiManualPlugin extends CiPlugin {
     })
   }
 
+  /**
+   * @param {import('../../config/config-base')} config - Tracer configuration
+   * @param {boolean} shouldGetEnvironmentData - Whether to get environment data
+   */
   configure (config, shouldGetEnvironmentData) {
     this._config = config
     super.configure(config, shouldGetEnvironmentData)