dd-trace 6.10.0 → 6.12.0

package/LICENSE-3rdparty.csv

@@ -44,18 +44,21 @@
 "@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']"
+"agent-base","https://github.com/TooTallNate/proxy-agents","['MIT']","['Nathan Rajlich']"
 "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>']"
+"debug","https://github.com/debug-js/debug","['MIT']","['Josh Junon']"
 "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']"
 "fast-fifo","https://github.com/mafintosh/fast-fifo","['MIT']","['Mathias Buus']"
+"https-proxy-agent","https://github.com/TooTallNate/proxy-agents","['MIT']","['Nathan Rajlich']"
 "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']"
@@ -68,6 +71,7 @@
 "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']"
+"ms","https://github.com/vercel/ms","['MIT']","['vercel']"
 "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']"
@@ -75,6 +79,7 @@
 "oxc-parser","https://github.com/oxc-project/oxc","['MIT']","['Boshen and oxc contributors']"
 "pprof-format","https://github.com/DataDog/pprof-format","['MIT']","['Datadog Inc.']"
 "protobufjs","https://github.com/protobufjs/protobuf.js","['BSD-3-Clause']","['Daniel Wirtz']"
+"proxy-from-env","https://github.com/Rob--W/proxy-from-env","['MIT']","['Rob Wu']"
 "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']"

package/README.md

@@ -93,23 +93,6 @@ Regardless of where you open the issue, someone at Datadog will try to help.
 
 If you would like to trace your bundled application then please read this page on [bundling and dd-trace](https://docs.datadoghq.com/tracing/trace_collection/automatic_instrumentation/dd_libraries/nodejs/#bundling). It includes information on how to use our ESBuild plugin and includes caveats for other bundlers.
 
-When using the experimental OpenFeature provider, file-traced deployments can force the optional provider and
-its dependencies into the output with a side-effect import before accessing `tracer.openfeature`:
-
-CommonJS:
-
-```js
-require('dd-trace/openfeature')
-```
-
-ES modules:
-
-```js
-import 'dd-trace/openfeature.js'
-```
-
-This is a fallback for build tools that do not recognize the provider's optional-require wrapper.
-
 
 ## Security Vulnerabilities
 

package/index.d.ts

@@ -243,6 +243,7 @@ interface Plugins {
   "azure-functions": tracer.plugins.azure_functions;
   "azure-service-bus": tracer.plugins.azure_service_bus;
   "azure-durable-functions": tracer.plugins.azure_durable_functions
+  "browser-bunyan": tracer.plugins.browser_bunyan;
   "bullmq": tracer.plugins.bullmq;
   "bunyan": tracer.plugins.bunyan;
   "cassandra-driver": tracer.plugins.cassandra_driver;
@@ -1940,6 +1941,18 @@ declare namespace tracer {
     /** @hidden */
     interface Instrumentation extends Integration, Analyzable {}
 
+    /** @hidden */
+    interface LLMObsIntegration extends Integration {
+      /**
+       * Whether to capture LLM Observability spans for this integration. When set to `false`,
+       * the integration keeps emitting APM spans and propagating trace context, but no LLM
+       * Observability spans are produced. Useful when another integration already captures the
+       * same operation and the payloads would otherwise be stored twice.
+       * @default true
+       */
+      llmobs?: boolean;
+    }
+
     /** @hidden */
     interface DatabaseInstrumentation extends Instrumentation {
       /**
@@ -2333,11 +2346,13 @@ declare namespace tracer {
       interface azure_durable_functions extends Integration {}
 
     /**
-     * This plugin patches the [bunyan](https://github.com/trentm/node-bunyan)
+     * This plugin patches the [browser-bunyan](https://github.com/philmander/browser-bunyan)
      * to automatically inject trace identifiers in log records when the
      * [logInjection](interfaces/traceroptions.html#logInjection) option is enabled
      * on the tracer.
      */
+    interface browser_bunyan extends Integration {}
+
     /**
      * This plugin automatically instruments the
      * [bullmq](https://github.com/npmjs/package/bullmq) message queue library.
@@ -2358,6 +2373,12 @@ declare namespace tracer {
       producerFilter?: (job: { name?: string; data?: unknown; opts?: unknown; queueName?: string }) => boolean;
     }
 
+    /**
+     * This plugin patches the [bunyan](https://github.com/trentm/node-bunyan)
+     * to automatically inject trace identifiers in log records when the
+     * [logInjection](interfaces/traceroptions.html#logInjection) option is enabled
+     * on the tracer.
+     */
     interface bunyan extends Integration {}
 
     /**
@@ -2804,7 +2825,7 @@ declare namespace tracer {
      * This plugin automatically instruments the
      * [langchain](https://js.langchain.com/) module
      */
-    interface langchain extends Instrumentation {}
+    interface langchain extends Instrumentation, LLMObsIntegration {}
 
     /**
      * This plugin automatically instruments the
@@ -2846,7 +2867,7 @@ declare namespace tracer {
      * This plugin automatically instruments the
      * [modelcontextprotocol-sdk](https://github.com/npmjs/package/@modelcontextprotocol/sdk) library.
      */
-    interface modelcontextprotocol_sdk extends Instrumentation {}
+    interface modelcontextprotocol_sdk extends Instrumentation, LLMObsIntegration {}
 
     /**
      * This plugin automatically instruments the
@@ -3783,7 +3804,8 @@ declare namespace tracer {
         id?: string,
         inputData: JSONType,
         expectedOutput?: JSONType,
-        metadata?: Record<string, JSONType>
+        metadata?: Record<string, JSONType>,
+        tags?: string[]
       }>
     }
 
@@ -3816,6 +3838,8 @@ declare namespace tracer {
       expectedRecordCount?: number
       /** Maximum total time to wait, in ms. Default 30000. */
       maxWaitMs?: number
+      /** Filter records by these tags. */
+      tags?: string[]
     }
 
     interface ExperimentResultRow {
@@ -3852,6 +3876,79 @@ declare namespace tracer {
       url: string
     }
 
+    type ExternalExperimentTimestamp = number | string | Date
+
+    interface StartExperimentDatasetOptions {
+      /** Existing dataset id. When omitted, a placeholder dataset is created. */
+      id?: string
+      /** Dataset version to associate with the experiment. */
+      version?: number
+      /** Placeholder dataset name. Defaults to `<experiment name> dataset`. */
+      name?: string
+      /** Placeholder dataset description. */
+      description?: string
+    }
+
+    interface StartExperimentOptions {
+      name: string
+      description?: string
+      /** Override the configured project name for this external experiment. */
+      projectName?: string
+      dataset?: StartExperimentDatasetOptions
+      config?: Record<string, JSONType>
+      metadata?: Record<string, JSONType>
+      tags?: Record<string, string>
+    }
+
+    interface ExternalExperimentSpanInput {
+      name?: string
+      input?: JSONType
+      output?: JSONType
+      expectedOutput?: JSONType
+      metadata?: Record<string, JSONType>
+      tags?: Record<string, string>
+      startedAt?: ExternalExperimentTimestamp
+      completedAt?: ExternalExperimentTimestamp
+      durationMs?: number
+      error?: string | Error | { type?: string, name?: string, message?: string, stack?: string }
+      datasetRecordId?: string
+      runId?: string
+      runIteration?: number
+    }
+
+    interface ExternalExperimentSpan {
+      experimentId: string
+      spanId: string
+      traceId: string
+      url: string | null
+    }
+
+    interface ExternalExperimentMetric {
+      label: string
+      value?: JSONType
+      error?: string | Error
+      timestamp?: ExternalExperimentTimestamp
+      tags?: Record<string, string>
+      source?: string
+    }
+
+    interface ExternalExperimentCloseOptions {
+      status?: string
+      error?: string | Error
+    }
+
+    interface ExternalExperiment {
+      experimentId (): string
+      name (): string
+      url (): string | null
+      submitSpan (input?: ExternalExperimentSpanInput): Promise<ExternalExperimentSpan>
+      submitEvaluationMetrics (
+        span: { experimentId?: string, spanId: string, traceId: string },
+        metrics: ExternalExperimentMetric[]
+      ): Promise<void>
+      close (options?: ExternalExperimentCloseOptions): Promise<void>
+    }
+
     interface DatasetPushResult {
       /** Number of records from this push that were confirmed with a record id. */
       pushedCount: number
@@ -3860,10 +3957,30 @@ declare namespace tracer {
     }
 
     interface Dataset {
-      addRecord (input: JSONType, expectedOutput?: JSONType, metadata?: Record<string, JSONType>): Dataset
+      addRecord (
+        input: JSONType,
+        expectedOutput?: JSONType,
+        metadata?: Record<string, JSONType>,
+        tags?: string[]
+      ): Dataset
+      /** Update fields on an existing dataset record. */
+      update (index: number, fields: {
+        input?: JSONType
+        expectedOutput?: JSONType
+        metadata?: Record<string, JSONType>
+      }): Dataset
+      /** Delete an existing dataset record. */
+      delete (index: number): Dataset
+      /** Add tags to a dataset record. */
+      addTags (index: number, tags: string[]): Dataset
+      /** Remove tags from a dataset record. */
+      removeTags (index: number, tags: string[]): Dataset
+      /** Replace all tags on a dataset record. */
+      replaceTags (index: number, tags: string[]): Dataset
       /** Creates the dataset remotely if needed and pushes any unpushed records. */
       push (): Promise<DatasetPushResult>
       name (): string
+      description (): string
       id (): string | null
       projectId (): string | null
       version (): number | null
@@ -3872,8 +3989,11 @@ declare namespace tracer {
         id: string | null,
         input: JSONType,
         expectedOutput: JSONType,
-        metadata: Record<string, JSONType>
+        metadata: Record<string, JSONType>,
+        tags: string[]
       }>
+      /** Return the tags used to filter this dataset. */
+      filterTags (): string[]
       /** Dashboard URL for the dataset, or null until pushed. */
       url (): string | null
     }
@@ -3893,6 +4013,8 @@ declare namespace tracer {
       pullDataset (name: string, options?: PullDatasetOptions): Promise<Dataset>
       /** Build an experiment to run over a dataset. */
       experiment (options: ExperimentOptions): Experiment
+      /** Start an externally-driven experiment. */
+      startExperiment (options: StartExperimentOptions): Promise<ExternalExperiment>
     }
 
     interface LLMObservabilitySpan {

package/initialize.mjs

@@ -16,19 +16,28 @@ import * as Module from 'module'
 import { types } from 'util'
 import { isMainThread } from 'worker_threads'
 
-// This file must support Node.js 12.0.0 syntax
+// This file must support Node.js 14.13.1 syntax
 
-import {
-  iitmExclusionRegExp,
-  initialize as hookInitialize,
-  load as hookLoad,
-  resolve as hookResolve,
-} from './loader-hook.mjs?initialize'
+const NODE_VERSION = process.versions.node
+
+const brokenLoaders = NODE_VERSION.startsWith('18.0')
+const isNode20LoaderWorker = !isMainThread && NODE_VERSION.startsWith('20.0')
+const useDefaultLoader = brokenLoaders || isNode20LoaderWorker
+// Avoid CommonJS in the loader worker on Node 20.0: https://github.com/nodejs/node/issues/47566
+const loaderHook = useDefaultLoader ? undefined : await import('./loader-hook.mjs?initialize')
 
 let hasInsertedInit = false
 const initJsUrl = new URL('init.js', import.meta.url).href
 // `--loader` only reliably influences ESM entrypoints; for CJS apps use `--import`/`--require`.
 
+// `globalPreload` is deprecated in favor of the `initialize` hook, but `initialize` only exists
+// from Node 20.6 on, so it is the only way to run code in the application realm on Node 20.0.
+export const globalPreload = isNode20LoaderWorker
+  ? () => `if (getBuiltin('module').createRequire(${JSON.stringify(import.meta.url)})('./init.js')) {
+  process.emitWarning('dd-trace cannot instrument ES modules on Node.js 20.0.0. Upgrade to Node.js 20.1.0 or newer.')
+}`
+  : undefined
+
 /**
  * @param {{ source?: string|Buffer|Uint8Array, format?: string }} result
  * @param {unknown} _url_
@@ -63,26 +72,28 @@ function insertInit (result, _url_, context) {
   return result
 }
 
-const [NODE_MAJOR, NODE_MINOR] = process.versions.node.split('.').map(Number)
-
-const brokenLoaders = NODE_MAJOR === 18 && NODE_MINOR === 0
-
 // Node calls `initialize` only through `module.register`, never for `--loader`; without it
 // import-in-the-middle keeps its default matcher and proxies every application module. Loaders
 // before Node 18.19 share the application thread, where `loader-hook.mjs` builds no matcher.
-let needsHookInitialize = !isMainThread && !brokenLoaders
+let needsHookInitialize = !isMainThread && !useDefaultLoader
 
-export async function load (url, context, nextLoad) {
+/**
+ * @param {string} url
+ * @param {import('node:module').LoadHookContext & { isMain?: boolean }} context
+ * @param {Parameters<import('node:module').LoadHook>[2]} nextLoad
+ */
+async function loadWithInit (url, context, nextLoad) {
   if (needsHookInitialize) {
     needsHookInitialize = false
-    hookInitialize()
+    loaderHook.initialize()
   }
 
-  const loadHook = (brokenLoaders || iitmExclusionRegExp.test(url)) ? nextLoad : hookLoad
-  return insertInit(await loadHook(url, context, nextLoad), url, context)
+  const load = (useDefaultLoader || loaderHook.iitmExclusionRegExp.test(url)) ? nextLoad : loaderHook.load
+  return insertInit(await load(url, context, nextLoad), url, context)
 }
 
-export const resolve = brokenLoaders ? undefined : hookResolve
+export const load = isNode20LoaderWorker ? undefined : loadWithInit
+export const resolve = useDefaultLoader ? undefined : loaderHook.resolve
 
 if (isMainThread) {
   const require = Module.createRequire(import.meta.url)

package/openfeature.js

@@ -1,4 +1,4 @@
 'use strict'
 
-// Static fallback for file tracers that do not recognize the optional-peer wrapper.
-require('@datadog/openfeature-node-server')
+// Static fallback for file tracers that do not recognize the vendored provider's lazy require.
+require('./vendor/dist/@datadog/openfeature-node-server')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "6.10.0",
+  "version": "6.12.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -49,7 +49,7 @@
     "test:esbuild:ci": "node scripts/c8-ci.js test:esbuild",
     "test:webpack": "mocha \"packages/datadog-webpack/test/**/*.spec.js\"",
     "test:webpack:ci": "node scripts/c8-ci.js test:webpack",
-    "test:instrumentations": "mocha \"packages/datadog-instrumentations/test/@(${PLUGINS}).spec.js\"",
+    "test:instrumentations": "mocha --fail-zero \"packages/datadog-instrumentations/test/@(${PLUGINS}).spec.js\"",
     "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": "node scripts/c8-ci.js test:instrumentations:misc",
@@ -57,20 +57,23 @@
     "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": "node scripts/c8-ci.js test:code-origin",
+    "test:evp_proxy": "mocha \"packages/dd-trace/test/evp_proxy/**/*.spec.js\"",
     "test:lambda": "mocha \"packages/dd-trace/test/lambda/**/*.spec.js\"",
     "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": "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 && node scripts/c8-ci.js test:llmobs:plugins",
-    "test:openfeature": "mocha \"packages/dd-trace/test/openfeature/**/*.spec.js\"",
+    "test:openfeature": "mocha \"packages/dd-trace/test/evp_proxy/**/*.spec.js\" \"packages/dd-trace/test/openfeature/**/*.spec.js\"",
     "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": "node --expose-gc ./node_modules/mocha/bin/mocha.js --fail-zero \"packages/datadog-plugin-@(${PLUGINS})/test/**/${SPEC:-*}*.spec.js\"",
     "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": "node scripts/c8-ci.js test:profiler",
+    "test:otel-thread-ctx": "mocha --timeout 60000 packages/dd-trace/test/otel-thread-ctx.spec.js",
+    "test:docker:otel-thread-ctx": "./scripts/docker/run-otel-thread-ctx-spec.sh",
     "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\"",
@@ -112,7 +115,7 @@
     "test:integration:plugins:coverage": "yarn services && node ./integration-tests/coverage/run-suite.js \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/${SPEC:-*}*.spec.js\"",
     "test:unit:plugins": "mocha \"packages/datadog-instrumentations/test/@(${PLUGINS}).spec.js\" \"packages/datadog-plugin-@(${PLUGINS})/test/**/*.spec.js\" --exclude \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/*.spec.js\"",
     "test:release": "mocha \"scripts/release/**/*.spec.js\"",
-    "test:scripts": "mocha \"scripts/helpers/**/*.spec.js\" \"scripts/*.spec.mjs\"",
+    "test:scripts": "mocha \"benchmark/sirun/*.spec.js\" \"scripts/helpers/**/*.spec.js\" \"scripts/*.spec.mjs\"",
     "test:shimmer": "mocha \"packages/datadog-shimmer/test/**/*.spec.js\"",
     "test:shimmer:ci": "node scripts/c8-ci.js test:shimmer",
     "verify:workflow-job-names": "node scripts/verify-workflow-job-names.js",
@@ -180,13 +183,12 @@
     "opentracing": ">=0.14.7"
   },
   "optionalDependencies": {
-    "@datadog/libdatadog": "0.9.4",
+    "@datadog/libdatadog": "0.12.1",
     "@datadog/native-appsec": "11.0.1",
     "@datadog/native-iast-taint-tracking": "4.2.0",
     "@datadog/native-metrics": "3.1.2",
-    "@datadog/openfeature-node-server": "2.0.2",
-    "@datadog/pprof": "5.17.0",
-    "@datadog/wasm-js-rewriter": "5.0.1",
+    "@datadog/pprof": "5.18.1",
+    "@datadog/wasm-js-rewriter": "5.0.3",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
     "@opentelemetry/api-logs": "<1.0.0",
     "oxc-parser": "^0.132.0"
@@ -195,56 +197,58 @@
     "@actions/core": "^3.0.1",
     "@actions/github": "^9.1.1",
     "@babel/helpers": "^8.0.0",
-    "@eslint/eslintrc": "^3.3.5",
+    "@eslint/eslintrc": "^3.3.6",
     "@eslint/js": "^10.0.1",
+    "@eslint/plugin-kit": "^0.7.2",
+    "@datadog/openfeature-node-server": "2.1.0",
     "@msgpack/msgpack": "^3.1.3",
-    "@openfeature/core": "^1.11.0",
-    "@openfeature/server-sdk": "~1.22.0",
+    "@openfeature/core": "^1.12.0",
+    "@openfeature/server-sdk": "~1.23.0",
     "@stylistic/eslint-plugin": "^5.10.0",
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.106",
     "@types/sinon": "^22.0.0",
     "@vercel/nft": "^1.10.2",
     "@yarnpkg/lockfile": "^1.1.0",
-    "axios": "^1.18.1",
+    "axios": "^1.19.0",
     "benchmark": "^2.1.4",
     "body-parser": "^2.3.0",
     "bun": "1.3.14",
     "c8": "^12.0.0",
     "codeowners-audit": "^2.9.0",
-    "eslint": "^10.5.0",
-    "eslint-plugin-cypress": "^6.4.2",
+    "eslint": "^10.8.1",
+    "eslint-plugin-cypress": "^7.0.0",
     "eslint-plugin-import-x": "^4.16.2",
-    "eslint-plugin-jsdoc": "^63.0.12",
+    "eslint-plugin-jsdoc": "^64.2.0",
     "eslint-plugin-mocha": "^11.3.0",
-    "eslint-plugin-n": "^18.2.1",
+    "eslint-plugin-n": "^18.3.0",
     "eslint-plugin-promise": "^7.3.0",
     "eslint-plugin-sonarjs": "^4.2.0",
     "eslint-plugin-unicorn": "^73.0.0",
     "express": "^5.1.0",
     "glob": "^10.4.5",
-    "globals": "^17.7.0",
+    "globals": "^17.11.0",
     "graphql": "*",
     "husky": "^9.1.7",
     "istanbul-lib-report": "^3.0.0",
     "istanbul-reports": "^3.0.2",
     "jsonc-parser": "^3.3.1",
     "jszip": "^3.10.1",
-    "minimatch": "^10.2.5",
-    "mocha": "^11.7.6",
+    "minimatch": "^10.2.6",
+    "mocha": "^11.8.0",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
     "multer": "^2.2.0",
-    "nock": "^14.0.16",
+    "nock": "^14.0.17",
     "node-preload": "^0.2.1",
     "nyc": "^18.0.0",
     "octokit": "^5.0.3",
-    "p-limit": "^7.2.0",
+    "p-limit": "^7.3.1",
     "proxyquire": "^2.1.3",
     "retry": "^0.13.1",
     "semifies": "^1.0.0",
     "semver": "^7.8.5",
-    "sinon": "^22.0.0",
+    "sinon": "^22.1.0",
     "source-map-support": "^0.5.21",
     "test-exclude": "^8.0.0",
     "tiktoken": "^1.0.21",

package/packages/datadog-esbuild/index.js

@@ -8,11 +8,6 @@ const { pathToFileURL, fileURLToPath } = require('node:url')
 const instrumentations = require('../datadog-instrumentations/src/helpers/instrumentations')
 const extractPackageAndModulePath = require('../datadog-instrumentations/src/helpers/extract-package-and-module-path')
 const hooks = require('../datadog-instrumentations/src/helpers/hooks')
-const {
-  OPTIONAL_PEER_FILTER,
-  matchesOptionalPeerFile,
-  rewriteOptionalPeerLoads,
-} = require('../datadog-instrumentations/src/helpers/optional-peer-bundler')
 const { processModule, isESMFile } = require('./src/utils')
 const log = require('./src/log')
 
@@ -133,19 +128,6 @@ module.exports.setup = function (build) {
 ${build.initialOptions.banner.js}`
   }
 
-  // Keep the build from failing on the optional `@openfeature/core` peer of
-  // `@openfeature/server-sdk` when it is not installed (#8635). esbuild follows the chain
-  // whenever `@openfeature/server-sdk` is reachable -- the app importing it directly, or the
-  // bundled provider when the optional peer is present -- so mark `@openfeature/core` external
-  // when it is absent rather than erroring at bundle time.
-  try {
-    // eslint-disable-next-line n/no-unpublished-require
-    require.resolve('@openfeature/core')
-  } catch {
-    build.initialOptions.external ??= []
-    build.initialOptions.external.push('@openfeature/core')
-  }
-
   const esmBuild = isESMBuild(build)
   if (
     esmBuild &&
@@ -182,22 +164,6 @@ ${build.initialOptions.banner.js}`
     log.warn('No git metadata available - skipping injection')
   }
 
-  // Rewrite optional-peer loads so installed peers get bundled and survive the bundle being
-  // relocated without them on disk (#8980). Registered before the generic onLoad so it wins for
-  // these files. Absent peers stay opaque, so a build that does not opt into the feature does not
-  // follow their dependency chain (#8635).
-  build.onLoad({ filter: OPTIONAL_PEER_FILTER }, args => {
-    const normalizedPath = args.path.replaceAll('\\', '/')
-    if (!matchesOptionalPeerFile(normalizedPath)) return
-
-    log.debug('INLINE: optional-peer loader applied to %s', normalizedPath)
-    return {
-      contents: rewriteOptionalPeerLoads(fs.readFileSync(args.path, 'utf8'), path.dirname(args.path)),
-      loader: 'js',
-      resolveDir: path.dirname(args.path),
-    }
-  })
-
   // first time is intercepted, proxy should be created, next time the original should be loaded
   const interceptedESMModules = new Set()