dd-trace 5.83.0 → 5.85.0

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

@@ -4,7 +4,7 @@ const dc = require('dc-polyfill')
 const shimmer = require('../../datadog-shimmer')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 const prepareCh = channel('datadog:mquery:filter:prepare')
@@ -17,7 +17,7 @@ const methods = [
   'findOneAndDelete',
   'count',
   'distinct',
-  'where'
+  'where',
 ]
 
 const methodsOptionalArgs = ['findOneAndUpdate']
@@ -36,10 +36,10 @@ function getFilters (args, methodName) {
 
 addHook({
   name: 'mquery',
-  versions: ['>=5.0.0']
+  versions: ['>=5.0.0'],
 }, Query => {
-  [...methods, ...methodsOptionalArgs].forEach(methodName => {
-    if (!(methodName in Query.prototype)) return
+  for (const methodName of [...methods, ...methodsOptionalArgs]) {
+    if (!(methodName in Query.prototype)) continue
 
     shimmer.wrap(Query.prototype, methodName, method => {
       return function () {
@@ -53,7 +53,7 @@ addHook({
         return method.apply(this, arguments)
       }
     })
-  })
+  }
 
   shimmer.wrap(Query.prototype, 'exec', originalExec => {
     return function wrappedExec () {

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

@@ -23,7 +23,7 @@ function publishRequestBodyAndNext (req, res, next) {
 addHook({
   name: 'multer',
   file: 'lib/make-middleware.js',
-  versions: ['^1.4.4-lts.1']
+  versions: ['^1.4.4-lts.1'],
 }, makeMiddleware => {
   return shimmer.wrapFunction(makeMiddleware, makeMiddleware => function () {
     const middleware = makeMiddleware.apply(this, arguments)

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

@@ -44,7 +44,7 @@ addHook({ name: 'mysql', file: 'lib/Connection.js', versions: ['>=2'] }, Connect
 
         return res
       } catch (err) {
-        err.stack // trigger getting the stack at the original throwing point
+        void err.stack // trigger getting the stack at the original throwing point
         ctx.error = err
         errorCh.publish(ctx)
 

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

@@ -89,13 +89,13 @@ function getOptions (args) {
     case 'string':
       if (Number.isNaN(Number.parseFloat(args[0]))) {
         return {
-          path: args[0]
+          path: args[0],
         }
       }
     case 'number': // eslint-disable-line no-fallthrough
       return {
         port: args[0],
-        host: typeof args[1] === 'string' ? args[1] : 'localhost'
+        host: typeof args[1] === 'string' ? args[1] : 'localhost',
       }
   }
 }
@@ -125,9 +125,9 @@ function setupListeners (socket, protocol, ctx, finishCh, errorCh) {
 
   const cleanupOtherListeners = function () {
     socket.removeListener('connect', localListener)
-    events.forEach(event => {
+    for (const event of events) {
       socket.removeListener(event, wrapListener)
-    })
+    }
   }
 
   // TODO: Identify why the connect listener should remove the other listeners.
@@ -137,7 +137,7 @@ function setupListeners (socket, protocol, ctx, finishCh, errorCh) {
     events.push('connect')
   }
 
-  events.forEach(event => {
+  for (const event of events) {
     socket.once(event, wrapListener)
-  })
+  }
 }

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

@@ -208,7 +208,7 @@ function finish (ctx, result, err) {
 addHook({
   name: 'next',
   versions: ['>=13.3.0'],
-  file: 'dist/server/web/spec-extension/adapters/next-request.js'
+  file: 'dist/server/web/spec-extension/adapters/next-request.js',
 }, NextRequestAdapter => {
   shimmer.wrap(NextRequestAdapter.NextRequestAdapter, 'fromNodeNextRequest', fromNodeNextRequest => {
     return function (nodeNextRequest) {
@@ -223,13 +223,13 @@ addHook({
 addHook({
   name: 'next',
   versions: ['>=11.1'],
-  file: 'dist/server/serve-static.js'
+  file: 'dist/server/serve-static.js',
 }, serveStatic => shimmer.wrap(serveStatic, 'serveStatic', wrapServeStatic, { replaceGetter: true }))
 
 addHook({
   name: 'next',
   versions: ['>=10.2 <11.1'],
-  file: 'dist/next-server/server/serve-static.js'
+  file: 'dist/next-server/server/serve-static.js',
 }, serveStatic => shimmer.wrap(serveStatic, 'serveStatic', wrapServeStatic, { replaceGetter: true }))
 
 addHook({ name: 'next', versions: ['>=11.1'], file: 'dist/server/next-server.js' }, nextServer => {
@@ -258,7 +258,7 @@ addHook({ name: 'next', versions: ['>=13.2'], file: 'dist/server/next-server.js'
 addHook({
   name: 'next',
   versions: ['>=11.1 <13.2'],
-  file: 'dist/server/next-server.js'
+  file: 'dist/server/next-server.js',
 }, nextServer => {
   const Server = nextServer.default
   shimmer.wrap(Server.prototype, 'handleApiRequest', wrapHandleApiRequest)
@@ -268,7 +268,7 @@ addHook({
 addHook({
   name: 'next',
   versions: ['>=10.2 <11.1'],
-  file: 'dist/next-server/server/next-server.js'
+  file: 'dist/next-server/server/next-server.js',
 }, nextServer => {
   const Server = nextServer.default
 
@@ -288,7 +288,7 @@ addHook({
 addHook({
   name: 'next',
   versions: ['>=13'],
-  file: 'dist/server/web/spec-extension/request.js'
+  file: 'dist/server/web/spec-extension/request.js',
 }, request => {
   const requestProto = Object.getPrototypeOf(request.NextRequest.prototype)
 

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

@@ -2,17 +2,23 @@
 
 const shimmer = require('../../datadog-shimmer')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
+const { setupSettingsCachePath } = require('../../dd-trace/src/ci-visibility/test-optimization-cache')
 const { addHook, channel } = require('./helpers/instrument')
 
 const codeCoverageWrapCh = channel('ci:nyc:wrap')
+const codeCoverageReportCh = channel('ci:nyc:report')
 
 addHook({
   name: 'nyc',
-  versions: ['>=17']
+  versions: ['>=17'],
 }, (nycPackage) => {
+  // Set up the cache file path early (when nyc is required) so it's available
+  // when dd-trace fetches library configuration
+  setupSettingsCachePath()
+
   // `wrap` is an async function
   shimmer.wrap(nycPackage.prototype, 'wrap', wrap => function () {
-    // Only relevant if the config `all` is set to true
+    // Only relevant if the config `all` is set to true (for untested code coverage)
     try {
       if (JSON.parse(getEnvironmentVariable('NYC_CONFIG')).all) {
         codeCoverageWrapCh.publish(this)
@@ -23,5 +29,31 @@ addHook({
 
     return wrap.apply(this, arguments)
   })
+
+  // `report` is an async function, so we wait for it to complete before publishing
+  shimmer.wrap(nycPackage.prototype, 'report', report => function () {
+    if (!codeCoverageReportCh.hasSubscribers) {
+      return report.apply(this, arguments)
+    }
+    const nycInstance = this
+    const reportPromise = report.apply(this, arguments)
+
+    if (reportPromise && typeof reportPromise.then === 'function') {
+      // Return a new promise that waits for both the report AND the coverage upload
+      return reportPromise.then(() => {
+        return new Promise((resolve) => {
+          codeCoverageReportCh.publish({
+            rootDir: nycInstance.cwd,
+            onDone: resolve,
+          })
+        })
+      }).catch(() => {
+        // Ignore errors - report generation failed
+      })
+    }
+
+    return reportPromise
+  })
+
   return nycPackage
 })

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

@@ -13,14 +13,14 @@ const V4_PACKAGE_SHIMS = [
     targetClass: 'Completions',
     baseResource: 'chat.completions',
     methods: ['create'],
-    streamedResponse: true
+    streamedResponse: true,
   },
   {
     file: 'resources/completions',
     targetClass: 'Completions',
     baseResource: 'completions',
     methods: ['create'],
-    streamedResponse: true
+    streamedResponse: true,
   },
   {
     file: 'resources/responses/responses',
@@ -28,13 +28,13 @@ const V4_PACKAGE_SHIMS = [
     baseResource: 'responses',
     methods: ['create'],
     streamedResponse: true,
-    versions: ['>=4.87.0']
+    versions: ['>=4.87.0'],
   },
   {
     file: 'resources/embeddings',
     targetClass: 'Embeddings',
     baseResource: 'embeddings',
-    methods: ['create']
+    methods: ['create'],
   },
   {
     file: 'resources/files',
@@ -47,93 +47,93 @@ const V4_PACKAGE_SHIMS = [
     targetClass: 'Files',
     baseResource: 'files',
     methods: ['del'],
-    versions: ['>=4.0.0 <5.0.0']
+    versions: ['>=4.0.0 <5.0.0'],
   },
   {
     file: 'resources/files',
     targetClass: 'Files',
     baseResource: 'files',
     methods: ['delete'],
-    versions: ['>=5']
+    versions: ['>=5'],
   },
   {
     file: 'resources/files',
     targetClass: 'Files',
     baseResource: 'files',
     methods: ['retrieveContent'],
-    versions: ['>=4.0.0 <4.17.1']
+    versions: ['>=4.0.0 <4.17.1'],
   },
   {
     file: 'resources/files',
     targetClass: 'Files',
     baseResource: 'files',
     methods: ['content'], // replaced `retrieveContent` in v4.17.1
-    versions: ['>=4.17.1']
+    versions: ['>=4.17.1'],
   },
   {
     file: 'resources/images',
     targetClass: 'Images',
     baseResource: 'images',
-    methods: ['createVariation', 'edit', 'generate']
+    methods: ['createVariation', 'edit', 'generate'],
   },
   {
     file: 'resources/fine-tuning/jobs/jobs',
     targetClass: 'Jobs',
     baseResource: 'fine_tuning.jobs',
     methods: ['cancel', 'create', 'list', 'listEvents', 'retrieve'],
-    versions: ['>=4.34.0'] // file location changed in 4.34.0
+    versions: ['>=4.34.0'], // file location changed in 4.34.0
   },
   {
     file: 'resources/fine-tuning/jobs',
     targetClass: 'Jobs',
     baseResource: 'fine_tuning.jobs',
     methods: ['cancel', 'create', 'list', 'listEvents', 'retrieve'],
-    versions: ['>=4.1.0 <4.34.0']
+    versions: ['>=4.1.0 <4.34.0'],
   },
   {
     file: 'resources/fine-tunes', // deprecated after 4.1.0
     targetClass: 'FineTunes',
     baseResource: 'fine-tune',
     methods: ['cancel', 'create', 'list', 'listEvents', 'retrieve'],
-    versions: ['>=4.0.0 <4.1.0']
+    versions: ['>=4.0.0 <4.1.0'],
   },
   {
     file: 'resources/models',
     targetClass: 'Models',
     baseResource: 'models',
-    methods: ['list', 'retrieve']
+    methods: ['list', 'retrieve'],
   },
   {
     file: 'resources/models',
     targetClass: 'Models',
     baseResource: 'models',
     methods: ['del'],
-    versions: ['>=4 <5']
+    versions: ['>=4 <5'],
   },
   {
     file: 'resources/models',
     targetClass: 'Models',
     baseResource: 'models',
     methods: ['delete'],
-    versions: ['>=5']
+    versions: ['>=5'],
   },
   {
     file: 'resources/moderations',
     targetClass: 'Moderations',
     baseResource: 'moderations',
-    methods: ['create']
+    methods: ['create'],
   },
   {
     file: 'resources/audio/transcriptions',
     targetClass: 'Transcriptions',
     baseResource: 'audio.transcriptions',
-    methods: ['create']
+    methods: ['create'],
   },
   {
     file: 'resources/audio/translations',
     targetClass: 'Translations',
     baseResource: 'audio.translations',
-    methods: ['create']
+    methods: ['create'],
   },
   {
     file: 'resources/chat/completions/completions',
@@ -141,8 +141,8 @@ const V4_PACKAGE_SHIMS = [
     baseResource: 'chat.completions',
     methods: ['create'],
     streamedResponse: true,
-    versions: ['>=4.85.0']
-  }
+    versions: ['>=4.85.0'],
+  },
 ]
 
 addHook({ name: 'openai', file: 'dist/api.js', versions: ['>=3.0.0 <4'] }, exports => {
@@ -188,8 +188,8 @@ function wrapStreamIterator (response, options, ctx) {
                 headers: response.headers,
                 request: {
                   path: response.url,
-                  method: options.method
-                }
+                  method: options.method,
+                },
               })
             }
 
@@ -293,8 +293,8 @@ function handleUnwrappedAPIPromise (apiProm, ctx, stream) {
           data: body,
           request: {
             path: response.url,
-            method: options.method
-          }
+            method: options.method,
+          },
         })
       }
 

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

@@ -3,7 +3,7 @@
 const shimmer = require('../../datadog-shimmer')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 const connectionAttributes = new WeakMap()
@@ -68,7 +68,7 @@ addHook({ name: 'oracledb', versions: ['>=5'], file: 'lib/oracledb.js' }, oracle
         port,
         hostname,
         query: dbQuery,
-        connAttrs
+        connAttrs,
       }
 
       return startChannel.runStores(ctx, () => {

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

@@ -14,7 +14,7 @@ if (otelSdkEnabled) {
   addHook({
     name: '@opentelemetry/sdk-trace-node',
     file: 'build/src/NodeTracerProvider.js',
-    versions: ['*']
+    versions: ['*'],
   }, (mod) => {
     shimmer.wrap(mod, 'NodeTracerProvider', () => {
       return tracer.TracerProvider

package/packages/datadog-instrumentations/src/passport-http.js

@@ -6,5 +6,5 @@ const { strategyHook } = require('./passport-utils')
 addHook({
   name: 'passport-http',
   file: 'lib/passport-http/strategies/basic.js',
-  versions: ['>=0.3.0']
+  versions: ['>=0.3.0'],
 }, strategyHook)

package/packages/datadog-instrumentations/src/passport-local.js

@@ -6,5 +6,5 @@ const { strategyHook } = require('./passport-utils')
 addHook({
   name: 'passport-local',
   file: 'lib/strategy.js',
-  versions: ['>=1.0.0']
+  versions: ['>=1.0.0'],
 }, strategyHook)

package/packages/datadog-instrumentations/src/passport-utils.js

@@ -57,5 +57,5 @@ function strategyHook (Strategy) {
 }
 
 module.exports = {
-  strategyHook
+  strategyHook,
 }

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

@@ -37,7 +37,7 @@ function wrapDeserializeUser (deserializeUser) {
 addHook({
   name: 'passport',
   file: 'lib/authenticator.js',
-  versions: ['>=0.3.0']
+  versions: ['>=0.3.0'],
 }, Authenticator => {
   shimmer.wrap(Authenticator.prototype, 'deserializeUser', wrapDeserializeUser)
 

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

@@ -5,7 +5,7 @@ const { errorMonitor } = require('node:events')
 const shimmer = require('../../datadog-shimmer')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 const startCh = channel('apm:pg:query:start')
@@ -54,7 +54,7 @@ function wrapQuery (query) {
       Object.defineProperty(textPropObj, 'text', {
         get () {
           return this?.__ddInjectableQuery || originalText
-        }
+        },
       })
     }
     const abortController = new AbortController()
@@ -64,7 +64,7 @@ function wrapQuery (query) {
       originalText,
       processId,
       abortController,
-      stream
+      stream,
     }
     const finish = (error, res) => {
       if (error) {

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

@@ -3,7 +3,7 @@
 const shimmer = require('../../datadog-shimmer')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 function wrapPino (symbol, wrapper, pino) {
@@ -14,7 +14,7 @@ function wrapPino (symbol, wrapper, pino) {
       configurable: true,
       enumerable: true,
       writable: true,
-      value: wrapper(instance[symbol])
+      value: wrapper(instance[symbol]),
     })
 
     return instance