dd-trace 6.17.0 → 6.18.0

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

@@ -63,6 +63,7 @@ const baseReporterWaitForSyncCh = tracingChannel('orchestrion:@wdio/runner:BaseR
 const runnerRunCh = tracingChannel('orchestrion:@wdio/runner:Runner_run')
 const executeAsyncCh = tracingChannel('orchestrion:@wdio/utils:executeAsync')
 const launcherStartInstanceCh = tracingChannel('orchestrion:@wdio/cli:Launcher_startInstance')
+const configParserShardCh = tracingChannel('orchestrion:@wdio/config:ConfigParser_shard')
 const localRunnerRunCh = tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_run')
 const localRunnerShutdownCh = tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_shutdown')
 const testFrameworkFnWrapperCh = tracingChannel('orchestrion:@wdio/utils:testFrameworkFnWrapper')
@@ -87,6 +88,7 @@ if (loadCh.hasSubscribers) {
 }
 
 const coordinatorStates = new WeakMap()
+const emptyShardConfigurations = new WeakSet()
 const localRunnerVersions = new WeakMap()
 const rumBrowsers = new Set()
 const rumCorrelationBrowsers = new Set()
@@ -936,6 +938,7 @@ function waitForRumTestStart (context) {
  * @property {string} framework
  * @property {string|undefined} rootDir
  * @property {typeof process.env|undefined} runnerEnv
+ * @property {{total: number}|undefined} shard
  */
 
 /**
@@ -1806,17 +1809,18 @@ function getSessionStatus (state) {
 }
 
 /**
- * Returns whether every started worker reported that it discovered no tests.
+ * Explains a skipped session using the workers' discovery results.
  *
  * @param {CoordinatorState} state
  */
-function isExpectedEmptySession (state) {
-  if (state.workers.size === 0) return false
-
+function getTestSessionEmptyReason (state) {
+  if (state.workers.size === 0 && emptyShardConfigurations.has(getRunnerConfiguration(state.localRunner))) {
+    return 'zero_test_shard'
+  }
   for (const workerRecord of state.workers) {
-    if (workerRecord.hasTests !== false) return false
+    if (workerRecord.hasTests !== false) return 'all_tests_skipped'
   }
-  return true
+  return 'zero_tests'
 }
 
 /**
@@ -1832,9 +1836,9 @@ function finishCoordinator (state, error, onDone) {
     return
   }
   if (!state.sessionStarted) {
-    if (!error && getSessionStatus(state) !== 'fail') {
-      onDone()
-      return
+    if (!error && state.workers.size === 0 &&
+      !emptyShardConfigurations.has(getRunnerConfiguration(state.localRunner))) {
+      error = new Error('No test files were found.')
     }
     initializeCoordinator(state, () => finishCoordinator(state, error, onDone))
     return
@@ -1861,7 +1865,7 @@ function finishCoordinator (state, error, onDone) {
   const status = error ? 'fail' : getSessionStatus(state)
   testSessionFinishCh.publish({
     status,
-    isExpectedEmptySession: status === 'skip' && isExpectedEmptySession(state),
+    testSessionEmptyReason: status === 'skip' ? getTestSessionEmptyReason(state) : undefined,
     error,
     isEarlyFlakeDetectionEnabled: state.configuration.isEarlyFlakeDetectionEnabled,
     isEarlyFlakeDetectionFaulty: state.configuration.isEarlyFlakeDetectionFaulty,
@@ -1976,6 +1980,17 @@ jasmineAdapterInitCh.subscribe({
 
 // dc-polyfill supports partial tracing-channel subscribers, unlike the Node.js type definition.
 // @ts-expect-error
+configParserShardCh.subscribe({
+  end (context) {
+    const config = context.self._config
+    if (testFinishCh.hasSubscribers && config?.shard?.total > 1 &&
+      context.arguments[0].length > 0 && context.result?.length === 0) {
+      emptyShardConfigurations.add(config)
+    }
+  },
+})
+
+// @ts-expect-error See the partial tracing-channel subscriber above.
 launcherStartInstanceCh.subscribe({
   start (context) {
     const localRunner = context.self?.runner
@@ -2050,10 +2065,11 @@ localRunnerRunCh.subscribe({
 // @ts-expect-error See the partial tracing-channel subscriber above.
 localRunnerShutdownCh.subscribe({
   asyncEnd (context) {
-    const state = coordinatorStates.get(context.self)
-    if (!state) {
+    const runnerConfiguration = getRunnerConfiguration(context.self)
+    if (!testFinishCh.hasSubscribers || !SUPPORTED_FRAMEWORK_ADAPTERS.has(runnerConfiguration?.framework)) {
       return
     }
+    const state = getCoordinatorState(context.self)
 
     // Orchestrion uses the callback for the matching settlement path to delay LocalRunner.shutdown.
     const waitForCoordinator = onDone => {

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

@@ -94,9 +94,22 @@ function wrapSend (send) {
       return send.apply(this, arguments)
     }
 
+    const socket = this._sender?._socket
+    // No socket is attached before the handshake completes or after it is torn down.
+    if (!socket) {
+      return send.apply(this, arguments)
+    }
+
     const [data, options, cb] = arguments
 
-    const ctx = { data, socket: this._sender?._socket }
+    // `ws` stringifies numbers, then spreads `options` over its own inferred default, so an
+    // explicitly passed `binary` wins even when it is nullish and the frame goes out as text.
+    const payload = typeof data === 'number' ? data.toString() : data
+    const binary = options != null && Object.hasOwn(options, 'binary')
+      ? Boolean(options.binary)
+      : typeof payload !== 'string'
+    const byteLength = sentDataLength(payload)
+    const ctx = { data, binary, socket, byteLength }
 
     return typeof cb === 'function'
       ? producerCh.traceCallback(send, undefined, ctx, this, data, options, cb)
@@ -241,6 +254,33 @@ addHook({
   return Receiver
 })
 
+/**
+ * Byte length of an outgoing payload, following the coercion `ws` applies in `Sender.send`:
+ * strings and blobs are measured directly and everything else goes through `toBuffer()`, which
+ * yields one byte per element for plain arrays rather than concatenating them. Blob-likes carry
+ * neither a `byteLength` nor an array shape, so they are matched last to keep the common
+ * buffer path first.
+ *
+ * @param {WebSocketMessageData | number | undefined} data
+ */
+function sentDataLength (data) {
+  if (typeof data === 'string') {
+    return Buffer.byteLength(data)
+  }
+  // An array is one byte per element even when it carries an unrelated `byteLength`.
+  if (Array.isArray(data)) {
+    return data.length
+  }
+  // Covers views as well as `ArrayBuffer` and `SharedArrayBuffer`.
+  if (typeof (/** @type {{ byteLength?: unknown }} */ (data)?.byteLength) === 'number') {
+    return /** @type {{ byteLength: number }} */ (data).byteLength
+  }
+  // Blobs and files, detected the way `ws` does: structurally, so shimmed and cross-realm
+  // implementations it accepts are measured instead of silently reported as empty.
+  const { size } = /** @type {{ size?: unknown }} */ (data) ?? {}
+  return typeof size === 'number' ? size : 0
+}
+
 /**
  * @param {WebSocketMessageData} data
  */

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

@@ -73,7 +73,7 @@ class CucumberPlugin extends CiPlugin {
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
       isParallel,
-      isExpectedEmptySession,
+      testSessionEmptyReason,
       error,
       onDone,
     }) => {
@@ -118,12 +118,11 @@ class CucumberPlugin extends CiPlugin {
 
       this.testSessionSpan.setTag(TEST_STATUS, status)
       this.testModuleSpan.setTag(TEST_STATUS, status)
-      if (isExpectedEmptySession) {
+      if (testSessionEmptyReason) {
         setExpectedEmptyTestSessionTags(
           this.testSessionSpan,
           this.testModuleSpan,
-          'No scenarios were executed',
-          'zero_tests'
+          testSessionEmptyReason
         )
       }
       if (error) {

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

@@ -242,7 +242,7 @@ function getSessionStatus (summary, testSuiteStatuses) {
   if (summary.status === 'failed' || summary.failures > 0 || summary.totalFailed > 0) {
     return 'fail'
   }
-  if (summary.totalSkipped !== undefined && summary.totalSkipped === summary.totalTests) {
+  if ((summary.totalSkipped ?? 0) + (summary.totalPending ?? 0) === summary.totalTests) {
     return 'skip'
   }
   return 'pass'
@@ -381,7 +381,7 @@ function getSuiteStatus (suiteStats) {
     return 'fail'
   }
   if (suiteStats.tests !== undefined &&
-    (suiteStats.tests === suiteStats.pending || suiteStats.tests === suiteStats.skipped)) {
+    suiteStats.tests === (suiteStats.pending ?? 0) + (suiteStats.skipped ?? 0)) {
     return 'skip'
   }
   return 'pass'
@@ -451,6 +451,8 @@ function getFinalStatus ({
 }
 
 class CypressPlugin {
+  #pendingTestSuiteSpans = new Map()
+
   _isInit = false
   testEnvironmentMetadata = getTestEnvironmentMetadata(TEST_FRAMEWORK_NAME)
 
@@ -548,6 +550,7 @@ class CypressPlugin {
    *
    */
   resetRunState () {
+    this.#pendingTestSuiteSpans.clear()
     this._isInit = false
     this.finishedTestsByFile = {}
     this.hasTestsReported = false
@@ -1048,7 +1051,7 @@ class CypressPlugin {
       }
     }
 
-    return this.tracer.startSpan(`${TEST_FRAMEWORK_NAME}.test_suite`, {
+    const testSuiteSpan = this.tracer.startSpan(`${TEST_FRAMEWORK_NAME}.test_suite`, {
       childOf: this.testModuleSpan,
       tags: {
         [COMPONENT]: TEST_FRAMEWORK_NAME,
@@ -1057,9 +1060,13 @@ class CypressPlugin {
       },
       integrationName: TEST_FRAMEWORK_NAME,
     })
+    this.#pendingTestSuiteSpans.set(testSuite, testSuiteSpan)
+    return testSuiteSpan
   }
 
-  getTestSpan ({ testName, testSuite, isUnskippable, isForcedToRun, testSourceFile, isDisabled, isQuarantined }) {
+  getTestSpan ({
+    testName, testSuite, isUnskippable, isForcedToRun, testSourceFile, isDisabled, isQuarantined, startTime,
+  }) {
     const testSuiteTags = {
       [TEST_MODULE]: TEST_FRAMEWORK_NAME,
     }
@@ -1116,6 +1123,7 @@ class CypressPlugin {
 
     return this.tracer.startSpan(`${TEST_FRAMEWORK_NAME}.test`, {
       childOf,
+      startTime,
       tags: {
         [COMPONENT]: TEST_FRAMEWORK_NAME,
         [ORIGIN_KEY]: CI_APP_ORIGIN,
@@ -1348,6 +1356,20 @@ class CypressPlugin {
   }
 
   afterRun (suiteStats, error) {
+    const pendingFinalizations = []
+    // Late manual initialization cannot intercept a later replacement of after:spec.
+    // Run results let us finalize the suites whose browser hooks already created spans.
+    if (this._isInit && suiteStats?.runs) {
+      for (const result of suiteStats.runs) {
+        const testSuiteSpan = this.#pendingTestSuiteSpans.get(result.spec?.relative)
+        if (!testSuiteSpan) continue
+        this.testSuiteSpan = testSuiteSpan
+        const endedAt = Date.parse(result.stats?.endedAt)
+        const finalization = this.afterSpec(result.spec, result, undefined,
+          Number.isFinite(endedAt) ? endedAt : undefined)
+        if (finalization) pendingFinalizations.push(finalization)
+      }
+    }
     const hasPendingVideoSpans = this.pendingVideoUploads.length > 0
     const videoUploadsPromise = this.uploadPendingTestSuiteVideos()
     if (!this._isInit) {
@@ -1358,7 +1380,11 @@ class CypressPlugin {
       }
       return
     }
-    const finalizationPromise = this.#finalizeRun(suiteStats, error, hasPendingVideoSpans)
+    // Recovered screenshot-only tests must finish before the run closes any remaining trace spans.
+    const finalizeRun = () => this.#finalizeRun(suiteStats, error, hasPendingVideoSpans)
+    const finalizationPromise = pendingFinalizations.length > 0
+      ? Promise.all(pendingFinalizations).then(finalizeRun)
+      : finalizeRun()
     if (videoUploadsPromise) {
       return Promise.all([videoUploadsPromise, finalizationPromise])
         .then(() => this.#flushExporter(false))
@@ -1384,12 +1410,11 @@ class CypressPlugin {
 
       this.testModuleSpan.setTag(TEST_STATUS, testStatus)
       this.testSessionSpan.setTag(TEST_STATUS, testStatus)
-      if (testStatus !== 'fail' && hasNoTests) {
+      if (testStatus !== 'fail' && (hasNoTests || testStatus === 'skip')) {
         setExpectedEmptyTestSessionTags(
           this.testSessionSpan,
           this.testModuleSpan,
-          'No tests were executed',
-          'zero_tests'
+          hasNoTests ? 'zero_tests' : 'all_tests_skipped'
         )
       }
       if (error) {
@@ -1504,10 +1529,10 @@ class CypressPlugin {
     }
   }
 
-  afterSpec (spec, results, error) {
+  afterSpec (spec, results, error, finishTime) {
     const { tests, stats, screenshots, video, error: resultError } = results || {}
     const cypressTests = tests || []
-    if (cypressTests.length > 0) this.hasTestsReported = true
+    if (cypressTests.length > 0 || stats?.tests > 0) this.hasTestsReported = true
     const specScreenshots = screenshots || []
     const finishedTests = this.finishedTestsByFile[spec.relative] || []
     const screenshotUploadPromises = []
@@ -1540,7 +1565,10 @@ class CypressPlugin {
         ? getTestSuitePath(spec.absolute, this.repositoryRoot)
         : spec.relative
 
-      const skippedTestSpan = this.getTestSpan({ testName: cypressTestName, testSuite: spec.relative, testSourceFile })
+      // Recovered tests that never ran have no execution time; keep them at the recorded suite end.
+      const skippedTestSpan = this.getTestSpan({
+        testName: cypressTestName, testSuite: spec.relative, testSourceFile, startTime: finishTime,
+      })
       skippedTestSpan.setTag(TEST_FINAL_STATUS, 'skip')
 
       skippedTestSpan.setTag(TEST_STATUS, 'skip')
@@ -1578,7 +1606,7 @@ class CypressPlugin {
         })
       }
 
-      testSpanFinishes.push({ testSpan: skippedTestSpan, finishTime: this._now() })
+      testSpanFinishes.push({ testSpan: skippedTestSpan, finishTime: finishTime ?? this._now() })
     }
 
     // Make sure that reported test statuses are the same as Cypress reports.
@@ -1749,7 +1777,7 @@ class CypressPlugin {
       }
     }
 
-    const testSuiteFinishTime = this._now()
+    const testSuiteFinishTime = finishTime ?? this._now()
     const suiteError = error || resultError || latestError
     const suiteStatus = suiteError ||
       cypressTests.some(test => CYPRESS_STATUS_TO_TEST_STATUS[test.state] === 'fail')
@@ -1771,6 +1799,7 @@ class CypressPlugin {
       testSuiteSpan.setTag(TEST_STATUS, suiteStatus)
       if (suiteError) testSuiteSpan.setTag('error', suiteError)
       this.testSuiteSpan = null
+      this.#pendingTestSuiteSpans.delete(spec.relative)
     }
 
     let testSpansPromise
@@ -2034,7 +2063,8 @@ class CypressPlugin {
           rumTestExecutionIdCookieName: RUM_TEST_EXECUTION_ID_COOKIE_NAME,
         }
 
-        this.testSuiteSpan ||= this.getTestSuiteSpan({ testSuite, testSuiteAbsolutePath })
+        this.testSuiteSpan = this.#pendingTestSuiteSpans.get(testSuite) ||
+          this.getTestSuiteSpan({ testSuite, testSuiteAbsolutePath })
         return suitePayload
       },
       'dd:beforeEach': (test) => {

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

@@ -26,6 +26,7 @@ class CypressPlugin extends Plugin {
         userAfterRunHandlers,
         userAfterScreenshotHandlers,
         cleanupWrapper,
+        registerBeforeRun,
       } = payload
 
       const registerAfterRunWithCleanup = (afterRunHandler) => {
@@ -79,6 +80,7 @@ class CypressPlugin extends Plugin {
       }
 
       if (cypressPlugin._isInit) {
+        registerBeforeRun()
         // Already initialized by manual plugin call — just chain user handlers.
         // Pass the plugin's afterScreenshot so chaining a user handler doesn't drop the upload
         // (the chained registration replaces the one plugin.js set, so it must include it).
@@ -94,7 +96,7 @@ class CypressPlugin extends Plugin {
         return
       }
 
-      on('before:run', cypressPlugin.beforeRun.bind(cypressPlugin))
+      registerBeforeRun(cypressPlugin.beforeRun.bind(cypressPlugin))
       registerAfterScreenshot(datadogAfterScreenshotHandler)
 
       on('after:spec', (spec, results) => {

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

@@ -117,19 +117,18 @@ class JestPlugin extends CiPlugin {
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
-      isExpectedEmptySession,
+      testSessionEmptyReason,
       onDone,
     }) => {
       const finishSession = () => {
         this.testSessionSpan.setTag(TEST_STATUS, status)
         this.testModuleSpan.setTag(TEST_STATUS, status)
 
-        if (isExpectedEmptySession) {
+        if (testSessionEmptyReason) {
           setExpectedEmptyTestSessionTags(
             this.testSessionSpan,
             this.testModuleSpan,
-            'No tests were found',
-            'zero_tests'
+            testSessionEmptyReason
           )
         }
 

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

@@ -885,7 +885,7 @@ class MochaPlugin extends CiPlugin {
       isTestManagementEnabled,
       isParallel,
       isFrameworkError,
-      isExpectedEmptySession,
+      testSessionEmptyReason,
       onDone,
     }) => {
       this._exportPendingWorkerTraces()
@@ -898,12 +898,11 @@ class MochaPlugin extends CiPlugin {
         this.testSessionSpan.setTag(TEST_STATUS, status)
         this.testModuleSpan.setTag(TEST_STATUS, status)
 
-        if (isExpectedEmptySession) {
+        if (testSessionEmptyReason) {
           setExpectedEmptyTestSessionTags(
             this.testSessionSpan,
             this.testModuleSpan,
-            'No tests were executed',
-            'zero_tests'
+            testSessionEmptyReason
           )
         }
 

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

@@ -70,8 +70,6 @@ const log = require('../../dd-trace/src/log')
 
 const PLAYWRIGHT_FAILURE_SCREENSHOT_RE = /^test-failed-\d+\.png$/
 const PLAYWRIGHT_VIDEO_CONTENT_TYPES = new Set(['video/mp4', 'video/webm'])
-const EMPTY_SHARD_SKIP_REASON = 'No tests were assigned to this shard'
-const EMPTY_SHARD_REASON = 'zero_test_shard'
 const RETRY_TEST_ID = '_dd.playwright.retry_test_id'
 const DEFER_FINAL_STATUS = '_dd.playwright.defer_final_status'
 const noop = () => {}
@@ -186,7 +184,7 @@ class PlaywrightPlugin extends CiPlugin {
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
-      isExpectedEmptyShard,
+      testSessionEmptyReason,
       error,
       onDone,
     }) => {
@@ -212,12 +210,11 @@ class PlaywrightPlugin extends CiPlugin {
         this.testModuleSpan.setTag(TEST_STATUS, status)
         this.testSessionSpan.setTag(TEST_STATUS, status)
 
-        if (isExpectedEmptyShard) {
+        if (testSessionEmptyReason) {
           setExpectedEmptyTestSessionTags(
             this.testSessionSpan,
             this.testModuleSpan,
-            EMPTY_SHARD_SKIP_REASON,
-            EMPTY_SHARD_REASON
+            testSessionEmptyReason
           )
         }
 
@@ -526,6 +523,8 @@ class PlaywrightPlugin extends CiPlugin {
     this.addSub('ci:playwright:test:finish', ({
       span,
       testStatus,
+      isExpectedFailure,
+      hasNonRetriableError,
       steps,
       error,
       extraTags,
@@ -565,6 +564,12 @@ class PlaywrightPlugin extends CiPlugin {
       if (extraTags) {
         span.addTags(extraTags)
       }
+      if (isExpectedFailure) {
+        span.setTag('test.result', 'xfail')
+      }
+      if (hasNonRetriableError === true) {
+        span.setTag('test.playwright.has_non_retriable_error', 'true')
+      }
       if (isNew) {
         span.setTag(TEST_IS_NEW, 'true')
         if (isEfdRetry) {

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

@@ -580,7 +580,7 @@ class VitestPlugin extends CiPlugin {
       requestErrorTags,
       vitestPool,
       isVitestNoWorkerInitActive,
-      isExpectedEmptySession,
+      testSessionEmptyReason,
       onDone,
     }) => {
       for (const [tag, value] of Object.entries(requestErrorTags)) {
@@ -589,12 +589,11 @@ class VitestPlugin extends CiPlugin {
       }
       this.testSessionSpan.setTag(TEST_STATUS, status)
       this.testModuleSpan.setTag(TEST_STATUS, status)
-      if (isExpectedEmptySession) {
+      if (testSessionEmptyReason) {
         setExpectedEmptyTestSessionTags(
           this.testSessionSpan,
           this.testModuleSpan,
-          'No tests were executed',
-          'zero_tests'
+          testSessionEmptyReason
         )
       }
       if (error) {

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

@@ -21,7 +21,7 @@ class WSProducerPlugin extends TracingPlugin {
 
   bindStart (ctx) {
     const { byteLength, socket, binary } = ctx
-    if (!socket.spanContext) return
+    if (!socket?.spanContext) return
 
     const spanTags = socket.spanTags
     const path = getSegment(spanTags['resource.name'], ' ', 1)

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

@@ -53,8 +53,15 @@ function copyProperties (original, wrapped) {
       const descriptor = /** @type {Descriptor} */ (Object.getOwnPropertyDescriptor(original, key))
       if (descriptor.writable && descriptor.enumerable && descriptor.configurable) {
         wrapped[key] = original[key]
-      } else if (descriptor.writable || descriptor.configurable || !Object.hasOwn(wrapped, key)) {
-        Object.defineProperty(wrapped, key, descriptor)
+      } else {
+        try {
+          Object.defineProperty(wrapped, key, descriptor)
+        } catch (error) {
+          const wrappedDescriptor = Object.getOwnPropertyDescriptor(wrapped, key)
+          if (wrappedDescriptor?.configurable !== false || wrappedDescriptor.writable) {
+            throw error
+          }
+        }
       }
     }
   }
@@ -320,19 +327,16 @@ function assertMethod (target, name, method) {
 }
 
 /**
- * Asserts that a target is not a class constructor.
+ * Asserts that a target is not an identifiable class constructor.
  *
  * @param {Function} target - The target function.
- * @throws {Error} If the target is a class constructor.
+ * @throws {TypeError} If the target is an identifiable class constructor.
  */
 function assertNotClass (target) {
-  // 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.
+  // Frozen functions also have a non-writable `prototype`; inspect their source only then.
   if ('prototype' in target &&
-      Object.getOwnPropertyDescriptor(target, 'prototype').writable === false) {
+      Object.getOwnPropertyDescriptor(target, 'prototype').writable === false &&
+      (!Object.isFrozen(target) || Function.prototype.toString.call(target).startsWith('class'))) {
     throw new TypeError('Target is a native class constructor and cannot be wrapped.')
   }
 }

package/packages/datadog-turbopack/index.js

@@ -6,6 +6,7 @@ const path = require('node:path')
 
 const satisfies = require('../../vendor/dist/semifies')
 const hooks = require('../datadog-instrumentations/src/helpers/hooks')
+const { getRewriteTargetNames } = require('../datadog-instrumentations/src/helpers/rewriter/targets')
 const { SYNTHETIC_EXTENSION } = require('./src/constants')
 
 const BUILTIN_MODULES = new Set(Module.builtinModules)
@@ -158,7 +159,9 @@ function hasDatadogLoader (value) {
  */
 function createPackagePathPattern () {
   const names = []
-  for (const name of Object.keys(hooks)) {
+  const targetPackages = new Set(Object.keys(hooks))
+  for (const name of getRewriteTargetNames()) targetPackages.add(name)
+  for (const name of targetPackages) {
     if (!name.startsWith('.') && !BUILTIN_MODULES.has(name)) names.push(escapeRegExp(name))
   }
   names.sort()

package/packages/datadog-turbopack/src/loader.js

@@ -11,7 +11,10 @@ const hooks = require('../../datadog-instrumentations/src/helpers/hooks')
 const instrumentations = require('../../datadog-instrumentations/src/helpers/instrumentations')
 const { filename, matchesInstrumentation } = require('../../datadog-instrumentations/src/helpers/instrumentation-utils')
 const { createBundlerRewriter } = require('../../datadog-instrumentations/src/helpers/rewriter')
-const { getRewriteTarget } = require('../../datadog-instrumentations/src/helpers/rewriter/targets')
+const {
+  getRewriteTarget,
+  getRewriteTargetNames,
+} = require('../../datadog-instrumentations/src/helpers/rewriter/targets')
 const { isESMFile } = require('../../datadog-esbuild/src/utils')
 const { SYNTHETIC_EXTENSION } = require('./constants')
 
@@ -21,6 +24,7 @@ const MODULE_BINDING = 2
 const REQUIRE_BINDING = 4
 const COMMONJS_BINDINGS = MODULE_BINDING | REQUIRE_BINDING
 const targetPackages = new Set(Object.keys(hooks))
+for (const name of getRewriteTargetNames()) targetPackages.add(name)
 const entrypoints = new Map()
 const loadedHooks = new Set()
 const packageCache = new Map()
@@ -98,7 +102,7 @@ module.exports = function loader (source, inputSourceMap) {
     }
 
     if (publications.length > 0) code = appendCommonJsPublications(code, publications, dcModule)
-    if (rewritten && publications.length === 0) {
+    if (rewritten && publications.length === 0 && (rewriteTarget.activate || hooks[rewriteTarget.moduleName])) {
       if (!esm && hasUnsafeCommonJsBindings(code)) {
         this.emitWarning?.(new Error(`Skipped CommonJS activation for unsafe wrapper bindings in ${resourcePath}`))
         this.callback(undefined, source, inputSourceMap)

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

@@ -17,21 +17,22 @@ module.exports = {
  * Fetches agent information from the /info endpoint
  * @param {URL} url - The agent URL
  * @param {Function} callback - Callback function with signature (err, agentInfo)
- * @param {{ deadline?: number, signal?: AbortSignal }} [options] - Request finalization options
+ * @param {{ deadline?: number, signal?: AbortSignal, path?: string, retry?: boolean }} [options]
+ * Request finalization and routing options
  * @param {Function} [makeRequest] - Request implementation
  */
 function fetchAgentInfo (url, callback, options = {}, makeRequest = request) {
-  const urlKey = url.href
+  const urlKey = JSON.stringify([url.href, options.path ?? '/info'])
 
   if (cachedUrl !== null && cachedUrl !== urlKey) {
-    // Clear cache if URL changes
+    // Different consumers may query different paths on the same Agent URL.
     clearCache()
   } else if (cachedData !== null && (Date.now() - cachedTimestamp) < CACHE_TTL_MS) {
     // Return cached result if still valid
     return process.nextTick(callback, null, cachedData)
   }
 
-  options.path = '/info'
+  options.path ??= '/info'
   options.url = url
   makeRequest('', options, (err, res) => {
     if (err) {