dd-trace 6.16.0 → 6.17.0

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

@@ -2,9 +2,10 @@
 
 const { readFileSync } = require('node:fs')
 const { join } = require('node:path')
-const { pathToFileURL } = require('node:url')
+const { fileURLToPath, pathToFileURL } = require('node:url')
 
 const log = require('../../../../dd-trace/src/log')
+const { getDisabledInstrumentations } = require('../instrumentation-utils')
 const instrumentations = require('./instrumentations')
 const { getRewriteTarget } = require('./targets')
 
@@ -26,7 +27,8 @@ const { getRewriteTarget } = require('./targets')
  * @type {Record<string, string>} map of module base name to version
  */
 const moduleVersions = {}
-const disabled = new Set()
+// Asynchronous loader workers have their own module graph and cannot receive disable() calls made on the main thread.
+const disabled = getDisabledInstrumentations()
 
 // Matchers are built on the first module that actually needs rewriting. The
 // vendored transformer is a quarter megabyte of bundle that an application
@@ -42,6 +44,20 @@ let matcherEsm
 // eslint-disable-next-line unicorn/no-useless-concat -- Keep the source-map marker non-contiguous.
 const SOURCE_MAP_PREFIX = '//# sourceMapping' + 'URL=data:application/json;base64,'
 
+/**
+ * Loader hooks hand `file://` URLs to the rewriter while CommonJS and bundler
+ * callers pass plain paths. `fileURLToPath` is the only correct conversion: a
+ * plain scheme strip leaves Windows paths rooted at `/C:/` and keeps
+ * percent-encoded characters undecoded, which breaks version resolution.
+ * Rewrite-target paths use forward slashes, including on Windows.
+ *
+ * @param {string} filename
+ */
+function normalizeFilename (filename) {
+  const path = filename.startsWith('file://') ? fileURLToPath(filename) : filename
+  return path.replaceAll('\\', '/')
+}
+
 /**
  * @param {string|Buffer|ArrayBuffer|Uint8Array} content
  * @param {string} filename
@@ -52,30 +68,39 @@ const SOURCE_MAP_PREFIX = '//# sourceMapping' + 'URL=data:application/json;base6
 function rewrite (content, filename, format, target) {
   if (!content) return content
 
-  target ||= getRewriteTarget(filename)
-  if (!target) return content
-
-  filename = filename.replace('file://', '')
+  try {
+    filename = normalizeFilename(filename)
+    target ||= getRewriteTarget(filename)
+    if (!target) return content
 
-  const moduleType = format === 'module' ? 'esm' : 'cjs'
-  const { moduleName, filePath } = target
-  const version = getVersion(filename, filePath)
+    const moduleType = format === 'module' ? 'esm' : 'cjs'
+    const { moduleName, filePath } = target
+    if (disabled.has(moduleName)) return content
 
-  if (disabled.has(moduleName)) return content
+    const version = getVersion(filename, filePath)
+    if (!version) return content
 
-  const transformer = getMatcher(moduleType).getTransformer(moduleName, version, filePath)
+    const transformer = getMatcher(moduleType).getTransformer(moduleName, version, filePath)
 
-  if (!transformer) return content
+    if (!transformer) return content
 
-  try {
     const source = getSourceText(content)
 
     // TODO: pass existing sourcemap as input for remapping
-    const { code, map } = transformer.transform(source, moduleType)
+    let { code, map } = transformer.transform(source, moduleType)
+
+    if (source.startsWith('#!') && !code.startsWith('#!')) {
+      // A shebang must be the entire first line, and JavaScript recognizes
+      // exactly four line terminators: \n, \r, \u2028 (line separator), and
+      // \u2029 (paragraph separator). Any of the four can end the shebang line.
+      const shebangEnd = source.search(/[\r\n\u2028\u2029]/)
+      code = (shebangEnd === -1 ? source : source.slice(0, shebangEnd)) + '\n' + code
+      map = shiftSourceMapLine(map)
+    }
 
     if (!map) return code
 
-    const inlineMap = Buffer.from(map).toString('base64')
+    const inlineMap = Buffer.from(typeof map === 'string' ? map : JSON.stringify(map)).toString('base64')
 
     return code + '\n' + SOURCE_MAP_PREFIX + inlineMap
   } catch (e) {
@@ -95,16 +120,19 @@ function createBundlerRewriter (dcModule) {
   return function rewriteBundled (content, filename, format, target, sourceMap) {
     if (!content) return { code: content, map: sourceMap }
 
-    target ||= getRewriteTarget(filename)
-    if (!target) return { code: content, map: sourceMap }
+    try {
+      filename = normalizeFilename(filename)
+      target ||= getRewriteTarget(filename)
+      if (!target) return { code: content, map: sourceMap }
 
-    filename = filename.replace('file://', '')
-    const moduleType = format === 'module' ? 'esm' : 'cjs'
-    const { moduleName, filePath } = target
-    const transformer = matcher.getTransformer(moduleName, getVersion(filename, filePath), filePath)
-    if (!transformer) return { code: content, map: sourceMap }
+      const moduleType = format === 'module' ? 'esm' : 'cjs'
+      const { moduleName, filePath } = target
+      const version = getVersion(filename, filePath)
+      if (!version) return { code: content, map: sourceMap }
+
+      const transformer = matcher.getTransformer(moduleName, version, filePath)
+      if (!transformer) return { code: content, map: sourceMap }
 
-    try {
       return transformer.transform(getSourceText(content), moduleType, sourceMap)
     } catch (error) {
       log.error(error)
@@ -146,6 +174,11 @@ function createMatcher (dcModule) {
     publishDurableOrchestrationFailure,
     waitForAsyncEnd,
   } = require('./transforms')
+  const {
+    postgresQueryHandlers,
+    postgresQueryLifecycle,
+    postgresQueryPreparation,
+  } = require('./transforms/postgres')
 
   const matcher = create(instrumentations, dcModule)
 
@@ -158,6 +191,9 @@ function createMatcher (dcModule) {
   matcher.addTransform('configureGraphqlJitRuntime', configureGraphqlJitRuntime)
   matcher.addTransform('configureMercuriusRequest', configureMercuriusRequest)
   matcher.addTransform('publishDurableOrchestrationFailure', publishDurableOrchestrationFailure)
+  matcher.addTransform('postgresQueryHandlers', postgresQueryHandlers)
+  matcher.addTransform('postgresQueryLifecycle', postgresQueryLifecycle)
+  matcher.addTransform('postgresQueryPreparation', postgresQueryPreparation)
 
   return matcher
 }
@@ -191,7 +227,6 @@ function getDcPolyfillSpecifier (moduleType) {
  * Convert the source representations accepted by Node.js loader hooks to text.
  *
  * @param {string | ArrayBuffer | BufferView} source
- * @returns {string}
  */
 function getSourceText (source) {
   if (typeof source === 'string') return source
@@ -201,6 +236,19 @@ function getSourceText (source) {
   return Buffer.from(source).toString('utf8')
 }
 
+/**
+ * Account for a shebang restored ahead of the generated program. The transformer already maps original positions
+ * past the input shebang, so only the generated side needs an additional empty line.
+ *
+ * @param {string|object|undefined} map
+ */
+function shiftSourceMapLine (map) {
+  if (!map) return map
+  const sourceMap = typeof map === 'string' ? JSON.parse(map) : map
+  const shifted = { ...sourceMap, mappings: `;${sourceMap.mappings}` }
+  return typeof map === 'string' ? JSON.stringify(shifted) : shifted
+}
+
 function disable (instrumentation) {
   disabled.add(instrumentation)
 }

package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentation-registry.js

@@ -0,0 +1,39 @@
+'use strict'
+
+// activationName is the plugin-manager key published after a target is successfully rewritten.
+const registry = [
+  { instrumentations: require('./instrumentations/ai') },
+  { activationName: '@azure/cosmos', instrumentations: require('./instrumentations/azure-cosmos') },
+  { instrumentations: require('./instrumentations/azure-durable-functions') },
+  { activationName: 'bullmq', instrumentations: require('./instrumentations/bullmq') },
+  { instrumentations: require('./instrumentations/claude-agent-sdk') },
+  { instrumentations: require('./instrumentations/graphql') },
+  { instrumentations: require('./instrumentations/graphql-jit') },
+  { activationName: '@langchain/core', instrumentations: require('./instrumentations/langchain') },
+  { activationName: '@langchain/langgraph', instrumentations: require('./instrumentations/langgraph') },
+  { activationName: 'mercurius', instrumentations: require('./instrumentations/mercurius') },
+  { instrumentations: require('./instrumentations/modelcontextprotocol-sdk') },
+  { instrumentations: require('./instrumentations/openai-agents') },
+  { instrumentations: require('./instrumentations/playwright') },
+  { instrumentations: require('./instrumentations/postgres') },
+  { instrumentations: require('./instrumentations/webdriverio') },
+  { instrumentations: require('./instrumentations/aws-durable-execution-sdk-js') },
+  { instrumentations: require('./instrumentations/supabase') },
+]
+
+const activationNames = new Map()
+for (const { activationName, instrumentations } of registry) {
+  if (!activationName) continue
+  for (const { module } of instrumentations) activationNames.set(module.name, activationName)
+}
+
+const instrumentations = registry.flatMap(entry => entry.instrumentations)
+
+/**
+ * @param {string} moduleName
+ */
+function getRewriteActivationName (moduleName) {
+  return activationNames.get(moduleName)
+}
+
+module.exports = { getRewriteActivationName, instrumentations, registry }

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

@@ -1,19 +1,5 @@
 'use strict'
 
-module.exports = [
-  ...require('./ai'),
-  ...require('./azure-cosmos'),
-  ...require('./azure-durable-functions'),
-  ...require('./bullmq'),
-  ...require('./claude-agent-sdk'),
-  ...require('./graphql'),
-  ...require('./graphql-jit'),
-  ...require('./langchain'),
-  ...require('./langgraph'),
-  ...require('./mercurius'),
-  ...require('./modelcontextprotocol-sdk'),
-  ...require('./openai-agents'),
-  ...require('./playwright'),
-  ...require('./webdriverio'),
-  ...require('./aws-durable-execution-sdk-js'),
-]
+const { instrumentations } = require('../instrumentation-registry')
+
+module.exports = instrumentations

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

@@ -93,6 +93,18 @@ module.exports = [
     },
     channelName: 'createRootSuite',
   },
+  {
+    module: {
+      name: 'playwright',
+      versionRange: '>=1.60.0',
+      filePath: 'lib/runner/index.js',
+    },
+    functionQuery: {
+      functionName: 'filterForShard',
+      kind: 'Sync',
+    },
+    channelName: 'filterForShard',
+  },
   {
     module: {
       name: 'playwright-core',

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

@@ -0,0 +1,36 @@
+'use strict'
+
+const handlers = ['src/index.js', 'cjs/src/index.js'].map(filePath => ({
+  module: {
+    name: 'postgres',
+    versionRange: '>=3.0.0',
+    filePath,
+  },
+  astQuery: 'Program',
+  transform: 'postgresQueryHandlers',
+  channelName: 'query',
+}))
+
+const preparations = ['src/connection.js', 'cjs/src/connection.js'].map(filePath => ({
+  module: {
+    name: 'postgres',
+    versionRange: '>=3.0.0',
+    filePath,
+  },
+  astQuery: 'Program',
+  transform: 'postgresQueryPreparation',
+  channelName: 'query:prepare',
+}))
+
+const lifecycles = ['src/query.js', 'cjs/src/query.js'].map(filePath => ({
+  module: {
+    name: 'postgres',
+    versionRange: '>=3.0.0',
+    filePath,
+  },
+  astQuery: 'Program',
+  transform: 'postgresQueryLifecycle',
+  channelName: 'query',
+}))
+
+module.exports = [...handlers, ...preparations, ...lifecycles]

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

@@ -0,0 +1,128 @@
+'use strict'
+
+const versionRange = '>=2.112.2'
+
+module.exports = [
+  {
+    module: {
+      name: '@supabase/storage-js',
+      versionRange,
+      filePath: 'dist/index.cjs',
+    },
+    functionQuery: { functionName: '_handleRequest', kind: 'Async' },
+    channelName: 'handleRequest',
+  },
+  {
+    module: {
+      name: '@supabase/storage-js',
+      versionRange,
+      filePath: 'dist/index.mjs',
+    },
+    functionQuery: { functionName: '_handleRequest', kind: 'Async' },
+    channelName: 'handleRequest',
+  },
+  {
+    module: {
+      name: '@supabase/auth-js',
+      versionRange,
+      filePath: 'dist/main/GoTrueClient.js',
+    },
+    functionQuery: {
+      methodName: 'getUser',
+      className: 'GoTrueClient',
+      kind: 'Async',
+    },
+    channelName: 'GoTrueClient_getUser',
+  },
+  {
+    module: {
+      name: '@supabase/auth-js',
+      versionRange,
+      filePath: 'dist/module/GoTrueClient.js',
+    },
+    functionQuery: {
+      methodName: 'getUser',
+      className: 'GoTrueClient',
+      kind: 'Async',
+    },
+    channelName: 'GoTrueClient_getUser',
+  },
+  {
+    module: {
+      name: '@supabase/realtime-js',
+      versionRange,
+      filePath: 'dist/main/RealtimeChannel.js',
+    },
+    functionQuery: {
+      methodName: 'send',
+      className: 'RealtimeChannel',
+      kind: 'Async',
+    },
+    channelName: 'RealtimeChannel_send',
+  },
+  {
+    module: {
+      name: '@supabase/realtime-js',
+      versionRange,
+      filePath: 'dist/module/RealtimeChannel.js',
+    },
+    functionQuery: {
+      methodName: 'send',
+      className: 'RealtimeChannel',
+      kind: 'Async',
+    },
+    channelName: 'RealtimeChannel_send',
+  },
+  {
+    module: {
+      name: '@supabase/functions-js',
+      versionRange,
+      filePath: 'dist/main/FunctionsClient.js',
+    },
+    functionQuery: {
+      methodName: 'invoke',
+      className: 'FunctionsClient',
+      kind: 'Async',
+    },
+    channelName: 'FunctionsClient_invoke',
+  },
+  {
+    module: {
+      name: '@supabase/functions-js',
+      versionRange,
+      filePath: 'dist/module/FunctionsClient.js',
+    },
+    functionQuery: {
+      methodName: 'invoke',
+      className: 'FunctionsClient',
+      kind: 'Async',
+    },
+    channelName: 'FunctionsClient_invoke',
+  },
+  {
+    module: {
+      name: '@supabase/postgrest-js',
+      versionRange,
+      filePath: 'dist/index.cjs',
+    },
+    functionQuery: {
+      methodName: 'then',
+      className: 'PostgrestBuilder',
+      kind: 'Async',
+    },
+    channelName: 'PostgrestBuilder_then',
+  },
+  {
+    module: {
+      name: '@supabase/postgrest-js',
+      versionRange,
+      filePath: 'dist/index.mjs',
+    },
+    functionQuery: {
+      methodName: 'then',
+      className: 'PostgrestBuilder',
+      kind: 'Async',
+    },
+    channelName: 'PostgrestBuilder_then',
+  },
+]

package/packages/datadog-instrumentations/src/helpers/rewriter/targets.json

@@ -30,6 +30,16 @@
   "@modelcontextprotocol/sdk/dist/esm/server/mcp.js": "@modelcontextprotocol/sdk",
   "@openai/agents-openai/dist/openaiChatCompletionsModel.js": "@openai/agents-openai",
   "@openai/agents-openai/dist/openaiChatCompletionsModel.mjs": "@openai/agents-openai",
+  "@supabase/auth-js/dist/main/GoTrueClient.js": "@supabase/auth-js",
+  "@supabase/auth-js/dist/module/GoTrueClient.js": "@supabase/auth-js",
+  "@supabase/functions-js/dist/main/FunctionsClient.js": "@supabase/functions-js",
+  "@supabase/functions-js/dist/module/FunctionsClient.js": "@supabase/functions-js",
+  "@supabase/postgrest-js/dist/index.cjs": "@supabase/postgrest-js",
+  "@supabase/postgrest-js/dist/index.mjs": "@supabase/postgrest-js",
+  "@supabase/realtime-js/dist/main/RealtimeChannel.js": "@supabase/realtime-js",
+  "@supabase/realtime-js/dist/module/RealtimeChannel.js": "@supabase/realtime-js",
+  "@supabase/storage-js/dist/index.cjs": "@supabase/storage-js",
+  "@supabase/storage-js/dist/index.mjs": "@supabase/storage-js",
   "@wdio/cli/build/index.js": "@wdio/cli",
   "@wdio/jasmine-framework/build/index.js": "@wdio/jasmine-framework",
   "@wdio/local-runner/build/index.js": "@wdio/local-runner",
@@ -67,6 +77,12 @@
   "playwright-core/lib/coreBundle.js": "playwright-core",
   "playwright/lib/index.js": "playwright",
   "playwright/lib/runner/index.js": "playwright",
+  "postgres/cjs/src/connection.js": "postgres",
+  "postgres/cjs/src/index.js": "postgres",
+  "postgres/cjs/src/query.js": "postgres",
+  "postgres/src/connection.js": "postgres",
+  "postgres/src/index.js": "postgres",
+  "postgres/src/query.js": "postgres",
   "webdriver/build/index.js": "webdriver",
   "webdriver/build/node.js": "webdriver",
   "webdriverio/build/index.js": "webdriverio",