dd-trace 5.83.0 → 5.85.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.83.0",
+  "version": "5.85.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -13,49 +13,49 @@
     "type:check": "tsc --noEmit -p tsconfig.dev.json",
     "type:doc:build": "cd docs && yarn && yarn build",
     "type:doc:test": "cd docs && yarn && yarn test",
-    "lint": "node scripts/check_licenses.js && eslint . --concurrency=auto --max-warnings 0",
-    "lint:fix": "node scripts/check_licenses.js && eslint . --concurrency=auto --max-warnings 0 --fix",
+    "lint": "node scripts/check_licenses.js && node scripts/check-no-coverage-artifacts.js && eslint . --concurrency=auto --max-warnings 0",
+    "lint:fix": "node scripts/check_licenses.js && node scripts/check-no-coverage-artifacts.js && eslint . --concurrency=auto --max-warnings 0 --fix",
     "lint:inspect": "npx @eslint/config-inspector@latest",
     "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 --no-clean --include \"packages/dd-trace/src/aiguard/**/*.js\" -- npm run test:aiguard",
+    "test:aiguard:ci": "nyc -- npm run 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 --no-clean --include \"packages/dd-trace/src/appsec/**/*.js\" --exclude \"packages/dd-trace/test/appsec/**/*.plugin.spec.js\" -- npm run test:appsec",
+    "test:appsec:ci": "nyc -- npm run test:appsec",
     "test:appsec:plugins": "mocha \"packages/dd-trace/test/appsec/**/*.@(${PLUGINS}).plugin.spec.js\"",
-    "test:appsec:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/src/appsec/**/*.js\" -- npm run test:appsec:plugins",
+    "test:appsec:plugins:ci": "yarn services && nyc -- npm run test:appsec:plugins",
     "test:debugger": "mocha packages/dd-trace/test/debugger/**/*.spec.js",
-    "test:debugger:ci": "nyc --no-clean --include \"packages/dd-trace/src/debugger/**/*.js\" -- npm run test:debugger",
+    "test:debugger:ci": "nyc -- npm run 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/{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 --no-clean --include \"packages/dd-trace/src/**/*.js\" -- npm run test:trace:core",
+    "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 -- npm run test:trace:core",
     "test:trace:guardrails": "mocha packages/dd-trace/test/guardrails/**/*.spec.js",
-    "test:trace:guardrails:ci": "nyc --no-clean --include \"packages/dd-trace/src/guardrails/**/*.js\" -- npm run test:trace:guardrails",
+    "test:trace:guardrails:ci": "nyc -- npm run test:trace:guardrails",
     "test:esbuild": "mocha packages/datadog-esbuild/test/**/*.spec.js",
-    "test:esbuild:ci": "nyc --no-clean --include \"packages/datadog-esbuild/test/**/*.js\" -- npm run test:esbuild",
+    "test:esbuild:ci": "nyc -- npm run test:esbuild",
     "test:instrumentations": "mocha \"packages/datadog-instrumentations/test/@(${PLUGINS}).spec.js\"",
-    "test:instrumentations:ci": "yarn services && nyc --no-clean --include \"packages/datadog-instrumentations/src/@(${PLUGINS}).js\" --include \"packages/datadog-instrumentations/src/@(${PLUGINS})/**/*.js\" -- npm run test:instrumentations",
+    "test:instrumentations:ci": "yarn services && nyc -- npm run test:instrumentations",
     "test:instrumentations:misc": "mocha 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:instrumentations:misc:ci": "nyc -- npm run 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 --no-clean --include \"packages/datadog-core/src/**/*.js\" -- npm run test:core",
+    "test:core:ci": "nyc -- npm run test:core",
     "test:code-origin": "mocha packages/datadog-code-origin/test/**/*.spec.js",
-    "test:code-origin:ci": "nyc --no-clean --include \"packages/datadog-code-origin/**/*.js\" -- npm run test:code-origin",
+    "test:code-origin:ci": "nyc -- npm run test:code-origin",
     "test:lambda": "mocha packages/dd-trace/test/lambda/**/*.spec.js",
-    "test:lambda:ci": "nyc --no-clean --include \"packages/dd-trace/src/lambda/**/*.js\" -- npm run test:lambda",
+    "test:lambda:ci": "nyc -- npm run 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 --no-clean --include \"packages/dd-trace/src/llmobs/**/*.js\" -- npm run test:llmobs:sdk",
+    "test:llmobs:sdk:ci": "nyc -- npm run test:llmobs:sdk",
     "test:llmobs:plugins": "mocha \"packages/dd-trace/test/llmobs/plugins/@(${PLUGINS})/*.spec.js\"",
-    "test:llmobs:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/src/llmobs/**/*.js\" -- npm run test:llmobs:plugins",
+    "test:llmobs:plugins:ci": "yarn services && nyc -- npm run test:llmobs:plugins",
     "test:openfeature": "mocha packages/dd-trace/test/openfeature/**/*.spec.js",
-    "test:openfeature:ci": "nyc --no-clean --include \"packages/dd-trace/src/openfeature/**/*.js\" -- npm run test:openfeature",
+    "test:openfeature:ci": "nyc -- npm run 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 --no-clean --include \"packages/datadog-plugin-@(${PLUGINS})/src/**/*.js\" -- npm run test:plugins",
-    "test:plugins:ci:flaky": "yarn services && nyc --no-clean --include \"packages/datadog-plugin-@(${PLUGINS})/src/**/*.js\" -- npm run test:plugins -- --bail --retries 2",
+    "test:plugins:ci": "yarn services && nyc -- npm run test:plugins",
+    "test:plugins:ci:flaky": "yarn services && nyc -- npm run 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 --no-clean --include \"packages/dd-trace/src/profiling/**/*.js\" -- npm run test:profiler",
+    "test:profiler:ci": "nyc -- npm run test:profiler",
     "test:integration": "mocha --timeout 60000 \"integration-tests/*.spec.js\"",
     "test:integration:aiguard": "mocha --timeout 60000 \"integration-tests/aiguard/*.spec.js\"",
     "test:integration:appsec": "mocha --timeout 60000 \"integration-tests/appsec/*.spec.js\"",
@@ -71,10 +71,11 @@
     "test:integration:vitest": "mocha --timeout 60000 \"integration-tests/vitest/*.spec.js\"",
     "test:integration:testopt": "mocha --timeout 120000 \"integration-tests/ci-visibility/*.spec.js\"",
     "test:integration:profiler": "mocha --timeout 180000 \"integration-tests/profiler/*.spec.js\"",
-    "test:integration:plugins": "mocha \"packages/datadog-plugin-@($(echo $PLUGINS))/test/integration-test/**/*.spec.js\"",
-    "test:unit:plugins": "mocha \"packages/datadog-instrumentations/test/@($(echo $PLUGINS)).spec.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/**/*.spec.js\" --exclude \"packages/datadog-plugin-@($(echo $PLUGINS))/test/integration-test/**/*.spec.js\"",
+    "test:integration:plugins": "mocha \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/*.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:shimmer": "mocha \"packages/datadog-shimmer/test/**/*.spec.js\"",
-    "test:shimmer:ci": "nyc --no-clean --include \"packages/datadog-shimmer/src/**/*.js\" -- npm run test:shimmer",
+    "test:shimmer:ci": "nyc -- npm run test:shimmer",
+    "verify:workflow-job-names": "node scripts/verify-workflow-job-names.js",
     "verify-exercised-tests": "node scripts/verify-exercised-tests.js"
   },
   "repository": {
@@ -130,15 +131,15 @@
   ],
   "dependencies": {
     "dc-polyfill": "^0.1.10",
-    "import-in-the-middle": "2.0.3"
+    "import-in-the-middle": "^2.0.6"
   },
   "optionalDependencies": {
     "@datadog/libdatadog": "0.7.0",
     "@datadog/native-appsec": "10.3.0",
     "@datadog/native-iast-taint-tracking": "4.1.0",
     "@datadog/native-metrics": "3.1.1",
-    "@datadog/openfeature-node-server": "^0.2.0",
-    "@datadog/pprof": "5.13.2",
+    "@datadog/openfeature-node-server": "^0.3.3",
+    "@datadog/pprof": "5.13.3",
     "@datadog/wasm-js-rewriter": "5.0.1",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
     "@opentelemetry/api-logs": "<1.0.0"
@@ -150,25 +151,25 @@
     "@msgpack/msgpack": "^3.1.3",
     "@openfeature/core": "^1.8.1",
     "@openfeature/server-sdk": "~1.20.0",
-    "@stylistic/eslint-plugin": "^5.7.0",
+    "@stylistic/eslint-plugin": "^5.7.1",
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.106",
     "@types/sinon": "^21.0.0",
-    "axios": "^1.12.2",
+    "axios": "^1.13.4",
     "benchmark": "^2.1.4",
     "body-parser": "^2.2.2",
-    "bun": "1.3.6",
+    "bun": "1.3.8",
     "eslint": "^9.39.2",
     "eslint-plugin-cypress": "^5.2.1",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jsdoc": "^62.0.0",
+    "eslint-plugin-jsdoc": "^62.5.0",
     "eslint-plugin-mocha": "^11.2.0",
     "eslint-plugin-n": "^17.23.2",
     "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-unicorn": "^62.0.0",
     "express": "^5.1.0",
     "glob": "^10.4.5",
-    "globals": "^17.0.0",
+    "globals": "^17.2.0",
     "graphql": "*",
     "jszip": "^3.10.1",
     "mocha": "^11.6.0",
@@ -179,6 +180,7 @@
     "nyc": "^17.1.0",
     "octokit": "^5.0.3",
     "opentracing": ">=0.14.7",
+    "p-limit": "^7.2.0",
     "proxyquire": "^2.1.3",
     "retry": "^0.13.1",
     "semifies": "^1.0.0",
@@ -188,6 +190,7 @@
     "typescript": "^5.9.2",
     "workerpool": "^10.0.0",
     "yaml": "^2.8.0",
+    "husky": "^9.1.7",
     "yarn-deduplicate": "^6.0.2"
   }
 }

package/packages/datadog-code-origin/index.js

@@ -1,41 +1,43 @@
 'use strict'
 
+const { getEnvironmentVariable } = require('../dd-trace/src/config/helper')
 const { parseUserLandFrames } = require('../dd-trace/src/plugins/util/stacktrace')
 
 const ENTRY_SPAN_STACK_FRAMES_LIMIT = 1
-const EXIT_SPAN_STACK_FRAMES_LIMIT = Number(process.env._DD_CODE_ORIGIN_FOR_SPANS_EXIT_SPAN_MAX_USER_FRAMES) || 8
+const EXIT_SPAN_STACK_FRAMES_LIMIT =
+  Number(getEnvironmentVariable('_DD_CODE_ORIGIN_FOR_SPANS_EXIT_SPAN_MAX_USER_FRAMES')) || 8
 
 module.exports = {
   entryTags,
-  exitTags
+  exitTags,
 }
 
 /**
- * @param {Function} topOfStackFunc - A function present in the current stack, above which no stack frames should be
+ * @param {Function} [topOfStackFunc] - A function present in the current stack, above which no stack frames should be
  *   collected.
  * @returns {Record<string, string>}
  */
 function entryTags (topOfStackFunc) {
-  return tag('entry', topOfStackFunc, ENTRY_SPAN_STACK_FRAMES_LIMIT)
+  return tag('entry', ENTRY_SPAN_STACK_FRAMES_LIMIT, topOfStackFunc)
 }
 
 /**
- * @param {Function} topOfStackFunc - A function present in the current stack, above which no stack frames should be
+ * @param {Function} [topOfStackFunc] - A function present in the current stack, above which no stack frames should be
  *   collected.
  * @returns {Record<string, string>}
  */
 function exitTags (topOfStackFunc) {
-  return tag('exit', topOfStackFunc, EXIT_SPAN_STACK_FRAMES_LIMIT)
+  return tag('exit', EXIT_SPAN_STACK_FRAMES_LIMIT, topOfStackFunc)
 }
 
 /**
  * @param {'entry'|'exit'} type - The type of code origin.
- * @param {Function} topOfStackFunc - A function present in the current stack, above which no stack frames should be
- *   collected.
  * @param {number} limit - The maximum number of stack frames to include in the tags.
+ * @param {Function} [topOfStackFunc] - A function present in the current stack, above which no stack frames should be
+ *   collected.
  * @returns {Record<string, string>}
  */
-function tag (type, topOfStackFunc, limit) {
+function tag (type, limit, topOfStackFunc) {
   // The `Error.prepareStackTrace` API doesn't support resolving source maps.
   // Fall back to manually parsing the stack trace.
   const originalLimit = Error.stackTraceLimit
@@ -46,7 +48,7 @@ function tag (type, topOfStackFunc, limit) {
   Error.stackTraceLimit = originalLimit
 
   const tags = {
-    '_dd.code_origin.type': type
+    '_dd.code_origin.type': type,
   }
   for (let i = 0; i < frames.length; i++) {
     const frame = frames[i]

package/packages/datadog-core/src/utils/src/pick.js

@@ -2,10 +2,10 @@
 
 module.exports = function pick (object, props) {
   const result = {}
-  props.forEach(prop => {
+  for (const prop of props) {
     if (Object.hasOwn(object, prop)) {
       result[prop] = object[prop]
     }
-  })
+  }
   return result
 }

package/packages/datadog-esbuild/index.js

@@ -1,20 +1,16 @@
 'use strict'
 
-/* eslint-disable no-console */
-
-const { execSync } = require('child_process')
-const fs = require('fs')
-const RAW_BUILTINS = require('module').builtinModules
-const path = require('path')
-const { pathToFileURL, fileURLToPath } = require('url')
-
-const instrumentations = require('../datadog-instrumentations/src/helpers/instrumentations.js')
-
-const extractPackageAndModulePath = require(
-  '../datadog-instrumentations/src/helpers/extract-package-and-module-path.js'
-)
-const hooks = require('../datadog-instrumentations/src/helpers/hooks.js')
-const { processModule, isESMFile } = require('./src/utils.js')
+const { execSync } = require('node:child_process')
+const fs = require('node:fs')
+const RAW_BUILTINS = require('node:module').builtinModules
+const path = require('node:path')
+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 { processModule, isESMFile } = require('./src/utils')
+const log = require('./src/log')
 
 const ESM_INTERCEPTED_SUFFIX = '._dd_esbuild_intercepted'
 const INTERNAL_ESM_INTERCEPTED_PREFIX = '/_dd_esm_internal_/'
@@ -22,7 +18,7 @@ const INTERNAL_ESM_INTERCEPTED_PREFIX = '/_dd_esm_internal_/'
 let rewriter
 
 for (const hook of Object.values(hooks)) {
-  if (typeof hook === 'object') {
+  if (hook !== null && typeof hook === 'object') {
     hook.fn()
   } else {
     hook()
@@ -33,10 +29,10 @@ const modulesOfInterest = new Set()
 
 for (const instrumentation of Object.values(instrumentations)) {
   for (const entry of instrumentation) {
-    if (!entry.file) {
-      modulesOfInterest.add(entry.name) // e.g. "redis"
-    } else {
+    if (entry.file) {
       modulesOfInterest.add(`${entry.name}/${entry.file}`) // e.g. "redis/my/file.js"
+    } else {
+      modulesOfInterest.add(entry.name) // e.g. "redis"
     }
   }
 }
@@ -50,7 +46,7 @@ for (const builtin of RAW_BUILTINS) {
   builtins.add(`node:${builtin}`)
 }
 
-const DEBUG = !!process.env.DD_TRACE_DEBUG
+// eslint-disable-next-line eslint-rules/eslint-process-env
 const DD_IAST_ENABLED = process.env.DD_IAST_ENABLED?.toLowerCase() === 'true' || process.env.DD_IAST_ENABLED === '1'
 
 module.exports.name = 'datadog-esbuild'
@@ -64,33 +60,34 @@ function isESMBuild (build) {
 }
 
 function getGitMetadata () {
+  /**
+   * @type {object}
+   * @property {string | null} repositoryURL
+   * @property {string | null} commitSHA
+   */
   const gitMetadata = {
     repositoryURL: null,
-    commitSHA: null
+    commitSHA: null,
   }
 
   try {
     gitMetadata.repositoryURL = execSync('git config --get remote.origin.url', {
       encoding: 'utf8',
       stdio: ['pipe', 'pipe', 'ignore'],
-      cwd: process.cwd()
+      cwd: process.cwd(),
     }).trim()
   } catch (e) {
-    if (DEBUG) {
-      console.warn('Warning: failed to get git repository URL:', e.message)
-    }
+    log.warn('failed to get git repository URL:', e.message)
   }
 
   try {
     gitMetadata.commitSHA = execSync('git rev-parse HEAD', {
       encoding: 'utf8',
       stdio: ['pipe', 'pipe', 'ignore'],
-      cwd: process.cwd()
+      cwd: process.cwd(),
     }).trim()
   } catch (e) {
-    if (DEBUG) {
-      console.warn('Warning: failed to get git commit SHA:', e.message)
-    }
+    log.warn('failed to get git commit SHA:', e.message)
   }
 
   return gitMetadata
@@ -123,22 +120,23 @@ ${build.initialOptions.banner.js}`
   try {
     // eslint-disable-next-line n/no-unpublished-require
     require.resolve('@openfeature/core')
-  } catch (error) {
+  } catch {
     build.initialOptions.external ??= []
     build.initialOptions.external.push('@openfeature/core')
   }
 
   const esmBuild = isESMBuild(build)
-  if (esmBuild) {
-    if (!build.initialOptions.banner.js.includes('import { createRequire as $dd_createRequire } from \'module\'')) {
-      build.initialOptions.banner.js = `import { createRequire as $dd_createRequire } from 'module';
+  if (
+    esmBuild &&
+    !build.initialOptions.banner.js.includes('import { createRequire as $dd_createRequire } from \'module\'')
+  ) {
+    build.initialOptions.banner.js = `import { createRequire as $dd_createRequire } from 'module';
 import { fileURLToPath as $dd_fileURLToPath } from 'url';
 import { dirname as $dd_dirname } from 'path';
 globalThis.require ??= $dd_createRequire(import.meta.url);
 globalThis.__filename ??= $dd_fileURLToPath(import.meta.url);
 globalThis.__dirname ??= $dd_dirname(globalThis.__filename);
 ${build.initialOptions.banner.js}`
-    }
   }
 
   // Get git metadata at build time and add it to the banner for both ESM and CommonJS builds
@@ -154,13 +152,13 @@ ${build.initialOptions.banner.js}`
 }
 ${build.initialOptions.banner.js}`
 
-    if (DEBUG) {
-      console.log('Info: automatically injected git metadata:')
-      console.log(`DD_GIT_REPOSITORY_URL: ${gitMetadata.repositoryURL || 'not available'}`)
-      console.log(`DD_GIT_COMMIT_SHA: ${gitMetadata.commitSHA || 'not available'}`)
-    }
-  } else if (DEBUG) {
-    console.warn('Warning: No git metadata available - skipping injection')
+    log.debug(
+      'Automatically injected git metadata (DD_GIT_REPOSITORY_URL: %s, DD_GIT_COMMIT_SHA: %s)',
+      gitMetadata.repositoryURL || 'not available',
+      gitMetadata.commitSHA || 'not available'
+    )
+  } else {
+    log.warn('No git metadata available - skipping injection')
   }
 
   // first time is intercepted, proxy should be created, next time the original should be loaded
@@ -169,7 +167,7 @@ ${build.initialOptions.banner.js}`
   build.onResolve({ filter: /.*/ }, args => {
     if (externalModules.has(args.path)) {
       // Internal Node.js packages will still be instrumented via require()
-      if (DEBUG) console.log(`EXTERNAL: ${args.path}`)
+      log.debug('EXTERNAL: %s', args.path)
       return
     }
 
@@ -178,32 +176,29 @@ ${build.initialOptions.banner.js}`
         args.path.startsWith('@') &&
         !args.importer.includes('node_modules/')) {
       // This is the Next.js convention for loading local files
-      if (DEBUG) console.log(`@LOCAL: ${args.path}`)
+      log.debug('@LOCAL: %s', args.path)
       return
     }
 
     let fullPathToModule
     try {
       fullPathToModule = dotFriendlyResolve(args.path, args.resolveDir, args.kind === 'import-statement')
-    } catch (err) {
-      if (DEBUG) {
-        console.warn(`Warning: Unable to find "${args.path}".` +
-          "Unless it's dead code this could cause a problem at runtime.")
-      }
+    } catch {
+      log.warn('Unable to find "%s". Unless it\'s dead code this could cause a problem at runtime.', args.path)
       return
     }
 
     if (args.path.startsWith('.') && !args.importer.includes('node_modules/')) {
       // It is local application code, not an instrumented package
-      if (DEBUG) console.log(`APP: ${args.path}`)
+      log.debug('APP: %s', args.path)
 
       return {
         path: fullPathToModule,
         pluginData: {
           path: args.path,
           full: fullPathToModule,
-          applicationFile: true
-        }
+          applicationFile: true,
+        },
       }
     }
 
@@ -228,8 +223,8 @@ ${build.initialOptions.banner.js}`
             pkgOfInterest: true,
             kind: args.kind,
             internal,
-            isESM: true
-          }
+            isESM: true,
+          },
         }
       }
       // The file namespace is used when requiring files from disk in userland
@@ -241,26 +236,25 @@ ${build.initialOptions.banner.js}`
       } catch (err) {
         if (err.code === 'MODULE_NOT_FOUND') {
           if (!internal) {
-            if (DEBUG) {
-              console.warn(`Warning: Unable to find "${extracted.pkg}/package.json".` +
-              "Unless it's dead code this could cause a problem at runtime.")
-            }
+            log.warn(
+              'Unable to find "%s/package.json". Unless it\'s dead code this could cause a problem at runtime.',
+              extracted.pkg
+            )
           }
           return
-        } else {
-          throw err
         }
+        throw err
       }
 
       try {
-        const packageJson = JSON.parse(fs.readFileSync(pathToPackageJson).toString())
+        const packageJson = JSON.parse(fs.readFileSync(/** @type {string} */ (pathToPackageJson)).toString())
 
         const isESM = isESMFile(fullPathToModule, pathToPackageJson, packageJson)
         if (isESM && !interceptedESMModules.has(fullPathToModule)) {
           fullPathToModule += ESM_INTERCEPTED_SUFFIX
         }
 
-        if (DEBUG) console.log(`RESOLVE: ${args.path}@${packageJson.version}`)
+        log.debug('RESOLVE: %s@%s', args.path, packageJson.version)
 
         // https://esbuild.github.io/plugins/#on-resolve-arguments
         return {
@@ -274,8 +268,8 @@ ${build.initialOptions.banner.js}`
             pkgOfInterest: true,
             kind: args.kind,
             internal,
-            isESM
-          }
+            isESM,
+          },
         }
       } catch (e) {
         // Skip vendored dependencies which never have a `package.json`. This
@@ -283,12 +277,10 @@ ${build.initialOptions.banner.js}`
         // since those files should be treated as regular files and not modules
         // even though they are in a `node_modules` folder.
         if (e.code === 'ENOENT') {
-          if (DEBUG) {
-            console.log([
-              'Skipping `package.json` lookup.',
-              'This usually means the package was vendored but could indicate an issue otherwise.'
-            ].join(' '))
-          }
+          log.debug(
+            // eslint-disable-next-line @stylistic/max-len
+            'Skipping `package.json` lookup. This usually means the package was vendored but could indicate an issue otherwise.'
+          )
         } else {
           throw e
         }
@@ -300,11 +292,11 @@ ${build.initialOptions.banner.js}`
     if (args.pluginData?.pkgOfInterest) {
       const data = args.pluginData
 
-      if (DEBUG) console.log(`LOAD: ${data.pkg}@${data.version}, pkg "${data.path}"`)
+      log.debug('LOAD: %s@%s, pkg "%s"', data.pkg, data.version, data.path)
 
-      const pkgPath = data.raw !== data.pkg
-        ? `${data.pkg}/${data.path}`
-        : data.pkg
+      const pkgPath = data.raw === data.pkg
+        ? data.pkg
+        : `${data.pkg}/${data.path}`
 
       // Read the content of the module file of interest
       let contents
@@ -322,7 +314,7 @@ ${build.initialOptions.banner.js}`
           const setters = await processModule({
             path: args.path,
             internal: data.internal,
-            context: { format: 'module' }
+            context: { format: 'module' },
           })
 
           const iitmPath = require.resolve('import-in-the-middle/lib/register.js')
@@ -335,7 +327,7 @@ const _ = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } });
 const set = {};
 const get = {};
 
-${Array.from(setters.values()).join(';\n')};
+${[...setters.values()].join(';\n')};
 
 register(${JSON.stringify(toRegister)}, _, set, get, ${JSON.stringify(data.raw)});
 `
@@ -368,7 +360,7 @@ register(${JSON.stringify(toRegister)}, _, set, get, ${JSON.stringify(data.raw)}
       return {
         contents,
         loader: 'js',
-        resolveDir: path.dirname(args.path)
+        resolveDir: path.dirname(args.path),
       }
     }
     if (DD_IAST_ENABLED && args.pluginData?.applicationFile) {
@@ -376,13 +368,13 @@ register(${JSON.stringify(toRegister)}, _, set, get, ${JSON.stringify(data.raw)}
       const isJs = /^\.(js|mjs|cjs)$/.test(ext)
       if (!isJs) return
 
-      if (DEBUG) console.log(`REWRITE: ${args.path}`)
+      log.debug('REWRITE: %s', args.path)
       const fileCode = fs.readFileSync(args.path, 'utf8')
       const rewritten = rewriter.rewrite(fileCode, args.path, ['iast'])
       return {
         contents: rewritten.content,
         loader: 'js',
-        resolveDir: path.dirname(args.path)
+        resolveDir: path.dirname(args.path),
       }
     }
   })
@@ -403,5 +395,9 @@ function dotFriendlyResolve (path, directory, usesImportStatement) {
   if (path.startsWith('file://')) {
     path = fileURLToPath(path)
   }
-  return require.resolve(path, { paths: [directory], conditions })
+  return require.resolve(path, {
+    paths: [directory],
+    // @ts-expect-error - Node.js 22+ unofficially supports a conditions option
+    conditions,
+  })
 }

package/packages/datadog-esbuild/src/log.js

@@ -0,0 +1,32 @@
+'use strict'
+
+const { format } = require('util')
+
+// eslint-disable-next-line eslint-rules/eslint-process-env
+const DD_TRACE_DEBUG = (process.env.DD_TRACE_DEBUG || '').trim().toLowerCase()
+const DEBUG = DD_TRACE_DEBUG === 'true' || DD_TRACE_DEBUG === '1'
+
+const noop = () => {}
+
+const formatWithLogPrefix = (prefix, str, ...args) => {
+  if (typeof str === 'string') {
+    return format(`${prefix} ${str}`, ...args)
+  }
+  return format(prefix, str, ...args)
+}
+
+module.exports = DEBUG
+  ? {
+      debug (...args) {
+        // eslint-disable-next-line no-console
+        console.log(formatWithLogPrefix('[dd-trace/esbuild]', ...args))
+      },
+      warn (...args) {
+        // eslint-disable-next-line no-console
+        console.warn(formatWithLogPrefix('[dd-trace/esbuild] Warning:', ...args))
+      },
+    }
+  : {
+      debug: noop,
+      warn: noop,
+    }