dd-trace 5.53.0 → 5.54.0

package/packages/datadog-instrumentations/src/router.js

@@ -1,10 +1,22 @@
 'use strict'
 
-const METHODS = require('http').METHODS.map(v => v.toLowerCase()).concat('all')
+const METHODS = [...require('http').METHODS.map(v => v.toLowerCase()), 'all']
 const pathToRegExp = require('path-to-regexp')
 const shimmer = require('../../datadog-shimmer')
 const { addHook, channel } = require('./helpers/instrument')
 
+function isFastStar (layer, matchers) {
+  return layer.regexp?.fast_star ?? matchers.some(matcher => matcher.path === '*')
+}
+
+function isFastSlash (layer, matchers) {
+  return layer.regexp?.fast_slash ?? matchers.some(matcher => matcher.path === '/')
+}
+
+function flatten (arr) {
+  return arr.reduce((acc, val) => Array.isArray(val) ? acc.concat(flatten(val)) : acc.concat(val), [])
+}
+
 // TODO: Move this function to a shared file between Express and Router
 function createWrapRouterMethod (name) {
   const enterChannel = channel(`apm:${name}:middleware:enter`)
@@ -12,6 +24,7 @@ function createWrapRouterMethod (name) {
   const finishChannel = channel(`apm:${name}:middleware:finish`)
   const errorChannel = channel(`apm:${name}:middleware:error`)
   const nextChannel = channel(`apm:${name}:middleware:next`)
+  const routeAddedChannel = channel(`apm:${name}:route:added`)
 
   const layerMatchers = new WeakMap()
   const regexpCache = Object.create(null)
@@ -36,16 +49,16 @@ function createWrapRouterMethod (name) {
 
       if (matchers) {
         // Try to guess which path actually matched
-        for (let i = 0; i < matchers.length; i++) {
-          if (matchers[i].test(layer)) {
-            route = matchers[i].path
+        for (const matcher of matchers) {
+          if (matcher.test(layer)) {
+            route = matcher.path
 
             break
           }
         }
       }
 
-      enterChannel.publish({ name, req, route })
+      enterChannel.publish({ name, req, route, layer })
 
       try {
         return original.apply(this, arguments)
@@ -114,26 +127,6 @@ function createWrapRouterMethod (name) {
     }))
   }
 
-  function isFastStar (layer, matchers) {
-    if (layer.regexp?.fast_star !== undefined) {
-      return layer.regexp.fast_star
-    }
-
-    return matchers.some(matcher => matcher.path === '*')
-  }
-
-  function isFastSlash (layer, matchers) {
-    if (layer.regexp?.fast_slash !== undefined) {
-      return layer.regexp.fast_slash
-    }
-
-    return matchers.some(matcher => matcher.path === '/')
-  }
-
-  function flatten (arr) {
-    return arr.reduce((acc, val) => Array.isArray(val) ? acc.concat(flatten(val)) : acc.concat(val), [])
-  }
-
   function cachedPathToRegExp (pattern) {
     const maybeCached = regexpCache[pattern]
     if (maybeCached) {
@@ -153,6 +146,10 @@ function createWrapRouterMethod (name) {
         this.stack = [{ handle: this.stack }]
       }
 
+      if (routeAddedChannel.hasSubscribers) {
+        routeAddedChannel.publish({ topOfStackFunc: methodWithTrace, layer: this.stack[0] })
+      }
+
       wrapStack(this.stack, offset, extractMatchers(fn))
 
       return router

package/packages/datadog-instrumentations/src/tedious.js

@@ -37,7 +37,7 @@ addHook({ name: 'tedious', versions: ['>=1.0.0'] }, tedious => {
         if (error) {
           errorCh.publish(error)
         }
-        finishCh.publish(undefined)
+        finishCh.publish()
 
         return cb.apply(this, arguments)
       }, null, request)

package/packages/datadog-instrumentations/src/vitest.js

@@ -12,6 +12,7 @@ const isNewTestCh = channel('ci:vitest:test:is-new')
 const isAttemptToFixCh = channel('ci:vitest:test:is-attempt-to-fix')
 const isDisabledCh = channel('ci:vitest:test:is-disabled')
 const isQuarantinedCh = channel('ci:vitest:test:is-quarantined')
+const isModifiedCh = channel('ci:vitest:test:is-modified')
 
 // test suite hooks
 const testSuiteStartCh = channel('ci:vitest:test-suite:start')
@@ -25,6 +26,7 @@ const libraryConfigurationCh = channel('ci:vitest:library-configuration')
 const knownTestsCh = channel('ci:vitest:known-tests')
 const isEarlyFlakeDetectionFaultyCh = channel('ci:vitest:is-early-flake-detection-faulty')
 const testManagementTestsCh = channel('ci:vitest:test-management-tests')
+const impactedTestsCh = channel('ci:vitest:modified-tests')
 
 const taskToCtx = new WeakMap()
 const taskToStatuses = new WeakMap()
@@ -32,6 +34,7 @@ const newTasks = new WeakSet()
 const disabledTasks = new WeakSet()
 const quarantinedTasks = new WeakSet()
 const attemptToFixTasks = new WeakSet()
+const modifiedTasks = new WeakSet()
 let isRetryReasonEfd = false
 let isRetryReasonAttemptToFix = false
 const switchedStatuses = new WeakSet()
@@ -58,7 +61,9 @@ function getProvidedContext () {
       _ddIsTestManagementTestsEnabled: isTestManagementTestsEnabled,
       _ddTestManagementAttemptToFixRetries: testManagementAttemptToFixRetries,
       _ddTestManagementTests: testManagementTests,
-      _ddIsFlakyTestRetriesEnabled: isFlakyTestRetriesEnabled
+      _ddIsFlakyTestRetriesEnabled: isFlakyTestRetriesEnabled,
+      _ddIsImpactedTestsEnabled: isImpactedTestsEnabled,
+      _ddModifiedTests: modifiedTests
     } = globalThis.__vitest_worker__.providedContext
 
     return {
@@ -70,9 +75,11 @@ function getProvidedContext () {
       isTestManagementTestsEnabled,
       testManagementAttemptToFixRetries,
       testManagementTests,
-      isFlakyTestRetriesEnabled
+      isFlakyTestRetriesEnabled,
+      isImpactedTestsEnabled,
+      modifiedTests
     }
-  } catch (e) {
+  } catch {
     log.error('Vitest workers could not parse provided context, so some features will not work.')
     return {
       isDiEnabled: false,
@@ -83,7 +90,9 @@ function getProvidedContext () {
       isTestManagementTestsEnabled: false,
       testManagementAttemptToFixRetries: 0,
       testManagementTests: {},
-      isFlakyTestRetriesEnabled: false
+      isFlakyTestRetriesEnabled: false,
+      isImpactedTestsEnabled: false,
+      modifiedTests: {}
     }
   }
 }
@@ -123,7 +132,6 @@ function getSessionStatus (state) {
   return 'pass'
 }
 
-// eslint-disable-next-line
 // From https://github.com/vitest-dev/vitest/blob/51c04e2f44d91322b334f8ccbcdb368facc3f8ec/packages/runner/src/run.ts#L243-L250
 function getVitestTestStatus (test, retryCount) {
   if (test.result.state !== 'fail') {
@@ -183,10 +191,12 @@ function getSortWrapper (sort) {
     let isEarlyFlakeDetectionFaulty = false
     let isKnownTestsEnabled = false
     let isTestManagementTestsEnabled = false
+    let isImpactedTestsEnabled = false
     let testManagementAttemptToFixRetries = 0
     let isDiEnabled = false
     let knownTests = {}
     let testManagementTests = {}
+    let modifiedTests = {}
 
     try {
       const { err, libraryConfig } = await getChannelPromise(libraryConfigurationCh)
@@ -199,12 +209,14 @@ function getSortWrapper (sort) {
         isKnownTestsEnabled = libraryConfig.isKnownTestsEnabled
         isTestManagementTestsEnabled = libraryConfig.isTestManagementEnabled
         testManagementAttemptToFixRetries = libraryConfig.testManagementAttemptToFixRetries
+        isImpactedTestsEnabled = libraryConfig.isImpactedTestsEnabled
       }
-    } catch (e) {
+    } catch {
       isFlakyTestRetriesEnabled = false
       isEarlyFlakeDetectionEnabled = false
       isDiEnabled = false
       isKnownTestsEnabled = false
+      isImpactedTestsEnabled = false
     }
 
     if (isFlakyTestRetriesEnabled && !this.ctx.config.retry && flakyTestRetriesCount > 0) {
@@ -212,14 +224,17 @@ function getSortWrapper (sort) {
       try {
         const workspaceProject = this.ctx.getCoreWorkspaceProject()
         workspaceProject._provided._ddIsFlakyTestRetriesEnabled = isFlakyTestRetriesEnabled
-      } catch (e) {
+      } catch {
         log.warn('Could not send library configuration to workers.')
       }
     }
 
     if (isKnownTestsEnabled) {
       const knownTestsResponse = await getChannelPromise(knownTestsCh)
-      if (!knownTestsResponse.err) {
+      if (knownTestsResponse.err) {
+        isEarlyFlakeDetectionEnabled = false
+        isKnownTestsEnabled = false
+      } else {
         knownTests = knownTestsResponse.knownTests
         const getFilePaths = this.ctx.getTestFilepaths || this.ctx._globTestFilepaths
 
@@ -245,13 +260,10 @@ function getSortWrapper (sort) {
             workspaceProject._provided._ddKnownTests = knownTests.vitest || {}
             workspaceProject._provided._ddIsEarlyFlakeDetectionEnabled = isEarlyFlakeDetectionEnabled
             workspaceProject._provided._ddEarlyFlakeDetectionNumRetries = earlyFlakeDetectionNumRetries
-          } catch (e) {
+          } catch {
             log.warn('Could not send known tests to workers so Early Flake Detection will not work.')
           }
         }
-      } else {
-        isEarlyFlakeDetectionEnabled = false
-        isKnownTestsEnabled = false
       }
     }
 
@@ -259,26 +271,43 @@ function getSortWrapper (sort) {
       try {
         const workspaceProject = this.ctx.getCoreWorkspaceProject()
         workspaceProject._provided._ddIsDiEnabled = isDiEnabled
-      } catch (e) {
+      } catch {
         log.warn('Could not send Dynamic Instrumentation configuration to workers.')
       }
     }
 
     if (isTestManagementTestsEnabled) {
       const { err, testManagementTests: receivedTestManagementTests } = await getChannelPromise(testManagementTestsCh)
-      if (!err) {
+      if (err) {
+        isTestManagementTestsEnabled = false
+        log.error('Could not get test management tests.')
+      } else {
         testManagementTests = receivedTestManagementTests
         try {
           const workspaceProject = this.ctx.getCoreWorkspaceProject()
           workspaceProject._provided._ddIsTestManagementTestsEnabled = isTestManagementTestsEnabled
           workspaceProject._provided._ddTestManagementAttemptToFixRetries = testManagementAttemptToFixRetries
           workspaceProject._provided._ddTestManagementTests = testManagementTests
-        } catch (e) {
+        } catch {
           log.warn('Could not send test management tests to workers so Test Management will not work.')
         }
+      }
+    }
+
+    if (isImpactedTestsEnabled) {
+      const { err, modifiedTests: receivedModifiedTests } = await getChannelPromise(impactedTestsCh)
+      if (err) {
+        isImpactedTestsEnabled = false
+        log.error('Could not get modified tests.')
       } else {
-        isTestManagementTestsEnabled = false
-        log.error('Could not get test management tests.')
+        modifiedTests = receivedModifiedTests
+        try {
+          const workspaceProject = this.ctx.getCoreWorkspaceProject()
+          workspaceProject._provided._ddIsImpactedTestsEnabled = isImpactedTestsEnabled
+          workspaceProject._provided._ddModifiedTests = modifiedTests
+        } catch {
+          log.warn('Could not send modified tests to workers so Impacted Tests will not work.')
+        }
       }
     }
 
@@ -290,7 +319,7 @@ function getSortWrapper (sort) {
 
         try {
           testCodeCoverageLinesTotal = totalCodeCoverage.getCoverageSummary().lines.pct
-        } catch (e) {
+        } catch {
           // ignore errors
         }
         return totalCodeCoverage
@@ -364,7 +393,9 @@ addHook({
       numRepeats,
       isTestManagementTestsEnabled,
       testManagementAttemptToFixRetries,
-      testManagementTests
+      testManagementTests,
+      isImpactedTestsEnabled,
+      modifiedTests
     } = getProvidedContext()
 
     if (isTestManagementTestsEnabled) {
@@ -397,6 +428,23 @@ addHook({
       })
     }
 
+    if (isImpactedTestsEnabled) {
+      isModifiedCh.publish({
+        modifiedTests,
+        testSuiteAbsolutePath: task.file.filepath,
+        onDone: (isImpacted) => {
+          if (isImpacted) {
+            if (isEarlyFlakeDetectionEnabled) {
+              isRetryReasonEfd = task.repeats !== numRepeats
+              task.repeats = numRepeats
+            }
+            modifiedTasks.add(task)
+            taskToStatuses.set(task, [])
+          }
+        }
+      })
+    }
+
     if (isKnownTestsEnabled) {
       isNewTestCh.publish({
         knownTests,
@@ -404,7 +452,7 @@ addHook({
         testName,
         onDone: (isNew) => {
           if (isNew && !attemptToFixTasks.has(task)) {
-            if (isEarlyFlakeDetectionEnabled) {
+            if (isEarlyFlakeDetectionEnabled && !modifiedTasks.has(task)) {
               isRetryReasonEfd = task.repeats !== numRepeats
               task.repeats = numRepeats
             }
@@ -575,11 +623,12 @@ addHook({
       isAttemptToFix: attemptToFixTasks.has(task),
       isDisabled: disabledTasks.has(task),
       isQuarantined,
-      isRetryReasonAtr
+      isRetryReasonAtr,
+      isModified: modifiedTasks.has(task)
     }
     taskToCtx.set(task, ctx)
 
-    testStartCh.runStores(ctx, () => { })
+    testStartCh.runStores(ctx, () => {})
     return onBeforeTryTask.apply(this, arguments)
   })
 
@@ -609,7 +658,7 @@ addHook({
         if (statuses.length === testManagementAttemptToFixRetries) {
           if (statuses.every(status => status === 'pass')) {
             attemptToFixPassed = true
-          } else if (statuses.some(status => status === 'fail')) {
+          } else if (statuses.includes('fail')) {
             attemptToFixFailed = true
           }
         }
@@ -621,7 +670,7 @@ addHook({
         ctx.task = task
         ctx.attemptToFixPassed = attemptToFixPassed
         ctx.attemptToFixFailed = attemptToFixFailed
-        testFinishTimeCh.runStores(ctx, () => { })
+        testFinishTimeCh.runStores(ctx, () => {})
       }
 
       return result
@@ -726,7 +775,7 @@ addHook({
     const testSuiteAbsolutePath = testPaths[0]?.filepath || testPaths[0]
 
     const testSuiteCtx = { testSuiteAbsolutePath, frameworkVersion }
-    testSuiteStartCh.runStores(testSuiteCtx, () => { })
+    testSuiteStartCh.runStores(testSuiteCtx, () => {})
     const startTestsResponse = await startTests.apply(this, arguments)
 
     let onFinish = null
@@ -768,7 +817,7 @@ addHook({
           let attemptToFixFailed = false
           if (attemptToFixTasks.has(task)) {
             const statuses = taskToStatuses.get(task)
-            if (statuses.some(status => status === 'fail')) {
+            if (statuses.includes('fail')) {
               attemptToFixFailed = true
             }
             if (statuses.every(status => status === 'fail')) {
@@ -780,7 +829,7 @@ addHook({
             const isRetry = task.result?.retryCount > 0
             // `duration` is the duration of all the retries, so it can't be used if there are retries
             testErrorCh.publish({
-              duration: !isRetry ? duration : undefined,
+              duration: isRetry ? undefined : duration,
               error: testError,
               hasFailedAllRetries,
               attemptToFixFailed,
@@ -815,7 +864,7 @@ addHook({
 
     if (testSuiteError) {
       testSuiteCtx.error = testSuiteError
-      testSuiteErrorCh.runStores(testSuiteCtx, () => { })
+      testSuiteErrorCh.runStores(testSuiteCtx, () => {})
     }
 
     testSuiteFinishCh.publish({ status: testSuiteResult.state, onFinish, ...testSuiteCtx.currentStore })

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

@@ -7,12 +7,14 @@ class Amqp10ConsumerPlugin extends ConsumerPlugin {
   static get id () { return 'amqp10' }
   static get system () { return 'amqp' }
 
-  start ({ link }) {
+  bindStart (ctx) {
+    const { link } = ctx
+
     const source = getShortName(link)
     const address = getAddress(link)
 
     this.startSpan({
-      resource: ['receive', source].filter(v => v).join(' '),
+      resource: ['receive', source].filter(Boolean).join(' '),
       type: 'worker',
       meta: {
         'amqp.link.source.address': source,
@@ -23,7 +25,9 @@ class Amqp10ConsumerPlugin extends ConsumerPlugin {
         'amqp.connection.port': address.port,
         'amqp.connection.user': address.user
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }
 

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

@@ -9,12 +9,14 @@ class Amqp10ProducerPlugin extends ProducerPlugin {
   static get operation () { return 'send' }
   static get system () { return 'amqp' }
 
-  start ({ link }) {
+  bindStart (ctx) {
+    const { link } = ctx
+
     const address = getAddress(link)
     const target = getShortName(link)
 
     this.startSpan({
-      resource: ['send', target].filter(v => v).join(' '),
+      resource: ['send', target].filter(Boolean).join(' '),
       meta: {
         'amqp.link.target.address': target,
         'amqp.link.role': 'sender',
@@ -26,7 +28,9 @@ class Amqp10ProducerPlugin extends ProducerPlugin {
         'amqp.connection.port': address.port,
         'amqp.connection.user': address.user
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }
 

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

@@ -10,7 +10,9 @@ class AmqplibClientPlugin extends ClientPlugin {
   static get type () { return 'messaging' }
   static get operation () { return 'command' }
 
-  start ({ channel = {}, method, fields }) {
+  bindStart (ctx) {
+    const { channel = {}, method, fields } = ctx
+
     if (method === 'basic.deliver' || method === 'basic.get') return
     if (method === 'basic.publish') return
 
@@ -29,11 +31,13 @@ class AmqplibClientPlugin extends ClientPlugin {
         'amqp.source': fields.source,
         'amqp.destination': fields.destination
       }
-    })
+    }, ctx)
 
     fields.headers = fields.headers || {}
 
     this.tracer.inject(span, TEXT_MAP, fields.headers)
+
+    return ctx.currentStore
   }
 }
 

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

@@ -7,9 +7,11 @@ const { getResourceName } = require('./util')
 
 class AmqplibConsumerPlugin extends ConsumerPlugin {
   static get id () { return 'amqplib' }
-  static get operation () { return 'command' }
+  static get operation () { return 'consume' }
+
+  bindStart (ctx) {
+    const { method, fields, message, queue } = ctx
 
-  start ({ method, fields, message, queue }) {
     if (method !== 'basic.deliver' && method !== 'basic.get') return
 
     const childOf = extract(this.tracer, message)
@@ -27,7 +29,7 @@ class AmqplibConsumerPlugin extends ConsumerPlugin {
         'amqp.source': fields.source,
         'amqp.destination': fields.destination
       }
-    })
+    }, ctx)
 
     if (
       this.config.dsmEnabled && message?.properties?.headers
@@ -37,6 +39,8 @@ class AmqplibConsumerPlugin extends ConsumerPlugin {
       this.tracer
         .setCheckpoint(['direction:in', `topic:${queueName}`, 'type:rabbitmq'], span, payloadSize)
     }
+
+    return ctx.currentStore
   }
 }
 

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

@@ -8,9 +8,11 @@ const { getResourceName } = require('./util')
 
 class AmqplibProducerPlugin extends ProducerPlugin {
   static get id () { return 'amqplib' }
-  static get operation () { return 'command' }
+  static get operation () { return 'publish' }
+
+  bindStart (ctx) {
+    const { channel = {}, method, fields, message } = ctx
 
-  start ({ channel = {}, method, fields, message }) {
     if (method !== 'basic.publish') return
 
     const stream = (channel.connection && channel.connection.stream) || {}
@@ -26,7 +28,7 @@ class AmqplibProducerPlugin extends ProducerPlugin {
         'amqp.source': fields.source,
         'amqp.destination': fields.destination
       }
-    })
+    }, ctx)
 
     fields.headers = fields.headers || {}
 
@@ -49,6 +51,8 @@ class AmqplibProducerPlugin extends ProducerPlugin {
           , span, payloadSize)
       DsmPathwayCodec.encode(dataStreamsContext, fields.headers)
     }
+
+    return ctx.currentStore
   }
 }
 

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

@@ -8,7 +8,7 @@ function getResourceName (method, fields = {}) {
     fields.queue,
     fields.source,
     fields.destination
-  ].filter(val => val).join(' ')
+  ].filter(Boolean).join(' ')
 }
 
 module.exports = { getResourceName }

package/packages/datadog-plugin-apollo/src/gateway/request.js

@@ -58,9 +58,8 @@ class ApolloGatewayRequestPlugin extends ApolloBasePlugin {
     const errors = ctx?.result?.errors
     // apollo gateway catches certain errors and returns them in the result object
     // we want to capture these errors as spans
-    if (errors instanceof Array &&
-      errors[errors.length - 1] && errors[errors.length - 1].stack && errors[errors.length - 1].message) {
-      ctx.currentStore.span.setTag('error', errors[errors.length - 1])
+    if (Array.isArray(errors) && errors.at(-1)?.stack && errors.at(-1).message) {
+      ctx.currentStore.span.setTag('error', errors.at(-1))
     }
     ctx.currentStore.span.finish()
     return ctx.parentStore
@@ -91,7 +90,7 @@ function buildOperationContext (schema, operationDocument, operationName) {
           break
       }
     })
-  } catch (e) {
+  } catch {
     // safety net
   }
 
@@ -113,12 +112,12 @@ function getSignature (document, operationName, operationType, calculate) {
       }
 
       return tools.defaultEngineReportingSignature(document, operationName)
-    } catch (e) {
+    } catch {
       // safety net
     }
   }
 
-  return [operationType, operationName].filter(val => val).join(' ')
+  return [operationType, operationName].filter(Boolean).join(' ')
 }
 
 module.exports = ApolloGatewayRequestPlugin

package/packages/datadog-plugin-apollo/src/gateway/validate.js

@@ -14,9 +14,8 @@ class ApolloGatewayValidatePlugin extends ApolloBasePlugin {
 
     if (!span) return
 
-    if (result instanceof Array &&
-      result[result.length - 1] && result[result.length - 1].stack && result[result.length - 1].message) {
-      span.setTag('error', result[result.length - 1])
+    if (Array.isArray(result) && result.at(-1)?.stack && result.at(-1).message) {
+      span.setTag('error', result.at(-1))
     }
     span.finish()
   }

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

@@ -226,9 +226,10 @@ function normalizeConfig (config, serviceIdentifier) {
   })
 }
 
+const noop = () => {}
+
 function getHooks (config) {
-  const noop = () => {}
-  const request = (config.hooks && config.hooks.request) || noop
+  const request = config.hooks?.request || noop
 
   return { request }
 }

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

@@ -3,14 +3,14 @@
 const BaseAwsSdkPlugin = require('../../base')
 const { parseModelId, extractRequestParams, extractTextAndResponseReason } = require('./utils')
 
-const enabledOperations = ['invokeModel']
+const enabledOperations = new Set(['invokeModel'])
 
 class BedrockRuntime extends BaseAwsSdkPlugin {
   static get id () { return 'bedrockruntime' }
 
   isEnabled (request) {
     const operation = request.operation
-    if (!enabledOperations.includes(operation)) {
+    if (!enabledOperations.has(operation)) {
       return false
     }