dd-trace 6.7.0 → 6.8.0

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

@@ -67,9 +67,7 @@ function getMeta (resourceName, commandArgs) {
     const [ns, set, bin, exp, index] = commandArgs
 
     // The `ext` argument was added to IndexCreate in 6.3.0
-    meta = commandArgs.length > 8
-      ? getMetaForIndex(ns, set, bin, index)
-      : getMetaForIndex(ns, set, bin, exp)
+    meta = getMetaForIndex(ns, set, bin, commandArgs.length > 8 ? index : exp)
   } else if (resourceName === 'Query') {
     const { ns, set } = commandArgs[2]
     meta = getMetaForQuery({ ns, set })

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

@@ -33,7 +33,7 @@ class AmqplibClientPlugin extends ClientPlugin {
       },
     }, ctx)
 
-    fields.headers = fields.headers || {}
+    fields.headers ||= {}
 
     this.tracer.inject(span, TEXT_MAP, fields.headers)
 

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

@@ -52,7 +52,7 @@ class AmqplibProducerPlugin extends ProducerPlugin {
       },
     }, ctx)
 
-    fields.headers = fields.headers || {}
+    fields.headers ||= {}
 
     this.tracer.inject(span, TEXT_MAP, fields.headers)
 

package/packages/datadog-plugin-aws-sdk/src/services/eventbridge.js

@@ -39,9 +39,9 @@ class EventBridge extends BaseAwsSdkPlugin {
     const rulename = params.Name ?? ''
     return {
       'resource.name': operation ? `${operation} ${params.source}` : params.source,
-      'aws.eventbridge.source': `${params.source}`,
+      'aws.eventbridge.source': params.source,
       'messaging.system': 'aws_eventbridge',
-      rulename: `${rulename}`,
+      rulename,
     }
   }
 

package/packages/datadog-plugin-aws-sdk/src/services/stepfunctions.js

@@ -29,9 +29,9 @@ class Stepfunctions extends BaseAwsSdkPlugin {
 
   generateTags (params, operation, response) {
     if (!params) return
-    const tags = { 'resource.name': params.name ? `${operation} ${params.name}` : `${operation}` }
+    const tags = { 'resource.name': params.name ? `${operation} ${params.name}` : operation }
     if (operation === 'startExecution' || operation === 'startSyncExecution') {
-      tags.statemachinearn = `${params.stateMachineArn}`
+      tags.statemachinearn = params.stateMachineArn
     }
     return tags
   }

package/packages/datadog-plugin-azure-event-hubs/src/producer.js

@@ -46,9 +46,7 @@ class AzureEventHubsProducerPlugin extends ProducerPlugin {
         }
         injectTraceContext(this.tracer, span, ctx.eventData)
       }
-    }
-
-    if (ctx.functionName === 'sendBatch') {
+    } else if (ctx.functionName === 'sendBatch') {
       const eventData = ctx.eventData
       const eventDataLength = eventData.length || eventData._context.connection._eventsCount
       span.setTag('messaging.operation', 'send')

package/packages/datadog-plugin-azure-service-bus/src/producer.js

@@ -45,9 +45,11 @@ class AzureServiceBusProducerPlugin extends ProducerPlugin {
         }
         injectTraceContext(this.tracer, span, ctx.msg)
       }
-    }
-
-    if (ctx.functionName === 'send' || ctx.functionName === 'sendBatch' || ctx.functionName === 'scheduleMessages') {
+    } else if (
+      ctx.functionName === 'send' ||
+      ctx.functionName === 'sendBatch' ||
+      ctx.functionName === 'scheduleMessages'
+    ) {
       const messages = ctx.msg
       const isBatch = messages.constructor?.name === 'ServiceBusMessageBatchImpl'
       if (isBatch) {

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

@@ -222,7 +222,7 @@ class QueueAddBulkPlugin extends BaseBullmqProducerPlugin {
     for (let i = 0; i < jobs.length; i++) {
       const job = jobs[i]
       if (!job) continue
-      job.opts = job.opts || {}
+      job.opts ||= {}
       cache[i] = this._injectIntoOpts(span, job.opts)
     }
     ctx._ddMetadata = cache
@@ -274,7 +274,7 @@ class FlowProducerAddPlugin extends BaseBullmqProducerPlugin {
   injectTraceContext (span, ctx) {
     const flow = ctx.arguments?.[0]
     if (!flow) return
-    flow.opts = flow.opts || {}
+    flow.opts ||= {}
     ctx._ddMetadata = this._injectIntoOpts(span, flow.opts)
   }
 
@@ -283,7 +283,7 @@ class FlowProducerAddPlugin extends BaseBullmqProducerPlugin {
     if (!flow) {
       return { queueName: 'bullmq', payloadSize: 0, optsTarget: undefined }
     }
-    flow.opts = flow.opts || {}
+    flow.opts ||= {}
     return {
       queueName: flow.queueName || 'bullmq',
       payloadSize: flow.data ? getMessageSize(flow.data) : 0,

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

@@ -52,7 +52,7 @@ class ChildProcessPlugin extends TracingPlugin {
     }
 
     if (truncated) {
-      meta['cmd.truncated'] = `${truncated}`
+      meta['cmd.truncated'] = 'true'
     }
 
     this.startSpan('command_execution', {
@@ -81,7 +81,7 @@ class ChildProcessPlugin extends TracingPlugin {
 
     const span = ctx.currentStore?.span || this.activeSpan
 
-    span?.setTag('cmd.exit_code', `${exitCode}`)
+    span?.setTag('cmd.exit_code', String(exitCode))
     span?.finish()
 
     return ctx.parentStore
@@ -112,7 +112,7 @@ class ChildProcessPlugin extends TracingPlugin {
 
     const span = ctx.currentStore?.span || this.activeSpan
 
-    span?.setTag('cmd.exit_code', `${exitCode}`)
+    span?.setTag('cmd.exit_code', String(exitCode))
     span?.finish()
 
     return ctx.parentStore

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*)(?:[^\w]|$)/gmi
+const VARNAMES_REGEX = /\$(\w*)(?:[^\w]|$)/gm
 // 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')
@@ -14,18 +14,15 @@ const envVarRegex = new RegExp(ENV_PATTERN)
 const REDACTED = '?'
 
 function extractVarNames (expression) {
-  const varNames = new Set()
+  const varNames = {}
   let match
 
   while ((match = VARNAMES_REGEX.exec(expression))) {
-    varNames.add(match[1])
+    const name = match[1]
+    varNames[name] = `$${name}`
   }
 
-  const varNamesObject = {}
-  for (const varName of varNames.keys()) {
-    varNamesObject[varName] = `$${varName}`
-  }
-  return varNamesObject
+  return varNames
 }
 
 function getTokensByExpression (expressionTokens) {

package/packages/datadog-plugin-cypress/src/source-map-utils.js

@@ -61,7 +61,7 @@ function decodeVLQ (str, cursor) {
  * @returns {string | null}
  */
 function resolveSourcePath (mapDir, sourceRoot, sourcePath) {
-  const cleanSourcePath = sourcePath.replace(/[?#].*$/, '')
+  const cleanSourcePath = sourcePath.split(/[?#]/)[0]
   if (/^[A-Za-z][A-Za-z\d+.-]*:\/\//.test(cleanSourcePath)) {
     // Virtual sources may use URL-like schemes (e.g. file://, webpack://, vite://).
     // If they encode an absolute local path in the URL pathname, use it.

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

@@ -27,7 +27,7 @@ class FastifyTracingPlugin extends RouterPlugin {
 }
 
 function getParentStore (ctx) {
-  ctx.parentStore = ctx.parentStore ?? storage('legacy').getStore()
+  ctx.parentStore ??= storage('legacy').getStore()
   return ctx.parentStore
 }
 

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

@@ -7,10 +7,6 @@ class FsPlugin extends TracingPlugin {
   static operation = 'operation'
   static experimental = true
 
-  configure (...args) {
-    return super.configure(...args)
-  }
-
   bindStart (ctx) {
     if (!this.activeSpan) return { noop: true }
 

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

@@ -96,6 +96,20 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
     })
   }
 
+  start (ctx) {
+    if (!this.config.dsmEnabled) return
+    const { message } = ctx
+    if (!message?.attributes) return
+
+    const { span } = ctx.currentStore
+    const subscription = message._subscriber._subscription
+    const topic = subscription?.metadata?.topic || message.attributes?.['pubsub.topic']
+    const payloadSize = getMessageSize(message)
+    this.tracer.decodeDataStreamsContext(message.attributes)
+    this.tracer
+      .setCheckpoint(['direction:in', `topic:${topic}`, 'type:google-pubsub'], span, payloadSize)
+  }
+
   bindStart (ctx) {
     const { message } = ctx
     const subscription = message._subscriber._subscription
@@ -181,13 +195,6 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
       }
     }
 
-    if (this.config.dsmEnabled && message?.attributes) {
-      const payloadSize = getMessageSize(message)
-      this.tracer.decodeDataStreamsContext(message.attributes)
-      this.tracer
-        .setCheckpoint(['direction:in', `topic:${topic}`, 'type:google-pubsub'], span, payloadSize)
-    }
-
     return ctx.currentStore
   }
 

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

@@ -36,6 +36,25 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
     if (topicName) attributes['pubsub.topic'] = topicName
   }
 
+  start (ctx) {
+    if (!this.config.dsmEnabled) return
+    if (ctx.api !== 'publish' || !ctx.currentStore) return
+    const { request } = ctx
+    const messages = request.messages || []
+    const topic = request.topic
+    const { span } = ctx.currentStore
+
+    for (const msg of messages) {
+      const attributes = msg.attributes ??= {}
+      const dataStreamsContext = this.tracer.setCheckpoint(
+        ['direction:out', `topic:${topic}`, 'type:google-pubsub'],
+        span,
+        getHeadersSize(msg)
+      )
+      DsmPathwayCodec.encode(dataStreamsContext, attributes)
+    }
+  }
+
   bindStart (ctx) {
     const { request, api, projectId } = ctx
     if (api !== 'publish') return
@@ -113,7 +132,6 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
 
     const messageCountStr = String(messageCount)
     const startTimeStr = String(Math.floor(batchSpan._startTime))
-    const dsmEnabled = this.config.dsmEnabled
 
     for (let i = 0; i < messageCount; i++) {
       const msg = messages[i]
@@ -137,15 +155,6 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
       if (batchTraceIdUpper) {
         attributes['_dd.pubsub_request.p.tid'] = batchTraceIdUpper
       }
-
-      if (dsmEnabled) {
-        const dataStreamsContext = this.tracer.setCheckpoint(
-          ['direction:out', `topic:${topic}`, 'type:google-pubsub'],
-          batchSpan,
-          getHeadersSize(msg)
-        )
-        DsmPathwayCodec.encode(dataStreamsContext, attributes)
-      }
     }
 
     ctx.batchSpan = batchSpan

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

@@ -495,6 +495,7 @@ function wrapResolve (resolve) {
     // run in the parent store, not field.currentStore: the first sibling's
     // synchronous resolver already finished the shared graphql.resolve span, so
     // re-entering its store would parent user spans to a closed span.
+    // eslint-disable-next-line unicorn/prefer-else-if -- Keep sibling early return outside first-field setup.
     if (!isFirst) {
       return callInAsyncScope(resolve, this, arguments, rootCtx.abortController, field.parentStore, (err) => {
         if (updateFieldCh.hasSubscribers) {

package/packages/datadog-plugin-graphql/src/tools/signature.js

@@ -11,7 +11,7 @@ const transforms = require('./transforms')
 const cache = new WeakMap()
 
 function defaultEngineReportingSignature (ast, operationName) {
-  const key = operationName == null ? '' : operationName
+  const key = operationName ?? ''
   let inner = cache.get(ast)
   if (inner !== undefined) {
     const cached = inner.get(key)

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

@@ -10,6 +10,7 @@ const HTTP_HEADERS = formats.HTTP_HEADERS
 const urlFilter = require('../../dd-trace/src/plugins/util/urlfilter')
 const { buildClientHttpUrl } = require('../../dd-trace/src/plugins/util/url')
 const log = require('../../dd-trace/src/log')
+const { stripQueryAndFragment } = require('../../dd-trace/src/util')
 const { CLIENT_PORT_KEY, COMPONENT, ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants')
 
 const HTTP_STATUS_CODE = tags.HTTP_STATUS_CODE
@@ -32,7 +33,7 @@ class HttpClientPlugin extends ClientPlugin {
     // A URL object (e.g. from the fetch integration) carries the query in
     // `options.search`, not `options.path`; keep it so url.full retains the query.
     const pathname = options.path || `${options.pathname || ''}${options.search || ''}`
-    const path = pathname ? pathname.split(/[?#]/)[0] : '/'
+    const path = pathname ? stripQueryAndFragment(pathname) : '/'
     const uri = `${base}${path}`
 
     const allowed = this.config.filter(uri)

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

@@ -237,9 +237,8 @@ class JestPlugin extends CiPlugin {
 
       const testSuiteMetadata = {
         ...getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite, 'jest'),
-        // requestErrorTags from test env options may be undefined
-        ...(requestErrorTags !== undefined && requestErrorTags !== null ? requestErrorTags : {}),
-        ...(itrSkippingEnabledTags !== undefined && itrSkippingEnabledTags !== null ? itrSkippingEnabledTags : {}),
+        ...requestErrorTags,
+        ...itrSkippingEnabledTags,
       }
 
       if (_ddUnskippable) {

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

@@ -43,7 +43,8 @@ function getFormattedJestTestParameters (testParameters) {
 
 // @fast-check/jest appends a random seed to the reported test name. A test name that keeps changing
 // breaks some Test Optimization features, so normalize this narrow suffix regardless of import style.
-const SEED_SUFFIX_RE = /\s*\(with seed=-?\d+\)\s*$/i
+// fast-check emits exactly one space before the suffix.
+const SEED_SUFFIX_RE = / ?\(with seed=-?\d+\) ?$/i
 
 function removeSeedSuffixFromTestName (testName) {
   return testName.replace(SEED_SUFFIX_RE, '')

package/packages/datadog-plugin-langchain/src/tokens.js

@@ -9,7 +9,7 @@ function getTokensFromLlmOutput (result) {
   const { llmOutput } = result
   if (!llmOutput) return tokens
 
-  const tokenUsage = llmOutput.tokenUsage || llmOutput.usage_metadata || llmOutput.usage_metadata
+  const tokenUsage = llmOutput.tokenUsage || llmOutput.usage_metadata
   if (!tokenUsage) return tokens
 
   for (const tokenNames of [['input', 'prompt'], ['output', 'completion'], ['total']]) {
@@ -25,7 +25,7 @@ function getTokensFromLlmOutput (result) {
   }
 
   // assign total_tokens again in case it was improperly set the first time, or was not on tokenUsage
-  tokens.total = tokens.total || tokens.input + tokens.output
+  tokens.total ||= tokens.input + tokens.output
 
   return tokens
 }

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

@@ -34,6 +34,8 @@ const {
   TEST_IS_MODIFIED,
   TEST_FINAL_STATUS,
   TEST_HAS_DYNAMIC_NAME,
+  TEST_FRAMEWORK_ADAPTER,
+  getTestSuiteExecutionKey,
   isModifiedTest,
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
@@ -58,6 +60,12 @@ class MochaPlugin extends CiPlugin {
     this._testTitleToParams = {}
     this.sourceRoot = process.cwd()
 
+    this.addSub('ci:mocha:worker:configuration', ({ libraryConfig, repositoryRoot, testFramework }) => {
+      this.libraryConfig = libraryConfig
+      this.testFramework = testFramework
+      this._setRepositoryRoot(repositoryRoot)
+    })
+
     this.addSub('ci:mocha:test-suite:code-coverage', ({ coverageFiles, suiteFile }) => {
       if (!this.libraryConfig?.isCodeCoverageEnabled) {
         return
@@ -88,23 +96,33 @@ class MochaPlugin extends CiPlugin {
     })
 
     this.addBind('ci:mocha:test-suite:start', (ctx) => {
-      const { testSuiteAbsolutePath, isUnskippable, isForcedToRun, itrCorrelationId } = ctx
+      const {
+        testSuiteAbsolutePath,
+        testSuiteExecutionId,
+        isUnskippable,
+        isForcedToRun,
+        itrCorrelationId,
+      } = ctx
 
       // If the test module span is undefined, the plugin has not been initialized correctly and we bail out
       if (!this.testModuleSpan) {
         return
       }
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.sourceRoot)
+      const testFramework = this.testFramework || this.constructor.id
       const testSuiteMetadata = {
         ...getTestSuiteCommonTags(
           this.command,
           this.frameworkVersion,
           testSuite,
-          'mocha'
+          testFramework
         ),
         ...this.getSessionRequestErrorTags(),
         ...this.getSessionItrSkippingEnabledTags(),
       }
+      if (this.testFrameworkAdapter) {
+        testSuiteMetadata[TEST_FRAMEWORK_ADAPTER] = this.testFrameworkAdapter
+      }
       if (isUnskippable) {
         testSuiteMetadata[TEST_ITR_UNSKIPPABLE] = 'true'
         this.telemetry.count(TELEMETRY_ITR_UNSKIPPABLE, { testLevel: 'suite' })
@@ -144,8 +162,9 @@ class MochaPlugin extends CiPlugin {
       const store = storage('legacy').getStore()
       ctx.parentStore = store
       ctx.currentStore = { ...store, testSuiteSpan }
-      this._testSuiteSpansByTestSuite.set(testSuite, testSuiteSpan)
-      this._exportPendingWorkerTracesForTestSuite(testSuite)
+      const testSuiteKey = getTestSuiteExecutionKey(testSuite, testSuiteExecutionId)
+      this._testSuiteSpansByTestSuite.set(testSuiteKey, testSuiteSpan)
+      this._exportPendingWorkerTracesForTestSuite(testSuiteKey)
     })
 
     this.addSub('ci:mocha:test-suite:finish', ({ testSuiteSpan, status }) => {
@@ -203,8 +222,8 @@ class MochaPlugin extends CiPlugin {
       return ctx.currentStore
     })
 
-    this.addSub('ci:mocha:worker:finish', () => {
-      this.tracer._exporter.flush()
+    this.addSub('ci:mocha:worker:finish', ({ onDone } = {}) => {
+      this.tracer._exporter.flush(onDone)
     })
 
     this.addSub('ci:mocha:test:finish', ({

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

@@ -125,9 +125,13 @@ class PrismaPlugin extends DatabasePlugin {
   }
 }
 
+/**
+ * @param {string} resource
+ * @param {{ name?: string, model?: string, method?: string }} [attributes]
+ */
 function formatResourceName (resource, attributes) {
   if (attributes?.name) {
-    return `${attributes.name}`.trim()
+    return attributes.name.trim()
   }
   if (attributes?.model && attributes.method) {
     return `${attributes.model}.${attributes.method}`.trim()

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

@@ -15,12 +15,27 @@ class RheaConsumerPlugin extends ConsumerPlugin {
     })
   }
 
+  start (ctx) {
+    if (!this.config.dsmEnabled) return
+    const { msgObj } = ctx
+    if (!msgObj?.message?.delivery_annotations) return
+
+    const { span } = ctx.currentStore
+    const name = getResourceNameFromMessage(msgObj)
+    const payloadSize = getAmqpMessageSize(
+      { headers: msgObj.message.delivery_annotations, content: msgObj.message.body }
+    )
+    this.tracer.decodeDataStreamsContext(msgObj.message.delivery_annotations)
+    this.tracer
+      .setCheckpoint(['direction:in', `topic:${name}`, 'type:rabbitmq'], span, payloadSize)
+  }
+
   bindStart (ctx) {
     const { msgObj } = ctx
     const name = getResourceNameFromMessage(msgObj)
     const childOf = extractTextMap(msgObj, this.tracer)
 
-    const span = this.startSpan({
+    this.startSpan({
       childOf,
       resource: name,
       type: 'worker',
@@ -31,18 +46,6 @@ class RheaConsumerPlugin extends ConsumerPlugin {
       },
     }, ctx)
 
-    if (
-      this.config.dsmEnabled &&
-      msgObj?.message?.delivery_annotations
-    ) {
-      const payloadSize = getAmqpMessageSize(
-        { headers: msgObj.message.delivery_annotations, content: msgObj.message.body }
-      )
-      this.tracer.decodeDataStreamsContext(msgObj.message.delivery_annotations)
-      this.tracer
-        .setCheckpoint(['direction:in', `topic:${name}`, 'type:rabbitmq'], span, payloadSize)
-    }
-
     return ctx.currentStore
   }
 }

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

@@ -37,7 +37,7 @@ class RheaProducerPlugin extends ProducerPlugin {
 
 function addDeliveryAnnotations (msg, tracer, span) {
   if (msg) {
-    msg.delivery_annotations = msg.delivery_annotations || {}
+    msg.delivery_annotations ||= {}
 
     tracer.inject(span, 'text_map', msg.delivery_annotations)
 

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

@@ -7,6 +7,7 @@ const formats = require('../../../ext/formats')
 const HTTP_HEADERS = formats.HTTP_HEADERS
 const log = require('../../dd-trace/src/log')
 const { buildClientHttpUrl } = require('../../dd-trace/src/plugins/util/url')
+const { stripQueryAndFragment } = require('../../dd-trace/src/util')
 const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 
 const {
@@ -62,7 +63,7 @@ class UndiciPlugin extends HttpClientPlugin {
 
     const host = port ? `${hostname}:${port}` : hostname
     const base = `${protocol}//${host}`
-    const pathname = path.split(/[?#]/)[0]
+    const pathname = stripQueryAndFragment(path)
     const uri = `${base}${pathname}`
 
     const allowed = this.config.filter(uri)