dd-trace 5.84.0 → 5.85.0

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const { isInServerlessEnvironment } = require('../../dd-trace/src/serverless')
+const { IS_SERVERLESS } = require('../../dd-trace/src/serverless')
 
 if (globalThis.fetch) {
   const globalFetch = globalThis.fetch
@@ -23,7 +23,7 @@ if (globalThis.fetch) {
     fetch = wrapFetch(globalFetch)
   }
 
-  if (!isInServerlessEnvironment()) {
+  if (!IS_SERVERLESS) {
     wrapRealFetch()
   }
 

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

@@ -54,13 +54,13 @@ const paramsByMethod = {
   utimes: ['path', 'atime', 'mtime'],
   write: ['fd'],
   writeFile: ['file', 'data', 'options'],
-  writev: ['fd']
+  writev: ['fd'],
 }
 
 const watchMethods = {
   unwatchFile: ['path', 'listener'],
   watch: ['path', 'options', 'listener'],
-  watchFile: ['path', 'options', 'listener']
+  watchFile: ['path', 'options', 'listener'],
 }
 
 const paramsByFileHandleMethods = {
@@ -82,10 +82,10 @@ const paramsByFileHandleMethods = {
   utimes: ['atime', 'mtime'],
   write: ['buffer', 'offset', 'length', 'position'],
   writeFile: ['data', 'options'],
-  writev: ['buffers', 'position']
+  writev: ['buffers', 'position'],
 }
 const names = ['fs', 'node:fs']
-names.forEach(name => {
+for (const name of names) {
   addHook({ name }, fs => {
     const asyncMethods = Object.keys(paramsByMethod)
     const syncMethods = asyncMethods.map(name => `${name}Sync`)
@@ -114,7 +114,7 @@ names.forEach(name => {
 
     return fs
   })
-})
+}
 function isFirstMethodReturningFileHandle (original) {
   return !kHandle && original.name === 'open'
 }
@@ -130,7 +130,7 @@ function wrapFileHandle (fh) {
         this[ddFhSym] = h
         wrap(this, 'close', createWrapFunction('filehandle.'))
       },
-      configurable: true
+      configurable: true,
     })
   }
   for (const name of Reflect.ownKeys(fileHandlePrototype)) {
@@ -181,7 +181,7 @@ function createWrapDirAsyncIterator () {
 function wrapCreateStream (original) {
   const classes = {
     createReadStream: 'ReadStream',
-    createWriteStream: 'WriteStream'
+    createWriteStream: 'WriteStream',
   }
   const name = classes[original.name]
 

package/packages/datadog-instrumentations/src/generic-pool.js

@@ -33,7 +33,7 @@ function createWrapPool () {
 
 addHook({
   name: 'generic-pool',
-  versions: ['^2.4']
+  versions: ['^2.4'],
 }, genericPool => {
   shimmer.wrap(genericPool.Pool.prototype, 'acquire', createWrapAcquire())
   return genericPool
@@ -41,7 +41,7 @@ addHook({
 
 addHook({
   name: 'generic-pool',
-  versions: ['2 - 2.3']
+  versions: ['2 - 2.3'],
 }, genericPool => {
   shimmer.wrap(genericPool, 'Pool', createWrapPool())
   return genericPool

package/packages/datadog-instrumentations/src/google-cloud-pubsub.js

@@ -3,7 +3,7 @@
 const shimmer = require('../../datadog-shimmer')
 const {
   channel,
-  addHook
+  addHook,
 } = require('./helpers/instrument')
 
 const requestStartCh = channel('apm:google-cloud-pubsub:request:start')
@@ -38,7 +38,7 @@ const publisherMethods = [
   'listTopicSubscriptions',
   'listTopicSnapshots',
   'deleteTopic',
-  'detachSubscription'
+  'detachSubscription',
 ]
 
 const schemaServiceMethods = [
@@ -51,7 +51,7 @@ const schemaServiceMethods = [
   'deleteSchemaRevision',
   'deleteSchema',
   'validateSchema',
-  'validateMessage'
+  'validateMessage',
 ]
 
 const subscriberMethods = [
@@ -70,7 +70,7 @@ const subscriberMethods = [
   'createSnapshot',
   'updateSnapshot',
   'deleteSnapshot',
-  'seek'
+  'seek',
 ]
 
 function wrapMethod (method) {
@@ -91,7 +91,7 @@ function wrapMethod (method) {
       messageAckRetrieveCh.publish({
         ackIds: request.ackIds,
         api,
-        ctx
+        ctx,
       })
     }
 
@@ -171,7 +171,7 @@ addHook({ name: '@google-cloud/pubsub', versions: ['>=1.2'], file: 'build/src/su
       if (this.ackId) {
         const ctx = {
           message: this,
-          ackId: this.ackId
+          ackId: this.ackId,
         }
 
         return messageAckStoreCh.runStores(ctx, originalAck, this, ...arguments)
@@ -244,7 +244,7 @@ addHook({ name: '@google-cloud/pubsub', versions: ['>=1.2'] }, (obj) => {
           messagePublishCh.publish({
             attributes: data.attributes,
             pubsub: this.pubsub,
-            topicName: this.name
+            topicName: this.name,
           })
         }
         return publishMessage.apply(this, arguments)
@@ -263,7 +263,7 @@ addHook({ name: '@google-cloud/pubsub', versions: ['>=1.2'] }, (obj) => {
         attributes: arguments[1],
         pubsub: this.pubsub,
         topicName: this.name,
-        buffer
+        buffer,
       })
 
       return publish.apply(this, arguments)

package/packages/datadog-instrumentations/src/google-cloud-vertexai.js

@@ -13,7 +13,7 @@ function wrapGenerate (generate) {
     const ctx = {
       request,
       instance: this,
-      resource: [this.constructor.name, generate.name].join('.')
+      resource: [this.constructor.name, generate.name].join('.'),
     }
 
     return vertexaiTracingChannel.tracePromise(generate, ctx, this, ...arguments)
@@ -30,7 +30,7 @@ function wrapGenerateStream (generateStream) {
       request,
       instance: this,
       resource: [this.constructor.name, generateStream.name].join('.'),
-      stream: true
+      stream: true,
     }
 
     return vertexaiTracingChannel.start.runStores(ctx, () => {
@@ -77,7 +77,7 @@ function finish (ctx, response, err, publishEndEvent = false) {
 addHook({
   name: '@google-cloud/vertexai',
   file: 'build/src/models/generative_models.js',
-  versions: ['>=1']
+  versions: ['>=1'],
 }, exports => {
   const GenerativeModel = exports.GenerativeModel
 
@@ -90,7 +90,7 @@ addHook({
 addHook({
   name: '@google-cloud/vertexai',
   file: 'build/src/models/chat_session.js',
-  versions: ['>=1']
+  versions: ['>=1'],
 }, exports => {
   const ChatSession = exports.ChatSession
 

package/packages/datadog-instrumentations/src/google-genai.js

@@ -83,7 +83,7 @@ function finish (ctx, result, error) {
 // Hook the main package entry point
 addHook({
   name: '@google/genai',
-  versions: ['>=1.19.0']
+  versions: ['>=1.19.0'],
 }, exports => {
   // Wrap GoogleGenAI to intercept when it creates Models instances
   if (!exports.GoogleGenAI) return exports

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

@@ -3,7 +3,7 @@
 const shimmer = require('../../datadog-shimmer')
 const {
   addHook,
-  channel
+  channel,
 } = require('./helpers/instrument')
 
 const ddGlobal = globalThis[Symbol.for('dd-trace')]
@@ -80,7 +80,7 @@ function normalizePositional (args, defaultFieldResolver) {
     contextValue: args[3],
     variableValues: args[4],
     operationName: args[5],
-    fieldResolver: args[6]
+    fieldResolver: args[6],
   }
 }
 
@@ -105,7 +105,7 @@ function wrapParse (parse) {
 
         return ctx.document
       } catch (err) {
-        err.stack
+        void err.stack
         ctx.error = err
         parseErrorCh.publish(ctx)
 
@@ -134,7 +134,7 @@ function wrapValidate (validate) {
         }
         return errors
       } catch (err) {
-        err.stack
+        void err.stack
         ctx.error = err
         validateErrorCh.publish(ctx)
 
@@ -172,7 +172,7 @@ function wrapExecute (execute) {
         docSource: documentSources.get(document),
         source,
         fields: {},
-        abortController: new AbortController()
+        abortController: new AbortController(),
       }
 
       return startExecuteCh.runStores(ctx, () => {
@@ -281,7 +281,7 @@ function assertField (rootCtx, info, args) {
     startResolveCh.publish(fieldCtx)
     field = fields[pathString] = {
       error: null,
-      ctx: fieldCtx
+      ctx: fieldCtx,
     }
   }
 
@@ -295,12 +295,12 @@ function wrapFields (type) {
 
   patchedTypes.add(type)
 
-  Object.keys(type._fields).forEach(key => {
+  for (const key of Object.keys(type._fields)) {
     const field = type._fields[key]
 
     wrapFieldResolve(field)
     wrapFieldType(field)
-  })
+  }
 }
 
 function wrapFieldResolve (field) {
@@ -321,7 +321,7 @@ function wrapFieldType (field) {
 }
 
 function finishResolvers ({ fields }) {
-  Object.keys(fields).reverse().forEach(key => {
+  for (const key of Object.keys(fields).reverse()) {
     const field = fields[key]
     field.ctx.finishTime = field.finishTime
     field.ctx.field = field
@@ -330,7 +330,7 @@ function finishResolvers ({ fields }) {
       resolveErrorCh.publish(field.ctx)
     }
     finishResolveCh.publish(field.ctx)
-  })
+  }
 }
 
 addHook({ name: '@graphql-tools/executor', versions: ['>=0.0.14'] }, executor => {

package/packages/datadog-instrumentations/src/grpc/client.js

@@ -63,22 +63,18 @@ function wrapClientConstructor (ServiceClient, methods, hasPeer = false) {
 
   if (typeof methods !== 'object' || 'format' in methods) return
 
-  Object.keys(methods)
-    .forEach(name => {
-      if (!methods[name]) return
+  for (const [name, method] of Object.entries(methods)) {
+    if (!method) continue
 
-      const originalName = methods[name].originalName
-      const path = methods[name].path
-      const type = getType(methods[name])
+    const { originalName, path } = method
+    const type = getType(method)
 
-      if (methods[name]) {
-        proto[name] = wrapMethod(proto[name], path, type, hasPeer)
-      }
+    proto[name] = wrapMethod(proto[name], path, type, hasPeer)
 
-      if (originalName) {
-        proto[originalName] = wrapMethod(proto[originalName], path, type, hasPeer)
-      }
-    })
+    if (originalName) {
+      proto[originalName] = wrapMethod(proto[originalName], path, type, hasPeer)
+    }
+  }
 }
 
 function wrapMethod (method, path, type, hasPeer) {

package/packages/datadog-instrumentations/src/grpc/types.js

@@ -6,5 +6,5 @@ module.exports = {
   client_stream: 'client_streaming',
   clientStream: 'client_streaming',
   server_stream: 'server_streaming',
-  serverStream: 'server_streaming'
+  serverStream: 'server_streaming',
 }

package/packages/datadog-instrumentations/src/helpers/bundler-register.js

@@ -6,7 +6,7 @@ const log = require('../../../dd-trace/src/log')
 const {
   filename,
   loadChannel,
-  matchVersion
+  matchVersion,
 } = require('./register.js')
 const hooks = require('./hooks')
 const instrumentations = require('./instrumentations')

package/packages/datadog-instrumentations/src/helpers/check-require-cache.js

@@ -23,7 +23,7 @@ const potentialConflicts = new Set([
   'elastic-apm-node',
   'newrelic',
   'stackify-node-apm',
-  'sqreen'
+  'sqreen',
 ])
 
 const extractPackageAndModulePath = require('./extract-package-and-module-path')

package/packages/datadog-instrumentations/src/helpers/extract-package-and-module-path.js

@@ -28,7 +28,7 @@ module.exports = function extractPackageAndModulePath (fullPath) {
     return {
       pkg,
       path: subPath.slice(Math.max(0, firstSlash + 1 + secondSlash + 1)),
-      pkgJson: firstPath + pkg + '/package.json'
+      pkgJson: firstPath + pkg + '/package.json',
     }
   }
 
@@ -37,6 +37,6 @@ module.exports = function extractPackageAndModulePath (fullPath) {
   return {
     pkg,
     path: firstSlashSubPath,
-    pkgJson: firstPath + pkg + '/package.json'
+    pkgJson: firstPath + pkg + '/package.json',
   }
 }

package/packages/datadog-instrumentations/src/helpers/hooks.js

@@ -145,5 +145,5 @@ module.exports = {
   when: () => require('../when'),
   winston: () => require('../winston'),
   workerpool: () => require('../mocha'),
-  ws: () => require('../ws')
+  ws: () => require('../ws'),
 }

package/packages/datadog-instrumentations/src/helpers/register.js

@@ -6,7 +6,7 @@ const satisfies = require('../../../../vendor/dist/semifies')
 const requirePackageJson = require('../../../dd-trace/src/require-package-json')
 const log = require('../../../dd-trace/src/log')
 const telemetry = require('../../../dd-trace/src/guardrails/telemetry')
-const { isInServerlessEnvironment } = require('../../../dd-trace/src/serverless')
+const { IS_SERVERLESS } = require('../../../dd-trace/src/serverless')
 const { getValueFromEnvSources } = require('../../../dd-trace/src/config/helper')
 const checkRequireCache = require('./check-require-cache')
 const Hook = require('./hook')
@@ -59,7 +59,7 @@ for (const packageName of names) {
   let hook = hooks[packageName]
 
   if (hook !== null && typeof hook === 'object') {
-    if (hook.serverless === false && isInServerlessEnvironment()) continue
+    if (hook.serverless === false && IS_SERVERLESS) continue
 
     hookOptions.internals = hook.esmFirst
     hook = hook.fn
@@ -156,11 +156,11 @@ for (const packageName of names) {
             telemetry('error', [
               `error_type:${e.constructor.name}`,
               `integration:${name}`,
-              `integration_version:${version}`
+              `integration_version:${version}`,
             ], {
               result: 'error',
               result_class: 'internal_error',
-              result_reason: `Error during instrumentation of ${name}@${version}: ${e.message}`
+              result_reason: `Error during instrumentation of ${name}@${version}: ${e.message}`,
             })
           }
           namesAndSuccesses[`${name}@${version}`] = true
@@ -174,11 +174,11 @@ for (const packageName of names) {
       if (!success && !seenCombo.has(nameVersion) && !allInstrumentations[instrumentationFileName]) {
         telemetry('abort.integration', [
           `integration:${name}`,
-          `integration_version:${version}`
+          `integration_version:${version}`,
         ], {
           result: 'abort',
           result_class: 'incompatible_library',
-          result_reason: `Incompatible integration version: ${name}@${version}`
+          result_reason: `Incompatible integration version: ${name}@${version}`,
         })
         log.info('Found incompatible integration version: %s', nameVersion)
         seenCombo.add(nameVersion)
@@ -238,5 +238,5 @@ module.exports = {
   filename,
   pathSepExpr,
   loadChannel,
-  matchVersion
+  matchVersion,
 }

package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/index.js

@@ -2,5 +2,5 @@
 
 module.exports = [
   ...require('./langchain'),
-  ...require('./bullmq')
+  ...require('./bullmq'),
 ]