dd-trace 5.41.1 → 5.42.0

package/LICENSE-3rdparty.csv

@@ -32,6 +32,7 @@ require,shell-quote,mit,Copyright (c) 2013 James Halliday
 require,source-map,BSD-3-Clause,Copyright (c) 2009-2011, Mozilla Foundation and contributors
 require,ttl-set,MIT,Copyright (c) 2024 Thomas Watson
 dev,@apollo/server,MIT,Copyright (c) 2016-2020 Apollo Graph, Inc. (Formerly Meteor Development Group, Inc.)
+dev,@babel/helpers,MIT,Copyright (c) 2014-present Sebastian McKenzie and other contributors
 dev,@types/node,MIT,Copyright Authors
 dev,@eslint/eslintrc,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
 dev,@eslint/js,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>

package/index.d.ts

@@ -165,6 +165,7 @@ interface Plugins {
   "fetch": tracer.plugins.fetch;
   "generic-pool": tracer.plugins.generic_pool;
   "google-cloud-pubsub": tracer.plugins.google_cloud_pubsub;
+  "google-cloud-vertexai": tracer.plugins.google_cloud_vertexai;
   "graphql": tracer.plugins.graphql;
   "grpc": tracer.plugins.grpc;
   "hapi": tracer.plugins.hapi;
@@ -1370,6 +1371,12 @@ declare namespace tracer {
      */
     interface google_cloud_pubsub extends Integration {}
 
+    /**
+     * This plugin automatically instruments the
+     * [@google-cloud/vertexai](https://github.com/googleapis/nodejs-vertexai) module.
+     */
+    interface google_cloud_vertexai extends Integration {}
+
     /** @hidden */
     interface ExecutionArgs {
       schema: any,
@@ -2340,7 +2347,7 @@ declare namespace tracer {
        * ```javascript
        * llmobs.trace({ kind: 'llm', name: 'myLLM', modelName: 'gpt-4o', modelProvider: 'openai' }, () => {
        *  llmobs.annotate({
-       *    inputData: [{ content: 'system prompt, role: 'system' }, { content: 'user prompt', role: 'user' }],
+       *    inputData: [{ content: 'system prompt', role: 'system' }, { content: 'user prompt', role: 'user' }],
        *    outputData: { content: 'response', role: 'ai' },
        *    metadata: { temperature: 0.7 },
        *    tags: { host: 'localhost' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.41.1",
+  "version": "5.42.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -28,6 +28,8 @@
     "test:trace:core:ci": "npm run test:trace:core -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/**/*.js\"",
     "test:instrumentations": "mocha -r 'packages/dd-trace/test/setup/mocha.js' 'packages/datadog-instrumentations/test/**/*.spec.js'",
     "test:instrumentations:ci": "nyc --no-clean --include 'packages/datadog-instrumentations/src/**/*.js' -- npm run test:instrumentations",
+    "test:instrumentations:misc": "mocha -r 'packages/dd-trace/test/setup/mocha.js' 'packages/datadog-instrumentations/test/*/**/*.spec.js'",
+    "test:instrumentations:misc:ci": "nyc --no-clean --include 'packages/datadog-instrumentations/src/**/*.js' -- npm run test:instrumentations:misc",
     "test:core": "tap \"packages/datadog-core/test/**/*.spec.js\"",
     "test:core:ci": "npm run test:core -- --coverage --nyc-arg=--include=\"packages/datadog-core/src/**/*.js\"",
     "test:lambda": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/lambda/**/*.spec.js\"",
@@ -83,7 +85,7 @@
   },
   "dependencies": {
     "@datadog/libdatadog": "^0.5.0",
-    "@datadog/native-appsec": "8.4.0",
+    "@datadog/native-appsec": "8.5.0",
     "@datadog/native-iast-rewriter": "2.8.0",
     "@datadog/native-iast-taint-tracking": "3.3.0",
     "@datadog/native-metrics": "^3.1.0",
@@ -117,6 +119,7 @@
   },
   "devDependencies": {
     "@apollo/server": "^4.11.0",
+    "@babel/helpers": "^7.26.10",
     "@eslint/eslintrc": "^3.2.0",
     "@eslint/js": "^9.19.0",
     "@msgpack/msgpack": "^3.0.0-beta3",
@@ -125,7 +128,7 @@
     "application-config-path": "^1.0.0",
     "autocannon": "^4.5.2",
     "aws-sdk": "^2.1446.0",
-    "axios": "^1.7.4",
+    "axios": "^1.8.2",
     "benchmark": "^2.1.4",
     "body-parser": "^1.20.3",
     "chai": "^4.3.7",

package/packages/datadog-esbuild/index.js

@@ -4,7 +4,9 @@
 
 const instrumentations = require('../datadog-instrumentations/src/helpers/instrumentations.js')
 const hooks = require('../datadog-instrumentations/src/helpers/hooks.js')
-const extractPackageAndModulePath = require('../datadog-instrumentations/src/utils/src/extract-package-and-module-path')
+const extractPackageAndModulePath = require(
+  '../datadog-instrumentations/src/helpers/extract-package-and-module-path.js'
+)
 
 for (const hook of Object.values(hooks)) {
   if (typeof hook === 'object') {

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

@@ -22,7 +22,7 @@ const knownTestsCh = channel('ci:cucumber:known-tests')
 const skippableSuitesCh = channel('ci:cucumber:test-suite:skippable')
 const sessionStartCh = channel('ci:cucumber:session:start')
 const sessionFinishCh = channel('ci:cucumber:session:finish')
-const quarantinedTestsCh = channel('ci:cucumber:quarantined-tests')
+const testManagementTestsCh = channel('ci:cucumber:test-management-tests')
 
 const workerReportTraceCh = channel('ci:cucumber:worker-report:trace')
 
@@ -72,8 +72,8 @@ let earlyFlakeDetectionFaultyThreshold = 0
 let isEarlyFlakeDetectionFaulty = false
 let isFlakyTestRetriesEnabled = false
 let isKnownTestsEnabled = false
-let isQuarantinedTestsEnabled = false
-let quarantinedTests = {}
+let isTestManagementTestsEnabled = false
+let testManagementTests = {}
 let numTestRetries = 0
 let knownTests = []
 let skippedSuites = []
@@ -120,15 +120,11 @@ function isNewTest (testSuite, testName) {
   return !testsForSuite.includes(testName)
 }
 
-function isQuarantinedTest (testSuite, testName) {
-  return quarantinedTests
-    ?.cucumber
-    ?.suites
-    ?.[testSuite]
-    ?.tests
-    ?.[testName]
-    ?.properties
-    ?.quarantined
+function getTestProperties (testSuite, testName) {
+  const { disabled, quarantined } =
+    testManagementTests?.cucumber?.suites?.[testSuite]?.tests?.[testName]?.properties || {}
+
+  return { disabled, quarantined }
 }
 
 function getTestStatusFromRetries (testStatuses) {
@@ -155,10 +151,10 @@ function getErrorFromCucumberResult (cucumberResult) {
   return error
 }
 
-function getChannelPromise (channelToPublishTo) {
+function getChannelPromise (channelToPublishTo, isParallel = false) {
   return new Promise(resolve => {
     sessionAsyncResource.runInAsyncScope(() => {
-      channelToPublishTo.publish({ onDone: resolve })
+      channelToPublishTo.publish({ onDone: resolve, isParallel })
     })
   })
 }
@@ -307,6 +303,7 @@ function wrapRun (pl, isLatestVersion) {
         }
         let isNew = false
         let isEfdRetry = false
+        let isDisabled = false
         let isQuarantined = false
         if (isKnownTestsEnabled && status !== 'skip') {
           const numRetries = numRetriesByPickleId.get(this.pickle.id)
@@ -314,9 +311,13 @@ function wrapRun (pl, isLatestVersion) {
           isNew = numRetries !== undefined
           isEfdRetry = numRetries > 0
         }
-        if (isQuarantinedTestsEnabled) {
+        if (isTestManagementTestsEnabled) {
           const testSuitePath = getTestSuitePath(testFileAbsolutePath, process.cwd())
-          isQuarantined = isQuarantinedTest(testSuitePath, this.pickle.name)
+          const testProperties = getTestProperties(testSuitePath, this.pickle.name)
+          isDisabled = testProperties.disabled
+          if (!isDisabled) {
+            isQuarantined = testProperties.quarantined
+          }
         }
         const attemptAsyncResource = numAttemptToAsyncResource.get(numAttempt)
 
@@ -333,6 +334,7 @@ function wrapRun (pl, isLatestVersion) {
             isNew,
             isEfdRetry,
             isFlakyRetry: numAttempt > 0,
+            isDisabled,
             isQuarantined
           })
         })
@@ -414,7 +416,7 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
     }
     let errorSkippableRequest
 
-    const configurationResponse = await getChannelPromise(libraryConfigurationCh)
+    const configurationResponse = await getChannelPromise(libraryConfigurationCh, isParallel)
 
     isEarlyFlakeDetectionEnabled = configurationResponse.libraryConfig?.isEarlyFlakeDetectionEnabled
     earlyFlakeDetectionNumRetries = configurationResponse.libraryConfig?.earlyFlakeDetectionNumRetries
@@ -423,7 +425,7 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
     isFlakyTestRetriesEnabled = configurationResponse.libraryConfig?.isFlakyTestRetriesEnabled
     numTestRetries = configurationResponse.libraryConfig?.flakyTestRetriesCount
     isKnownTestsEnabled = configurationResponse.libraryConfig?.isKnownTestsEnabled
-    isQuarantinedTestsEnabled = configurationResponse.libraryConfig?.isQuarantinedTestsEnabled
+    isTestManagementTestsEnabled = configurationResponse.libraryConfig?.isTestManagementEnabled
 
     if (isKnownTestsEnabled) {
       const knownTestsResponse = await getChannelPromise(knownTestsCh)
@@ -481,12 +483,12 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
       }
     }
 
-    if (isQuarantinedTestsEnabled) {
-      const quarantinedTestsResponse = await getChannelPromise(quarantinedTestsCh)
-      if (!quarantinedTestsResponse.err) {
-        quarantinedTests = quarantinedTestsResponse.quarantinedTests
+    if (isTestManagementTestsEnabled) {
+      const testManagementTestsResponse = await getChannelPromise(testManagementTestsCh)
+      if (!testManagementTestsResponse.err) {
+        testManagementTests = testManagementTestsResponse.testManagementTests
       } else {
-        isQuarantinedTestsEnabled = false
+        isTestManagementTestsEnabled = false
       }
     }
 
@@ -537,7 +539,7 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
         hasForcedToRunSuites: isForcedToRun,
         isEarlyFlakeDetectionEnabled,
         isEarlyFlakeDetectionFaulty,
-        isQuarantinedTestsEnabled,
+        isTestManagementTestsEnabled,
         isParallel
       })
     })
@@ -574,6 +576,7 @@ function getWrappedRunTestCase (runTestCaseFunction, isNewerCucumberVersion = fa
     }
 
     let isNew = false
+    let isDisabled = false
     let isQuarantined = false
 
     if (isKnownTestsEnabled) {
@@ -582,10 +585,15 @@ function getWrappedRunTestCase (runTestCaseFunction, isNewerCucumberVersion = fa
         numRetriesByPickleId.set(pickle.id, 0)
       }
     }
-    if (isQuarantinedTestsEnabled) {
-      isQuarantined = isQuarantinedTest(testSuitePath, pickle.name)
+    if (isTestManagementTestsEnabled) {
+      const testProperties = getTestProperties(testSuitePath, pickle.name)
+      isDisabled = testProperties.disabled
+      if (isDisabled) {
+        this.options.dryRun = true
+      } else {
+        isQuarantined = testProperties.quarantined
+      }
     }
-
     // TODO: for >=11 we could use `runTestCaseResult` instead of accumulating results in `lastStatusByPickleId`
     let runTestCaseResult = await runTestCaseFunction.apply(this, arguments)
 
@@ -617,7 +625,7 @@ function getWrappedRunTestCase (runTestCaseFunction, isNewerCucumberVersion = fa
       }
     }
 
-    if (isQuarantinedTestsEnabled && isQuarantined) {
+    if (isTestManagementTestsEnabled && isQuarantined) {
       this.success = true
       shouldBePassedByQuarantine = true
     }
@@ -653,7 +661,7 @@ function getWrappedRunTestCase (runTestCaseFunction, isNewerCucumberVersion = fa
       return shouldBePassedByEFD
     }
 
-    if (isNewerCucumberVersion && isQuarantinedTestsEnabled && isQuarantined) {
+    if (isNewerCucumberVersion && isTestManagementTestsEnabled && isQuarantined) {
       return shouldBePassedByQuarantine
     }
 

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

@@ -0,0 +1,102 @@
+'use strict'
+
+const { addHook } = require('./helpers/instrument')
+const shimmer = require('../../datadog-shimmer')
+
+const vertexaiTracingChannel = require('dc-polyfill').tracingChannel('apm:vertexai:request')
+
+function wrapGenerate (generate) {
+  return function (request) {
+    if (!vertexaiTracingChannel.start.hasSubscribers) {
+      return generate.apply(this, arguments)
+    }
+
+    const ctx = {
+      request,
+      instance: this,
+      resource: [this.constructor.name, generate.name].join('.')
+    }
+
+    return vertexaiTracingChannel.tracePromise(generate, ctx, this, ...arguments)
+  }
+}
+
+function wrapGenerateStream (generateStream) {
+  return function (request) {
+    if (!vertexaiTracingChannel.start.hasSubscribers) {
+      return generateStream.apply(this, arguments)
+    }
+
+    const ctx = {
+      request,
+      instance: this,
+      resource: [this.constructor.name, generateStream.name].join('.'),
+      stream: true
+    }
+
+    return vertexaiTracingChannel.start.runStores(ctx, () => {
+      let streamingResult
+      try {
+        streamingResult = generateStream.apply(this, arguments)
+      } catch (e) {
+        finish(ctx, null, e, true)
+        throw e
+      }
+
+      vertexaiTracingChannel.end.publish(ctx)
+
+      return streamingResult.then(stream => {
+        stream.response.then(response => {
+          finish(ctx, response, null)
+        }).catch(e => {
+          finish(ctx, null, e)
+          throw e
+        })
+
+        return stream
+      }).catch(e => {
+        finish(ctx, null, e)
+        throw e
+      })
+    })
+  }
+}
+
+function finish (ctx, response, err, publishEndEvent = false) {
+  if (err) {
+    ctx.error = err
+    vertexaiTracingChannel.error.publish(ctx)
+  }
+
+  ctx.result = { response }
+
+  if (publishEndEvent) vertexaiTracingChannel.end.publish(ctx)
+
+  vertexaiTracingChannel.asyncEnd.publish(ctx)
+}
+
+addHook({
+  name: '@google-cloud/vertexai',
+  file: 'build/src/models/generative_models.js',
+  versions: ['>=1']
+}, exports => {
+  const GenerativeModel = exports.GenerativeModel
+
+  shimmer.wrap(GenerativeModel.prototype, 'generateContent', wrapGenerate)
+  shimmer.wrap(GenerativeModel.prototype, 'generateContentStream', wrapGenerateStream)
+
+  return exports
+})
+
+addHook({
+  name: '@google-cloud/vertexai',
+  file: 'build/src/models/chat_session.js',
+  versions: ['>=1']
+}, exports => {
+  const ChatSession = exports.ChatSession
+
+  shimmer.wrap(ChatSession.prototype, 'sendMessage', wrapGenerate)
+  shimmer.wrap(ChatSession.prototype, 'sendMessageStream', wrapGenerateStream)
+
+  return exports
+})

package/packages/datadog-instrumentations/src/{check_require_cache.js → helpers/check-require-cache.js}

@@ -26,7 +26,7 @@ const potentialConflicts = new Set([
   'sqreen'
 ])
 
-const extractPackageAndModulePath = require('./utils/src/extract-package-and-module-path')
+const extractPackageAndModulePath = require('./extract-package-and-module-path')
 
 /**
  * The lowest hanging fruit to debug an app that isn't tracing
@@ -45,7 +45,7 @@ const extractPackageAndModulePath = require('./utils/src/extract-package-and-mod
  * This is OK as the tracer should be loaded earlier anyway.
  */
 module.exports.checkForRequiredModules = function () {
-  const packages = require('../../datadog-instrumentations/src/helpers/hooks')
+  const packages = require('./hooks')
   const naughties = new Set()
   let didWarn = false
 

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

@@ -11,6 +11,7 @@ module.exports = {
   '@elastic/elasticsearch': () => require('../elasticsearch'),
   '@elastic/transport': () => require('../elasticsearch'),
   '@google-cloud/pubsub': () => require('../google-cloud-pubsub'),
+  '@google-cloud/vertexai': () => require('../google-cloud-vertexai'),
   '@graphql-tools/executor': () => require('../graphql'),
   '@grpc/grpc-js': () => require('../grpc'),
   '@hapi/hapi': () => require('../hapi'),
@@ -20,7 +21,6 @@ module.exports = {
   '@jest/transform': () => require('../jest'),
   '@koa/router': () => require('../koa'),
   '@langchain/core': { esmFirst: true, fn: () => require('../langchain') },
-  '@langchain/openai': { esmFirst: true, fn: () => require('../langchain') },
   '@node-redis/client': () => require('../redis'),
   '@opensearch-project/opensearch': () => require('../opensearch'),
   '@opentelemetry/sdk-trace-node': () => require('../otel-sdk-trace'),
@@ -50,7 +50,7 @@ module.exports = {
   'express-session': () => require('../express-session'),
   fastify: () => require('../fastify'),
   'find-my-way': () => require('../find-my-way'),
-  fs: () => require('../fs'),
+  fs: { serverless: false, fn: () => require('../fs') },
   'generic-pool': () => require('../generic-pool'),
   graphql: () => require('../graphql'),
   grpc: () => require('../grpc'),

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

@@ -6,8 +6,9 @@ const satisfies = require('semifies')
 const Hook = require('./hook')
 const requirePackageJson = require('../../../dd-trace/src/require-package-json')
 const log = require('../../../dd-trace/src/log')
-const checkRequireCache = require('../check_require_cache')
+const checkRequireCache = require('./check-require-cache')
 const telemetry = require('../../../dd-trace/src/guardrails/telemetry')
+const { isInServerlessEnvironment } = require('../../../dd-trace/src/serverless')
 
 const {
   DD_TRACE_DISABLED_INSTRUMENTATIONS = '',
@@ -60,6 +61,8 @@ for (const packageName of names) {
   let hook = hooks[packageName]
 
   if (typeof hook === 'object') {
+    if (hook.serverless === false && isInServerlessEnvironment()) continue
+
     hookOptions.internals = hook.esmFirst
     hook = hook.fn
   }