dd-trace 5.94.0 → 5.95.0

package/LICENSE-3rdparty.csv

@@ -1,10 +1,11 @@
-"component","origin","license","copyright"
-"@datadog/flagging-core","https://github.com/DataDog/openfeature-js-client","['Apache-2.0']","['DataDog']"
-"@datadog/libdatadog","https://github.com/DataDog/libdatadog-nodejs","['Apache-2.0']","['Datadog Inc.']"
-"@datadog/native-appsec","https://github.com/DataDog/dd-native-appsec-js","['Apache-2.0']","['Datadog Inc.']"
-"@datadog/native-iast-taint-tracking","https://github.com/DataDog/dd-native-iast-taint-tracking-js","['Apache-2.0']","['Datadog Inc.']"
-"@datadog/native-metrics","https://github.com/DataDog/dd-native-metrics-js","['Apache-2.0']","['Datadog Inc.']"
-"@datadog/openfeature-node-server","https://github.com/DataDog/openfeature-js-client","['Apache-2.0']","['DataDog']"
+"component","origin","license","copyright"
+"@apm-js-collab/code-transformer","https://github.com/nodejs/orchestrion-js","['Apache-2.0']","['nodejs']"
+"@datadog/flagging-core","https://github.com/DataDog/openfeature-js-client","['Apache-2.0']","['DataDog']"
+"@datadog/libdatadog","https://github.com/DataDog/libdatadog-nodejs","['Apache-2.0']","['Datadog Inc.']"
+"@datadog/native-appsec","https://github.com/DataDog/dd-native-appsec-js","['Apache-2.0']","['Datadog Inc.']"
+"@datadog/native-iast-taint-tracking","https://github.com/DataDog/dd-native-iast-taint-tracking-js","['Apache-2.0']","['Datadog Inc.']"
+"@datadog/native-metrics","https://github.com/DataDog/dd-native-metrics-js","['Apache-2.0']","['Datadog Inc.']"
+"@datadog/openfeature-node-server","https://github.com/DataDog/openfeature-js-client","['Apache-2.0']","['DataDog']"
 "@datadog/pprof","https://github.com/DataDog/pprof-nodejs","['Apache-2.0']","['Google Inc.']"
 "@datadog/sketches-js","https://github.com/DataDog/sketches-js","['Apache-2.0']","['DataDog']"
 "@datadog/wasm-js-rewriter","https://github.com/DataDog/dd-wasm-js-rewriter","['Apache-2.0']","['Datadog Inc.']"
@@ -44,59 +45,60 @@
 "@protobufjs/aspromise","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
 "@protobufjs/base64","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
 "@protobufjs/codegen","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
-"@protobufjs/eventemitter","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
-"@protobufjs/fetch","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
-"@protobufjs/float","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
-"@protobufjs/inquire","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
+"@protobufjs/eventemitter","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
+"@protobufjs/fetch","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
+"@protobufjs/float","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
+"@protobufjs/inquire","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
 "@protobufjs/path","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
 "@protobufjs/pool","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
 "@protobufjs/utf8","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
 "@tybys/wasm-util","https://github.com/toyobayashi/wasm-util","['MIT']","['toyobayashi']"
+"@types/estree","https://github.com/DefinitelyTyped/DefinitelyTyped","['MIT']","['DefinitelyTyped']"
 "@types/node","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']"
-"crypto-randomuuid","npm:crypto-randomuuid","['MIT']","['Stephen Belanger']"
-"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']"
-"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']"
-"fast-fifo","https://github.com/mafintosh/fast-fifo","['MIT']","['Mathias Buus']"
-"ignore","https://github.com/kaelzhang/node-ignore","['MIT']","['kael']"
-"import-in-the-middle","https://github.com/nodejs/import-in-the-middle","['Apache-2.0']","['Bryan English']"
-"istanbul-lib-coverage","https://github.com/istanbuljs/istanbuljs","['BSD-3-Clause']","['Krishnan Anantheswaran']"
-"jest-docblock","https://github.com/jestjs/jest","['MIT']","['jestjs']"
-"js-yaml","https://github.com/nodeca/js-yaml","['MIT']","['Vladimir Zapparov']"
-"jsep","https://github.com/EricSmekens/jsep","['MIT']","['Stephen Oney']"
-"jsonpath-plus","https://github.com/JSONPath-Plus/JSONPath","['MIT']","['Stefan Goessner']"
-"limiter","https://github.com/jhurliman/node-rate-limiter","['MIT']","['John Hurliman']"
-"lodash.sortby","https://github.com/lodash/lodash","['MIT']","['John-David Dalton']"
-"long","https://github.com/dcodeIO/long.js","['Apache-2.0']","['Daniel Wirtz']"
-"lru-cache","https://github.com/isaacs/node-lru-cache","['ISC']","['Isaac Z. Schlueter']"
-"meriyah","https://github.com/meriyah/meriyah","['ISC']","['Kenny F.']"
-"module-details-from-path","https://github.com/watson/module-details-from-path","['MIT']","['Thomas Watson']"
-"mutexify","https://github.com/mafintosh/mutexify","['MIT']","['Mathias Buus']"
+"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']"
+"crypto-randomuuid","npm:crypto-randomuuid","['MIT']","['Stephen Belanger']"
+"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']"
+"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']"
+"fast-fifo","https://github.com/mafintosh/fast-fifo","['MIT']","['Mathias Buus']"
+"ignore","https://github.com/kaelzhang/node-ignore","['MIT']","['kael']"
+"import-in-the-middle","https://github.com/nodejs/import-in-the-middle","['Apache-2.0']","['Bryan English']"
+"istanbul-lib-coverage","https://github.com/istanbuljs/istanbuljs","['BSD-3-Clause']","['Krishnan Anantheswaran']"
+"jest-docblock","https://github.com/jestjs/jest","['MIT']","['jestjs']"
+"js-yaml","https://github.com/nodeca/js-yaml","['MIT']","['Vladimir Zapparov']"
+"jsep","https://github.com/EricSmekens/jsep","['MIT']","['Stephen Oney']"
+"jsonpath-plus","https://github.com/JSONPath-Plus/JSONPath","['MIT']","['Stefan Goessner']"
+"limiter","https://github.com/jhurliman/node-rate-limiter","['MIT']","['John Hurliman']"
+"lodash.sortby","https://github.com/lodash/lodash","['MIT']","['John-David Dalton']"
+"long","https://github.com/dcodeIO/long.js","['Apache-2.0']","['Daniel Wirtz']"
+"lru-cache","https://github.com/isaacs/node-lru-cache","['ISC']","['Isaac Z. Schlueter']"
+"meriyah","https://github.com/meriyah/meriyah","['ISC']","['Kenny F.']"
+"module-details-from-path","https://github.com/watson/module-details-from-path","['MIT']","['Thomas Watson']"
+"mutexify","https://github.com/mafintosh/mutexify","['MIT']","['Mathias Buus']"
 "node-addon-api","https://github.com/nodejs/node-addon-api","['MIT']","['nodejs']"
 "node-gyp-build","https://github.com/prebuild/node-gyp-build","['MIT']","['Mathias Buus']"
 "opentracing","https://github.com/opentracing/opentracing-javascript","['Apache-2.0']","['opentracing']"
 "oxc-parser","https://github.com/oxc-project/oxc","['MIT']","['Boshen and oxc contributors']"
 "path-to-regexp","https://github.com/pillarjs/path-to-regexp","['MIT']","['pillarjs']"
 "pprof-format","https://github.com/DataDog/pprof-format","['MIT']","['Datadog Inc.']"
-"protobufjs","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
-"queue-tick","https://github.com/mafintosh/queue-tick","['MIT']","['Mathias Buus']"
-"retry","https://github.com/tim-kos/node-retry","['MIT']","['Tim Koschützki']"
-"rfdc","https://github.com/davidmarkclements/rfdc","['MIT']","['David Mark Clements']"
-"semifies","https://github.com/holepunchto/semifies","['Apache-2.0']","['Holepunch Inc']"
-"shell-quote","https://github.com/ljharb/shell-quote","['MIT']","['James Halliday']"
+"protobufjs","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
+"queue-tick","https://github.com/mafintosh/queue-tick","['MIT']","['Mathias Buus']"
+"retry","https://github.com/tim-kos/node-retry","['MIT']","['Tim Koschützki']"
+"rfdc","https://github.com/davidmarkclements/rfdc","['MIT']","['David Mark Clements']"
+"semifies","https://github.com/holepunchto/semifies","['Apache-2.0']","['Holepunch Inc']"
+"shell-quote","https://github.com/ljharb/shell-quote","['MIT']","['James Halliday']"
 "source-map","https://github.com/mozilla/source-map","['BSD-3-Clause']","['Nick Fitzgerald']"
 "spark-md5","https://github.com/satazor/js-spark-md5","['(WTFPL OR MIT)']","['André Cruz']"
 "tlhunter-sorted-set","https://github.com/tlhunter/node-sorted-set","['MIT']","['Thomas Hunter II']"
 "tslib","https://github.com/microsoft/tslib","['0BSD']","['Microsoft Corp.']"
 "ttl-set","https://github.com/watson/ttl-set","['MIT']","['Thomas Watson']"
 "undici-types","https://github.com/nodejs/undici","['MIT']","['nodejs']"
-"aws-lambda-nodejs-runtime-interface-client","https://github.com/aws/aws-lambda-nodejs-runtime-interface-client/blob/v2.1.0/src/utils/UserFunction.ts","['Apache-2.0']","['Amazon.com Inc. or its affiliates']"
-"is-git-url","https://github.com/jonschlinkert/is-git-url/blob/396965ffabf2f46656c8af4c47bef1d69f09292e/index.js#L9C15-L9C87","['MIT']","['Jon Schlinkert']"
+"aws-lambda-nodejs-runtime-interface-client","https://github.com/aws/aws-lambda-nodejs-runtime-interface-client/blob/v2.1.0/src/utils/UserFunction.ts","['Apache-2.0']","['Amazon.com Inc. or its affiliates']"
+"is-git-url","https://github.com/jonschlinkert/is-git-url/blob/396965ffabf2f46656c8af4c47bef1d69f09292e/index.js#L9C15-L9C87","['MIT']","['Jon Schlinkert']"

package/index.d.ts

@@ -456,11 +456,15 @@ declare namespace tracer {
   export interface PropagationStyle {
     /**
      * Selection of context propagation injection mechanisms.
+     * @env DD_TRACE_PROPAGATION_STYLE, DD_TRACE_PROPAGATION_STYLE_INJECT
+     * Programmatic configuration takes precedence over the environment variables listed above.
      */
     inject: string[],
 
     /**
      * Selection and priority order of context propagation extraction mechanisms.
+     * @env DD_TRACE_PROPAGATION_STYLE, DD_TRACE_PROPAGATION_STYLE_EXTRACT
+     * Programmatic configuration takes precedence over the environment variables listed above.
      */
     extract: string[]
   }
@@ -477,6 +481,14 @@ declare namespace tracer {
      */
     apmTracingEnabled?: boolean
 
+    /**
+     * List of baggage tag keys to be included in the baggage.
+     * @default ['user.id', 'session.id', 'account.id']
+     * @env DD_TRACE_BAGGAGE_TAG_KEYS
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    baggageTagKeys?: string[];
+
     /**
      * Whether to enable trace ID injection in log records to be able to correlate
      * traces with logs.
@@ -577,7 +589,7 @@ declare namespace tracer {
 
     /**
      * Controls the ingestion sample rate (between 0 and 1) between the agent and the backend.
-     * @env DD_TRACE_SAMPLE_RATE, OTEL_TRACES_SAMPLER, OTEL_TRACES_SAMPLER_ARG
+     * @env DD_TRACE_SAMPLE_RATE
      * Programmatic configuration takes precedence over the environment variables listed above.
      */
     sampleRate?: number;
@@ -682,7 +694,7 @@ declare namespace tracer {
     ingestion?: {
       /**
        * Controls the ingestion sample rate (between 0 and 1) between the agent and the backend.
-       * @env DD_TRACE_SAMPLE_RATE, OTEL_TRACES_SAMPLER, OTEL_TRACES_SAMPLER_ARG
+       * @env DD_TRACE_SAMPLE_RATE
        * Programmatic configuration takes precedence over the environment variables listed above.
        */
       sampleRate?: number
@@ -695,6 +707,22 @@ declare namespace tracer {
       rateLimit?: number
     };
 
+    /**
+     * Whether to enable inferred proxy services.
+     * @default false
+     * @env DD_TRACE_INFERRED_PROXY_SERVICES_ENABLED
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    inferredProxyServicesEnabled?: boolean
+
+    /**
+     * The site to use for the trace.
+     * @default 'datadoghq.com'
+     * @env DD_SITE
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    site?: string;
+
     /**
      * Experimental features can be enabled individually using key / value pairs.
      * @default {}
@@ -725,24 +753,31 @@ declare namespace tracer {
 
       /**
        * Configuration of the IAST. Can be a boolean as an alias to `iast.enabled`.
+       * @deprecated Please use the non-experimental `iast` option instead.
        */
       iast?: boolean | IastOptions
 
-      appsec?: {
+      /**
+       * Configuration of the AppSec. Can be a boolean as an alias to `appsec.enabled`.
+       * @deprecated Please use the non-experimental `appsec` option instead.
+       */
+      appsec?: boolean | {
         /**
          * Configuration of Standalone ASM mode
          * Deprecated in favor of `apmTracingEnabled`.
          *
-         * @deprecated
+         * @deprecated Please use `apmTracingEnabled` instead.
          */
         standalone?: {
           /**
            * Whether to enable Standalone ASM.
            * @default false
+           * @env DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED
+           * Programmatic configuration takes precedence over the environment variables listed above.
            */
           enabled?: boolean
         }
-      },
+      } | TracerOptions['appsec'],
 
       aiguard?: {
         /**
@@ -808,6 +843,7 @@ declare namespace tracer {
 
     /**
      * Whether to load all built-in plugins.
+     * @deprecated To deactivate plugins, use the specific DD_TRACE_<INTEGRATION>_ENABLED environment variables.
      * @default true
      */
     plugins?: boolean;
@@ -1092,6 +1128,18 @@ declare namespace tracer {
        * Programmatic configuration takes precedence over the environment variables listed above.
        */
       enabled?: boolean
+
+      experimental?: {
+        exit_spans?: {
+          /**
+           * Whether to attach code origin data to exit spans.
+           * @default false
+           * @env DD_CODE_ORIGIN_FOR_SPANS_EXPERIMENTAL_EXIT_SPANS_ENABLED
+           * Programmatic configuration takes precedence over the environment variables listed above.
+           */
+          enabled?: boolean
+        }
+      }
     }
 
     /**
@@ -1226,6 +1274,134 @@ declare namespace tracer {
        */
       redactionExcludedIdentifiers?: string[]
     }
+
+    /**
+     * Maximum size in bytes for serialized baggage items.
+     * @default 8192
+     * @env DD_TRACE_BAGGAGE_MAX_BYTES
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    baggageMaxBytes?: number
+
+    /**
+     * Maximum number of baggage items allowed on a context.
+     * @default 64
+     * @env DD_TRACE_BAGGAGE_MAX_ITEMS
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    baggageMaxItems?: number
+
+    /**
+     * Header tags (key-value pairs comma separated) to extract and attach to spans.
+     * TODO: In the next major version, this will become an object.
+     * @env DD_TRACE_HEADER_TAGS
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    headerTags?: string[]
+
+    /**
+     * Whether to use Datadog legacy baggage extraction and injection behavior.
+     * @default false
+     * @env DD_TRACE_LEGACY_BAGGAGE_ENABLED
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    legacyBaggageEnabled?: boolean
+
+    /**
+     * Whether middleware spans should be created.
+     * @default true
+     * @env DD_TRACE_MIDDLEWARE_TRACING_ENABLED
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    middlewareTracingEnabled?: boolean
+
+    /**
+     * Whether to enable OpenAI log collection.
+     * @default false
+     * @env DD_OPENAI_LOGS_ENABLED
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    openAiLogsEnabled?: boolean
+
+    /**
+     * Peer service name remapping rules.
+     * @env DD_TRACE_PEER_SERVICE_MAPPING
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    peerServiceMapping?: { [key: string]: string }
+
+    /**
+     * Controls the naming schema version used for spans.
+     * @default 'v0'
+     * @env DD_TRACE_SPAN_ATTRIBUTE_SCHEMA
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    spanAttributeSchema?: 'v0' | 'v1'
+
+    /**
+     * Whether to compute peer.service tags automatically.
+     * @default false
+     * @env DD_TRACE_PEER_SERVICE_DEFAULTS_ENABLED
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    spanComputePeerService?: boolean
+
+    /**
+     * Whether to remove integration names from service names under the active schema.
+     * @default false
+     * @env DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    spanRemoveIntegrationFromService?: boolean
+
+    /**
+     * Whether to enable client-side stats computation.
+     * @default false
+     * @env DD_TRACE_STATS_COMPUTATION_ENABLED
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    stats?: boolean
+
+    /**
+     * Whether to generate 128-bit trace IDs.
+     * @default true
+     * @env DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    traceId128BitGenerationEnabled?: boolean
+
+    /**
+     * Whether to include the high 64 bits of 128-bit trace IDs in logs.
+     * @default true
+     * @env DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    traceId128BitLoggingEnabled?: boolean
+
+    /**
+     * Whether websocket message spans should be created.
+     * @default true
+     * @env DD_TRACE_WEBSOCKET_MESSAGES_ENABLED
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    traceWebsocketMessagesEnabled?: boolean
+
+    /**
+     * Whether websocket message spans should inherit sampling decisions.
+     * @default true
+     * @env DD_TRACE_WEBSOCKET_MESSAGES_INHERIT_SAMPLING
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    traceWebsocketMessagesInheritSampling?: boolean
+
+    /**
+     * Whether websocket message spans should start separate traces.
+     * @default true
+     * @env DD_TRACE_WEBSOCKET_MESSAGES_SEPARATE_TRACES
+     * Programmatic configuration takes precedence over the environment variables listed above.
+     */
+    traceWebsocketMessagesSeparateTraces?: boolean
+
   }
 
   /**
@@ -3256,13 +3432,6 @@ declare namespace tracer {
      */
     maxContextOperations?: number,
 
-    /**
-     * Defines the pattern to ignore cookie names in the vulnerability hash calculation
-     * @default ".{32,}"
-     * @deprecated This property has no effect because hash calculation algorithm has been updated for cookie vulnerabilities
-     */
-    cookieFilterPattern?: string,
-
     /**
      * Defines the number of rows to taint in data coming from databases
      * @default 1
@@ -3304,7 +3473,7 @@ declare namespace tracer {
      * Allows to enable security controls. This option is not supported when
      * using ESM.
      * @deprecated Please use the DD_IAST_SECURITY_CONTROLS_CONFIGURATION
-     * environment variable instead.
+     * environment variable instead. This option will be removed in the next major version.
      * @env DD_IAST_SECURITY_CONTROLS_CONFIGURATION
      * Programmatic configuration takes precedence over the environment variables listed above.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.94.0",
+  "version": "5.95.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",

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

@@ -41,7 +41,7 @@ function wrapCreate (create) {
     const options = arguments[0]
     const stream = options.stream
 
-    const ctx = { options, resource: 'create' }
+    const ctx = { options, resource: 'create', baseUrl: this._client?.baseURL }
 
     return anthropicTracingChannel.start.runStores(ctx, () => {
       let apiPromise

package/packages/datadog-instrumentations/src/helpers/rewriter/{orchestrion/compiler.js → compiler.js}

@@ -1,6 +1,6 @@
 'use strict'
 
-const log = require('../../../../../dd-trace/src/log')
+const log = require('../../../../dd-trace/src/log')
 
 // eslint-disable-next-line camelcase, no-undef
 const runtimeRequire = typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require
@@ -25,7 +25,7 @@ const compiler = {
       log.error(e)
 
       // Fallback for when OXC is not available.
-      const meriyah = require('../../../../../../vendor/dist/meriyah')
+      const meriyah = require('../../../../../vendor/dist/meriyah')
 
       compiler.parse = (sourceText, { range, sourceType } = {}) => {
         return meriyah.parse(sourceText.toString(), {
@@ -39,16 +39,8 @@ const compiler = {
     return compiler.parse(sourceText, options)
   },
 
-  generate: (...args) => {
-    const astring = require('../../../../../../vendor/dist/astring')
-
-    compiler.generate = astring.generate
-
-    return compiler.generate(...args)
-  },
-
   traverse: (ast, query, visitor) => {
-    const esquery = require('../../../../../../vendor/dist/esquery').default
+    const esquery = require('../../../../../vendor/dist/esquery')
 
     compiler.traverse = (ast, query, visitor) => {
       return esquery.traverse(ast, esquery.parse(query), visitor)
@@ -58,7 +50,7 @@ const compiler = {
   },
 
   query: (ast, query) => {
-    const esquery = require('../../../../../../vendor/dist/esquery').default
+    const esquery = require('../../../../../vendor/dist/esquery')
 
     compiler.query = esquery.query
 
@@ -68,7 +60,6 @@ const compiler = {
 
 module.exports = {
   parse: (...args) => compiler.parse(...args),
-  generate: (...args) => compiler.generate(...args),
   traverse: (...args) => compiler.traverse(...args),
   query: (...args) => compiler.query(...args),
 }

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

@@ -3,13 +3,27 @@
 const { readFileSync } = require('fs')
 const { join } = require('path')
 const log = require('../../../../dd-trace/src/log')
+const { create } = require('../../../../../vendor/dist/@apm-js-collab/code-transformer')
+const { traceAsyncIterator, traceIterator } = require('./transforms')
 const instrumentations = require('./instrumentations')
-const { create } = require('./orchestrion')
+
+let dcPolyfill
+
+try {
+  dcPolyfill = require.resolve('dc-polyfill').replaceAll('\\', '/')
+} catch {
+  // The `dc-polyfill` module is unavailable for some reason (like bundling).
+  // Let's just keep the default of using `diagnostics-channel` as a fallback
+  // which works for most Node versions.
+}
 
 /** @type {Record<string, string>} map of module base name to version */
 const moduleVersions = {}
 const disabled = new Set()
-const matcher = create(instrumentations, 'dc-polyfill')
+const matcher = create(instrumentations, dcPolyfill)
+
+matcher.addTransform('traceIterator', traceIterator)
+matcher.addTransform('traceAsyncIterator', traceAsyncIterator)
 
 function rewrite (content, filename, format) {
   if (!content) return content

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

@@ -10,9 +10,9 @@ module.exports = [
     functionQuery: {
       methodName: 'stream',
       className: 'Pregel',
-      kind: 'AsyncIterator',
     },
     channelName: 'Pregel_stream',
+    transform: 'traceAsyncIterator',
   },
   {
     module: {
@@ -23,8 +23,8 @@ module.exports = [
     functionQuery: {
       methodName: 'stream',
       className: 'Pregel',
-      kind: 'AsyncIterator',
     },
     channelName: 'Pregel_stream',
+    transform: 'traceAsyncIterator',
   },
 ]

package/packages/datadog-instrumentations/src/helpers/rewriter/{orchestrion/transforms.js → transforms.js}

@@ -1,5 +1,7 @@
 'use strict'
 
+// TODO: Move traceIterator to Orchestrion.
+
 const { parse, query, traverse } = require('./compiler')
 
 const tracingChannelPredicate = (node) => (
@@ -36,10 +38,7 @@ const transforms = module.exports = {
   },
 
   traceAsyncIterator: traceAny,
-  traceCallback: traceAny,
   traceIterator: traceAny,
-  tracePromise: traceAny,
-  traceSync: traceAny,
 }
 
 function traceAny (state, node, _parent, ancestry) {
@@ -117,33 +116,10 @@ function traceInstanceMethod (state, node, program) {
 }
 
 function wrap (state, node, program) {
-  const { channelName, operator } = state
+  const { operator } = state
 
   if (operator === 'traceAsyncIterator') return wrapIterator(state, node, program)
-  if (operator === 'traceCallback') return wrapCallback(state, node)
   if (operator === 'traceIterator') return wrapIterator(state, node, program)
-
-  const async = operator === 'tracePromise' ? 'async' : ''
-  const channelVariable = 'tr_ch_apm$' + channelName.replaceAll(':', '_')
-  const wrapper = parse(`
-    function wrapper () {
-      const __apm$traced = ${async} () => {
-        const __apm$wrapped = () => {};
-        return __apm$wrapped.apply(this, arguments);
-      };
-      if (!${channelVariable}.hasSubscribers) return __apm$traced();
-      return ${channelVariable}.${operator}(__apm$traced, {
-        arguments,
-        self: this,
-        moduleVersion: "1.0.0"
-      });
-    }
-  `).body[0].body // Extract only block statement of function body.
-
-  // Replace the right-hand side assignment of `const __apm$wrapped = () => {}`.
-  query(wrapper, '[id.name=__apm$wrapped]')[0].init = node
-
-  return wrapper
 }
 
 function wrapSuper (_state, node) {
@@ -195,68 +171,6 @@ function wrapSuper (_state, node) {
   }
 }
 
-function wrapCallback (state, node) {
-  const { channelName, functionQuery: { callbackIndex = -1 } } = state
-  const channelVariable = 'tr_ch_apm$' + channelName.replaceAll(':', '_')
-  const wrapper = parse(`
-    function wrapper () {
-      const __apm$cb = Array.prototype.at.call(arguments, ${callbackIndex});
-      const __apm$ctx = {
-        arguments,
-        self: this,
-        moduleVersion: "1.0.0"
-      };
-      const __apm$traced = () => {
-        const __apm$wrapped = () => {};
-        return __apm$wrapped.apply(this, arguments);
-      };
-
-      if (!${channelVariable}.start.hasSubscribers) return __apm$traced();
-
-      function __apm$wrappedCb(err, res) {
-        if (err) {
-          __apm$ctx.error = err;
-          ${channelVariable}.error.publish(__apm$ctx);
-        } else {
-          __apm$ctx.result = res;
-        }
-
-        ${channelVariable}.asyncStart.runStores(__apm$ctx, () => {
-          try {
-            if (__apm$cb) {
-              return __apm$cb.apply(this, arguments);
-            }
-          } finally {
-            ${channelVariable}.asyncEnd.publish(__apm$ctx);
-          }
-        });
-      }
-
-      if (typeof __apm$cb !== 'function') {
-        return __apm$traced();
-      }
-      Array.prototype.splice.call(arguments, ${callbackIndex}, 1, __apm$wrappedCb);
-
-      return ${channelVariable}.start.runStores(__apm$ctx, () => {
-        try {
-          return __apm$traced();
-        } catch (err) {
-          __apm$ctx.error = err;
-          ${channelVariable}.error.publish(__apm$ctx);
-          throw err;
-        } finally {
-          ${channelVariable}.end.publish(__apm$ctx);
-        }
-      });
-    }
-  `).body[0].body // Extract only block statement of function body.
-
-  // Replace the right-hand side assignment of `const __apm$wrapped = () => {}`.
-  query(wrapper, '[id.name=__apm$wrapped]')[0].init = node
-
-  return wrapper
-}
-
 function wrapIterator (state, node, program) {
   const { channelName, operator } = state
   const baseChannel = channelName.replaceAll(':', '_')