dd-trace 5.100.0 → 5.102.0

package/packages/datadog-plugin-aws-sdk/src/util.js

@@ -143,9 +143,31 @@ const extractQueueMetadata = queueURL => {
   return { queueName, arn }
 }
 
+/**
+ * Returns true when `obj` has no own enumerable properties. The
+ * `for-in` loop with an early return is the only allocation-free shape
+ * for this check; benchmarks pin it as 1.3-1.4x faster than
+ * `Object.keys(obj).length === 0` across small / medium / large
+ * objects, and this is the hot path on every AWS messaging send.
+ *
+ * Callers in this package only pass plain objects they construct
+ * locally, so prototype-enumerable keys are not a concern here. Do not
+ * reuse this helper on caller-supplied objects without revisiting that
+ * assumption.
+ *
+ * @param {object} obj
+ * @returns {boolean}
+ */
+const isEmpty = obj => {
+  // eslint-disable-next-line no-unreachable-loop
+  for (const _ in obj) return false
+  return true
+}
+
 module.exports = {
   generatePointerHash,
   encodeValue,
   extractPrimaryKeys,
   extractQueueMetadata,
+  isEmpty,
 }

package/packages/datadog-plugin-bullmq/src/consumer.js

@@ -69,8 +69,8 @@ class BullmqConsumerPlugin extends ConsumerPlugin {
       const ddCarrier = metadata._datadog
       if (!ddCarrier) return
 
-      // Clean up only our _datadog key, preserve other metadata
-      delete metadata._datadog
+      // Avoid `delete`'s hidden-class transition; JSON.stringify also omits undefined values.
+      metadata._datadog = undefined
       job.opts.telemetry.metadata = JSON.stringify(metadata)
 
       return ddCarrier

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

@@ -56,12 +56,14 @@ class BaseBullmqProducerPlugin extends ProducerPlugin {
     throw new Error('injectTraceContext must be implemented by subclass')
   }
 
+  // Returned so setProducerCheckpoint can mutate it without a second parse.
   _injectIntoOpts (span, opts) {
     const carrier = {}
     this.tracer.inject(span, 'text_map', carrier)
     const metadata = parseTelemetryMetadata(opts.telemetry?.metadata)
     metadata._datadog = carrier
     opts.telemetry = { metadata: JSON.stringify(metadata), omitContext: true }
+    return metadata
   }
 
   setProducerCheckpoint (span, ctx) {
@@ -70,7 +72,7 @@ class BaseBullmqProducerPlugin extends ProducerPlugin {
     const dataStreamsContext = this.tracer.setCheckpoint(edgeTags, span, payloadSize)
 
     if (optsTarget && typeof optsTarget === 'object') {
-      const metadata = parseTelemetryMetadata(optsTarget.telemetry?.metadata)
+      const metadata = ctx._ddMetadata ?? parseTelemetryMetadata(optsTarget.telemetry?.metadata)
       DsmPathwayCodec.encode(dataStreamsContext, metadata._datadog || metadata)
       if (!metadata._datadog) metadata._datadog = {}
       optsTarget.telemetry = { metadata: JSON.stringify(metadata), omitContext: true }
@@ -110,7 +112,7 @@ class QueueAddPlugin extends BaseBullmqProducerPlugin {
 
   injectTraceContext (span, ctx) {
     const opts = this.#ensureOpts(ctx)
-    this._injectIntoOpts(span, opts)
+    ctx._ddMetadata = this._injectIntoOpts(span, opts)
   }
 
   getDsmData (ctx) {
@@ -146,36 +148,28 @@ class QueueAddBulkPlugin extends BaseBullmqProducerPlugin {
     const jobs = ctx.arguments?.[0]
     if (!Array.isArray(jobs)) return
 
-    for (const job of jobs) {
+    const cache = []
+    for (let i = 0; i < jobs.length; i++) {
+      const job = jobs[i]
       if (!job) continue
       job.opts = job.opts || {}
-      this._injectIntoOpts(span, job.opts)
-    }
-  }
-
-  getDsmData (ctx) {
-    const jobs = ctx.arguments?.[0] || []
-    const payloadSize = jobs.reduce((total, job) => {
-      return total + (job?.data ? getMessageSize(job.data) : 0)
-    }, 0)
-    return {
-      queueName: ctx.self?.name || 'bullmq',
-      payloadSize,
-      optsTarget: jobs[0]?.opts,
+      cache[i] = this._injectIntoOpts(span, job.opts)
     }
+    ctx._ddMetadata = cache
   }
 
   setProducerCheckpoint (span, ctx) {
     const jobs = ctx.arguments?.[0] || []
     const queueName = ctx.self?.name || 'bullmq'
     const edgeTags = ['direction:out', `topic:${queueName}`, 'type:bullmq']
+    const cache = ctx._ddMetadata
 
-    for (const job of jobs) {
+    for (let i = 0; i < jobs.length; i++) {
+      const job = jobs[i]
       if (!job?.data) continue
       const payloadSize = getMessageSize(job.data)
       const dataStreamsContext = this.tracer.setCheckpoint(edgeTags, span, payloadSize)
-      job.opts = job.opts || {}
-      const metadata = parseTelemetryMetadata(job.opts.telemetry?.metadata)
+      const metadata = cache?.[i] ?? parseTelemetryMetadata(job.opts.telemetry?.metadata)
       DsmPathwayCodec.encode(dataStreamsContext, metadata._datadog || metadata)
       if (!metadata._datadog) metadata._datadog = {}
       job.opts.telemetry = { metadata: JSON.stringify(metadata), omitContext: true }
@@ -201,7 +195,7 @@ class FlowProducerAddPlugin extends BaseBullmqProducerPlugin {
     const flow = ctx.arguments?.[0]
     if (!flow) return
     flow.opts = flow.opts || {}
-    this._injectIntoOpts(span, flow.opts)
+    ctx._ddMetadata = this._injectIntoOpts(span, flow.opts)
   }
 
   getDsmData (ctx) {

package/packages/datadog-plugin-child_process/src/scrub-cmd-params.js

@@ -5,7 +5,7 @@ const shellParser = require('../../../vendor/dist/shell-quote').parse
 const ALLOWED_ENV_VARIABLES = new Set(['LD_PRELOAD', 'LD_LIBRARY_PATH', 'PATH'])
 const PROCESS_DENYLIST = new Set(['md5'])
 
-const VARNAMES_REGEX = /\$([\w\d_]*)(?:[^\w\d_]|$)/gmi
+const VARNAMES_REGEX = /\$(\w*)(?:[^\w]|$)/gmi
 // eslint-disable-next-line @stylistic/max-len
 const PARAM_PATTERN = '^-{0,2}(?:p(?:ass(?:w(?:or)?d)?)?|address|api[-_]?key|e?mail|secret(?:[-_]?key)?|a(?:ccess|uth)[-_]?token|mysql_pwd|credentials|(?:stripe)?token)$'
 const regexParam = new RegExp(PARAM_PATTERN, 'i')
@@ -104,13 +104,13 @@ function scrubChildProcessCmd (expression) {
           result.push(token)
 
           if (PROCESS_DENYLIST.has(token)) {
-            for (index++; index < expressionTokens.length; index++) {
-              const token = expressionTokens[index]
+            for (let i = index + 1; i < expressionTokens.length; i++) {
+              const innerToken = expressionTokens[i]
 
-              if (token.op) {
-                result.push(token.op)
+              if (innerToken.op) {
+                result.push(innerToken.op)
               } else {
-                expressionTokens[index] = REDACTED
+                expressionTokens[i] = REDACTED
                 result.push(REDACTED)
               }
             }

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

@@ -308,6 +308,7 @@ class CucumberPlugin extends CiPlugin {
       isDisabled,
       isQuarantined,
       isModified,
+      earlyFlakeAbortReason,
       finalStatus,
     }) => {
       const statusTag = isStep ? 'step.status' : TEST_STATUS
@@ -317,6 +318,9 @@ class CucumberPlugin extends CiPlugin {
       if (finalStatus) {
         span.setTag(TEST_FINAL_STATUS, finalStatus)
       }
+      if (earlyFlakeAbortReason) {
+        span.setTag(TEST_EARLY_FLAKE_ABORT_REASON, earlyFlakeAbortReason)
+      }
 
       if (isNew) {
         span.setTag(TEST_IS_NEW, 'true')

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

@@ -4,6 +4,7 @@
 const { performance } = require('perf_hooks')
 const dateNow = Date.now
 
+const satisfies = require('../../../vendor/dist/semifies')
 const {
   TEST_STATUS,
   TEST_IS_RUM_ACTIVE,
@@ -108,6 +109,7 @@ const {
 } = require('./source-map-utils')
 
 const TEST_FRAMEWORK_NAME = 'cypress'
+let hasWarnedDeprecatedCypressVersion = false
 
 const CYPRESS_STATUS_TO_TEST_STATUS = {
   passed: 'pass',
@@ -136,6 +138,20 @@ function getCypressVersion (details) {
   return ''
 }
 
+function warnDeprecatedCypressVersion (version) {
+  if (DD_MAJOR >= 6 || hasWarnedDeprecatedCypressVersion || !version || !satisfies(version, '<12.0.0')) {
+    return
+  }
+
+  hasWarnedDeprecatedCypressVersion = true
+  // console.warn does not seem to work reliably in Cypress, so use console.log instead.
+  // eslint-disable-next-line no-console
+  console.log(
+    'WARNING: dd-trace support for Cypress<12.0.0 is deprecated' +
+    ' and will not be supported in dd-trace v6. Please upgrade Cypress to >=12.0.0.'
+  )
+}
+
 function getRootDir (details) {
   if (details?.config) {
     return details.config.projectRoot || details.config.repoRoot || process.cwd()
@@ -434,6 +450,7 @@ class CypressPlugin {
     this._isInit = true
     this.tracer = tracer
     this.cypressConfig = cypressConfig
+    warnDeprecatedCypressVersion(cypressConfig.version)
 
     this.isTestIsolationEnabled = getIsTestIsolationEnabled(cypressConfig)
 
@@ -1037,10 +1054,7 @@ class CypressPlugin {
           rumFlushWaitMillis: this.rumFlushWaitMillis,
         }
 
-        if (this.testSuiteSpan) {
-          return suitePayload
-        }
-        this.testSuiteSpan = this.getTestSuiteSpan({ testSuite, testSuiteAbsolutePath })
+        this.testSuiteSpan ||= this.getTestSuiteSpan({ testSuite, testSuiteAbsolutePath })
         return suitePayload
       },
       'dd:beforeEach': (test) => {

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

@@ -23,22 +23,13 @@ const noopTask = {
 module.exports = function CypressPlugin (on, config) {
   const tracer = require('../../dd-trace')
 
-  if (satisfies(config.version, '<10.2.0')) {
-    if (DD_MAJOR >= 6) {
-      // eslint-disable-next-line no-console
-      console.error(
-        'ERROR: dd-trace v6 has deleted support for Cypress<10.2.0.'
-      )
-      on('task', noopTask)
-      return config
-    }
-
-    // console.warn does not seem to work in cypress, so using console.log instead
+  if (DD_MAJOR >= 6 && satisfies(config.version, '<12.0.0')) {
     // eslint-disable-next-line no-console
-    console.log(
-      'WARNING: dd-trace support for Cypress<10.2.0 is deprecated' +
-      ' and will not be supported in future versions of dd-trace.'
+    console.error(
+      'ERROR: dd-trace v6 has deleted support for Cypress<12.0.0.'
     )
+    on('task', noopTask)
+    return config
   }
 
   // The tracer was not init correctly for whatever reason (such as invalid DD_SITE)

package/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js

@@ -122,8 +122,6 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
 
     const topicName = topic?.slice(topic.lastIndexOf('/') + 1) ??
       subscription.name.slice(subscription.name.lastIndexOf('/') + 1)
-    const baseService = this.tracer._service || 'unknown'
-    const serviceName = this.config.service || { name: `${baseService}-pubsub`, source: baseService }
 
     const meta = {
       'gcloud.project_id': subscription.pubsub.projectId,
@@ -133,8 +131,6 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
       'pubsub.subscription': subscription.name,
       'pubsub.subscription_type': 'pull',
       'messaging.operation': 'receive',
-      base_service: baseService,
-      service_override_type: 'custom',
     }
 
     if (batchRequestTraceId && batchRequestSpanId) {
@@ -168,7 +164,7 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
       childOf,
       resource: `Message from ${topicName}`,
       type: 'worker',
-      service: serviceName,
+      service: this.config.service || this.serviceName(),
       meta,
       metrics,
     }, ctx)

package/packages/datadog-plugin-google-cloud-pubsub/src/pubsub-push-subscription.js

@@ -10,6 +10,8 @@ const pushReceiveSpans = new WeakMap()
 
 class GoogleCloudPubsubPushSubscriptionPlugin extends TracingPlugin {
   static get id () { return 'google-cloud-pubsub-push-subscription' }
+  static type = 'messaging'
+  static kind = 'consumer'
 
   constructor (...args) {
     super(...args)
@@ -150,7 +152,7 @@ class GoogleCloudPubsubPushSubscriptionPlugin extends TracingPlugin {
       childOf: parentContext,
       startTime,
       kind: 'consumer',
-      service: this.config.service || { name: `${this.tracer._service}-pubsub`, source: this.tracer._service },
+      service: this.config.service || this.serviceName(),
       meta: {
         component: 'google-cloud-pubsub',
         'pubsub.method': 'receive',

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

@@ -79,11 +79,7 @@ class HttpClientPlugin extends ClientPlugin {
   }
 
   shouldInjectTraceHeaders (options, uri) {
-    if (!this.config.propagationFilter(uri)) {
-      return false
-    }
-
-    return true
+    return Boolean(this.config.propagationFilter(uri))
   }
 
   bindAsyncStart ({ parentStore }) {

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

@@ -3,7 +3,7 @@
 const { readFileSync } = require('fs')
 const { parse } = require('../../../vendor/dist/jest-docblock')
 
-const { getTestSuitePath, getEfdRetryCount } = require('../../dd-trace/src/plugins/util/test')
+const { getTestSuitePath } = require('../../dd-trace/src/plugins/util/test')
 const log = require('../../dd-trace/src/log')
 
 /**
@@ -172,5 +172,4 @@ module.exports = {
   getJestTestName,
   getJestSuitesToRun,
   isMarkedAsUnskippable,
-  getEfdRetryCount,
 }

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

@@ -56,15 +56,8 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
 
   commit (commitList) {
     if (!this.config.dsmEnabled) return
-    const keys = [
-      'consumer_group',
-      'type',
-      'partition',
-      'offset',
-      'topic',
-    ]
-    for (const commit of commitList.map(this.transformCommit)) {
-      if (keys.some(key => !commit.hasOwnProperty(key))) continue
+    for (const rawCommit of commitList) {
+      const commit = this.transformCommit(rawCommit)
       this.tracer.setOffset(commit)
     }
   }

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

@@ -64,14 +64,8 @@ class KafkajsProducerPlugin extends ProducerPlugin {
 
     if (!this.config.dsmEnabled) return
     if (!commitList || !Array.isArray(commitList)) return
-    const keys = [
-      'type',
-      'partition',
-      'offset',
-      'topic',
-    ]
-    for (const commit of commitList.map(r => this.transformProduceResponse(r, clusterId))) {
-      if (keys.some(key => !commit.hasOwnProperty(key))) continue
+    for (const rawCommit of commitList) {
+      const commit = this.transformProduceResponse(rawCommit, clusterId)
       this.tracer.setOffset(commit)
     }
   }

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

@@ -218,12 +218,16 @@ class MochaPlugin extends CiPlugin {
       isAttemptToFixRetry,
       isAtrRetry,
       finalStatus,
+      earlyFlakeAbortReason,
     }) => {
       if (span) {
         span.setTag(TEST_STATUS, status)
         if (finalStatus) {
           span.setTag(TEST_FINAL_STATUS, finalStatus)
         }
+        if (earlyFlakeAbortReason) {
+          span.setTag(TEST_EARLY_FLAKE_ABORT_REASON, earlyFlakeAbortReason)
+        }
         if (hasBeenRetried) {
           span.setTag(TEST_IS_RETRY, 'true')
           if (isAtrRetry) {

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

@@ -173,9 +173,10 @@ function limitDepth (input) {
       } else if (shouldSimplify(child)) {
         output[key] = child
       } else {
+        output[key] = {}
         queue.push({
           input: child,
-          output: output[key] = {},
+          output: output[key],
           depth: nextDepth,
         })
       }

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

@@ -560,9 +560,8 @@ function createResponseResponseExtraction (tags, body, openaiStore) {
 
 // The server almost always responds with JSON
 function coerceResponseBody (body, methodName) {
-  switch (methodName) {
-    case 'downloadFile':
-      return { file: body }
+  if (methodName === 'downloadFile') {
+    return { file: body }
   }
 
   const type = typeof body
@@ -574,9 +573,8 @@ function coerceResponseBody (body, methodName) {
     }
   } else if (type === 'object') {
     return body
-  } else {
-    return {}
   }
+  return {}
 }
 
 // This method is used to replace a dynamic URL segment with an asterisk
@@ -594,28 +592,19 @@ function lookupOperationEndpoint (operationId, methodName, url) {
       return '/v1/files/*/content'
 
     case 'retrieveFineTune':
-      switch (methodName) {
-        case 'fine_tuning.jobs.retrieve':
-          return '/v1/fine_tuning/jobs/*'
-        default:
-          return '/v1/fine-tunes/*'
-      }
+      return methodName === 'fine_tuning.jobs.retrieve'
+        ? '/v1/fine_tuning/jobs/*'
+        : '/v1/fine-tunes/*'
 
     case 'listFineTuneEvents':
-      switch (methodName) {
-        case 'fine_tuning.jobs.listEvents':
-          return '/v1/fine_tuning/jobs/*/events'
-        default:
-          return '/v1/fine-tunes/*/events'
-      }
+      return methodName === 'fine_tuning.jobs.listEvents'
+        ? '/v1/fine_tuning/jobs/*/events'
+        : '/v1/fine-tunes/*/events'
 
     case 'cancelFineTune':
-      switch (methodName) {
-        case 'fine_tuning.jobs.cancel':
-          return '/v1/fine_tuning/jobs/*/cancel'
-        default:
-          return '/v1/fine-tunes/*/cancel'
-      }
+      return methodName === 'fine_tuning.jobs.cancel'
+        ? '/v1/fine_tuning/jobs/*/cancel'
+        : '/v1/fine-tunes/*/cancel'
   }
 
   return url

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

@@ -491,7 +491,7 @@ class PlaywrightPlugin extends CiPlugin {
       [TEST_SOURCE_START]: testSourceLine,
     }
     if (testSourceFile) {
-      extraTags[TEST_SOURCE_FILE] = testSourceFile || testSuite
+      extraTags[TEST_SOURCE_FILE] = testSourceFile
     }
     if (browserName) {
       // Added as parameter too because it should affect the test fingerprint

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

@@ -213,13 +213,16 @@ class VitestPlugin extends CiPlugin {
       return ctx.currentStore
     })
 
-    this.addSub('ci:vitest:test:pass', ({ span, task, finalStatus }) => {
+    this.addSub('ci:vitest:test:pass', ({ span, task, finalStatus, earlyFlakeAbortReason }) => {
       if (span) {
         this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', this.getTestTelemetryTags(span))
         span.setTag(TEST_STATUS, 'pass')
         if (finalStatus) {
           span.setTag(TEST_FINAL_STATUS, finalStatus)
         }
+        if (earlyFlakeAbortReason) {
+          span.setTag(TEST_EARLY_FLAKE_ABORT_REASON, earlyFlakeAbortReason)
+        }
         span.finish(this.taskToFinishTime.get(task))
         finishAllTraceSpans(span)
       }
@@ -234,6 +237,7 @@ class VitestPlugin extends CiPlugin {
       hasFailedAllRetries,
       attemptToFixFailed,
       finalStatus,
+      earlyFlakeAbortReason,
     }) => {
       if (!span) {
         return
@@ -262,6 +266,9 @@ class VitestPlugin extends CiPlugin {
       if (finalStatus) {
         span.setTag(TEST_FINAL_STATUS, finalStatus)
       }
+      if (earlyFlakeAbortReason) {
+        span.setTag(TEST_EARLY_FLAKE_ABORT_REASON, earlyFlakeAbortReason)
+      }
       if (duration) {
         span.finish(span._startTime + duration - MILLISECONDS_TO_SUBTRACT_FROM_FAILED_TEST_DURATION) // milliseconds
       } else {

package/packages/datadog-shimmer/src/shimmer.js

@@ -267,7 +267,13 @@ function assertMethod (target, name, method) {
  * @throws {Error} If the target is a class constructor.
  */
 function assertNotClass (target) {
-  if (Function.prototype.toString.call(target).startsWith('class')) {
+  // Class constructors have a non-writable `prototype` property; functions have a
+  // writable one and arrows / async / method-shorthand have none at all. The
+  // `'prototype' in target` gate skips the descriptor lookup for the no-prototype
+  // shapes; the `in` operator is cheaper than reading `target.prototype` since
+  // it returns a boolean instead of materialising the prototype reference.
+  if ('prototype' in target &&
+      Object.getOwnPropertyDescriptor(target, 'prototype').writable === false) {
     throw new TypeError('Target is a native class constructor and cannot be wrapped.')
   }
 }

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

@@ -5,7 +5,7 @@ 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,
+    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,
   },
 ]