dd-trace 5.84.0 → 5.85.0

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