dd-trace 5.88.0 → 5.90.0

package/LICENSE-3rdparty.csv

@@ -61,7 +61,6 @@
 "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>']"
-"delay","https://github.com/sindresorhus/delay","['MIT']","['Sindre Sorhus']"
 "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']"
@@ -85,7 +84,6 @@
 "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']"
-"p-limit","https://github.com/sindresorhus/p-limit","['MIT']","['Sindre Sorhus']"
 "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']"
@@ -100,6 +98,5 @@
 "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']"
-"yocto-queue","https://github.com/sindresorhus/yocto-queue","['MIT']","['Sindre Sorhus']"
 "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/ext/tags.js

@@ -30,6 +30,8 @@ const tags = {
 
   // DSM Specific
   PATHWAY_HASH: 'pathway.hash',
+  DSM_TRANSACTION_ID: 'dsm.transaction.id',
+  DSM_TRANSACTION_CHECKPOINT: 'dsm.transaction.checkpoint',
 }
 
 // Deprecated

package/index.d.ts

@@ -228,6 +228,7 @@ interface Plugins {
   "azure-event-hubs": tracer.plugins.azure_event_hubs;
   "azure-functions": tracer.plugins.azure_functions;
   "azure-service-bus": tracer.plugins.azure_service_bus;
+  "azure-durable-functions": tracer.plugins.azure_durable_functions
   "bullmq": tracer.plugins.bullmq;
   "bunyan": tracer.plugins.bunyan;
   "cassandra-driver": tracer.plugins.cassandra_driver;
@@ -1339,6 +1340,15 @@ declare namespace tracer {
      * @returns The DSM context associated with the current pathway.
      */
     setConsumeCheckpoint (type: string, source: string, carrier: any, manualCheckpoint?: boolean): any;
+
+    /**
+     * Records a transaction ID at a named checkpoint without pathway propagation.
+     * Tags the active span (or the provided span) with dsm.transaction.id and dsm.transaction.checkpoint.
+     * @param transactionId The unique transaction identifier (truncated to 255 UTF-8 bytes).
+     * @param checkpointName The logical checkpoint name (stable 1-byte ID per process lifetime).
+     * @param span The span to tag. Defaults to the currently active span.
+     */
+    trackTransaction(transactionId: string, checkpointName: string, span?: Span | null): void;
   }
 
   export interface EventTrackingV2 {
@@ -1617,6 +1627,10 @@ declare namespace tracer {
        * List of tags associated with the evaluation (e.g. indirect-prompt-injection)
        */
       tags: string[];
+      /**
+       * Sensitive Data Scanner findings from the evaluation.
+       */
+      sds: Object[];
     }
 
     /**
@@ -1632,6 +1646,10 @@ declare namespace tracer {
        * List of tags associated with the evaluation (e.g. indirect-prompt-injection)
        */
       tags: string[];
+      /**
+       * Sensitive Data Scanner findings from the evaluation.
+       */
+      sds: Object[];
     }
 
     /**
@@ -2025,6 +2043,22 @@ declare namespace tracer {
        * @default true
        */
       signature?: boolean;
+
+      /**
+       * An object of optional callbacks to be executed during the respective
+       * phase of an Apollo Gateway operation. Undefined callbacks default to a
+       * noop function.
+       *
+       * @default {}
+       */
+      hooks?: {
+        request?: (span?: Span, ctx?: any) => void;
+        validate?: (span?: Span, ctx?: any) => void;
+        plan?: (span?: Span, ctx?: any) => void;
+        execute?: (span?: Span, ctx?: any) => void;
+        fetch?: (span?: Span, ctx?: any) => void;
+        postprocessing?: (span?: Span, ctx?: any) => void;
+      };
     }
 
     /**
@@ -2088,6 +2122,12 @@ declare namespace tracer {
      */
     interface azure_service_bus extends Integration {}
 
+    /**
+     * This plugin automatically instruments the
+     * durable-functions module
+     */
+      interface azure_durable_functions extends Integration {}
+
     /**
      * This plugin patches the [bunyan](https://github.com/trentm/node-bunyan)
      * to automatically inject trace identifiers in log records when the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.88.0",
+  "version": "5.90.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -16,7 +16,8 @@
     "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",
-    "lint:codeowners": "node scripts/codeowners.mjs",
+    "lint:codeowners": "codeowners-audit",
+    "lint:codeowners:ci": "codeowners-audit --glob='**/*.spec.js'",
     "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",
@@ -60,6 +61,7 @@
     "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\"",
+    "test:integration:bun": "mocha --timeout 60000 \"integration-tests/bun/*.spec.js\"",
     "test:integration:cucumber": "mocha --timeout 60000 \"integration-tests/cucumber/*.spec.js\"",
     "test:integration:cypress": "mocha --timeout 60000 \"integration-tests/cypress/*.spec.js\"",
     "test:integration:debugger": "mocha --timeout 60000 \"integration-tests/debugger/*.spec.js\"",
@@ -132,44 +134,46 @@
   ],
   "dependencies": {
     "dc-polyfill": "^0.1.10",
-    "import-in-the-middle": "^2.0.6"
+    "import-in-the-middle": "^3.0.0"
   },
   "optionalDependencies": {
     "@datadog/libdatadog": "0.8.1",
     "@datadog/native-appsec": "11.0.1",
     "@datadog/native-iast-taint-tracking": "4.1.0",
     "@datadog/native-metrics": "3.1.1",
-    "@datadog/openfeature-node-server": "^0.3.3",
-    "@datadog/pprof": "5.13.4",
+    "@datadog/openfeature-node-server": "^1.1.0",
+    "@datadog/pprof": "5.13.5",
     "@datadog/wasm-js-rewriter": "5.0.1",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
     "@opentelemetry/api-logs": "<1.0.0",
-    "oxc-parser": "^0.115.0"
+    "oxc-parser": "^0.116.0"
   },
   "devDependencies": {
+    "@actions/core": "^3.0.0",
+    "@actions/github": "^9.0.0",
     "@babel/helpers": "^7.28.6",
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.39.2",
     "@msgpack/msgpack": "^3.1.3",
     "@openfeature/core": "^1.8.1",
     "@openfeature/server-sdk": "~1.20.0",
-    "@snyk/github-codeowners": "^1.1.0",
-    "@stylistic/eslint-plugin": "^5.7.1",
+    "@stylistic/eslint-plugin": "^5.10.0",
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.106",
     "@types/sinon": "^21.0.0",
     "axios": "^1.13.4",
     "benchmark": "^2.1.4",
     "body-parser": "^2.2.2",
-    "bun": "1.3.8",
+    "bun": "1.3.10",
+    "codeowners-audit": "^2.7.1",
     "eslint": "^9.39.2",
-    "eslint-plugin-cypress": "^5.2.1",
+    "eslint-plugin-cypress": "^6.1.0",
     "eslint-plugin-import": "^2.32.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",
+    "eslint-plugin-unicorn": "^63.0.0",
     "express": "^5.1.0",
     "glob": "^10.4.5",
     "globals": "^17.2.0",
@@ -179,9 +183,9 @@
     "mocha": "^11.6.0",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
-    "multer": "^2.0.2",
+    "multer": "^2.1.1",
     "nock": "^13.5.6",
-    "nyc": "^17.1.0",
+    "nyc": "^18.0.0",
     "octokit": "^5.0.3",
     "opentracing": ">=0.14.7",
     "p-limit": "^7.2.0",
@@ -189,7 +193,7 @@
     "retry": "^0.13.1",
     "semifies": "^1.0.0",
     "semver": "^7.7.2",
-    "sinon": "^21.0.1",
+    "sinon": "^21.0.2",
     "tiktoken": "^1.0.21",
     "typescript": "^5.9.2",
     "workerpool": "^10.0.0",

package/packages/datadog-instrumentations/src/azure-durable-functions.js

@@ -0,0 +1,75 @@
+'use strict'
+
+const dc = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
+
+const {
+  addHook,
+} = require('./helpers/instrument')
+
+/**
+ * @type {import('diagnostics_channel').TracingChannel}
+ */
+const azureDurableFunctionsChannel = dc.tracingChannel('datadog:azure:durable-functions:invoke')
+
+addHook({ name: 'durable-functions', versions: ['>=3'], patchDefault: false }, (df) => {
+  const { app } = df
+
+  shimmer.wrap(app, 'entity', entityWrapper)
+  shimmer.wrap(app, 'activity', activityHandler)
+
+  return df
+})
+
+function entityWrapper (method) {
+  return function (entityName, arg) {
+    // because this method is overloaded, the second argument can either be an object
+    // with the handler or the handler itself, so first we figure which type it is
+    if (typeof arg === 'function') {
+      // if a function, this is the handler we want to wrap and trace
+      arguments[1] = shimmer.wrapFunction(arg, handler => entityHandler(handler, entityName))
+    } else {
+      // if an object, access the handler then trace it
+      shimmer.wrap(arg, 'handler', handler => entityHandler(handler, entityName))
+    }
+
+    return method.apply(this, arguments)
+  }
+}
+
+function entityHandler (handler, entityName) {
+  return function () {
+    if (!azureDurableFunctionsChannel.hasSubscribers) return handler.apply(this, arguments)
+
+    const entityContext = arguments[0]
+    return azureDurableFunctionsChannel.traceSync(
+      handler,
+      { trigger: 'Entity', functionName: entityName, operationName: entityContext?.df?.operationName },
+      this, ...arguments)
+  }
+}
+
+function activityHandler (method) {
+  return function (activityName, activityOptions) {
+    shimmer.wrap(activityOptions, 'handler', handler => {
+      const isAsync =
+        handler && handler.constructor && handler.constructor.name === 'AsyncFunction'
+
+      return function () {
+        if (!azureDurableFunctionsChannel.hasSubscribers) return handler.apply(this, arguments)
+
+        // use tracePromise if this is an async handler. otherwise, use traceSync
+        return isAsync
+          ? azureDurableFunctionsChannel.tracePromise(
+            handler,
+            { trigger: 'Activity', functionName: activityName },
+            this, ...arguments)
+          : azureDurableFunctionsChannel.traceSync(
+            handler,
+            { trigger: 'Activity', functionName: activityName },
+            this, ...arguments)
+      }
+    })
+    return method.apply(this, arguments)
+  }
+}

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

@@ -55,6 +55,8 @@ const originalCoverageMap = createCoverageMap()
 const patched = new WeakSet()
 
 const lastStatusByPickleId = new Map()
+/** For ATR: statuses keyed by stable scenario id (uri:name) so retries accumulate correctly */
+const atrStatusesByScenarioKey = new Map()
 const numRetriesByPickleId = new Map()
 const numAttemptToCtx = new Map()
 const newTestsByTestFullname = new Map()
@@ -275,6 +277,17 @@ function wrapRun (pl, isLatestVersion, version) {
             const isFirstAttempt = numAttempt++ === 0
             const isAtrRetry = !isFirstAttempt && isFlakyTestRetriesEnabled
 
+            // ATR: record this attempt as failed so when run().finally runs (after retry) we have all statuses
+            if (isFlakyTestRetriesEnabled && isAtrRetry === false) {
+              const nameForKey = this.pickle.name.replace(/\s*\(attempt \d+(?:, retried)?\)\s*$/, '')
+              const atrKey = `${this.pickle.uri}:${nameForKey}`
+              if (atrStatusesByScenarioKey.has(atrKey)) {
+                atrStatusesByScenarioKey.get(atrKey).push('fail')
+              } else {
+                atrStatusesByScenarioKey.set(atrKey, ['fail'])
+              }
+            }
+
             if (promises.hitBreakpointPromise) {
               await promises.hitBreakpointPromise
             }
@@ -367,6 +380,25 @@ function wrapRun (pl, isLatestVersion, version) {
           }
         }
 
+        // ATR: accumulate statuses by stable scenario key (uri:name) so retries are grouped.
+        // Cucumber appends " (attempt N)" or " (attempt N, retried)" to the scenario name; normalize for keying.
+        if (isFlakyTestRetriesEnabled && !isAttemptToFix && !isEfdRetry && numTestRetries > 0) {
+          const nameForKey = this.pickle.name.replace(/\s*\(attempt \d+(?:, retried)?\)\s*$/, '')
+          const atrKey = `${this.pickle.uri}:${nameForKey}`
+          if (atrStatusesByScenarioKey.has(atrKey)) {
+            atrStatusesByScenarioKey.get(atrKey).push(status)
+          } else {
+            atrStatusesByScenarioKey.set(atrKey, [status])
+          }
+          const atrStatuses = atrStatusesByScenarioKey.get(atrKey)
+          const pickleStatuses = lastStatusByPickleId.get(this.pickle.id)
+          const statusesToCheck = atrStatuses?.length >= (numTestRetries + 1) ? atrStatuses : pickleStatuses
+          if (statusesToCheck && statusesToCheck.length === numTestRetries + 1 &&
+            statusesToCheck.every(s => s === 'fail')) {
+            hasFailedAllRetries = true
+          }
+        }
+
         const attemptCtx = numAttemptToCtx.get(numAttempt)
 
         const error = getErrorFromCucumberResult(result)
@@ -480,7 +512,8 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
     earlyFlakeDetectionFaultyThreshold = configurationResponse.libraryConfig?.earlyFlakeDetectionFaultyThreshold
     isSuitesSkippingEnabled = configurationResponse.libraryConfig?.isSuitesSkippingEnabled
     isFlakyTestRetriesEnabled = configurationResponse.libraryConfig?.isFlakyTestRetriesEnabled
-    numTestRetries = configurationResponse.libraryConfig?.flakyTestRetriesCount
+    const configRetryCount = configurationResponse.libraryConfig?.flakyTestRetriesCount
+    numTestRetries = (typeof configRetryCount === 'number' && configRetryCount > 0) ? configRetryCount : 0
     isKnownTestsEnabled = configurationResponse.libraryConfig?.isKnownTestsEnabled
     isTestManagementTestsEnabled = configurationResponse.libraryConfig?.isTestManagementEnabled
     testManagementAttemptToFixRetries = configurationResponse.libraryConfig?.testManagementAttemptToFixRetries
@@ -563,6 +596,7 @@ function getWrappedStart (start, frameworkVersion, isParallel = false, isCoordin
       options.retry = numTestRetries
     }
 
+    atrStatusesByScenarioKey.clear()
     sessionStartCh.publish({ command, frameworkVersion })
 
     if (!errorSkippableRequest && skippedSuites.length) {
@@ -1016,6 +1050,9 @@ addHook({
       this.options.worldParameters._ddModifiedFiles = modifiedFiles
     }
 
+    this.options.worldParameters._ddIsFlakyTestRetriesEnabled = isFlakyTestRetriesEnabled
+    this.options.worldParameters._ddNumTestRetries = numTestRetries
+
     return startWorker.apply(this, arguments)
   })
   return adapterPackage
@@ -1051,6 +1088,8 @@ addHook({
       if (isImpactedTestsEnabled) {
         modifiedFiles = this.options.worldParameters._ddModifiedFiles
       }
+      isFlakyTestRetriesEnabled = !!this.options.worldParameters._ddIsFlakyTestRetriesEnabled
+      numTestRetries = this.options.worldParameters._ddNumTestRetries ?? 0
     }
   )
   return workerPackage

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

@@ -6,12 +6,21 @@ const {
   addHook,
 } = require('./helpers/instrument')
 
-addHook({ name: '@elastic/transport', file: 'lib/Transport.js', versions: ['>=8'] }, (exports) => {
-  shimmer.wrap(exports.default.prototype, 'request', createWrapRequest('elasticsearch'))
-  shimmer.wrap(exports.default.prototype, 'getConnection', createWrapGetConnection('elasticsearch'))
+addHook({ name: '@elastic/transport', file: 'lib/Transport.js', versions: ['>=8 <9'] }, (exports) => {
+  wrapTransportPrototype(exports.default)
   return exports
 })
 
+addHook({ name: '@elastic/transport', versions: ['>=9'] }, (exports) => {
+  wrapTransportPrototype(exports.Transport)
+  return exports
+})
+
+function wrapTransportPrototype (Transport) {
+  shimmer.wrap(Transport.prototype, 'request', createWrapRequest('elasticsearch'))
+  shimmer.wrap(Transport.prototype, 'getConnection', createWrapGetConnection('elasticsearch'))
+}
+
 addHook({ name: '@elastic/elasticsearch', file: 'lib/Transport.js', versions: ['>=5.6.16 <8', '>=8'] }, Transport => {
   shimmer.wrap(Transport.prototype, 'request', createWrapRequest('elasticsearch'))
   shimmer.wrap(Transport.prototype, 'getConnection', createWrapGetConnection('elasticsearch'))

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

@@ -8,6 +8,7 @@ module.exports = {
   '@aws-sdk/smithy-client': () => require('../aws-sdk'),
   '@azure/event-hubs': () => require('../azure-event-hubs'),
   '@azure/functions': () => require('../azure-functions'),
+  'durable-functions': () => require('../azure-durable-functions'),
   '@azure/service-bus': () => require('../azure-service-bus'),
   '@cucumber/cucumber': () => require('../cucumber'),
   '@playwright/test': () => require('../playwright'),

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

@@ -1,95 +1,45 @@
 'use strict'
 
-/*
-This rewriter is basically a JavaScript version of Orchestrion-JS. The goal is
-not to replace Orchestrion-JS, but rather to make it easier and faster to write
-new integrations in the short-term, especially as many changes to the rewriter
-will be needed as all the patterns we need have not been identified yet. This
-will avoid the back and forth of having to make Rust changes to an external
-library for every integration change or addition that requires something new.
-
-In the meantime, we'll work concurrently on a change to Orchestrion-JS that
-adds an "arbitrary transform" or "plugin" system that can be used from
-JavaScript, in order to enable quick iteration while still using Orchestrion-JS.
-Once that's done we'll use that, so that we can remove this JS approach and
-return to using Orchestrion-JS.
-
-The long term goal is to backport any additional features we add to the JS
-rewriter (or using the plugin system in Orchestrion-JS once we're using that)
-to Orchestrion-JS  once we're confident that the implementation is fairly
-complete and has all features we need.
-
-Here is a list of the additions and changes in this rewriter compared to
-Orchestrion-JS that will need to be backported:
-
-(NOTE: Please keep this list up-to-date whenever new features are added)
-
-- Supports an `astQuery` field to filter AST nodes with an esquery query. This
-  is mostly meant to be used when experimenting or if what needs to be queried
-  is not a function. We'll see over time if something like this is needed to be
-  backported or if it can be replaced by simpler queries.
-- Supports replacing methods of child class instances in the base constructor.
-- Supports tracing iterator (sync/async) returning functions (sync/async).
-*/
-
 const { readFileSync } = require('fs')
 const { join } = require('path')
-const semifies = require('../../../../../vendor/dist/semifies')
 const log = require('../../../../dd-trace/src/log')
-const { getEnvironmentVariable } = require('../../../../dd-trace/src/config/helper')
-const { transform } = require('./transformer')
-const { generate, parse, traverse } = require('./compiler')
 const instrumentations = require('./instrumentations')
+const { create } = require('./orchestrion')
 
-const NODE_OPTIONS = getEnvironmentVariable('NODE_OPTIONS')
-
-/** @type {Record<string, Set<string>>} map of module base name to supported function query versions */
-const supported = {}
+/** @type {Record<string, string>} map of module base name to version */
+const moduleVersions = {}
 const disabled = new Set()
-
-// TODO: Source maps without `--enable-source-maps`.
-const enableSourceMaps = NODE_OPTIONS?.includes('--enable-source-maps') ||
-  process.execArgv?.some(arg => arg.includes('--enable-source-maps'))
-
-let SourceMapGenerator
+const matcher = create(instrumentations, 'dc-polyfill')
 
 function rewrite (content, filename, format) {
   if (!content) return content
+  if (!filename.includes('node_modules')) return content
 
-  const sourceType = format === 'module' ? 'module' : 'script'
-
-  try {
-    let ast
-
-    filename = filename.replace('file://', '')
-
-    for (const inst of instrumentations) {
-      const { astQuery, functionQuery = {}, module: { name, versionRange, filePath } } = inst
+  filename = filename.replace('file://', '')
 
-      if (disabled.has(name)) continue
-      if (!filename.endsWith(`${name}/${filePath}`)) continue
-      if (!satisfies(filename, filePath, versionRange)) continue
+  const moduleType = format === 'module' ? 'esm' : 'cjs'
+  const [modulePath] = filename.split('/node_modules/').reverse()
+  const moduleParts = modulePath.split('/')
+  const splitIndex = moduleParts[0].startsWith('@') ? 2 : 1
+  const moduleName = moduleParts.slice(0, splitIndex).join('/')
+  const filePath = moduleParts.slice(splitIndex).join('/')
+  const version = getVersion(filename, filePath)
 
-      ast ??= parse(content.toString(), { range: true, sourceType })
+  if (disabled.has(moduleName)) return content
 
-      const query = astQuery || fromFunctionQuery(functionQuery)
-      const state = { ...inst, sourceType, functionQuery }
+  const transformer = matcher.getTransformer(moduleName, version, filePath)
 
-      traverse(ast, query, (...args) => transform(state, ...args))
-    }
+  if (!transformer) return content
 
-    if (ast) {
-      if (!enableSourceMaps) return generate(ast)
+  try {
+    // TODO: pass existing sourcemap as input for remapping
+    const { code, map } = transformer.transform(content, moduleType)
 
-      // TODO: Can we use the same version of `source-map` that DI uses?
-      SourceMapGenerator ??= require('../../../../../vendor/dist/@datadog/source-map').SourceMapGenerator
+    if (!map) return code
 
-      const sourceMap = new SourceMapGenerator({ file: filename })
-      const code = generate(ast, { sourceMap })
-      const map = Buffer.from(sourceMap.toString()).toString('base64')
+    const inlineMap = Buffer.from(map).toString('base64')
 
-      return code + '\n' + `//# sourceMappingURL=data:application/json;base64,${map}`
-    }
+    return code + '\n' + `//# sourceMappingURL=data:application/json;base64,${inlineMap}`
   } catch (e) {
     log.error(e)
   }
@@ -101,55 +51,20 @@ function disable (instrumentation) {
   disabled.add(instrumentation)
 }
 
-function satisfies (filename, filePath, versions) {
+function getVersion (filename, filePath) {
   const [basename] = filename.split(filePath)
 
-  supported[basename] ??= new Set()
-
-  if (!supported[basename].has(versions)) {
+  if (!moduleVersions[basename]) {
     try {
       const pkg = JSON.parse(readFileSync(
         join(basename, 'package.json'), 'utf8'
       ))
 
-      if (semifies(pkg.version, versions)) {
-        supported[basename].add(versions)
-      }
+      moduleVersions[basename] = pkg.version
     } catch {}
   }
 
-  return supported[basename].has(versions)
-}
-
-// TODO: Support index
-function fromFunctionQuery (functionQuery) {
-  const { methodName, functionName, expressionName, className } = functionQuery
-  const queries = []
-
-  if (className) {
-    queries.push(
-      `[id.name="${className}"]`,
-      `[id.name="${className}"] > ClassExpression`,
-      `[id.name="${className}"] > ClassBody > [key.name="${methodName}"] > [async]`,
-      `[id.name="${className}"] > ClassExpression > ClassBody > [key.name="${methodName}"] > [async]`
-    )
-  } else if (methodName) {
-    queries.push(
-      `ClassBody > [key.name="${methodName}"] > [async]`,
-      `Property[key.name="${methodName}"] > [async]`
-    )
-  }
-
-  if (functionName) {
-    queries.push(`FunctionDeclaration[id.name="${functionName}"][async]`)
-  } else if (expressionName) {
-    queries.push(
-      `FunctionExpression[id.name="${expressionName}"][async]`,
-      `ArrowFunctionExpression[id.name="${expressionName}"][async]`
-    )
-  }
-
-  return queries.join(', ')
+  return moduleVersions[basename]
 }
 
 module.exports = { rewrite, disable }

package/packages/datadog-instrumentations/src/helpers/rewriter/{compiler.js → orchestrion/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(), {
@@ -40,7 +40,7 @@ const compiler = {
   },
 
   generate: (...args) => {
-    const astring = require('../../../../../vendor/dist/astring')
+    const astring = require('../../../../../../vendor/dist/astring')
 
     compiler.generate = astring.generate
 
@@ -48,7 +48,7 @@ const compiler = {
   },
 
   traverse: (ast, query, visitor) => {
-    const esquery = require('../../../../../vendor/dist/esquery').default
+    const esquery = require('../../../../../../vendor/dist/esquery').default
 
     compiler.traverse = (ast, query, visitor) => {
       return esquery.traverse(ast, esquery.parse(query), visitor)
@@ -58,7 +58,7 @@ const compiler = {
   },
 
   query: (ast, query) => {
-    const esquery = require('../../../../../vendor/dist/esquery').default
+    const esquery = require('../../../../../../vendor/dist/esquery').default
 
     compiler.query = esquery.query