dd-trace 5.54.0 → 5.55.0

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const { addHook, channel, AsyncResource } = require('./helpers/instrument')
+const { addHook, channel } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
 const {
@@ -83,8 +83,6 @@ let testManagementAttemptToFixRetries = 0
 let isImpactedTestsEnabled = false
 let modifiedTests = {}
 
-const sessionAsyncResource = new AsyncResource('bound-anonymous-fn')
-
 const testContexts = new WeakMap()
 const originalTestFns = new WeakMap()
 const originalHookFns = new WeakMap()
@@ -581,19 +579,16 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
         }
       }
       if (event.name === 'test_skip' || event.name === 'test_todo') {
-        const asyncResource = new AsyncResource('bound-anonymous-fn')
-        asyncResource.runInAsyncScope(() => {
-          testSkippedCh.publish({
-            test: {
-              name: getJestTestName(event.test),
-              suite: this.testSuite,
-              testSourceFile: this.testSourceFile,
-              displayName: this.displayName,
-              frameworkVersion: jestVersion,
-              testStartLine: getTestLineStart(event.test.asyncError, this.testSuite)
-            },
-            isDisabled: this.testManagementTestsForThisSuite?.disabled?.includes(getJestTestName(event.test))
-          })
+        testSkippedCh.publish({
+          test: {
+            name: getJestTestName(event.test),
+            suite: this.testSuite,
+            testSourceFile: this.testSourceFile,
+            displayName: this.displayName,
+            frameworkVersion: jestVersion,
+            testStartLine: getTestLineStart(event.test.asyncError, this.testSuite)
+          },
+          isDisabled: this.testManagementTestsForThisSuite?.disabled?.includes(getJestTestName(event.test))
         })
       }
     }
@@ -711,9 +706,7 @@ function cliWrapper (cli, jestVersion) {
       return runCLI.apply(this, arguments)
     }
 
-    sessionAsyncResource.runInAsyncScope(() => {
-      libraryConfigurationCh.publish({ onDone })
-    })
+    libraryConfigurationCh.publish({ onDone })
 
     try {
       const { err, libraryConfig } = await configurationPromise
@@ -737,9 +730,7 @@ function cliWrapper (cli, jestVersion) {
         onDone = resolve
       })
 
-      sessionAsyncResource.runInAsyncScope(() => {
-        knownTestsCh.publish({ onDone })
-      })
+      knownTestsCh.publish({ onDone })
 
       try {
         const { err, knownTests: receivedKnownTests } = await knownTestsPromise
@@ -760,9 +751,7 @@ function cliWrapper (cli, jestVersion) {
         onDone = resolve
       })
 
-      sessionAsyncResource.runInAsyncScope(() => {
-        skippableSuitesCh.publish({ onDone })
-      })
+      skippableSuitesCh.publish({ onDone })
 
       try {
         const { err, skippableSuites: receivedSkippableSuites } = await skippableSuitesPromise
@@ -779,9 +768,7 @@ function cliWrapper (cli, jestVersion) {
         onDone = resolve
       })
 
-      sessionAsyncResource.runInAsyncScope(() => {
-        testManagementTestsCh.publish({ onDone })
-      })
+      testManagementTestsCh.publish({ onDone })
 
       try {
         const { err, testManagementTests: receivedTestManagementTests } = await testManagementTestsPromise
@@ -798,9 +785,7 @@ function cliWrapper (cli, jestVersion) {
         onDone = resolve
       })
 
-      sessionAsyncResource.runInAsyncScope(() => {
-        impactedTestsCh.publish({ onDone })
-      })
+      impactedTestsCh.publish({ onDone })
 
       try {
         const { err, modifiedTests: receivedModifiedTests } = await impactedTestsPromise
@@ -813,9 +798,7 @@ function cliWrapper (cli, jestVersion) {
     }
 
     const processArgv = process.argv.slice(2).join(' ')
-    sessionAsyncResource.runInAsyncScope(() => {
-      testSessionStartCh.publish({ command: `jest ${processArgv}`, frameworkVersion: jestVersion })
-    })
+    testSessionStartCh.publish({ command: `jest ${processArgv}`, frameworkVersion: jestVersion })
 
     const result = await runCLI.apply(this, arguments)
 
@@ -864,23 +847,22 @@ function cliWrapper (cli, jestVersion) {
       }, FLUSH_TIMEOUT).unref()
     })
 
-    sessionAsyncResource.runInAsyncScope(() => {
-      testSessionFinishCh.publish({
-        status,
-        isSuitesSkipped,
-        isSuitesSkippingEnabled,
-        isCodeCoverageEnabled,
-        testCodeCoverageLinesTotal,
-        numSkippedSuites,
-        hasUnskippableSuites,
-        hasForcedToRunSuites,
-        error,
-        isEarlyFlakeDetectionEnabled,
-        isEarlyFlakeDetectionFaulty,
-        isTestManagementTestsEnabled,
-        onDone
-      })
+    testSessionFinishCh.publish({
+      status,
+      isSuitesSkipped,
+      isSuitesSkippingEnabled,
+      isCodeCoverageEnabled,
+      testCodeCoverageLinesTotal,
+      numSkippedSuites,
+      hasUnskippableSuites,
+      hasForcedToRunSuites,
+      error,
+      isEarlyFlakeDetectionEnabled,
+      isEarlyFlakeDetectionFaulty,
+      isTestManagementTestsEnabled,
+      onDone
     })
+
     const waitingResult = await Promise.race([flushPromise, timeoutPromise])
 
     if (waitingResult === 'timeout') {
@@ -1006,45 +988,40 @@ function jestAdapterWrapper (jestAdapter, jestVersion) {
     if (!environment) {
       return adapter.apply(this, arguments)
     }
-    const asyncResource = new AsyncResource('bound-anonymous-fn')
-    return asyncResource.runInAsyncScope(() => {
-      testSuiteStartCh.publish({
-        testSuite: environment.testSuite,
-        testEnvironmentOptions: environment.testEnvironmentOptions,
-        testSourceFile: environment.testSourceFile,
-        displayName: environment.displayName,
-        frameworkVersion: jestVersion
-      })
-      return adapter.apply(this, arguments).then(suiteResults => {
-        const { numFailingTests, skipped, failureMessage: errorMessage } = suiteResults
-        let status = 'pass'
-        if (skipped) {
-          status = 'skipped'
-        } else if (numFailingTests !== 0) {
-          status = 'fail'
-        }
+    testSuiteStartCh.publish({
+      testSuite: environment.testSuite,
+      testEnvironmentOptions: environment.testEnvironmentOptions,
+      testSourceFile: environment.testSourceFile,
+      displayName: environment.displayName,
+      frameworkVersion: jestVersion
+    })
+    return adapter.apply(this, arguments).then(suiteResults => {
+      const { numFailingTests, skipped, failureMessage: errorMessage } = suiteResults
+      let status = 'pass'
+      if (skipped) {
+        status = 'skipped'
+      } else if (numFailingTests !== 0) {
+        status = 'fail'
+      }
 
-        /**
-         * Child processes do not each request ITR configuration, so the jest's parent process
-         * needs to pass them the configuration. This is done via _ddTestCodeCoverageEnabled, which
-         * controls whether coverage is reported.
-        */
-        if (environment.testEnvironmentOptions?._ddTestCodeCoverageEnabled) {
-          const root = environment.repositoryRoot || environment.rootDir
+      /**
+       * Child processes do not each request ITR configuration, so the jest's parent process
+       * needs to pass them the configuration. This is done via _ddTestCodeCoverageEnabled, which
+       * controls whether coverage is reported.
+      */
+      if (environment.testEnvironmentOptions?._ddTestCodeCoverageEnabled) {
+        const root = environment.repositoryRoot || environment.rootDir
 
-          const coverageFiles = getCoveredFilenamesFromCoverage(environment.global.__coverage__)
-            .map(filename => getTestSuitePath(filename, root))
+        const coverageFiles = getCoveredFilenamesFromCoverage(environment.global.__coverage__)
+          .map(filename => getTestSuitePath(filename, root))
 
-          asyncResource.runInAsyncScope(() => {
-            testSuiteCodeCoverageCh.publish({ coverageFiles, testSuite: environment.testSourceFile })
-          })
-        }
-        testSuiteFinishCh.publish({ status, errorMessage })
-        return suiteResults
-      }).catch(error => {
-        testSuiteFinishCh.publish({ status: 'fail', error })
-        throw error
-      })
+        testSuiteCodeCoverageCh.publish({ coverageFiles, testSuite: environment.testSourceFile })
+      }
+      testSuiteFinishCh.publish({ status, errorMessage })
+      return suiteResults
+    }).catch(error => {
+      testSuiteFinishCh.publish({ status: 'fail', error })
+      throw error
     })
   })
   if (jestAdapter.default) {
@@ -1064,9 +1041,7 @@ addHook({
 
 function configureTestEnvironment (readConfigsResult) {
   const { configs } = readConfigsResult
-  sessionAsyncResource.runInAsyncScope(() => {
-    testSessionConfigurationCh.publish(configs.map(config => config.testEnvironmentOptions))
-  })
+  testSessionConfigurationCh.publish(configs.map(config => config.testEnvironmentOptions))
   // We can't directly use isCodeCoverageEnabled when reporting coverage in `jestAdapterWrapper`
   // because `jestAdapterWrapper` runs in a different process. We have to go through `testEnvironmentOptions`
   configs.forEach(config => {
@@ -1315,21 +1290,15 @@ addHook({
   shimmer.wrap(ChildProcessWorker.prototype, '_onMessage', _onMessage => function () {
     const [code, data] = arguments[0]
     if (code === JEST_WORKER_TRACE_PAYLOAD_CODE) { // datadog trace payload
-      sessionAsyncResource.runInAsyncScope(() => {
-        workerReportTraceCh.publish(data)
-      })
+      workerReportTraceCh.publish(data)
       return
     }
     if (code === JEST_WORKER_COVERAGE_PAYLOAD_CODE) { // datadog coverage payload
-      sessionAsyncResource.runInAsyncScope(() => {
-        workerReportCoverageCh.publish(data)
-      })
+      workerReportCoverageCh.publish(data)
       return
     }
     if (code === JEST_WORKER_LOGS_PAYLOAD_CODE) { // datadog logs payload
-      sessionAsyncResource.runInAsyncScope(() => {
-        workerReportLogsCh.publish(data)
-      })
+      workerReportLogsCh.publish(data)
       return
     }
     return _onMessage.apply(this, arguments)

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

@@ -112,10 +112,9 @@ function wrapMiddleware (fn, layer) {
             throw err
           }
         )
-      } else {
-        fulfill(ctx)
-        return result
       }
+      fulfill(ctx)
+      return result
     } catch (e) {
       fulfill(ctx, e)
       throw e

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

@@ -1,10 +1,12 @@
 'use strict'
 
-const { channel, addHook, AsyncResource } = require('./helpers/instrument')
+const { channel, addHook } = require('./helpers/instrument')
 
 const shimmer = require('../../datadog-shimmer')
 
 const commandAddCh = channel('apm:mariadb:command:add')
+const connectionStartCh = channel('apm:mariadb:connection:start')
+const connectionFinishCh = channel('apm:mariadb:connection:finish')
 const startCh = channel('apm:mariadb:query:start')
 const finishCh = channel('apm:mariadb:query:finish')
 const errorCh = channel('apm:mariadb:query:error')
@@ -82,7 +84,7 @@ function createWrapQueryCallback (options) {
       const ctx = { sql, conf: options }
 
       if (typeof cb !== 'function') {
-        arguments.length = arguments.length + 1
+        arguments.length += 1
       }
 
       arguments[arguments.length - 1] = shimmer.wrapFunction(cb, cb => function (err) {
@@ -135,8 +137,13 @@ function wrapPoolGetConnectionMethod (getConnection) {
     const cb = arguments[arguments.length - 1]
     if (typeof cb !== 'function') return getConnection.apply(this, arguments)
 
-    const callbackResource = new AsyncResource('bound-anonymous-fn')
-    arguments[arguments.length - 1] = callbackResource.bind(cb)
+    const ctx = {}
+
+    arguments[arguments.length - 1] = function () {
+      return connectionFinishCh.runStores(ctx, cb, this, ...arguments)
+    }
+
+    connectionStartCh.publish(ctx)
 
     return getConnection.apply(this, arguments)
   }

package/packages/datadog-instrumentations/src/mocha/main.js

@@ -1,10 +1,11 @@
 'use strict'
 
 const { createCoverageMap } = require('istanbul-lib-coverage')
-const { addHook, channel, AsyncResource } = require('../helpers/instrument')
+const { addHook, channel } = require('../helpers/instrument')
 const shimmer = require('../../../datadog-shimmer')
 const { isMarkedAsUnskippable } = require('../../../datadog-plugin-jest/src/util')
 const log = require('../../../dd-trace/src/log')
+const { getEnvironmentVariable } = require('../../../dd-trace/src/config-helper')
 const {
   getTestSuitePath,
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,
@@ -37,7 +38,6 @@ const {
 
 require('./common')
 
-const testSessionAsyncResource = new AsyncResource('bound-anonymous-fn')
 const patched = new WeakSet()
 
 const unskippableSuites = []
@@ -65,6 +65,8 @@ const testSuiteCodeCoverageCh = channel('ci:mocha:test-suite:code-coverage')
 const libraryConfigurationCh = channel('ci:mocha:library-configuration')
 const knownTestsCh = channel('ci:mocha:known-tests')
 const skippableSuitesCh = channel('ci:mocha:test-suite:skippable')
+const mochaGlobalRunCh = channel('ci:mocha:global:run')
+
 const testManagementTestsCh = channel('ci:mocha:test-management-tests')
 const impactedTestsCh = channel('ci:mocha:modified-tests')
 const workerReportTraceCh = channel('ci:mocha:worker-report:trace')
@@ -100,18 +102,18 @@ function getFilteredSuites (originalSuites) {
 }
 
 function getOnStartHandler (isParallel, frameworkVersion) {
-  return testSessionAsyncResource.bind(function () {
+  return function () {
     const processArgv = process.argv.slice(2).join(' ')
     const command = `mocha ${processArgv}`
     testSessionStartCh.publish({ command, frameworkVersion })
     if (!isParallel && skippedSuites.length) {
       itrSkippedSuitesCh.publish({ skippedSuites, frameworkVersion })
     }
-  })
+  }
 }
 
 function getOnEndHandler (isParallel) {
-  return testSessionAsyncResource.bind(function () {
+  return function () {
     let status = 'pass'
     let error
     if (this.stats) {
@@ -196,47 +198,12 @@ function getOnEndHandler (isParallel) {
       isTestManagementEnabled: config.isTestManagementTestsEnabled,
       isParallel
     })
-  })
+  }
 }
 
 function getExecutionConfiguration (runner, isParallel, onFinishRequest) {
-  const mochaRunAsyncResource = new AsyncResource('bound-anonymous-fn')
-
-  const onReceivedTestManagementTests = ({ err, testManagementTests: receivedTestManagementTests }) => {
-    if (err) {
-      config.testManagementTests = {}
-      config.isTestManagementTestsEnabled = false
-      config.testManagementAttemptToFixRetries = 0
-    } else {
-      config.testManagementTests = receivedTestManagementTests
-    }
-    if (config.isImpactedTestsEnabled) {
-      impactedTestsCh.publish({
-        onDone: mochaRunAsyncResource.bind(onReceivedImpactedTests)
-      })
-    } else if (config.isSuitesSkippingEnabled) {
-      skippableSuitesCh.publish({
-        onDone: mochaRunAsyncResource.bind(onReceivedSkippableSuites)
-      })
-    } else {
-      onFinishRequest()
-    }
-  }
-
-  const onReceivedImpactedTests = ({ err, modifiedTests: receivedModifiedTests }) => {
-    if (err) {
-      config.modifiedTests = []
-      config.isImpactedTestsEnabled = false
-    } else {
-      config.modifiedTests = receivedModifiedTests
-    }
-    if (config.isSuitesSkippingEnabled) {
-      skippableSuitesCh.publish({
-        onDone: mochaRunAsyncResource.bind(onReceivedSkippableSuites)
-      })
-    } else {
-      onFinishRequest()
-    }
+  const ctx = {
+    isParallel
   }
 
   const onReceivedSkippableSuites = ({ err, skippableSuites, itrCorrelationId: responseItrCorrelationId }) => {
@@ -260,7 +227,47 @@ function getExecutionConfiguration (runner, isParallel, onFinishRequest) {
 
     skippedSuites = [...filteredSuites.skippedSuites]
 
-    onFinishRequest()
+    mochaGlobalRunCh.runStores(ctx, () => {
+      onFinishRequest()
+    })
+  }
+
+  const onReceivedImpactedTests = ({ err, modifiedTests: receivedModifiedTests }) => {
+    if (err) {
+      config.modifiedTests = []
+      config.isImpactedTestsEnabled = false
+    } else {
+      config.modifiedTests = receivedModifiedTests
+    }
+    if (config.isSuitesSkippingEnabled) {
+      ctx.onDone = onReceivedSkippableSuites
+      skippableSuitesCh.runStores(ctx, () => {})
+    } else {
+      mochaGlobalRunCh.runStores(ctx, () => {
+        onFinishRequest()
+      })
+    }
+  }
+
+  const onReceivedTestManagementTests = ({ err, testManagementTests: receivedTestManagementTests }) => {
+    if (err) {
+      config.testManagementTests = {}
+      config.isTestManagementTestsEnabled = false
+      config.testManagementAttemptToFixRetries = 0
+    } else {
+      config.testManagementTests = receivedTestManagementTests
+    }
+    if (config.isImpactedTestsEnabled) {
+      ctx.onDone = onReceivedImpactedTests
+      impactedTestsCh.runStores(ctx, () => {})
+    } else if (config.isSuitesSkippingEnabled) {
+      ctx.onDone = onReceivedSkippableSuites
+      skippableSuitesCh.runStores(ctx, () => {})
+    } else {
+      mochaGlobalRunCh.runStores(ctx, () => {
+        onFinishRequest()
+      })
+    }
   }
 
   const onReceivedKnownTests = ({ err, knownTests }) => {
@@ -272,27 +279,27 @@ function getExecutionConfiguration (runner, isParallel, onFinishRequest) {
       config.knownTests = knownTests
     }
     if (config.isTestManagementTestsEnabled) {
-      testManagementTestsCh.publish({
-        onDone: mochaRunAsyncResource.bind(onReceivedTestManagementTests)
-      })
+      ctx.onDone = onReceivedTestManagementTests
+      testManagementTestsCh.runStores(ctx, () => {})
     } if (config.isImpactedTestsEnabled) {
-      impactedTestsCh.publish({
-        onDone: mochaRunAsyncResource.bind(onReceivedImpactedTests)
-      })
+      ctx.onDone = onReceivedImpactedTests
+      impactedTestsCh.runStores(ctx, () => {})
     } else if (config.isSuitesSkippingEnabled) {
-      skippableSuitesCh.publish({
-        onDone: mochaRunAsyncResource.bind(onReceivedSkippableSuites)
-      })
+      ctx.onDone = onReceivedSkippableSuites
+      skippableSuitesCh.runStores(ctx, () => {})
     } else {
-      onFinishRequest()
+      mochaGlobalRunCh.runStores(ctx, () => {
+        onFinishRequest()
+      })
     }
   }
 
   const onReceivedConfiguration = ({ err, libraryConfig }) => {
     if (err || !skippableSuitesCh.hasSubscribers || !knownTestsCh.hasSubscribers) {
-      return onFinishRequest()
+      return mochaGlobalRunCh.runStores(ctx, () => {
+        onFinishRequest()
+      })
     }
-
     config.isEarlyFlakeDetectionEnabled = libraryConfig.isEarlyFlakeDetectionEnabled
     config.earlyFlakeDetectionNumRetries = libraryConfig.earlyFlakeDetectionNumRetries
     config.earlyFlakeDetectionFaultyThreshold = libraryConfig.earlyFlakeDetectionFaultyThreshold
@@ -306,30 +313,27 @@ function getExecutionConfiguration (runner, isParallel, onFinishRequest) {
     config.flakyTestRetriesCount = !isParallel && libraryConfig.flakyTestRetriesCount
 
     if (config.isKnownTestsEnabled) {
-      knownTestsCh.publish({
-        onDone: mochaRunAsyncResource.bind(onReceivedKnownTests)
-      })
+      ctx.onDone = onReceivedKnownTests
+      knownTestsCh.runStores(ctx, () => {})
     } else if (config.isTestManagementTestsEnabled) {
-      testManagementTestsCh.publish({
-        onDone: mochaRunAsyncResource.bind(onReceivedTestManagementTests)
-      })
+      ctx.onDone = onReceivedTestManagementTests
+      testManagementTestsCh.runStores(ctx, () => {})
     } else if (config.isImpactedTestsEnabled) {
-      impactedTestsCh.publish({
-        onDone: mochaRunAsyncResource.bind(onReceivedImpactedTests)
-      })
+      ctx.onDone = onReceivedImpactedTests
+      impactedTestsCh.runStores(ctx, () => {})
     } else if (config.isSuitesSkippingEnabled) {
-      skippableSuitesCh.publish({
-        onDone: mochaRunAsyncResource.bind(onReceivedSkippableSuites)
-      })
+      ctx.onDone = onReceivedSkippableSuites
+      skippableSuitesCh.runStores(ctx, () => {})
     } else {
-      onFinishRequest()
+      mochaGlobalRunCh.runStores(ctx, () => {
+        onFinishRequest()
+      })
     }
   }
 
-  libraryConfigurationCh.publish({
-    onDone: mochaRunAsyncResource.bind(onReceivedConfiguration),
-    isParallel
-  })
+  ctx.onDone = onReceivedConfiguration
+
+  libraryConfigurationCh.runStores(ctx, () => {})
 }
 
 // In this hook we delay the execution with options.delay to grab library configuration,
@@ -342,7 +346,7 @@ addHook({
 }, (Mocha) => {
   shimmer.wrap(Mocha.prototype, 'run', run => function () {
     // Workers do not need to request any data, just run the tests
-    if (!testFinishCh.hasSubscribers || process.env.MOCHA_WORKER_ID || this.options.parallel) {
+    if (!testFinishCh.hasSubscribers || getEnvironmentVariable('MOCHA_WORKER_ID') || this.options.parallel) {
       return run.apply(this, arguments)
     }
 
@@ -517,7 +521,7 @@ addHook({
       if (ctx) {
         testSuiteFinishCh.publish({ status, ...ctx.currentStore }, () => {})
       } else {
-        log.warn(() => `No AsyncResource found for suite ${suite.file}`)
+        log.warn(() => `No ctx found for suite ${suite.file}`)
       }
     })
 

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

@@ -1,4 +1,6 @@
-if (process.env.MOCHA_WORKER_ID) {
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+
+if (getEnvironmentVariable('MOCHA_WORKER_ID')) {
   require('./mocha/worker')
 } else {
   require('./mocha/main')

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const { channel, addHook, AsyncResource } = require('./helpers/instrument')
+const { channel, addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 
 addHook({ name: 'mysql', file: 'lib/Connection.js', versions: ['>=2'] }, Connection => {
@@ -57,11 +57,20 @@ addHook({ name: 'mysql', file: 'lib/Connection.js', versions: ['>=2'] }, Connect
 })
 
 addHook({ name: 'mysql', file: 'lib/Pool.js', versions: ['>=2'] }, Pool => {
+  const connectionStartCh = channel('apm:mysql:connection:start')
+  const connectionFinishCh = channel('apm:mysql:connection:finish')
   const startPoolQueryCh = channel('datadog:mysql:pool:query:start')
   const finishPoolQueryCh = channel('datadog:mysql:pool:query:finish')
 
   shimmer.wrap(Pool.prototype, 'getConnection', getConnection => function (cb) {
-    arguments[0] = AsyncResource.bind(cb)
+    arguments[0] = function () {
+      return connectionFinishCh.runStores(ctx, cb, this, ...arguments)
+    }
+
+    const ctx = {}
+
+    connectionStartCh.publish(ctx)
+
     return getConnection.apply(this, arguments)
   })
 

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

@@ -1,5 +1,6 @@
 const { addHook, channel } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 const codeCoverageWrapCh = channel('ci:nyc:wrap')
 
@@ -11,7 +12,7 @@ addHook({
   shimmer.wrap(nycPackage.prototype, 'wrap', wrap => function () {
     // Only relevant if the config `all` is set to true
     try {
-      if (JSON.parse(process.env.NYC_CONFIG).all) {
+      if (JSON.parse(getEnvironmentVariable('NYC_CONFIG')).all) {
         codeCoverageWrapCh.publish(this)
       }
     } catch {

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

@@ -187,12 +187,12 @@ function addStreamedChunk (content, chunk) {
   }
 }
 
-function convertBufferstoObjects (chunks = []) {
+function convertBufferstoObjects (chunks) {
   return Buffer
     .concat(chunks) // combine the buffers
     .toString() // stringify
     .split(/(?=data:)/) // split on "data:"
-    .map(chunk => chunk.replace(/\n/g, '').slice(6)) // remove newlines and 'data: ' from the front
+    .map(chunk => chunk.replaceAll('\n', '').slice(6)) // remove newlines and 'data: ' from the front
     .slice(0, -1) // remove the last [DONE] message
     .map(JSON.parse) // parse all of the returned objects
 }

package/packages/datadog-instrumentations/src/otel-sdk-trace.js

@@ -3,10 +3,11 @@
 const { addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
 const tracer = require('../../dd-trace')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
-const otelSdkEnabled = process.env.DD_TRACE_OTEL_ENABLED ||
-process.env.OTEL_SDK_DISABLED
-  ? !process.env.OTEL_SDK_DISABLED
+const otelSdkEnabled = getEnvironmentVariable('DD_TRACE_OTEL_ENABLED') ||
+getEnvironmentVariable('OTEL_SDK_DISABLED')
+  ? !getEnvironmentVariable('OTEL_SDK_DISABLED')
   : undefined
 
 if (otelSdkEnabled) {