dd-trace 6.0.0 → 6.2.0

package/LICENSE-3rdparty.csv

@@ -44,8 +44,6 @@
 "@oxc-project/types","https://github.com/oxc-project/oxc","['MIT']","['Boshen and oxc contributors']"
 "@tybys/wasm-util","https://github.com/toyobayashi/wasm-util","['MIT']","['toyobayashi']"
 "@types/estree","https://github.com/DefinitelyTyped/DefinitelyTyped","['MIT']","['DefinitelyTyped']"
-"acorn","https://github.com/acornjs/acorn","['MIT']","['acornjs']"
-"acorn-import-attributes","https://github.com/xtuc/acorn-import-attributes","['MIT']","['Sven Sauleau']"
 "argparse","https://github.com/nodeca/argparse","['Python-2.0']","['nodeca']"
 "astring","https://github.com/davidbonnet/astring","['MIT']","['David Bonnet']"
 "cjs-module-lexer","https://github.com/nodejs/cjs-module-lexer","['MIT']","['Guy Bedford']"
@@ -53,6 +51,7 @@
 "dc-polyfill","https://github.com/DataDog/dc-polyfill","['MIT']","['Thomas Hunter II']"
 "dd-trace","https://github.com/DataDog/dd-trace-js","['(Apache-2.0 OR BSD-3-Clause)']","['Datadog Inc. <info@datadoghq.com>']"
 "detect-newline","https://github.com/sindresorhus/detect-newline","['MIT']","['Sindre Sorhus']"
+"es-module-lexer","https://github.com/guybedford/es-module-lexer","['MIT']","['Guy Bedford']"
 "escape-string-regexp","https://github.com/sindresorhus/escape-string-regexp","['MIT']","['Sindre Sorhus']"
 "esquery","https://github.com/estools/esquery","['BSD-3-Clause']","['Joel Feenstra']"
 "estraverse","https://github.com/estools/estraverse","['BSD-2-Clause']","['estools']"

package/index.d.ts

@@ -233,6 +233,7 @@ interface Plugins {
   "amqp10": tracer.plugins.amqp10;
   "amqplib": tracer.plugins.amqplib;
   "anthropic": tracer.plugins.anthropic;
+  "claude-agent-sdk": tracer.plugins.claude_agent_sdk;
   "apollo": tracer.plugins.apollo;
   "avsc": tracer.plugins.avsc;
   "aws-durable-execution-sdk-js": tracer.plugins.aws_durable_execution_sdk_js;
@@ -2191,6 +2192,12 @@ declare namespace tracer {
      */
     interface anthropic extends Instrumentation {}
 
+    /**
+     * This plugin automatically instruments the
+     * [@anthropic-ai/claude-agent-sdk](https://www.npmjs.com/package/@anthropic-ai/claude-agent-sdk) module.
+     */
+    interface claude_agent_sdk extends Instrumentation {}
+
     /**
      * Currently this plugin automatically instruments
      * [@apollo/gateway](https://github.com/apollographql/federation) for module versions >= v2.3.0.
@@ -2507,6 +2514,13 @@ declare namespace tracer {
      * This plugin automatically instruments the
      * [graphql](https://github.com/graphql/graphql-js) module.
      *
+     * It also instruments [mercurius](https://github.com/mercurius-js/mercurius)
+     * (the Fastify GraphQL adapter): every request through `app.graphql` /
+     * `reply.graphql` opens a top-level `graphql.request` span that parents the
+     * `graphql.parse`/`graphql.validate`/`graphql.execute` spans and carries the
+     * request text. This span is produced even when mercurius serves the query
+     * from its JIT-compiled path, where `graphql.execute` does not run.
+     *
      * The `graphql` integration uses the operation name as the span resource name.
      * If no operation name is set, the resource name will always be just `query`,
      * `mutation` or `subscription`.
@@ -2535,6 +2549,7 @@ declare namespace tracer {
        * count toward the limit, regardless of `collapse`.
        *
        * @default -1
+       * @env DD_TRACE_GRAPHQL_DEPTH
        */
       depth?: number;
 
@@ -2551,7 +2566,10 @@ declare namespace tracer {
       /**
        * An array of variable names to record. Can also be a callback that returns
        * the key/value pairs to record. For example, using
-       * `variables => variables` would record all variables.
+       * `variables => variables` would record all variables. The environment
+       * variable only accepts the array form (comma-separated variable names).
+       *
+       * @env DD_TRACE_GRAPHQL_VARIABLES
        */
       variables?: string[] | ((variables: { [key: string]: any }) => { [key: string]: any });
 
@@ -2560,9 +2578,18 @@ declare namespace tracer {
        * `users.*.name` span instead of `users.0.name`, `users.1.name`, etc)
        *
        * @default true
+       * @env DD_TRACE_GRAPHQL_COLLAPSE
        */
       collapse?: boolean;
 
+      /**
+       * An array of error `extensions` keys to attach to the span error event
+       * for each GraphQL error.
+       *
+       * @env DD_TRACE_GRAPHQL_ERROR_EXTENSIONS
+       */
+      errorExtensions?: string[];
+
       /**
        * Whether to enable signature calculation for the resource name. This can
        * be disabled if your GraphQL operations always have a name. Note that when

package/initialize.mjs

@@ -75,8 +75,10 @@ export const resolve = brokenLoaders ? undefined : hookResolve
 
 if (isMainThread) {
   const require = Module.createRequire(import.meta.url)
-  require('./init.js')
-  if (Module.register) {
+  const initialized = require('./init.js')
+  // Only register the loader hook when instrumentation initialized. On a bailout the
+  // loader has nothing to instrument and can keep a short-lived process from exiting.
+  if (Module.register && initialized) {
     // The loader builds its own include/exclude matcher in `initialize`, so no
     // options need to cross the registration boundary.
     Module.register('./loader-hook.mjs', import.meta.url)

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "dd-trace",
-  "version": "6.0.0",
+  "version": "6.2.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
   "scripts": {
     "env": "bash ./plugin-env",
-    "prepare": "node scripts/patch-istanbul-lib-coverage.js && cd vendor && npm ci --include=dev",
+    "prepare": "node scripts/patch-istanbul-lib-coverage.js && node scripts/patch-v8-to-istanbul.js && cd vendor && npm ci --include=dev",
     "prepack": "node scripts/release/swap-v5-types.js",
     "bench": "node benchmark/index.js",
     "bench:e2e:test-optimization": "node benchmark/e2e-test-optimization/benchmark-run.js",
@@ -22,50 +22,50 @@
     "lint:fix": "node scripts/check_licenses.js && node scripts/check-no-coverage-artifacts.js && node scripts/check-no-mcr-images.js && node scripts/check-docker-image-shas.js && eslint . --concurrency=auto --max-warnings 0 --fix",
     "lint:inspect": "npx @eslint/config-inspector@latest",
     "lint:codeowners": "codeowners-audit",
-    "lint:codeowners:ci": "codeowners-audit --glob='**/*.spec.js' --glob='benchmark/sirun/**' --glob='.agents/**' --glob='.claude/**'",
+    "lint:codeowners:ci": "codeowners-audit --glob='**/*.spec.js' --glob='benchmark/sirun/**' --glob='.agents/**' --glob='.claude/**' --glob='integration-tests/**'",
     "lint:editorconfig": "editorconfig-checker",
     "release:proposal": "node scripts/release/proposal",
     "services": "node ./scripts/install_plugin_modules && node packages/dd-trace/test/setup/services",
     "test": "echo '\nError: The root \"npm test\" command is intentionally disabled.\n\nInstead, run specific test suites:\n  - npm run test:trace:core\n  - npm run test:appsec\n  - etc.\n\nOr run individual test files:\n  npx mocha path/to/test.spec.js\n\nSee CONTRIBUTING.md (Testing section) for more details.\n' && exit 1",
     "test:aiguard": "mocha \"packages/dd-trace/test/aiguard/**/*.spec.js\"",
-    "test:aiguard:ci": "nyc --silent node init && nyc -- npm run test:aiguard",
+    "test:aiguard:ci": "node scripts/c8-ci.js test:aiguard",
     "test:appsec": "mocha --exclude \"packages/dd-trace/test/appsec/**/*.plugin.spec.js\" \"packages/dd-trace/test/appsec/**/*.spec.js\"",
-    "test:appsec:ci": "nyc --silent node init && nyc -- npm run test:appsec",
+    "test:appsec:ci": "node scripts/c8-ci.js test:appsec",
     "test:appsec:plugins": "mocha \"packages/dd-trace/test/appsec/**/*.@(${PLUGINS}).plugin.spec.js\"",
-    "test:appsec:plugins:ci": "yarn services && nyc --silent node init && nyc -- npm run test:appsec:plugins",
+    "test:appsec:plugins:ci": "yarn services && node scripts/c8-ci.js test:appsec:plugins",
     "test:debugger": "mocha \"packages/dd-trace/test/debugger/**/*.spec.js\"",
-    "test:debugger:ci": "nyc --silent node init && nyc -- npm run test:debugger",
+    "test:debugger:ci": "node scripts/c8-ci.js test:debugger",
     "test:eslint-rules": "node eslint-rules/*.test.mjs",
     "test:trace:core": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- \"packages/dd-trace/test/*.spec.js\" \"packages/dd-trace/test/{agent,ci-visibility,config,crashtracking,datastreams,encode,exporters,msgpack,opentelemetry,opentracing,payload-tagging,plugins,remote_config,service-naming,standalone,telemetry,external-logger}/**/*.spec.js\"",
-    "test:trace:core:ci": "nyc --silent node init && nyc -- npm run test:trace:core",
+    "test:trace:core:ci": "node scripts/c8-ci.js test:trace:core",
     "test:trace:guardrails": "mocha \"packages/dd-trace/test/guardrails/**/*.spec.js\"",
-    "test:trace:guardrails:ci": "nyc --silent node init && nyc -- npm run test:trace:guardrails",
+    "test:trace:guardrails:ci": "node scripts/c8-ci.js test:trace:guardrails",
     "test:esbuild": "mocha \"packages/datadog-esbuild/test/**/*.spec.js\"",
-    "test:esbuild:ci": "nyc --silent node init && nyc -- npm run test:esbuild",
+    "test:esbuild:ci": "node scripts/c8-ci.js test:esbuild",
     "test:webpack": "mocha \"packages/datadog-webpack/test/**/*.spec.js\"",
-    "test:webpack:ci": "nyc --silent node init && nyc -- npm run test:webpack",
+    "test:webpack:ci": "node scripts/c8-ci.js test:webpack",
     "test:instrumentations": "mocha \"packages/datadog-instrumentations/test/@(${PLUGINS}).spec.js\"",
-    "test:instrumentations:ci": "yarn services && nyc --silent node init && nyc -- npm run test:instrumentations",
+    "test:instrumentations:ci": "yarn services && node scripts/c8-ci.js test:instrumentations",
     "test:instrumentations:misc": "mocha \"packages/datadog-instrumentations/test/*/**/*.spec.{js,mjs}\"",
-    "test:instrumentations:misc:ci": "nyc --silent node init && nyc -- npm run test:instrumentations:misc",
+    "test:instrumentations:misc:ci": "node scripts/c8-ci.js test:instrumentations:misc",
     "test:core": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- \"packages/datadog-core/test/**/*.spec.js\"",
-    "test:core:ci": "nyc --silent node init && nyc -- npm run test:core",
+    "test:core:ci": "node scripts/c8-ci.js test:core",
     "test:code-origin": "mocha \"packages/datadog-code-origin/test/**/*.spec.js\"",
-    "test:code-origin:ci": "nyc --silent node init && nyc -- npm run test:code-origin",
+    "test:code-origin:ci": "node scripts/c8-ci.js test:code-origin",
     "test:lambda": "mocha \"packages/dd-trace/test/lambda/**/*.spec.js\"",
-    "test:lambda:ci": "nyc --silent node init && nyc -- npm run test:lambda",
+    "test:lambda:ci": "node scripts/c8-ci.js test:lambda",
     "test:llmobs:sdk": "mocha --exclude \"packages/dd-trace/test/llmobs/plugins/**/*.spec.js\" \"packages/dd-trace/test/llmobs/**/*.spec.js\"",
-    "test:llmobs:sdk:ci": "nyc --silent node init && nyc -- npm run test:llmobs:sdk",
+    "test:llmobs:sdk:ci": "node scripts/c8-ci.js test:llmobs:sdk",
     "test:llmobs:plugins": "mocha \"packages/dd-trace/test/llmobs/plugins/@(${PLUGINS})/*.spec.js\"",
-    "test:llmobs:plugins:ci": "yarn services && nyc --silent node init && nyc -- npm run test:llmobs:plugins",
+    "test:llmobs:plugins:ci": "yarn services && node scripts/c8-ci.js test:llmobs:plugins",
     "test:openfeature": "mocha \"packages/dd-trace/test/openfeature/**/*.spec.js\"",
-    "test:openfeature:ci": "nyc --silent node init && nyc -- npm run test:openfeature",
+    "test:openfeature:ci": "node scripts/c8-ci.js test:openfeature",
     "test:plugins": "node --expose-gc ./node_modules/mocha/bin/mocha.js \"packages/datadog-plugin-@(${PLUGINS})/test/**/${SPEC:-*}*.spec.js\"",
-    "test:plugins:ci": "yarn services && nyc --silent node init && nyc -- npm run test:plugins",
-    "test:plugins:ci:flaky": "yarn services && nyc --silent node init && nyc -- npm run test:plugins -- --bail --retries 2",
+    "test:plugins:ci": "yarn services && node scripts/c8-ci.js test:plugins",
+    "test:plugins:ci:flaky": "yarn services && node scripts/c8-ci.js test:plugins --bail --retries 2",
     "test:plugins:upstream": "node ./packages/dd-trace/test/plugins/suite.js",
     "test:profiler": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- \"packages/dd-trace/test/profiling/**/*.spec.js\"",
-    "test:profiler:ci": "nyc --silent node init && nyc -- npm run test:profiler",
+    "test:profiler:ci": "node scripts/c8-ci.js test:profiler",
     "test:integration": "mocha --timeout 60000 \"integration-tests/*.spec.js\"",
     "test:integration:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/*.spec.js\"",
     "test:integration:aiguard": "mocha --timeout 60000 \"integration-tests/aiguard/*.spec.js\"",
@@ -106,7 +106,7 @@
     "test:release": "mocha \"scripts/release/**/*.spec.js\"",
     "test:scripts": "mocha \"scripts/helpers/**/*.spec.js\" \"scripts/*.spec.mjs\"",
     "test:shimmer": "mocha \"packages/datadog-shimmer/test/**/*.spec.js\"",
-    "test:shimmer:ci": "nyc --silent node init && nyc -- npm run test:shimmer",
+    "test:shimmer:ci": "node scripts/c8-ci.js test:shimmer",
     "verify:workflow-job-names": "node scripts/verify-workflow-job-names.js",
     "verify-exercised-tests": "node scripts/verify-exercised-tests.js"
   },
@@ -164,7 +164,7 @@
   ],
   "dependencies": {
     "dc-polyfill": "^0.1.11",
-    "import-in-the-middle": "^3.2.0",
+    "import-in-the-middle": "^3.3.1",
     "opentracing": ">=0.14.7"
   },
   "optionalDependencies": {
@@ -191,19 +191,20 @@
     "@stylistic/eslint-plugin": "^5.10.0",
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.106",
-    "@types/sinon": "^21.0.1",
+    "@types/sinon": "^22.0.0",
     "axios": "^1.18.1",
     "benchmark": "^2.1.4",
     "body-parser": "^2.3.0",
     "bun": "1.3.14",
+    "c8": "^11.0.0",
     "codeowners-audit": "^2.9.0",
     "editorconfig-checker": "^6.1.1",
     "eslint": "^9.39.2",
-    "eslint-plugin-cypress": "^6.4.1",
+    "eslint-plugin-cypress": "^6.4.2",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jsdoc": "^63.0.8",
+    "eslint-plugin-jsdoc": "^63.0.10",
     "eslint-plugin-mocha": "^11.3.0",
-    "eslint-plugin-n": "^18.2.0",
+    "eslint-plugin-n": "^18.2.1",
     "eslint-plugin-promise": "^7.3.0",
     "eslint-plugin-sonarjs": "^4.1.0",
     "eslint-plugin-unicorn": "^64.0.0",
@@ -219,7 +220,7 @@
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
     "multer": "^2.2.0",
-    "nock": "^14.0.15",
+    "nock": "^14.0.16",
     "node-preload": "^0.2.1",
     "nyc": "^18.0.0",
     "octokit": "^5.0.3",
@@ -229,9 +230,12 @@
     "semifies": "^1.0.0",
     "semver": "^7.8.5",
     "sinon": "^22.0.0",
+    "source-map-support": "^0.5.21",
+    "test-exclude": "^8.0.0",
     "tiktoken": "^1.0.21",
     "typescript": "^6.0.3",
-    "workerpool": "^10.0.2",
+    "v8-to-istanbul": "^9.0.0",
+    "workerpool": "^10.0.3",
     "yaml": "^2.9.0",
     "yarn-deduplicate": "^6.0.2"
   }

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

@@ -233,4 +233,49 @@ for (const hook of getHooks('ai')) {
   })
 }
 
+const aiSdkTelemetryChannel = tracingChannel('ai:telemetry')
+const aiSdkTelemetryStreamedChunkChannel = channel('dd-trace:vercel-ai:chunk')
+
+// for testing, and possibly actual instrumentation use, we want to
+// guard against double-subscribing to the asyncEnd channel of the
+// vercel ai-provided tracingChannel
+let subscribed = false
+
+// as of the v7 release, the ai sdk does not automatically aggregate streamed responses
+// we will handle emitting the chunks directly for products to handle
+addHook({ name: 'ai', versions: ['>=7.0.0'] }, exports => {
+  if (subscribed) return exports
+  subscribed = true
+
+  // ai sdk v7 only supported on node.js 22+
+  // inlining this import here so we only import in those cases
+  // eslint-disable-next-line n/no-unsupported-features/node-builtins
+  const { TransformStream } = require('node:stream/web')
+
+  aiSdkTelemetryChannel.subscribe({
+    asyncEnd (ctx) {
+      // guard against this event being re-emitted.
+      if (!ctx.isStream || !ctx.result?.stream || ctx.streamConsumed) return
+
+      const transform = new TransformStream({
+        transform (chunk, controller) {
+          const done = chunk.type === 'finish'
+
+          aiSdkTelemetryStreamedChunkChannel.publish({ ctx, chunk, done })
+
+          if (done) {
+            aiSdkTelemetryChannel.asyncEnd.publish(ctx)
+          }
+
+          controller.enqueue(chunk) // pass through value
+        },
+      })
+
+      ctx.result.stream = ctx.result.stream.pipeThrough(transform)
+    },
+  })
+
+  return exports
+})
+
 module.exports = { wrapModelWithLifecycle }

package/packages/datadog-instrumentations/src/apollo-server.js

@@ -112,24 +112,16 @@ function apolloDrainHttpServerHook (drainModule) {
   return drainModule
 }
 
-addHook({ name: '@apollo/server', file: 'dist/cjs/ApolloServer.js', versions: ['4'] }, apolloServerHook)
+addHook({ name: '@apollo/server', file: 'dist/cjs/ApolloServer.js', versions: ['>=4'] }, apolloServerHook)
 
 addHook({ name: '@apollo/server', file: 'dist/cjs/express4/index.js', versions: ['4'] }, apolloExpress4Hook)
 
-addHook({ name: '@apollo/server', file: 'dist/cjs/utils/HeaderMap.js', versions: ['4'] }, apolloHeaderMapHook)
-
 addHook(
-  { name: '@apollo/server', file: 'dist/cjs/plugin/drainHttpServer/index.js', versions: ['>=5.0.0'] },
-  apolloDrainHttpServerHook
+  { name: '@apollo/server', file: 'dist/cjs/utils/HeaderMap.js', versions: ['>=4'] },
+  apolloHeaderMapHook
 )
 
 addHook(
-  { name: '@apollo/server', file: 'dist/cjs/runHttpQuery.js', versions: ['>=5.0.0'] },
-  (runHttpQueryModule) => {
-    shimmer.wrap(runHttpQueryModule, 'runHttpQuery', function wrapRunHttpQuery (originalRunHttpQuery) {
-      return wrapExecuteHTTPGraphQLRequest(originalRunHttpQuery)
-    })
-
-    return runHttpQueryModule
-  }
+  { name: '@apollo/server', file: 'dist/cjs/plugin/drainHttpServer/index.js', versions: ['>=5.0.0'] },
+  apolloDrainHttpServerHook
 )

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

@@ -129,7 +129,7 @@ function wrapChildProcessCustomPromisifyMethod (customPromisifyMethod, shell) {
     const context = createContextFromChildProcessInfo(childProcessInfo)
     context.callArgs = callArgs
 
-    const { start, end, asyncStart, asyncEnd, error } = childProcessChannel
+    const { start, end, asyncStart, asyncEnd, error: errorChannel } = childProcessChannel
     start.publish(context)
 
     let result
@@ -140,7 +140,7 @@ function wrapChildProcessCustomPromisifyMethod (customPromisifyMethod, shell) {
         result = customPromisifyMethod.apply(this, context.callArgs)
       } catch (error) {
         context.error = error
-        error.publish(context)
+        errorChannel.publish(context)
         throw error
       } finally {
         end.publish(context)
@@ -149,7 +149,7 @@ function wrapChildProcessCustomPromisifyMethod (customPromisifyMethod, shell) {
 
     function reject (err) {
       context.error = err
-      error.publish(context)
+      errorChannel.publish(context)
       asyncStart.publish(context)
 
       asyncEnd.publish(context)