dd-trace 5.83.0 → 5.85.0

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

@@ -7,11 +7,11 @@ const {
   parseAnnotations,
   getTestSuitePath,
   PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE,
-  getIsFaultyEarlyFlakeDetection
+  getIsFaultyEarlyFlakeDetection,
 } = require('../../dd-trace/src/plugins/util/test')
 const log = require('../../dd-trace/src/log')
 const {
-  getValueFromEnvSources
+  getValueFromEnvSources,
 } = require('../../dd-trace/src/config/helper')
 const { DD_MAJOR } = require('../../../version')
 const { addHook, channel } = require('./helpers/instrument')
@@ -51,7 +51,7 @@ const STATUS_TO_TEST_STATUS = {
   passed: 'pass',
   failed: 'fail',
   timedOut: 'fail',
-  skipped: 'skip'
+  skipped: 'skip',
 }
 
 let remainingTestsByFile = {}
@@ -120,13 +120,13 @@ function deepCloneSuite (suite, filterTest, tags = []) {
     } else {
       if (filterTest(entry)) {
         const copiedTest = entry._clone()
-        tags.forEach(tag => {
+        for (const tag of tags) {
           const resolvedTag = typeof tag === 'function' ? tag(entry) : tag
 
           if (resolvedTag) {
             copiedTest[resolvedTag] = true
           }
-        })
+        }
         copy._addTest(copiedTest)
       }
     }
@@ -302,9 +302,9 @@ function testBeginHandler (test, browserName, shouldCreateTestSpan) {
   const {
     _requireFile: testSuiteAbsolutePath,
     location: {
-      line: testSourceLine
+      line: testSourceLine,
     },
-    _type
+    _type,
   } = test
 
   if (_type === 'beforeAll' || _type === 'afterAll') {
@@ -337,7 +337,7 @@ function testBeginHandler (test, browserName, shouldCreateTestSpan) {
       testSuiteAbsolutePath,
       testSourceLine,
       browserName,
-      isDisabled: test._ddIsDisabled
+      isDisabled: test._ddIsDisabled,
     }
     testToCtx.set(test, testCtx)
 
@@ -352,7 +352,7 @@ function testEndHandler ({
   error,
   isTimeout,
   shouldCreateTestSpan,
-  projects
+  projects,
 }) {
   const {
     _requireFile: testSuiteAbsolutePath,
@@ -422,7 +422,7 @@ function testEndHandler ({
         hasFailedAttemptToFixRetries: test._ddHasFailedAttemptToFixRetries,
         isAtrRetry,
         isModified: test._ddIsModified,
-        ...testCtx.currentStore
+        ...testCtx.currentStore,
       })
     }
   }
@@ -456,7 +456,7 @@ function testEndHandler ({
         isNew: test._ddIsNew,
         isDisabled: test._ddIsDisabled,
         isModified: test._ddIsModified,
-        isQuarantined: test._ddIsQuarantined
+        isQuarantined: test._ddIsQuarantined,
       })
     }
     remainingTestsByFile[testSuiteAbsolutePath] = []
@@ -484,11 +484,12 @@ function dispatcherRunWrapper (run) {
 
 function dispatcherRunWrapperNew (run) {
   return function (testGroups) {
-    // Filter out disabled tests from testGroups before they get scheduled
+    // Filter out disabled tests from testGroups before they get scheduled,
+    // unless they have attemptToFix (in which case they should still run and be retried)
     if (isTestManagementTestsEnabled) {
-      testGroups.forEach(group => {
-        group.tests = group.tests.filter(test => !test._ddIsDisabled)
-      })
+      for (const group of testGroups) {
+        group.tests = group.tests.filter(test => !test._ddIsDisabled || test._ddIsAttemptToFix)
+      }
       // Remove empty groups
       testGroups = testGroups.filter(group => group.tests.length > 0)
     }
@@ -533,7 +534,7 @@ function dispatcherHook (dispatcherExport) {
             error: testResult.error,
             isTimeout,
             shouldCreateTestSpan: true,
-            projects
+            projects,
           }
         )
       }
@@ -571,7 +572,7 @@ function dispatcherHookNew (dispatcherExport, runWrapper) {
           error: errors && errors[0],
           isTimeout,
           shouldCreateTestSpan,
-          projects
+          projects,
         }
       )
       const testResult = test.results.at(-1)
@@ -594,8 +595,8 @@ function dispatcherHookNew (dispatcherExport, runWrapper) {
           _ddHasPassedAttemptToFixRetries: test._ddHasPassedAttemptToFixRetries,
           _ddHasFailedAttemptToFixRetries: test._ddHasFailedAttemptToFixRetries,
           _ddIsAtrRetry: isAtrRetry,
-          _ddIsModified: test._ddIsModified
-        }
+          _ddIsModified: test._ddIsModified,
+        },
       })
     })
 
@@ -695,11 +696,11 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
     // preventing them from being retried by ATR or `--retries`.
     const shouldSetATRRetries = isFlakyTestRetriesEnabled && flakyTestRetriesCount > 0
     if (shouldSetATRRetries) {
-      projects.forEach(project => {
+      for (const project of projects) {
         if (project.retries === 0) { // Only if it hasn't been set by the user
           project.retries = flakyTestRetriesCount
         }
-      })
+      }
     }
 
     let runAllTestsReturn = await runAllTests.apply(this, arguments)
@@ -707,11 +708,11 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
     // Tests that have only skipped tests may reach this point
     // Skipped tests may or may not go through `testBegin` or `testEnd`
     // depending on the playwright configuration
-    Object.values(remainingTestsByFile).forEach(tests => {
+    for (const tests of Object.values(remainingTestsByFile)) {
       // `tests` should normally be empty, but if it isn't,
       // there were tests that did not go through `testBegin` or `testEnd`,
       // because they were skipped
-      tests.forEach(test => {
+      for (const test of tests) {
         const browser = getBrowserNameFromProjects(projects, test)
         testBeginHandler(test, browser, true)
         testEndHandler({
@@ -721,10 +722,10 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
           error: null,
           isTimeout: false,
           shouldCreateTestSpan: true,
-          projects
+          projects,
         })
-      })
-    })
+      }
+    }
 
     let preventedToFail = false
 
@@ -771,7 +772,7 @@ function runAllTestsWrapper (runAllTests, playwrightVersion) {
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
-      onDone
+      onDone,
     })
     await flushWait
 
@@ -808,56 +809,56 @@ if (DD_MAJOR < 6) { // <1.38.0 is only supported up to version 5
   addHook({
     name: '@playwright/test',
     file: 'lib/runner.js',
-    versions: ['>=1.18.0 <=1.30.0']
+    versions: ['>=1.18.0 <=1.30.0'],
   }, runnerHook)
 
   addHook({
     name: '@playwright/test',
     file: 'lib/dispatcher.js',
-    versions: ['>=1.18.0 <1.30.0']
+    versions: ['>=1.18.0 <1.30.0'],
   }, dispatcherHook)
 
   addHook({
     name: '@playwright/test',
     file: 'lib/dispatcher.js',
-    versions: ['>=1.30.0 <1.31.0']
+    versions: ['>=1.30.0 <1.31.0'],
   }, (dispatcher) => dispatcherHookNew(dispatcher, dispatcherRunWrapper))
 
   addHook({
     name: '@playwright/test',
     file: 'lib/runner/dispatcher.js',
-    versions: ['>=1.31.0 <1.38.0']
+    versions: ['>=1.31.0 <1.38.0'],
   }, (dispatcher) => dispatcherHookNew(dispatcher, dispatcherRunWrapperNew))
 
   addHook({
     name: '@playwright/test',
     file: 'lib/runner/runner.js',
-    versions: ['>=1.31.0 <1.38.0']
+    versions: ['>=1.31.0 <1.38.0'],
   }, runnerHook)
 }
 
 addHook({
   name: 'playwright',
   file: 'lib/runner/runner.js',
-  versions: ['>=1.38.0']
+  versions: ['>=1.38.0'],
 }, runnerHook)
 
 addHook({
   name: 'playwright',
   file: 'lib/runner/testRunner.js',
-  versions: ['>=1.55.0']
+  versions: ['>=1.55.0'],
 }, runnerHookNew)
 
 addHook({
   name: 'playwright',
   file: 'lib/runner/dispatcher.js',
-  versions: ['>=1.38.0']
+  versions: ['>=1.38.0'],
 }, (dispatcher) => dispatcherHookNew(dispatcher, dispatcherRunWrapperNew))
 
 addHook({
   name: 'playwright',
   file: 'lib/common/suiteUtils.js',
-  versions: ['>=1.38.0']
+  versions: ['>=1.38.0'],
 }, suiteUtilsPackage => {
   // We grab `applyRepeatEachIndex` to use it later
   // `applyRepeatEachIndex` needs to be applied to a cloned suite
@@ -892,7 +893,7 @@ function applyRetriesToTests (fileSuitesWithTestsToRetry, filterTest, tagsToAppl
 addHook({
   name: 'playwright',
   file: 'lib/runner/loadUtils.js',
-  versions: ['>=1.38.0']
+  versions: ['>=1.38.0'],
 }, (loadUtilsPackage) => {
   const oldCreateRootSuite = loadUtilsPackage.createRootSuite
 
@@ -911,14 +912,16 @@ addHook({
       const fileSuitesWithManagedTestsToProjects = new Map()
       for (const test of allTests) {
         const testProperties = getTestProperties(test)
-        // Disabled tests are skipped and not retried
+        // Disabled tests are skipped unless they have attemptToFix
         if (testProperties.disabled) {
           test._ddIsDisabled = true
-          test.expectedStatus = 'skipped'
-          // setting test.expectedStatus to 'skipped' does not work for every case,
-          // so we need to filter out disabled tests in dispatcherRunWrapperNew,
-          // so they don't get to the workers
-          continue
+          if (!testProperties.attemptToFix) {
+            test.expectedStatus = 'skipped'
+            // setting test.expectedStatus to 'skipped' does not work for every case,
+            // so we need to filter out disabled tests in dispatcherRunWrapperNew,
+            // so they don't get to the workers
+            continue
+          }
         }
         if (testProperties.quarantined) {
           test._ddIsQuarantined = true
@@ -947,8 +950,9 @@ addHook({
         (test) => test._ddIsAttemptToFix,
         [
           (test) => test._ddIsQuarantined && '_ddIsQuarantined',
+          (test) => test._ddIsDisabled && '_ddIsDisabled',
           '_ddIsAttemptToFix',
-          '_ddIsAttemptToFixRetry'
+          '_ddIsAttemptToFixRetry',
         ],
         testManagementAttemptToFixRetries
       )
@@ -960,13 +964,13 @@ addHook({
         isModifiedCh.publish({
           filePath: test._requireFile,
           modifiedFiles,
-          onDone: (isModified) => { isImpacted = isModified }
+          onDone: (isModified) => { isImpacted = isModified },
         })
         return isImpacted
       })
 
       const fileSuitesWithImpactedTestsToProjects = new Map()
-      impactedTests.forEach(impactedTest => {
+      for (const impactedTest of impactedTests) {
         impactedTest._ddIsModified = true
         if (isEarlyFlakeDetectionEnabled && impactedTest.expectedStatus !== 'skipped') {
           const fileSuite = getSuiteType(impactedTest, 'file')
@@ -974,7 +978,7 @@ addHook({
             fileSuitesWithImpactedTestsToProjects.set(fileSuite, getSuiteType(impactedTest, 'project'))
           }
         }
-      })
+      }
       // If something change in the file, all tests in the file are impacted, hence the () => true filter
       applyRetriesToTests(
         fileSuitesWithImpactedTestsToProjects,
@@ -982,7 +986,7 @@ addHook({
         [
           '_ddIsModified',
           '_ddIsEfdRetry',
-          (test) => (isKnownTestsEnabled && isNewTest(test) ? '_ddIsNew' : null)
+          (test) => (isKnownTestsEnabled && isNewTest(test) ? '_ddIsNew' : null),
         ],
         earlyFlakeDetectionNumRetries
       )
@@ -1003,7 +1007,7 @@ addHook({
         isEarlyFlakeDetectionFaulty = true
       } else {
         const fileSuitesWithNewTestsToProjects = new Map()
-        newTests.forEach(newTest => {
+        for (const newTest of newTests) {
           newTest._ddIsNew = true
           if (isEarlyFlakeDetectionEnabled && newTest.expectedStatus !== 'skipped' && !newTest._ddIsModified) {
             // Prevent ATR or `--retries` from retrying new tests if EFD is enabled
@@ -1013,7 +1017,7 @@ addHook({
               fileSuitesWithNewTestsToProjects.set(fileSuite, getSuiteType(newTest, 'project'))
             }
           }
-        })
+        }
 
         applyRetriesToTests(
           fileSuitesWithNewTestsToProjects,
@@ -1034,7 +1038,7 @@ addHook({
         return newCreateRootSuite
       }
       return target[prop]
-    }
+    },
   })
 
   return proxy
@@ -1044,13 +1048,13 @@ addHook({
 addHook({
   name: 'playwright',
   file: 'lib/runner/processHost.js',
-  versions: ['>=1.38.0']
+  versions: ['>=1.38.0'],
 }, (processHostPackage) => {
   shimmer.wrap(processHostPackage.ProcessHost.prototype, 'startRunner', startRunner => async function () {
     this._extraEnv = {
       ...this._extraEnv,
       // Used to detect that we're in a playwright worker
-      DD_PLAYWRIGHT_WORKER: '1'
+      DD_PLAYWRIGHT_WORKER: '1',
     }
 
     const res = await startRunner.apply(this, arguments)
@@ -1072,7 +1076,7 @@ addHook({
 addHook({
   name: 'playwright-core',
   file: 'lib/client/page.js',
-  versions: ['>=1.38.0']
+  versions: ['>=1.38.0'],
 }, (pagePackage) => {
   shimmer.wrap(pagePackage.Page.prototype, 'goto', goto => async function (url, options) {
     const response = await goto.apply(this, arguments)
@@ -1098,7 +1102,7 @@ addHook({
         if (isRumActive) {
           testPageGotoCh.publish({
             isRumActive,
-            page
+            page,
           })
         }
       }
@@ -1117,7 +1121,7 @@ addHook({
 addHook({
   name: 'playwright',
   file: 'lib/worker/workerMain.js',
-  versions: ['>=1.38.0']
+  versions: ['>=1.38.0'],
 }, (workerPackage) => {
   // we assume there's only a test running at a time
   let steps = []
@@ -1132,8 +1136,8 @@ addHook({
     const {
       _requireFile: testSuiteAbsolutePath,
       location: {
-        line: testSourceLine
-      }
+        line: testSourceLine,
+      },
     } = test
     let res
 
@@ -1148,7 +1152,7 @@ addHook({
       testName,
       testSuiteAbsolutePath,
       testSourceLine,
-      browserName
+      browserName,
     }
     testToCtx.set(test, testCtx)
     // TODO - In the future we may need to implement a mechanism to send test properties
@@ -1189,7 +1193,7 @@ addHook({
                       name: 'datadog-ci-visibility-test-execution-id',
                       value: '',
                       domain,
-                      path: '/'
+                      path: '/',
                     }])
                   } else {
                     log.error('RUM is active but page.url() is not available')
@@ -1202,7 +1206,7 @@ addHook({
             }
           },
           title: 'afterEach hook',
-          _ddHook: true
+          _ddHook: true,
         })
       }
 
@@ -1267,7 +1271,7 @@ addHook({
       isAtrRetry: test._ddIsAtrRetry,
       isModified: test._ddIsModified,
       onDone,
-      ...testCtx.currentStore
+      ...testCtx.currentStore,
     })
 
     await flushPromise
@@ -1282,7 +1286,7 @@ addHook({
       stepInfoByStepId[payload.stepId] = {
         startTime: payload.wallTime,
         title: payload.title,
-        testId: payload.testId
+        testId: payload.testId,
       }
     } else if (event === 'stepEnd') {
       const stepInfo = stepInfoByStepId[payload.stepId]
@@ -1292,7 +1296,7 @@ addHook({
         startTime: new Date(stepInfo.startTime),
         title: stepInfo.title,
         duration: payload.wallTime - stepInfo.startTime,
-        error: payload.error
+        error: payload.error,
       })
     }
     return dispatchEvent.apply(this, arguments)
@@ -1314,7 +1318,7 @@ function generateSummaryWrapper (generateSummary) {
           _ddIsNew: isNew,
           _ddIsDisabled: isDisabled,
           _ddIsModified: isModified,
-          _ddIsQuarantined: isQuarantined
+          _ddIsQuarantined: isQuarantined,
         } = test
         const browserName = getBrowserNameFromProjects(sessionProjects, test)
 
@@ -1326,7 +1330,7 @@ function generateSummaryWrapper (generateSummary) {
           isNew,
           isDisabled,
           isModified,
-          isQuarantined
+          isQuarantined,
         })
       }
     }
@@ -1341,7 +1345,7 @@ function generateSummaryWrapper (generateSummary) {
 addHook({
   name: 'playwright',
   file: 'lib/reporters/base.js',
-  versions: ['>=1.38.0']
+  versions: ['>=1.38.0'],
 }, (reportersPackage) => {
   // v1.50.0 changed the name of the base reporter from BaseReporter to TerminalReporter
   if (reportersPackage.TerminalReporter) {

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

@@ -1,92 +1,38 @@
 'use strict'
 
-const tracingChannel = require('dc-polyfill').tracingChannel
-
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const { channel, addHook } = require('./helpers/instrument')
-const prismaEngineStart = channel('apm:prisma:engine:start')
-const clientCH = tracingChannel('apm:prisma:client')
-
-const allowedClientSpanOperations = new Set([
-  'operation',
-  'serialize',
-  'transaction'
-])
-
-class DatadogTracingHelper {
-  dbConfig = null
-
-  constructor (dbConfig = null) {
-    this.dbConfig = dbConfig
-  }
-
-  isEnabled () {
-    return true
-  }
-
-  // needs a sampled tracecontext to generate engine spans
-  getTraceParent (context) {
-    // TODO: Fix the id
-    return '00-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-01' // valid sampled traceparent
-  }
-
-  dispatchEngineSpans (spans) {
-    for (const span of spans) {
-      if (span.parentId === null) {
-        prismaEngineStart.publish({ engineSpan: span, allEngineSpans: spans, dbConfig: this.dbConfig })
-      }
-    }
-  }
-
-  getActiveContext () {
-    // TODO: Fix context
-  }
-
-  runInChildSpan (options, callback) {
-    if (typeof options === 'string') {
-      options = {
-        name: options
-      }
-    }
-
-    if (allowedClientSpanOperations.has(options.name)) {
-      const ctx = {
-        resourceName: options.name,
-        attributes: options.attributes || {}
-      }
-
-      if (options.name !== 'serialize') {
-        return clientCH.tracePromise(callback, ctx, this, ...arguments)
-      }
-
-      return clientCH.traceSync(callback, ctx, this, ...arguments)
-    }
-    return callback()
-  }
-
-  setDbString (dbConfig) {
-    this.dbConfig = dbConfig
-  }
-}
+const prismaHelperInit = channel('apm:prisma:helper:init')
 
 const prismaHook = (runtime, versions, name, isIitm) => {
   const originalGetPrismaClient = runtime.getPrismaClient
 
   if (!originalGetPrismaClient) return runtime
-  const datadogTracingHelper = new DatadogTracingHelper()
+
+  const prismaHelperCtx = {}
 
   const wrappedGetPrismaClient = function (config) {
-    const datasources = config.inlineDatasources?.db.url?.value
-    if (datasources) {
-      const dbConfig = parseDBString(datasources)
-      datadogTracingHelper.setDbString(dbConfig)
+    // Prisma config shapes vary by version/runtime entrypoint. We try a few known locations
+    // and fall back to DATABASE_URL when present.
+    const datasourceUrl =
+      config?.inlineDatasources?.db?.url?.value ??
+      config?.inlineDatasources?.db?.url ??
+      config?.overrideDatasources?.db?.url ??
+      config?.datasources?.db?.url ??
+      config?.datasourceUrl ??
+      getEnvironmentVariable('DATABASE_URL')
+
+    if (datasourceUrl && !prismaHelperCtx.dbConfig) {
+      prismaHelperCtx.dbConfig = parseDBString(datasourceUrl)
     }
+    prismaHelperInit.publish(prismaHelperCtx)
 
     const PrismaClient = originalGetPrismaClient.call(this, config)
     return class WrappedPrismaClientClass extends PrismaClient {
       constructor (clientConfig) {
         super(clientConfig)
-        this._tracingHelper = datadogTracingHelper
-        this._engine.tracingHelper = datadogTracingHelper
+        this._tracingHelper = prismaHelperCtx.helper
+        this._engine.tracingHelper = prismaHelperCtx.helper
       }
     }
   }
@@ -102,19 +48,19 @@ const prismaHook = (runtime, versions, name, isIitm) => {
         return wrappedGetPrismaClient
       }
       return target[prop]
-    }
+    },
   })
 }
 
 const prismaConfigs = [
   { name: '@prisma/client', versions: ['>=6.1.0 <7.0.0'], filePattern: 'runtime/library.*' },
   { name: './runtime/library.js', versions: ['>=6.1.0 <7.0.0'], file: 'runtime/library.js' },
-  { name: '@prisma/client', versions: ['>=7.0.0'], filePattern: 'runtime/client.*' }
+  { name: '@prisma/client', versions: ['>=7.0.0'], filePattern: 'runtime/client.*' },
 ]
 
-prismaConfigs.forEach(config => {
+for (const config of prismaConfigs) {
   addHook(config, prismaHook)
-})
+}
 
 function parseDBString (dbString) {
   const url = new URL(dbString)
@@ -123,7 +69,7 @@ function parseDBString (dbString) {
     password: url.password,
     host: url.hostname,
     port: url.port,
-    database: url.pathname.slice(1) // Remove leading slash
+    database: url.pathname.slice(1), // Remove leading slash
   }
   return dbConfig
 }

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

@@ -6,7 +6,7 @@ const { wrapThen } = require('./helpers/promise')
 
 addHook({
   name: 'promise-js',
-  versions: ['>=0.0.3']
+  versions: ['>=0.0.3'],
 }, Promise => {
   if (Promise !== global.Promise) {
     shimmer.wrap(Promise.prototype, 'then', wrapThen)

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

@@ -7,7 +7,7 @@ const { wrapThen } = require('./helpers/promise')
 addHook({
   name: 'promise',
   file: 'lib/core.js',
-  versions: ['>=7']
+  versions: ['>=7'],
 }, Promise => {
   shimmer.wrap(Promise.prototype, 'then', wrapThen)
   return Promise

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

@@ -65,15 +65,15 @@ function wrapReflection (protobuf) {
   const reflectionMethods = [
     {
       target: protobuf.Root,
-      name: 'fromJSON'
+      name: 'fromJSON',
     },
     {
       target: protobuf.Type.prototype,
-      name: 'fromObject'
-    }
+      name: 'fromObject',
+    },
   ]
 
-  reflectionMethods.forEach(method => {
+  for (const method of reflectionMethods) {
     shimmer.wrap(method.target, method.name, original => function () {
       const result = original.apply(this, arguments)
       if (result.nested) {
@@ -86,7 +86,7 @@ function wrapReflection (protobuf) {
       }
       return result
     })
-  })
+  }
 }
 
 function isPromise (obj) {
@@ -95,7 +95,7 @@ function isPromise (obj) {
 
 addHook({
   name: 'protobufjs',
-  versions: ['>=6.8.0']
+  versions: ['>=6.8.0'],
 }, protobuf => {
   shimmer.wrap(protobuf.Root.prototype, 'load', original => function () {
     const result = original.apply(this, arguments)