dd-trace 6.12.0 → 6.13.0

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

@@ -14,6 +14,7 @@ const {
   takePoolWaitTime,
   wrapPoolQueryMethod,
 } = require('./helpers/pool-acquire')
+const { wrapCallbackBundle, wrapPromiseBundle } = require('./mariadb-bundle')
 
 const commandAddCh = channel('apm:mariadb:command:add')
 const connectionStartCh = channel('apm:mariadb:connection:start')
@@ -443,3 +444,9 @@ addHook({ name, file: 'lib/connection.js', versions: ['>=2.0.4 <=2.5.1'] }, (Con
 addHook({ name, file: 'lib/pool-base.js', versions: ['>=2.0.4 <3'] }, (PoolBase) => {
   return shimmer.wrapFunction(PoolBase, wrapPoolBase)
 })
+
+// MariaDB 3.5.3 added single-file CommonJS bundles that do not load the original source modules at runtime.
+// Matching their generated, minified internals would couple instrumentation to unstable bundle output, so wrap
+// the runtime objects returned by the public factories instead.
+addHook({ name, versions: ['>=3.5.3'] }, wrapPromiseBundle)
+addHook({ name, file: 'dist/callback.cjs', versions: ['>=3.5.3'] }, wrapCallbackBundle)

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

@@ -6,6 +6,8 @@ const {
   addHook,
 } = require('./helpers/instrument')
 
+const logSubmissionCh = channel('ci:log-submission:log')
+
 /**
  * @param {string} symbol
  * @param {(original: Function) => Function} wrapper
@@ -36,13 +38,22 @@ function wrapAsJson (asJson) {
     obj = arguments[0] = obj || {}
 
     // Caller-provided `dd` wins -- skip the splice so a bespoke `dd` survives.
+    let line
     if (!jsonCh.hasSubscribers || Object.hasOwn(obj, 'dd')) {
-      return asJson.apply(this, arguments)
+      line = asJson.apply(this, arguments)
+    } else {
+      const payload = { line: asJson.apply(this, arguments) }
+      jsonCh.publish(payload)
+      line = payload.line
+    }
+
+    // Submit the serialized line for agentless log collection only when trace
+    // correlation is active, matching the Bunyan contract.
+    if (jsonCh.hasSubscribers && logSubmissionCh.hasSubscribers) {
+      logSubmissionCh.publish({ source: 'pino', message: line })
     }
 
-    const payload = { line: asJson.apply(this, arguments) }
-    jsonCh.publish(payload)
-    return payload.line
+    return line
   }
 }
 

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

@@ -59,6 +59,7 @@ const testSuiteStartCh = channel('ci:playwright:test-suite:start')
 const testSuiteFinishCh = channel('ci:playwright:test-suite:finish')
 
 const workerReportCh = channel('ci:playwright:worker:report')
+const logSubmissionFlushCh = channel('ci:log-submission:flush')
 const workerReportTelemetryCh = channel('ci:playwright:worker-report:telemetry')
 const testPageGotoCh = channel('ci:playwright:test:page-goto')
 
@@ -1085,7 +1086,7 @@ function onDispatcherCreateWorker (dispatcher, worker) {
 
   const projects = getProjectsFromDispatcher(dispatcher)
   sessionProjects = projects
-  const automaticFailureScreenshotPathsByTestId = new Map()
+  const automaticFailureScreenshotsByTestId = new Map()
 
   if (disabledTestIds.size && !worker[kDdPlaywrightWorkerHostInstrumented] &&
       typeof worker.runTestGroup === 'function') {
@@ -1110,19 +1111,21 @@ function onDispatcherCreateWorker (dispatcher, worker) {
     const test = getTestByTestId(dispatcher, testId)
     if (!test) return
 
+    automaticFailureScreenshotsByTestId.clear()
     const browser = getBrowserNameFromProjects(projects, test)
     const shouldCreateTestSpan = test.expectedStatus === 'skipped'
     testBeginHandler(test, browser, shouldCreateTestSpan)
   })
-  worker.on('attach', ({ testId, path, _ddIsAutomaticFailureScreenshot }) => {
+  worker.on('attach', (attachment) => {
+    const { testId, _ddIsAutomaticFailureScreenshot } = attachment
     if (!_ddIsAutomaticFailureScreenshot) return
 
-    let screenshotPaths = automaticFailureScreenshotPathsByTestId.get(testId)
-    if (!screenshotPaths) {
-      screenshotPaths = new Set()
-      automaticFailureScreenshotPathsByTestId.set(testId, screenshotPaths)
+    let screenshots = automaticFailureScreenshotsByTestId.get(testId)
+    if (!screenshots) {
+      screenshots = []
+      automaticFailureScreenshotsByTestId.set(testId, screenshots)
     }
-    screenshotPaths.add(path)
+    screenshots.push(attachment)
   })
   worker.on('testEnd', ({ testId, status, errors, annotations }) => {
     const test = getTestByTestId(dispatcher, testId)
@@ -1146,19 +1149,20 @@ function onDispatcherCreateWorker (dispatcher, worker) {
       }
     )
     const testResult = test.results.at(-1)
-    const automaticFailureScreenshotPaths = automaticFailureScreenshotPathsByTestId.get(testId)
-    automaticFailureScreenshotPathsByTestId.delete(testId)
-    if (testStatus === 'fail' && automaticFailureScreenshotPaths?.size && testResult?.attachments?.length) {
-      const screenshots = []
-      for (const attachment of testResult.attachments) {
-        if (automaticFailureScreenshotPaths.has(attachment.path)) {
-          screenshots.push(attachment)
+    if (isFailureScreenshotUploadEnabled &&
+        !shouldCreateTestSpan &&
+        !test._ddShouldSkipEfdRetry &&
+        !disabledTestIds.has(testId)) {
+      let screenshots
+      if (testStatus === 'fail') {
+        screenshots = automaticFailureScreenshotsByTestId.get(testId)
+        if (!screenshots) {
+          screenshots = []
+          automaticFailureScreenshotsByTestId.set(testId, screenshots)
         }
       }
-      if (screenshots.length) {
-        worker[kDdPlaywrightFailureScreenshots] ??= []
-        worker[kDdPlaywrightFailureScreenshots].push(screenshots)
-      }
+      worker[kDdPlaywrightFailureScreenshots] ??= []
+      worker[kDdPlaywrightFailureScreenshots].push(screenshots)
     }
     const isAtrRetry = testResult?.retry > 0 &&
       isFlakyTestRetriesEnabled &&
@@ -2212,7 +2216,8 @@ addHook({
 
 function instrumentWorkerMainMethods (workerMain) {
   if (!workerMain || workerMain[kDdPlaywrightWorkerInstrumented] ||
-      typeof workerMain._runTest !== 'function' || typeof workerMain.dispatchEvent !== 'function') {
+      typeof workerMain._runTest !== 'function' || typeof workerMain.dispatchEvent !== 'function' ||
+      typeof workerMain.gracefullyClose !== 'function') {
     return workerMain
   }
 
@@ -2228,6 +2233,15 @@ function instrumentWorkerMainMethods (workerMain) {
     return runTestGroup.apply(this, arguments)
   })
 
+  // Playwright >=1.60 creates WorkerMain through a runtime factory, which Orchestrion cannot wrap statically.
+  shimmer.wrap(workerMain, 'gracefullyClose', gracefullyClose => async function () {
+    try {
+      return await gracefullyClose.apply(this, arguments)
+    } finally {
+      await getChannelPromise(logSubmissionFlushCh)
+    }
+  })
+
   shimmer.wrap(workerMain, '_runTest', _runTest => async function (test) {
     if (this[kDdPlaywrightDisabledTestIds]?.has(test.id)) {
       test._ddIsDisabled = true
@@ -2393,7 +2407,7 @@ function instrumentWorkerMainMethods (workerMain) {
   // We reproduce what happens in `Dispatcher#_onStepBegin` and `Dispatcher#_onStepEnd`,
   // since `startTime` and `duration` are not available directly in the worker process
   shimmer.wrap(workerMain, 'dispatchEvent', dispatchEvent => function (event, payload) {
-    if (event === 'testBegin' || event === 'testEnd') {
+    if (event === 'testBegin') {
       automaticFailureScreenshotPaths.clear()
     } else if (event === 'stepBegin') {
       stepInfoByStepId[payload.stepId] = {

package/packages/datadog-instrumentations/src/vitest-main-no-worker-init.js

@@ -1602,15 +1602,18 @@ function splitNodeOptions (nodeOptions) {
 }
 
 function serializeNodeOptions (tokens) {
-  const serializedTokens = []
+  let serializedTokens = ''
+  let hasSerializedToken = false
   for (const token of tokens) {
+    if (hasSerializedToken) serializedTokens += ' '
     if (NODE_OPTIONS_QUOTE_RE.test(token)) {
-      serializedTokens.push(JSON.stringify(token))
+      serializedTokens += JSON.stringify(token)
     } else {
-      serializedTokens.push(token)
+      serializedTokens += token
     }
+    hasSerializedToken = true
   }
-  return serializedTokens.join(' ')
+  return serializedTokens
 }
 
 function getTestSpecificationProject (testSpecification) {

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

@@ -5,6 +5,7 @@ const { performance } = require('node:perf_hooks')
 const { fileURLToPath } = require('node:url')
 const { isMainThread, parentPort } = require('node:worker_threads')
 
+const { channel } = require('dc-polyfill')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
 const { getEfdRetryCountForDuration } = require('../../dd-trace/src/ci-visibility/efd-retry-policy')
@@ -40,10 +41,12 @@ const {
 } = require('./vitest-util')
 
 const EFD_SUITE_ADMISSION_TIMEOUT_MS = 5000
+const logSubmissionFlushCh = channel('ci:log-submission:flush')
 const taskToCtx = new WeakMap()
 const taskToTestProperties = new WeakMap()
 const taskToStatuses = new WeakMap()
 const taskToReportedErrorCount = new WeakMap()
+const runnersWithLogSubmissionCleanup = new WeakSet()
 const attemptToFixTaskToStatuses = new WeakMap()
 const fileToHasConcurrentTests = new WeakMap()
 const fileToEfdSuiteAdmission = new WeakMap()
@@ -954,6 +957,14 @@ addHook({
     if (!testSuiteFinishCh.hasSubscribers) {
       return startTests.apply(this, arguments)
     }
+    const runner = arguments[1]
+    // Vitest 3+ exposes the only awaited worker-shutdown boundary; older versions keep timer/before-exit behavior.
+    if (logSubmissionFlushCh.hasSubscribers &&
+        typeof runner?.onCleanupWorkerContext === 'function' &&
+        !runnersWithLogSubmissionCleanup.has(runner)) {
+      runnersWithLogSubmissionCleanup.add(runner)
+      runner.onCleanupWorkerContext(() => getChannelPromise(logSubmissionFlushCh))
+    }
     // From >=3.0.1, the first arguments changes from a string to an object containing the filepath
     const testSuiteAbsolutePath = testPaths[0]?.filepath || testPaths[0]
     const providedContext = getProvidedContext()

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

@@ -16,6 +16,7 @@ const {
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,
   TEST_SUITE_EXECUTION_ID,
 } = require('../../dd-trace/src/plugins/util/test')
+const { publishWithCompletion } = require('./helpers/channel')
 const { addHook, channel, tracingChannel } = require('./helpers/instrument')
 const {
   CONFIGURATION_REQUEST,
@@ -38,6 +39,7 @@ const testSuiteStartCh = channel('ci:mocha:test-suite:start')
 const testSuiteFinishCh = channel('ci:mocha:test-suite:finish')
 const knownTestsCh = channel('ci:mocha:known-tests')
 const libraryConfigurationCh = channel('ci:mocha:library-configuration')
+const logSubmissionFlushCh = channel('ci:log-submission:flush')
 const modifiedFilesCh = channel('ci:mocha:modified-files')
 const testManagementTestsCh = channel('ci:mocha:test-management-tests')
 const workerConfigurationCh = channel('ci:mocha:worker:configuration')
@@ -46,6 +48,7 @@ const workerReportTelemetryCh = channel('ci:mocha:worker-report:telemetry')
 const workerReportTraceCh = channel('ci:mocha:worker-report:trace')
 
 const jasmineAdapterInitCh = tracingChannel('orchestrion:@wdio/jasmine-framework:JasmineAdapter_init')
+const baseReporterWaitForSyncCh = tracingChannel('orchestrion:@wdio/runner:BaseReporter_waitForSync')
 const launcherStartInstanceCh = tracingChannel('orchestrion:@wdio/cli:Launcher_startInstance')
 const localRunnerRunCh = tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_run')
 const localRunnerShutdownCh = tracingChannel('orchestrion:@wdio/local-runner:LocalRunner_shutdown')
@@ -1000,6 +1003,29 @@ function finishCoordinator (state, error, onDone) {
   })
 }
 
+/**
+ * Delays WebdriverIO worker exit until pending log-submission requests settle.
+ *
+ * @param {{
+ *   resolveCallback?: (onDone: () => void) => void,
+ *   rejectCallback?: (onDone: () => void) => void
+ * }} context
+ * @returns {void}
+ */
+function waitForLogSubmissionAtWorkerExit (context) {
+  if (!isWebdriverioWorker || !logSubmissionFlushCh.hasSubscribers) {
+    return
+  }
+
+  const waitForLogs = onDone => publishWithCompletion(logSubmissionFlushCh, {}, onDone)
+  context.resolveCallback = waitForLogs
+  context.rejectCallback = waitForLogs
+}
+
+baseReporterWaitForSyncCh.asyncEnd.subscribe(
+  /** @type {import('node:diagnostics_channel').ChannelListener} */ (waitForLogSubmissionAtWorkerExit)
+)
+
 // dc-polyfill supports partial tracing-channel subscribers, unlike the Node.js type definition.
 // @ts-expect-error
 jasmineAdapterInitCh.subscribe({

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

@@ -12,12 +12,15 @@ const patched = new WeakSet()
 const configureCh = channel('ci:log-submission:winston:configure')
 const addTransport = channel('ci:log-submission:winston:add-transport')
 
-addHook({ name: 'winston', file: 'lib/winston/transports/index.js', versions: ['>=3'] }, transportsPackage => {
+addHook({ name: 'winston', versions: ['>=3'] }, winston => {
   if (configureCh.hasSubscribers) {
-    configureCh.publish(transportsPackage.Http)
+    configureCh.publish({
+      createJsonFormat: winston.format.json,
+      StreamTransport: winston.transports.Stream,
+    })
   }
 
-  return transportsPackage
+  return winston
 })
 
 addHook({ name: 'winston', file: 'lib/winston/logger.js', versions: ['>=3'] }, Logger => {

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

@@ -409,6 +409,7 @@ beforeEach(function () {
       rumCookiePromise = setRumCorrelationCookie(traceId)
     }
     if (shouldSkip) {
+      // Test Optimization requested this runtime skip through the Cypress support hook.
       this.skip()
     }
     if (rumCookiePromise) {

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

@@ -8,8 +8,8 @@ const tags = require('../../../ext/tags')
 const formats = require('../../../ext/formats')
 const HTTP_HEADERS = formats.HTTP_HEADERS
 const urlFilter = require('../../dd-trace/src/plugins/util/urlfilter')
+const { getClientStatusValidator } = require('../../dd-trace/src/plugins/util/status-validator')
 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')
 
@@ -167,7 +167,7 @@ function addRequestHeaders (req, span, config) {
 }
 
 function normalizeClientConfig (config) {
-  const validateStatus = getStatusValidator(config)
+  const validateStatus = getClientStatusValidator(config)
   const filter = getFilter(config)
   const propagationFilter = getFilter({ blocklist: config.propagationBlocklist })
   const headers = getHeaders(config)
@@ -183,19 +183,6 @@ function normalizeClientConfig (config) {
   }
 }
 
-function is400ErrorCode (code) {
-  return code < 400 || code >= 500
-}
-
-function getStatusValidator (config) {
-  if (typeof config.validateStatus === 'function') {
-    return config.validateStatus
-  } else if (config.hasOwnProperty('validateStatus')) {
-    log.error('Expected `validateStatus` to be a function.')
-  }
-  return is400ErrorCode
-}
-
 function getFilter (config) {
   config = { ...config, blocklist: config.blocklist || [] }
 

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

@@ -4,12 +4,12 @@ const URL = require('url').URL
 
 const { storage } = require('../../datadog-core')
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
-const log = require('../../dd-trace/src/log')
 const tags = require('../../../ext/tags')
 const kinds = require('../../../ext/kinds')
 const formats = require('../../../ext/formats')
 const { COMPONENT, CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 const urlFilter = require('../../dd-trace/src/plugins/util/urlfilter')
+const { getClientStatusValidator } = require('../../dd-trace/src/plugins/util/status-validator')
 const { buildClientHttpUrl } = require('../../dd-trace/src/plugins/util/url')
 
 const HTTP_HEADERS = formats.HTTP_HEADERS
@@ -165,21 +165,8 @@ function hasAmazonSignature (headers, path) {
   return false
 }
 
-function is400ErrorCode (code) {
-  return code < 400 || code >= 500
-}
-
-function getStatusValidator (config) {
-  if (typeof config.validateStatus === 'function') {
-    return config.validateStatus
-  } else if (config.hasOwnProperty('validateStatus')) {
-    log.error('Expected `validateStatus` to be a function.')
-  }
-  return is400ErrorCode
-}
-
 function normalizeConfig (config) {
-  const validateStatus = getStatusValidator(config)
+  const validateStatus = getClientStatusValidator(config)
   const filter = getFilter(config)
   const headers = getHeaders(config)
 

package/packages/datadog-plugin-openai-agents/src/integration.js

@@ -63,6 +63,7 @@ class OpenAIAgentsIntegration {
   #tracer
   #config
   #enabled = false
+  #llmobsEnabled = true
   #service
   /**
    * LLMObs is gated independently of APM tracing: when DD_LLMOBS_ENABLED is
@@ -95,10 +96,11 @@ class OpenAIAgentsIntegration {
   /**
    * Apply plugin lifecycle configuration.
    *
-   * @param {{ enabled?: boolean, service?: string }} [config]
+   * @param {{ enabled?: boolean, llmobs?: boolean, service?: string }} [config]
    */
   configure (config) {
     this.#enabled = !!config?.enabled
+    this.#llmobsEnabled = config?.llmobs !== false
     this.#service = config?.service
   }
 
@@ -210,15 +212,17 @@ class OpenAIAgentsIntegration {
       completionRequested: false,
     })
 
-    this.#tagger.registerLLMObsSpan(ddSpan, {
-      kind: 'workflow',
-      name,
-      integration: COMPONENT,
-      parent: llmobsParentStore?.span,
-      sessionId: oaiTrace.groupId || undefined,
-    })
-    if (LLMObsTagger.tagMap.has(ddSpan)) {
-      llmobsStorage.enterWith({ ...llmobsParentStore, span: ddSpan })
+    if (this.#isLLMObsEnabled()) {
+      this.#tagger.registerLLMObsSpan(ddSpan, {
+        kind: 'workflow',
+        name,
+        integration: COMPONENT,
+        parent: llmobsParentStore?.span,
+        sessionId: oaiTrace.groupId || undefined,
+      })
+      if (LLMObsTagger.tagMap.has(ddSpan)) {
+        llmobsStorage.enterWith({ ...llmobsParentStore, span: ddSpan })
+      }
     }
   }
 
@@ -680,7 +684,7 @@ class OpenAIAgentsIntegration {
    * @returns {boolean}
    */
   #isLLMObsEnabled () {
-    return !!this.#config.llmobs?.DD_LLMOBS_ENABLED
+    return this.#llmobsEnabled && !!this.#config.llmobs?.DD_LLMOBS_ENABLED
   }
 
   /**

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

@@ -523,7 +523,15 @@ class PlaywrightPlugin extends CiPlugin {
 
       finishAllTraceSpans(span)
       if (this._tracerConfig.DD_PLAYWRIGHT_WORKER) {
-        this.tracer._exporter.flush(onDone)
+        try {
+          this.tracer._exporter.flush(onDone)
+        } catch (error) {
+          // A synchronous flush failure must still release the worker, otherwise it hangs.
+          // Log rather than rethrow: an exception from this diagnostics-channel subscriber
+          // would surface as an uncaught error in the worker and crash the user's test run.
+          onDone?.()
+          log.error('Error flushing traces at Playwright worker shutdown', error)
+        }
       }
     })
 

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

@@ -5,7 +5,7 @@ const { storage } = require('../../datadog-core')
 const tags = require('../../../ext/tags')
 const formats = require('../../../ext/formats')
 const HTTP_HEADERS = formats.HTTP_HEADERS
-const log = require('../../dd-trace/src/log')
+const { getClientStatusValidator } = require('../../dd-trace/src/plugins/util/status-validator')
 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')
@@ -302,7 +302,7 @@ function normalizeHeaders (headers) {
 }
 
 function normalizeConfig (config) {
-  const validateStatus = getStatusValidator(config)
+  const validateStatus = getClientStatusValidator(config)
   const hooks = getHooks(config)
 
   return {
@@ -312,19 +312,6 @@ function normalizeConfig (config) {
   }
 }
 
-function getStatusValidator (config) {
-  if (typeof config.validateStatus === 'function') {
-    return config.validateStatus
-  } else if (Object.hasOwn(config, 'validateStatus')) {
-    log.error('Expected `validateStatus` to be a function.')
-  }
-  return defaultValidateStatus
-}
-
-function defaultValidateStatus (code) {
-  return code < 400 || code >= 500
-}
-
 function getHooks (config) {
   const request = config.hooks?.request ?? noop