dd-trace 6.3.0 → 6.5.0

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

@@ -122,28 +122,43 @@ function isMarkedAsUnskippable (test) {
   return false
 }
 
-function getJestSuitesToRun (skippableSuites, originalTests, rootDir) {
+function getJestSuitesToRun (skippableSuites, originalTests, rootDir, fallbackRootDir) {
   const unskippableSuites = {}
   const forcedToRunSuites = {}
 
   const skippedSuites = []
   const suitesToRun = []
+  const normalizedSkippableSuites = new Set(skippableSuites.map(suite => suite.replaceAll('\\', '/')))
 
   for (const test of originalTests) {
     const relativePath = getTestSuitePath(test.path, rootDir)
-    const shouldBeSkipped = skippableSuites.includes(relativePath)
+    const testRootDir = test?.context?.config?.rootDir || fallbackRootDir
+    let fallbackRelativePath
+    let skippedSuite = normalizedSkippableSuites.has(relativePath) ? relativePath : undefined
+    if (testRootDir && testRootDir !== rootDir) {
+      fallbackRelativePath = getTestSuitePath(test.path, testRootDir)
+      if (skippedSuite === undefined && normalizedSkippableSuites.has(fallbackRelativePath)) {
+        skippedSuite = fallbackRelativePath
+      }
+    }
     if (isMarkedAsUnskippable(test)) {
       suitesToRun.push(test)
       unskippableSuites[relativePath] = true
-      if (shouldBeSkipped) {
+      if (fallbackRelativePath !== undefined) {
+        unskippableSuites[fallbackRelativePath] = true
+      }
+      if (skippedSuite !== undefined) {
         forcedToRunSuites[relativePath] = true
+        if (fallbackRelativePath !== undefined) {
+          forcedToRunSuites[fallbackRelativePath] = true
+        }
       }
       continue
     }
-    if (shouldBeSkipped) {
-      skippedSuites.push(relativePath)
-    } else {
+    if (skippedSuite === undefined) {
       suitesToRun.push(test)
+    } else {
+      skippedSuites.push(skippedSuite)
     }
   }
 

package/packages/datadog-plugin-langchain/src/handlers/embedding.js

@@ -1,10 +1,11 @@
 'use strict'
 
+const { getSegment } = require('../../../dd-trace/src/util')
 const LangChainHandler = require('./default')
 
 class LangChainEmbeddingHandler extends LangChainHandler {
   extractProvider (instance) {
-    return instance.constructor.name.split('Embeddings')[0].toLowerCase()
+    return getSegment(instance.constructor.name, 'Embeddings', 0).toLowerCase()
   }
 
   extractModel (instance) {

package/packages/datadog-plugin-langchain/src/handlers/language_models.js

@@ -1,10 +1,11 @@
 'use strict'
 
+const { getSegment } = require('../../../dd-trace/src/util')
 const LangChainHandler = require('./default')
 
 class LangChainLanguageModelHandler extends LangChainHandler {
   extractProvider (instance) {
-    return typeof instance._llmType === 'function' && instance._llmType().split('-')[0]
+    return typeof instance._llmType === 'function' && getSegment(instance._llmType(), '-', 0)
   }
 
   extractModel (instance) {

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

@@ -15,10 +15,10 @@ function getTokensFromLlmOutput (result) {
   for (const tokenNames of [['input', 'prompt'], ['output', 'completion'], ['total']]) {
     let token = 0
     for (const tokenName of tokenNames) {
-      const underScore = `${tokenName}_tokens`
+      const underscore = `${tokenName}_tokens`
       const camelCase = `${tokenName}Tokens`
 
-      token = tokenUsage[underScore] || tokenUsage[camelCase] || token
+      token = tokenUsage[underscore] || tokenUsage[camelCase] || token
     }
 
     tokens[tokenNames[0]] = token

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

@@ -1,16 +1,26 @@
 'use strict'
 
+const { basename } = require('node:path')
+
 const { storage } = require('../../datadog-core')
 const id = require('../../dd-trace/src/id')
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
+const getConfig = require('../../dd-trace/src/config')
+const {
+  SCREENSHOT_UPLOAD_RESULT_ERROR,
+  SCREENSHOT_UPLOAD_RESULT_UPLOADED,
+  getScreenshotCapturedAtMs,
+  getScreenshotUploadResult,
+  getScreenshotUploadTag,
+} = require('../../dd-trace/src/ci-visibility/test-screenshot')
 
 const {
   finishAllTraceSpans,
   getTestSuiteCommonTags,
   getTestSuitePath,
   isModifiedTest,
+  setRumTestCorrelation,
   TEST_BROWSER_NAME,
-  TEST_BROWSER_VERSION,
   TEST_CODE_OWNERS,
   TEST_EARLY_FLAKE_ABORT_REASON,
   TEST_EARLY_FLAKE_ENABLED,
@@ -51,6 +61,21 @@ const {
 const { appClosing: appClosingTelemetry } = require('../../dd-trace/src/telemetry')
 const log = require('../../dd-trace/src/log')
 
+const PLAYWRIGHT_FAILURE_SCREENSHOT_RE = /^test-failed-\d+\.png$/
+
+/**
+ * Returns whether an attachment is an automatic Playwright failure screenshot.
+ *
+ * @param {object} attachment - Playwright test attachment
+ * @returns {boolean}
+ */
+function isPlaywrightFailureScreenshot (attachment) {
+  return attachment?.name === 'screenshot' &&
+    attachment.contentType === 'image/png' &&
+    typeof attachment.path === 'string' &&
+    PLAYWRIGHT_FAILURE_SCREENSHOT_RE.test(basename(attachment.path))
+}
+
 class PlaywrightPlugin extends CiPlugin {
   static id = 'playwright'
 
@@ -60,6 +85,8 @@ class PlaywrightPlugin extends CiPlugin {
     this._testSuiteSpansByTestSuiteAbsolutePath = new Map()
     this.numFailedTests = 0
     this.numFailedSuites = 0
+    this.pendingTestFinishes = 0
+    this.finishSession = undefined
 
     this.addSub('ci:playwright:test:is-modified', ({
       filePath,
@@ -71,6 +98,30 @@ class PlaywrightPlugin extends CiPlugin {
       onDone(isModified)
     })
 
+    this.addSub('ci:playwright:session:start', ({ isFailureScreenshotEnabled }) => {
+      if (!getConfig().testOptimization.DD_TEST_FAILURE_SCREENSHOTS_ENABLED) return
+
+      if (!isFailureScreenshotEnabled) {
+        log.warn(
+          '%s %s',
+          'DD_TEST_FAILURE_SCREENSHOTS_ENABLED is true, but Playwright screenshot capture is disabled.',
+          'Set Playwright use.screenshot to "only-on-failure", "on-first-failure", or "on".'
+        )
+      }
+    })
+
+    this.addSub('ci:playwright:session:configuration', ({ isFailureScreenshotEnabled }) => {
+      if (!getConfig().testOptimization.DD_TEST_FAILURE_SCREENSHOTS_ENABLED || !isFailureScreenshotEnabled) return
+
+      if (!this.tracer._exporter?.canUploadTestScreenshots?.()) {
+        log.warn(
+          '%s %s',
+          'DD_TEST_FAILURE_SCREENSHOTS_ENABLED is true, but Playwright screenshot upload is not supported',
+          'by the active Test Optimization transport.'
+        )
+      }
+    })
+
     this.addSub('ci:playwright:session:finish', ({
       status,
       isEarlyFlakeDetectionEnabled,
@@ -78,42 +129,51 @@ class PlaywrightPlugin extends CiPlugin {
       isTestManagementTestsEnabled,
       onDone,
     }) => {
-      this.testModuleSpan.setTag(TEST_STATUS, status)
-      this.testSessionSpan.setTag(TEST_STATUS, status)
+      const finishSession = () => {
+        this.testModuleSpan.setTag(TEST_STATUS, status)
+        this.testSessionSpan.setTag(TEST_STATUS, status)
 
-      if (isEarlyFlakeDetectionEnabled) {
-        this.testSessionSpan.setTag(TEST_EARLY_FLAKE_ENABLED, 'true')
-      }
-      if (isEarlyFlakeDetectionFaulty) {
-        this.testSessionSpan.setTag(TEST_EARLY_FLAKE_ABORT_REASON, 'faulty')
-      }
-      if (status === 'fail' && this.numFailedSuites > 0) {
-        let errorMessage = `Test suites failed: ${this.numFailedSuites}.`
-        if (this.numFailedTests > 0) {
-          errorMessage += ` Tests failed: ${this.numFailedTests}`
+        if (isEarlyFlakeDetectionEnabled) {
+          this.testSessionSpan.setTag(TEST_EARLY_FLAKE_ENABLED, 'true')
+        }
+        if (isEarlyFlakeDetectionFaulty) {
+          this.testSessionSpan.setTag(TEST_EARLY_FLAKE_ABORT_REASON, 'faulty')
+        }
+        if (status === 'fail' && this.numFailedSuites > 0) {
+          let errorMessage = `Test suites failed: ${this.numFailedSuites}.`
+          if (this.numFailedTests > 0) {
+            errorMessage += ` Tests failed: ${this.numFailedTests}`
+          }
+          const error = new Error(errorMessage)
+          this.testModuleSpan.setTag('error', error)
+          this.testSessionSpan.setTag('error', error)
         }
-        const error = new Error(errorMessage)
-        this.testModuleSpan.setTag('error', error)
-        this.testSessionSpan.setTag('error', error)
-      }
 
-      if (isTestManagementTestsEnabled) {
-        this.testSessionSpan.setTag(TEST_MANAGEMENT_ENABLED, 'true')
+        if (isTestManagementTestsEnabled) {
+          this.testSessionSpan.setTag(TEST_MANAGEMENT_ENABLED, 'true')
+        }
+
+        this.testModuleSpan.finish()
+        this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'module')
+        this.testSessionSpan.finish()
+        this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
+        finishAllTraceSpans(this.testSessionSpan)
+        this.telemetry.count(TELEMETRY_TEST_SESSION, {
+          provider: this.ciProviderName,
+          autoInjected: !!this._tracerConfig.testOptimization.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER,
+        })
+        appClosingTelemetry()
+        this.tracer._exporter.flush(onDone)
+        this.numFailedTests = 0
+        this.numFailedSuites = 0
+        this.finishSession = undefined
       }
 
-      this.testModuleSpan.finish()
-      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'module')
-      this.testSessionSpan.finish()
-      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
-      finishAllTraceSpans(this.testSessionSpan)
-      this.telemetry.count(TELEMETRY_TEST_SESSION, {
-        provider: this.ciProviderName,
-        autoInjected: !!this._tracerConfig.testOptimization.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER,
-      })
-      appClosingTelemetry()
-      this.tracer._exporter.flush(onDone)
-      this.numFailedTests = 0
-      this.numFailedSuites = 0
+      if (this.pendingTestFinishes > 0) {
+        this.finishSession = finishSession
+      } else {
+        finishSession()
+      }
     })
 
     this.addBind('ci:playwright:test-suite:start', (ctx) => {
@@ -178,42 +238,17 @@ class PlaywrightPlugin extends CiPlugin {
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'suite')
     })
 
-    this.addSub('ci:playwright:test:page-goto', ({
-      isRumActive,
-      page,
-    }) => {
-      const store = storage('legacy').getStore()
-      const span = store && store.span
-      if (!span) {
+    this.addSub('ci:playwright:test:page-goto', (ctx) => {
+      const activeSpan = storage('legacy').getStore()?.span
+      if (!setRumTestCorrelation(ctx, activeSpan)) {
         log.error('ci:playwright:test:page-goto: test span not found')
-        return
-      }
-
-      if (isRumActive) {
-        span.setTag(TEST_IS_RUM_ACTIVE, 'true')
-
-        if (page) {
-          const browserVersion = page.context().browser().version()
-
-          if (browserVersion) {
-            span.setTag(TEST_BROWSER_VERSION, browserVersion)
-          }
-
-          const url = page.url()
-          const domain = new URL(url).hostname
-          page.context().addCookies([{
-            name: 'datadog-ci-visibility-test-execution-id',
-            value: span.context().toTraceId(),
-            domain,
-            path: '/',
-          }])
-        }
       }
     })
 
-    this.addSub('ci:playwright:worker:report', (serializedTraces) => {
+    this.addSub('ci:playwright:worker:report', ({ serializedTraces, screenshots }) => {
       const traces = JSON.parse(serializedTraces)
       const formattedTraces = []
+      let formattedTestSpan
 
       for (const trace of traces) {
         const formattedTrace = []
@@ -228,6 +263,7 @@ class PlaywrightPlugin extends CiPlugin {
             formattedSpan.meta[TEST_HAS_DYNAMIC_NAME] = 'true'
           }
           if (span.name === 'playwright.test') {
+            formattedTestSpan = formattedSpan
             // TODO: remove this comment
             // TODO: Let's pass rootDir, repositoryRoot, command, session id and module id as env vars
             // so we don't need this re-serialization logic. This can be passed just once, since they're unique
@@ -262,9 +298,36 @@ class PlaywrightPlugin extends CiPlugin {
         formattedTraces.push(formattedTrace)
       }
 
-      for (const trace of formattedTraces) {
-        this.tracer._exporter.export(trace)
+      const exportTraces = () => {
+        for (const trace of formattedTraces) {
+          this.tracer._exporter.export(trace)
+        }
       }
+
+      if (!formattedTestSpan || !screenshots) {
+        exportTraces()
+        return
+      }
+
+      this.pendingTestFinishes++
+      const uploadStarted = this.uploadTestScreenshots({
+        screenshots,
+        traceId: formattedTestSpan.trace_id.toString(10),
+      }, (screenshotUploadResult) => {
+        const screenshotUploadTag = getScreenshotUploadTag(screenshotUploadResult)
+        if (screenshotUploadTag) {
+          formattedTestSpan.meta[screenshotUploadTag] = 'true'
+        }
+        exportTraces()
+        this.pendingTestFinishes--
+        if (this.pendingTestFinishes === 0 && this.finishSession) {
+          this.finishSession()
+        }
+      })
+      if (uploadStarted) return
+
+      this.pendingTestFinishes--
+      exportTraces()
     })
 
     this.addBind('ci:playwright:test:start', (ctx) => {
@@ -480,6 +543,56 @@ class PlaywrightPlugin extends CiPlugin {
     })
   }
 
+  /**
+   * Uploads automatic failure screenshots for a Playwright test attempt.
+   *
+   * @param {object} options - Upload options
+   * @param {Array<object>} options.screenshots - Playwright test attachments
+   * @param {string} options.traceId - Test trace id used as the screenshot key
+   * @param {(result: string|undefined) => void} onDone - Completion callback
+   * @returns {boolean} Whether at least one upload was started
+   */
+  uploadTestScreenshots ({ screenshots, traceId }, onDone) {
+    const exporter = this.tracer?._exporter
+    if (!Array.isArray(screenshots) || !screenshots.length ||
+      !exporter?.canUploadTestScreenshots?.() ||
+      !exporter.uploadTestScreenshot) {
+      return false
+    }
+
+    const screenshotPaths = new Set()
+    for (const screenshot of screenshots) {
+      if (isPlaywrightFailureScreenshot(screenshot)) {
+        screenshotPaths.add(screenshot.path)
+      }
+    }
+    if (!screenshotPaths.size) return false
+
+    const uploadResults = new Array(screenshotPaths.size)
+    let pendingUploads = screenshotPaths.size
+    let index = 0
+    for (const filePath of screenshotPaths) {
+      const resultIndex = index++
+      exporter.uploadTestScreenshot({
+        filePath,
+        traceId,
+        idempotencyKey: `${traceId}:${basename(filePath)}`,
+        capturedAtMs: getScreenshotCapturedAtMs(filePath, filePath),
+      }, (error, uploaded = true) => {
+        if (uploaded) {
+          uploadResults[resultIndex] = error
+            ? SCREENSHOT_UPLOAD_RESULT_ERROR
+            : SCREENSHOT_UPLOAD_RESULT_UPLOADED
+        }
+        pendingUploads--
+        if (pendingUploads === 0) {
+          onDone(getScreenshotUploadResult(uploadResults))
+        }
+      })
+    }
+    return true
+  }
+
   // TODO: this runs both in worker and main process (main process: skipped tests that do not go through _runTest)
   startTestSpan (
     testName,

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

@@ -24,7 +24,7 @@ class RouterPlugin extends WebPlugin {
       let childOf
       if (context !== undefined) {
         const middleware = context.middleware
-        childOf = middleware.length === 0 ? context.span : middleware[middleware.length - 1]
+        childOf = middleware.length === 0 ? context.span : middleware.at(-1)
       } else if (store) {
         childOf = store.span
       }
@@ -75,12 +75,21 @@ class RouterPlugin extends WebPlugin {
       const context = this.#contexts.get(req)
       if (!context) return
       const middleware = context.middleware
-      const span = middleware.length === 0 ? context.span : middleware[middleware.length - 1]
+      const span = middleware.length === 0 ? context.span : middleware.at(-1)
       if (!span) return
 
       span.setTag('error', error)
     })
 
+    this.addSub(`apm:${this.constructor.id}:middleware:repeat`, ({ req, name, error }) => {
+      // The middleware span already finished on the first `next`, so record the
+      // repeat on the still-live request span instead of a finished one.
+      web.root(req)?.addEvent('middleware.next_called_again', {
+        'middleware.name': name || '<anonymous>',
+        with_error: Boolean(error && error !== 'route' && error !== 'router'),
+      })
+    })
+
     this.addSub('apm:http:server:request:finish', ({ req }) => {
       const context = this.#contexts.get(req)
 

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

@@ -4,27 +4,12 @@ const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
 
 const {
-  TEST_IS_RUM_ACTIVE,
+  setRumTestCorrelation,
   TEST_BROWSER_DRIVER,
   TEST_BROWSER_DRIVER_VERSION,
   TEST_BROWSER_NAME,
-  TEST_BROWSER_VERSION,
   TEST_TYPE,
 } = require('../../dd-trace/src/plugins/util/test')
-const { SPAN_TYPE } = require('../../../ext/tags')
-
-function isTestSpan (span) {
-  return span.context().getTag(SPAN_TYPE) === 'test'
-}
-
-function getTestSpanFromTrace (trace) {
-  for (const span of trace.started) {
-    if (isTestSpan(span)) {
-      return span
-    }
-  }
-  return null
-}
 
 class SeleniumPlugin extends CiPlugin {
   static id = 'selenium'
@@ -32,32 +17,16 @@ class SeleniumPlugin extends CiPlugin {
   constructor (...args) {
     super(...args)
 
-    this.addSub('ci:selenium:driver:get', ({
-      setTraceId,
-      seleniumVersion,
-      browserName,
-      browserVersion,
-      isRumActive,
-    }) => {
-      const store = storage('legacy').getStore()
-      const span = store?.span
-      if (!span) {
-        return
-      }
-      const testSpan = isTestSpan(span) ? span : getTestSpanFromTrace(span.context()._trace)
+    this.addSub('ci:selenium:driver:get', (ctx) => {
+      const { seleniumVersion, browserName } = ctx
+      const activeSpan = storage('legacy').getStore()?.span
+      const testSpan = setRumTestCorrelation(ctx, activeSpan)
       if (!testSpan) {
         return
       }
-      if (setTraceId) {
-        setTraceId(testSpan.context().toTraceId())
-      }
-      if (isRumActive) {
-        testSpan.setTag(TEST_IS_RUM_ACTIVE, 'true')
-      }
       testSpan.setTag(TEST_BROWSER_DRIVER, 'selenium')
       testSpan.setTag(TEST_BROWSER_DRIVER_VERSION, seleniumVersion)
       testSpan.setTag(TEST_BROWSER_NAME, browserName)
-      testSpan.setTag(TEST_BROWSER_VERSION, browserVersion)
       testSpan.setTag(TEST_TYPE, 'browser')
     })
   }

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

@@ -264,8 +264,10 @@ class VitestPlugin extends CiPlugin {
         span.setTag(TEST_EARLY_FLAKE_ABORT_REASON, earlyFlakeAbortReason)
       }
       const finish = () => {
-        if (duration) {
-          span.finish(span._startTime + duration - MILLISECONDS_TO_SUBTRACT_FROM_FAILED_TEST_DURATION) // milliseconds
+        if (Number.isFinite(duration) && duration >= 0) {
+          span.finish(
+            span._startTime + Math.max(duration - MILLISECONDS_TO_SUBTRACT_FROM_FAILED_TEST_DURATION, 0)
+          ) // milliseconds
         } else {
           span.finish() // `duration` is empty for retries, so we'll use clock time
         }

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

@@ -6,6 +6,7 @@ const {
   SPAN_POINTER_DIRECTION,
   SPAN_POINTER_DIRECTION_NAME,
 } = require('../../dd-trace/src/constants')
+const { getSegment } = require('../../dd-trace/src/util')
 const {
   incrementWebSocketCounter,
   buildWebSocketSpanPointerHash,
@@ -29,7 +30,7 @@ class WSClosePlugin extends TracingPlugin {
 
     const spanKind = isPeerClose ? 'consumer' : 'producer'
     const spanTags = socket.spanTags
-    const path = spanTags['resource.name'].split(' ')[1]
+    const path = getSegment(spanTags['resource.name'], ' ', 1)
     const service = this.serviceName({ pluginConfig: this.config })
     const span = this.startSpan(this.operationName(), {
       service,

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

@@ -6,6 +6,7 @@ const {
   SPAN_POINTER_DIRECTION,
   SPAN_POINTER_DIRECTION_NAME,
 } = require('../../dd-trace/src/constants')
+const { getSegment } = require('../../dd-trace/src/util')
 const {
   incrementWebSocketCounter,
   buildWebSocketSpanPointerHash,
@@ -23,7 +24,7 @@ class WSProducerPlugin extends TracingPlugin {
     if (!socket.spanContext) return
 
     const spanTags = socket.spanTags
-    const path = spanTags['resource.name'].split(' ')[1]
+    const path = getSegment(spanTags['resource.name'], ' ', 1)
     const opCode = binary ? 'binary' : 'text'
     const service = this.serviceName({ pluginConfig: this.config })
     const span = this.startSpan(this.operationName(), {

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

@@ -6,6 +6,7 @@ const {
   SPAN_POINTER_DIRECTION,
   SPAN_POINTER_DIRECTION_NAME,
 } = require('../../dd-trace/src/constants')
+const { getSegment } = require('../../dd-trace/src/util')
 const {
   incrementWebSocketCounter,
   buildWebSocketSpanPointerHash,
@@ -28,7 +29,7 @@ class WSReceiverPlugin extends TracingPlugin {
     if (!socket.spanContext) return
 
     const spanTags = socket.spanTags
-    const path = spanTags['resource.name'].split(' ')[1]
+    const path = getSegment(spanTags['resource.name'], ' ', 1)
     const opCode = binary ? 'binary' : 'text'
 
     const service = this.serviceName({ pluginConfig: this.config })

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

@@ -3,6 +3,7 @@
 const TracingPlugin = require('../../dd-trace/src/plugins/tracing.js')
 const tags = require('../../../ext/tags.js')
 const { HTTP_HEADERS } = require('../../../ext/formats')
+const { getSegment } = require('../../dd-trace/src/util')
 const {
   createWebSocketSpanContext,
   hasTraceHeaders,
@@ -94,7 +95,7 @@ function getRequestProtocol (req, fallback = 'ws') {
 
   // 2. Check for a trusted header set by a proxy
   if (req.headers && req.headers['x-forwarded-proto']) {
-    const proto = req.headers['x-forwarded-proto'].split(',')[0].trim()
+    const proto = getSegment(req.headers['x-forwarded-proto'], ',', 0).trim()
     if (proto === 'https') return 'wss'
     if (proto === 'http') return 'ws'
   }

package/packages/dd-trace/index.electron.js

@@ -0,0 +1,3 @@
+'use strict'
+
+module.exports = require('./src/bootstrap')

package/packages/dd-trace/index.js

@@ -1,39 +1,4 @@
 'use strict'
 
-if (!global._ddtrace) {
-  const ddTraceSymbol = Symbol.for('dd-trace')
-
-  // Set up beforeExitHandlers before loading the tracer so that modules loaded
-  // during require('./src') can register handlers.
-  Object.defineProperty(globalThis, ddTraceSymbol, {
-    value: {
-      beforeExitHandlers: new Set(),
-    },
-    enumerable: false,
-    configurable: true,
-    writable: false,
-  })
-
-  process.once('beforeExit', function mainBeforeExit () {
-    if (globalThis[ddTraceSymbol]?.beforeExitHandlers) {
-      for (const handler of globalThis[ddTraceSymbol].beforeExitHandlers) {
-        handler()
-      }
-    }
-  })
-
-  const TracerProxy = require('./src')
-
-  Object.defineProperty(global, '_ddtrace', {
-    value: new TracerProxy(),
-    enumerable: false,
-    configurable: true,
-    writable: true,
-  })
-}
-
-module.exports = global._ddtrace
-// Static aliases so cjs-module-lexer surfaces them as ESM named exports
-// (`import { tracer } from 'dd-trace'`).
-module.exports.tracer = global._ddtrace
-module.exports.default = global._ddtrace
+require('./src/openfeature/register')
+module.exports = require('./src/bootstrap')

package/packages/dd-trace/src/aiguard/sdk.js

@@ -230,7 +230,7 @@ class AIGuard extends NoopAIGuard {
     // still applies for SDK callers that don't supply an explicit parent.
     const traceOpts = childOf ? { childOf } : {}
     return this.#tracer.trace(TAGS.RESOURCE, traceOpts, async (span) => {
-      const last = messages[messages.length - 1]
+      const last = messages.at(-1)
       const target = this.#isToolCall(last) ? 'tool' : 'prompt'
       span.setTag(TAGS.TARGET_TAG_KEY, target)
       if (target === 'tool') {

package/packages/dd-trace/src/appsec/iast/taint-tracking/plugin.js

@@ -190,7 +190,7 @@ class TaintTrackingPlugin extends SourceIastPlugin {
   }
 
   addURLParsingSubscriptions () {
-    const urlResultTaintedProperties = ['host', 'origin', 'hostname']
+    const urlResultTaintedProperties = new Set(['host', 'origin', 'hostname'])
     this.addSub(
       { channelName: 'datadog:url:parse:finish' },
       ({ input, base, parsed, isURL }) => {
@@ -212,7 +212,7 @@ class TaintTrackingPlugin extends SourceIastPlugin {
     this.addSub(
       { channelName: 'datadog:url:getter:finish' },
       (context) => {
-        if (!urlResultTaintedProperties.includes(context.property)) return
+        if (!urlResultTaintedProperties.has(context.property)) return
 
         const origRange = this._taintedURLs.get(context.urlObject)
         if (!origRange) return