dd-trace 5.50.0 → 5.51.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.50.0",
+  "version": "5.51.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -54,7 +54,6 @@
     "test:integration:selenium": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/selenium/*.spec.js\"",
     "test:integration:vitest": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/vitest/*.spec.js\"",
     "test:integration:profiler": "mocha --timeout 180000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/profiler/*.spec.js\"",
-    "test:integration:serverless": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/serverless/*.spec.js\"",
     "test:integration:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/integration-test/**/*.spec.js\"",
     "test:unit:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-instrumentations/test/@($(echo $PLUGINS)).spec.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/**/*.spec.js\" --exclude \"packages/datadog-plugin-@($(echo $PLUGINS))/test/integration-test/**/*.spec.js\"",
     "test:shimmer": "mocha 'packages/datadog-shimmer/test/**/*.spec.js'",

package/packages/datadog-instrumentations/src/helpers/register.js

@@ -115,7 +115,16 @@ for (const packageName of names) {
           continue
         }
         if (typeof namesAndSuccesses[`${name}@${version}`] === 'undefined') {
-          namesAndSuccesses[`${name}@${version}`] = false
+          // TODO If `file` is present, we might elsewhere instrument the result of the module
+          // for a version range that actually matches, so we can't assume that we're _not_
+          // going to instrument that. However, the way the data model around instrumentation
+          // works, we can't know either way just yet, so to avoid false positives, we'll just
+          // ignore this if there is a `file` in the hook. The thing to do here is rework
+          // everything so that we can be sure that there are _no_ instrumentations that it
+          // could match.
+          if (!file) {
+            namesAndSuccesses[`${name}@${version}`] = false
+          }
         }
 
         if (matchVersion(version, versions)) {

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

@@ -81,6 +81,7 @@ const sessionAsyncResource = new AsyncResource('bound-anonymous-fn')
 
 const asyncResources = new WeakMap()
 const originalTestFns = new WeakMap()
+const originalHookFns = new WeakMap()
 const retriedTestsToNumAttempts = new Map()
 const newTestsTestStatuses = new Map()
 const attemptToFixRetriedTestsStatuses = new Map()
@@ -154,7 +155,7 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
           const hasKnownTests = !!knownTests?.jest
           earlyFlakeDetectionNumRetries = this.testEnvironmentOptions._ddEarlyFlakeDetectionNumRetries
           this.knownTestsForThisSuite = hasKnownTests
-            ? (knownTests?.jest[this.testSuite] || [])
+            ? (knownTests?.jest?.[this.testSuite] || [])
             : this.getKnownTestsForSuite(this.testEnvironmentOptions._ddKnownTests)
         } catch (e) {
           // If there has been an error parsing the tests, we'll disable Early Flake Deteciton
@@ -172,10 +173,10 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
 
       if (this.isTestManagementTestsEnabled) {
         try {
-          const hasTestManagementTests = !!testManagementTests.jest
+          const hasTestManagementTests = !!testManagementTests?.jest
           testManagementAttemptToFixRetries = this.testEnvironmentOptions._ddTestManagementAttemptToFixRetries
           this.testManagementTestsForThisSuite = hasTestManagementTests
-            ? this.getTestManagementTestsForSuite(testManagementTests.jest.suites?.[this.testSuite]?.tests)
+            ? this.getTestManagementTestsForSuite(testManagementTests?.jest?.suites?.[this.testSuite]?.tests)
             : this.getTestManagementTestsForSuite(this.testEnvironmentOptions._ddTestManagementTests)
         } catch (e) {
           log.error('Error parsing test management tests', e)
@@ -351,6 +352,15 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
             isDisabled,
             isQuarantined
           })
+          for (const hook of event.test.parent.hooks) {
+            let hookFn = hook.fn
+            if (!originalHookFns.has(hook)) {
+              originalHookFns.set(hook, hookFn)
+            } else {
+              hookFn = originalHookFns.get(hook)
+            }
+            hook.fn = asyncResource.bind(hookFn)
+          }
           originalTestFns.set(event.test, event.test.fn)
           event.test.fn = asyncResource.bind(event.test.fn)
         })
@@ -1186,7 +1196,7 @@ addHook({
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, globalConfig.rootDir || process.cwd())
       const suiteKnownTests = knownTests?.jest?.[testSuite] || []
 
-      const suiteTestManagementTests = testManagementTests.jest?.suites?.[testSuite]?.tests || {}
+      const suiteTestManagementTests = testManagementTests?.jest?.suites?.[testSuite]?.tests || {}
 
       args[0].config = {
         ...config,