@rootcat/node 0.1.0 → 0.2.0

package/dist/esm.mjs

@@ -17,22 +17,38 @@ async function main() {
     return; // the loader hooks thread runs the same preloads; nothing to do there
   }
   let waitForAllMessagesAcknowledged = async () => undefined;
-  try {
-    const { hookedPackages, esmHookMarker } = require('./esmhook.js');
-    const iitmPath = createRequire(require.resolve('@opentelemetry/instrumentation/package.json')).resolve('import-in-the-middle');
-    const iitm = await import(pathToFileURL(iitmPath).href);
-    const channel = iitm.createAddHookMessageChannel();
-    // The channel lists only the packages the instrumentations name, by
-    // bare specifier; a package patched through one of its internal files
-    // (Drizzle's query classes) must be matched by path as well.
-    channel.registerOptions.data.include.push(hookedPackages);
-    const hook = require.resolve('@opentelemetry/instrumentation/hook.mjs');
-    register(pathToFileURL(hook).href, import.meta.url, channel.registerOptions);
-    globalThis[esmHookMarker] = true;
-    waitForAllMessagesAcknowledged = channel.waitForAllMessagesAcknowledged;
-  } catch (error) {
-    const reason = error instanceof Error ? error.message : String(error);
-    process.stderr.write(`rootcat: ES module hook not registered (${reason.slice(0, 200)}); CommonJS modules are still traced\n`);
+  // An application whose tracer sets up OpenTelemetry when it initialises
+  // (Sentry) starts Rootcat after it (startAlongside); this entry runs
+  // before it, so it registers nothing and register.js says what to do
+  // instead.
+  const { providerRegistered, tracerDependency } = require('./coexist.js');
+  const waitsForTracer = !providerRegistered() && tracerDependency(process.cwd()) !== undefined;
+  if (!waitsForTracer) {
+    try {
+      const { hookedPackages, esmHookMarker, ownInstancePossible, noInstanceLine } = require('./esmhook.js');
+      if (!ownInstancePossible()) {
+        throw Object.assign(new Error('no create-hook.mjs'), { line: noInstanceLine });
+      }
+      const iitmPath = createRequire(require.resolve('@opentelemetry/instrumentation/package.json')).resolve('import-in-the-middle');
+      const iitm = await import(pathToFileURL(iitmPath).href);
+      const channel = iitm.createAddHookMessageChannel();
+      // The channel lists only the packages the instrumentations name, by
+      // bare specifier; a package patched through one of its internal files
+      // (Drizzle's query classes) must be matched by path as well.
+      channel.registerOptions.data.include.push(hookedPackages);
+      // The package's own import-in-the-middle instance (iitm-hook.mjs),
+      // never a second registration of a hook another SDK registered.
+      register(new URL('./iitm-hook.mjs', import.meta.url).href, import.meta.url, channel.registerOptions);
+      globalThis[esmHookMarker] = true;
+      waitForAllMessagesAcknowledged = channel.waitForAllMessagesAcknowledged;
+    } catch (error) {
+      if (typeof error?.line === 'string') {
+        process.stderr.write(error.line);
+      } else {
+        const reason = error instanceof Error ? error.message : String(error);
+        process.stderr.write(`rootcat: ES module hook not registered (${reason.slice(0, 200)}); CommonJS modules are still traced\n`);
+      }
+    }
   }
   require('./register.js');
   await waitForAllMessagesAcknowledged();

package/dist/esmhook.d.ts

@@ -1,12 +1,52 @@
 /** esmHookMarker is set on globalThis once a hook is registered. */
 export declare const esmHookMarker: unique symbol;
-/** hookedPackages are the packages the loader wraps for the instrumentations. */
+/**
+ * hookedPackages are the modules the loader wraps for the
+ * instrumentations. The CommonJS packages are matched whole (their
+ * internal files load through require, never through the loader). Of
+ * the ES module packages only the files the instrumentations patch are
+ * wrapped: postgres.js's entry, and Drizzle's two query classes. Wrapping
+ * every file of postgres.js would also hand its internal query.js to any
+ * other SDK's hook for it: Sentry patches that file to trace the
+ * driver's own connection queries, which it otherwise does only in
+ * CommonJS.
+ */
 export declare const hookedPackages: RegExp;
+/**
+ * noInstanceLine is said when the installed import-in-the-middle has no
+ * create-hook.mjs: the package cannot make a hook instance of its own,
+ * and a second registration of the shared hook.mjs would replace the
+ * options of another SDK that registered it (Sentry's, behind its request
+ * isolation), so it registers none: CommonJS modules are still traced.
+ */
+export declare const noInstanceLine = "rootcat: the installed import-in-the-middle has no create-hook.mjs; the ES module hook is not registered (ES modules are not traced; CommonJS modules are)\n";
+/**
+ * ownInstancePossible reports whether the import-in-the-middle copy
+ * @opentelemetry/instrumentation uses has create-hook.mjs (see
+ * iitm-hook.mjs).
+ */
+export declare function ownInstancePossible(): boolean;
+/**
+ * ownedModules are the ES module files only the package patches:
+ * postgres.js's entry and Drizzle's two query classes. Beside a tracer
+ * that records nothing, the package's hook takes them over from another
+ * import-in-the-middle hook that marked them (see iitm-hook.mjs); inside
+ * a tracer that records spans, Drizzle's only (that tracer may
+ * instrument postgres.js itself).
+ */
+export declare const ownedModules: RegExp;
+export declare const drizzleModules: RegExp;
 /** ESMHook says whether the hook was registered. */
 export type ESMHook = 'on' | 'off';
+/**
+ * quietESMHook makes the package's loader hook pass every module through
+ * from now on: a loader hook cannot be removed once registered, so a
+ * stopped package leaves it in place, idle.
+ */
+export declare function quietESMHook(): void;
 /**
  * registerESMHook registers the instrumentation loader hook once and
  * reports whether it is in place. A failure to register never reaches the
  * application.
  */
-export declare function registerESMHook(report?: (reason: string) => void): ESMHook;
+export declare function registerESMHook(report?: (reason: string) => void, takeOver?: RegExp, include?: RegExp): ESMHook;

package/dist/esmhook.js

@@ -33,31 +33,93 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hookedPackages = exports.esmHookMarker = void 0;
+exports.drizzleModules = exports.ownedModules = exports.noInstanceLine = exports.hookedPackages = exports.esmHookMarker = void 0;
+exports.ownInstancePossible = ownInstancePossible;
+exports.quietESMHook = quietESMHook;
 exports.registerESMHook = registerESMHook;
 // The ES module loader hook from the CommonJS entry. A CommonJS
 // application still loads ES module packages through the ESM loader
 // (postgres.js is ESM first; Next.js imports its external packages as
 // ES modules), and only a loader hook can patch those. The hook watches
-// a fixed list of packages, so nothing else pays for it.
+// a fixed list of modules, so nothing else pays for it.
 //
 // It runs on the loader's hooks thread (module.register), which costs
 // about 0.2 s of startup (every module load waits on the thread; see the
 // benchmark). The in-thread synchronous hooks (module.registerHooks) save
 // most of that, but in a Next.js standalone server they left postgres.js
 // and Drizzle unpatched.
+const fs = __importStar(require("node:fs"));
 const nodeModule = __importStar(require("node:module"));
 const node_url_1 = require("node:url");
+const node_worker_threads_1 = require("node:worker_threads");
 /** esmHookMarker is set on globalThis once a hook is registered. */
 exports.esmHookMarker = Symbol.for('rootcat.node.esmHook');
-/** hookedPackages are the packages the loader wraps for the instrumentations. */
-exports.hookedPackages = /[\\/]node_modules[\\/](pg|pg-pool|postgres|drizzle-orm|mysql2|mongodb|ioredis|redis|@redis|undici|@prisma)[\\/]/;
+/**
+ * hookedPackages are the modules the loader wraps for the
+ * instrumentations. The CommonJS packages are matched whole (their
+ * internal files load through require, never through the loader). Of
+ * the ES module packages only the files the instrumentations patch are
+ * wrapped: postgres.js's entry, and Drizzle's two query classes. Wrapping
+ * every file of postgres.js would also hand its internal query.js to any
+ * other SDK's hook for it: Sentry patches that file to trace the
+ * driver's own connection queries, which it otherwise does only in
+ * CommonJS.
+ */
+exports.hookedPackages = /[\\/]node_modules[\\/](?:(?:pg|pg-pool|mysql2|mongodb|ioredis|redis|@redis|undici|@prisma)[\\/]|postgres[\\/](?:cjs[\\/])?src[\\/]index\.js(?:[?#].*)?$|drizzle-orm[\\/](?:query-promise|query-builders[\\/]query-builder)\.(?:js|cjs|mjs)(?:[?#].*)?$)/;
+/**
+ * noInstanceLine is said when the installed import-in-the-middle has no
+ * create-hook.mjs: the package cannot make a hook instance of its own,
+ * and a second registration of the shared hook.mjs would replace the
+ * options of another SDK that registered it (Sentry's, behind its request
+ * isolation), so it registers none: CommonJS modules are still traced.
+ */
+exports.noInstanceLine = 'rootcat: the installed import-in-the-middle has no create-hook.mjs; the ES module hook is not registered (ES modules are not traced; CommonJS modules are)\n';
+/**
+ * ownInstancePossible reports whether the import-in-the-middle copy
+ * @opentelemetry/instrumentation uses has create-hook.mjs (see
+ * iitm-hook.mjs).
+ */
+function ownInstancePossible() {
+    try {
+        const fromInstrumentation = nodeModule.createRequire(require.resolve('@opentelemetry/instrumentation/package.json'));
+        const hookPath = fromInstrumentation.resolve('import-in-the-middle/hook.mjs');
+        return fs.statSync(hookPath.replace(/hook\.mjs$/, 'create-hook.mjs')).isFile();
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * ownedModules are the ES module files only the package patches:
+ * postgres.js's entry and Drizzle's two query classes. Beside a tracer
+ * that records nothing, the package's hook takes them over from another
+ * import-in-the-middle hook that marked them (see iitm-hook.mjs); inside
+ * a tracer that records spans, Drizzle's only (that tracer may
+ * instrument postgres.js itself).
+ */
+exports.ownedModules = /[\\/]node_modules[\\/](?:postgres[\\/](?:cjs[\\/])?src[\\/]index\.js|drizzle-orm[\\/](?:query-promise|query-builders[\\/]query-builder)\.(?:js|cjs|mjs))(?:[?#].*)?$/;
+exports.drizzleModules = /[\\/]node_modules[\\/]drizzle-orm[\\/](?:query-promise|query-builders[\\/]query-builder)\.(?:js|cjs|mjs)(?:[?#].*)?$/;
+/** control is the port the package's hook listens on (see quietESMHook). */
+let control;
+/**
+ * quietESMHook makes the package's loader hook pass every module through
+ * from now on: a loader hook cannot be removed once registered, so a
+ * stopped package leaves it in place, idle.
+ */
+function quietESMHook() {
+    try {
+        control?.postMessage('off');
+    }
+    catch {
+        // the hook stays as it was
+    }
+}
 /**
  * registerESMHook registers the instrumentation loader hook once and
  * reports whether it is in place. A failure to register never reaches the
  * application.
  */
-function registerESMHook(report = () => undefined) {
+function registerESMHook(report = () => undefined, takeOver, include = exports.hookedPackages) {
     const global = globalThis;
     if (global[exports.esmHookMarker]) {
         return 'on';
@@ -68,11 +130,23 @@ function registerESMHook(report = () => undefined) {
         return 'off';
     }
     try {
-        // Resolved here, by path: a file tracer (Next.js standalone output)
-        // follows require.resolve and ships the hook with the package, which
-        // a bare specifier handed to module.register alone would not get.
-        const hook = require.resolve('@opentelemetry/instrumentation/hook.mjs');
-        registrar.register((0, node_url_1.pathToFileURL)(hook).href, (0, node_url_1.pathToFileURL)(__filename).href, { data: { include: [exports.hookedPackages] } });
+        // The package's own instance of import-in-the-middle (see
+        // iitm-hook.mjs). Both files are resolved here, by path: a file tracer
+        // (Next.js standalone output) follows require.resolve and ships them,
+        // and import-in-the-middle's hook.mjs with them.
+        require.resolve('@opentelemetry/instrumentation/hook.mjs');
+        if (!ownInstancePossible()) {
+            process.stderr.write(exports.noInstanceLine);
+            return 'off';
+        }
+        const hook = require.resolve('./iitm-hook.mjs');
+        const channel = new node_worker_threads_1.MessageChannel();
+        channel.port1.unref();
+        control = channel.port1;
+        registrar.register((0, node_url_1.pathToFileURL)(hook).href, (0, node_url_1.pathToFileURL)(__filename).href, {
+            data: { include: [include], control: channel.port2, ...(takeOver ? { takeOver } : {}) },
+            transferList: [channel.port2],
+        });
         global[exports.esmHookMarker] = true;
         return 'on';
     }

package/dist/esmhook.js.map

@@ -1 +1 @@
-{"version":3,"file":"esmhook.js","sourceRoot":"","sources":["../src/esmhook.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8BA,0CAsBC;AApDD,gEAAgE;AAChE,oEAAoE;AACpE,sEAAsE;AACtE,wEAAwE;AACxE,yDAAyD;AACzD,EAAE;AACF,sEAAsE;AACtE,yEAAyE;AACzE,0EAA0E;AAC1E,yEAAyE;AACzE,yBAAyB;AACzB,wDAA0C;AAC1C,uCAAyC;AAEzC,oEAAoE;AACvD,QAAA,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAEhE,iFAAiF;AACpE,QAAA,cAAc,GAAG,iHAAiH,CAAC;AAOhJ;;;;GAIG;AACH,SAAgB,eAAe,CAAC,SAAmC,GAAG,EAAE,CAAC,SAAS;IAChF,MAAM,MAAM,GAAG,UAAqC,CAAC;IACrD,IAAI,MAAM,CAAC,qBAAa,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,SAAS,GAAG,UAAkC,CAAC;IACrD,IAAI,OAAO,SAAS,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;QAC7C,MAAM,CAAC,uDAAuD,CAAC,CAAC;QAChE,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC;QACH,oEAAoE;QACpE,qEAAqE;QACrE,kEAAkE;QAClE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,yCAAyC,CAAC,CAAC;QACxE,SAAS,CAAC,QAAQ,CAAC,IAAA,wBAAa,EAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAA,wBAAa,EAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,sBAAc,CAAC,EAAE,EAAE,CAAC,CAAC;QACtH,MAAM,CAAC,qBAAa,CAAC,GAAG,IAAI,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/D,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
+{"version":3,"file":"esmhook.js","sourceRoot":"","sources":["../src/esmhook.ts"],"names":[],"mappings":"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"}

package/dist/iitm-hook.mjs

@@ -0,0 +1,83 @@
+// The package's ES module loader hook: import-in-the-middle, as an
+// instance of its own. import-in-the-middle's hook.mjs creates one hook
+// at module level, so two registrations of the same file (Sentry's and
+// the package's, when the package manager installed one copy for both)
+// are one instance, and the second initialize() replaces the first one's
+// options: Sentry's list of modules to wrap was lost, and with it Sentry's
+// instrumentation of node:http. This module builds a separate instance
+// with createHook, pointed at the same copy (so the wrapped modules call
+// the register.js the package's instrumentations listen on). It also
+// clears the flag import-in-the-middle sets on the hooks thread around
+// its own initialize, so neither hook warns about the other.
+import { createRequire } from 'node:module';
+import { pathToFileURL } from 'node:url';
+
+const require = createRequire(import.meta.url);
+// The copy @opentelemetry/instrumentation depends on.
+const fromInstrumentation = createRequire(require.resolve('@opentelemetry/instrumentation/package.json'));
+const hookPath = fromInstrumentation.resolve('import-in-the-middle/hook.mjs');
+
+// No fallback to the shared hook.mjs: registering it a second time
+// replaces the options of whoever registered it first (Sentry's list of
+// modules, and with it the instrumentation behind its request
+// isolation). Without create-hook.mjs this module fails to load, and the
+// package's main thread, which checks first, says so and goes on without
+// the hook.
+const { createHook } = await import(pathToFileURL(createHookPath(hookPath)).href);
+const hook = createHook({ url: pathToFileURL(hookPath).href });
+
+function createHookPath(path) {
+  return path.replace(/hook\.mjs$/, 'create-hook.mjs');
+}
+
+/**
+ * takeOver names the modules this hook wraps even when another
+ * import-in-the-middle hook registered before it marked them for itself:
+ * Sentry 8's hook (import-in-the-middle 1.x, a copy of its own) marks
+ * every ES module, and the wrapper its copy generates never calls this
+ * copy's hooks, so postgres.js and Drizzle went unpatched. Set by the
+ * package only for modules the other SDK does not instrument (see
+ * esmhook.ts).
+ */
+let takeOver;
+
+/** off is set when the package stopped (quietESMHook): every module passes through. */
+let off = false;
+
+export async function initialize(data) {
+  takeOver = data?.takeOver instanceof RegExp ? data.takeOver : undefined;
+  const control = data?.control;
+  if (control && typeof control.on === 'function') {
+    control.on('message', (message) => {
+      if (message === 'off') {
+        off = true;
+      }
+    });
+    control.unref?.();
+  }
+  globalThis.__import_in_the_middle_initialized__ = false;
+  try {
+    await hook.initialize?.(data);
+  } finally {
+    globalThis.__import_in_the_middle_initialized__ = false;
+  }
+}
+
+export async function resolve(specifier, context, nextResolve) {
+  if (off) {
+    return nextResolve(specifier, context);
+  }
+  if (!takeOver) {
+    return hook.resolve(specifier, context, nextResolve);
+  }
+  return hook.resolve(specifier, context, async (next, nextContext) => {
+    const result = await nextResolve(next, nextContext);
+    if (result && typeof result.url === 'string' && result.url.includes('iitm') && takeOver.test(result.url)) {
+      const url = new URL(result.url);
+      url.searchParams.delete('iitm');
+      return { ...result, url: url.href };
+    }
+    return result;
+  });
+}
+export const load = hook.load;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { start, current, curatedInstrumentations, instrumentationNames, otlpExporter, redisStatement, type Started, type StartOptions } from './sdk.js';
+export { start, startAlongside, rootcatSpanProcessors, current, curatedInstrumentations, instrumentationNames, otlpExporter, redisStatement, type Mode, type Started, type StartOptions } from './sdk.js';
 export { rootcatSampler } from './sampler.js';
 export { readConfig, serviceIdentity, tracesURL, type Config } from './config.js';
 export { discoverIntake, defaultGateway, inContainer, type Files } from './intake.js';

package/dist/index.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.statementKeyword = exports.stripQuery = exports.scrubbed = exports.hookedPackages = exports.registerESMHook = exports.DrizzleEntryInstrumentation = exports.PgPoolEntryInstrumentation = exports.PostgresJsInstrumentation = exports.PgInstrumentation = exports.eligible = exports.callSiteContextKey = exports.CallSiteSampling = exports.CallSiteProcessor = exports.isAppFile = exports.resolveLocation = exports.parseStack = exports.firstAppFrame = exports.captureFrames = exports.captureCallSite = exports.inContainer = exports.defaultGateway = exports.discoverIntake = exports.tracesURL = exports.serviceIdentity = exports.readConfig = exports.rootcatSampler = exports.redisStatement = exports.otlpExporter = exports.instrumentationNames = exports.curatedInstrumentations = exports.current = exports.start = void 0;
+exports.statementKeyword = exports.stripQuery = exports.scrubbed = exports.hookedPackages = exports.registerESMHook = exports.DrizzleEntryInstrumentation = exports.PgPoolEntryInstrumentation = exports.PostgresJsInstrumentation = exports.PgInstrumentation = exports.eligible = exports.callSiteContextKey = exports.CallSiteSampling = exports.CallSiteProcessor = exports.isAppFile = exports.resolveLocation = exports.parseStack = exports.firstAppFrame = exports.captureFrames = exports.captureCallSite = exports.inContainer = exports.defaultGateway = exports.discoverIntake = exports.tracesURL = exports.serviceIdentity = exports.readConfig = exports.rootcatSampler = exports.redisStatement = exports.otlpExporter = exports.instrumentationNames = exports.curatedInstrumentations = exports.current = exports.rootcatSpanProcessors = exports.startAlongside = exports.start = void 0;
 // Programmatic surface (@rootcat/node/sdk): the same start the entries
 // call, and the pieces an application or a test may want on their own.
 var sdk_js_1 = require("./sdk.js");
 Object.defineProperty(exports, "start", { enumerable: true, get: function () { return sdk_js_1.start; } });
+Object.defineProperty(exports, "startAlongside", { enumerable: true, get: function () { return sdk_js_1.startAlongside; } });
+Object.defineProperty(exports, "rootcatSpanProcessors", { enumerable: true, get: function () { return sdk_js_1.rootcatSpanProcessors; } });
 Object.defineProperty(exports, "current", { enumerable: true, get: function () { return sdk_js_1.current; } });
 Object.defineProperty(exports, "curatedInstrumentations", { enumerable: true, get: function () { return sdk_js_1.curatedInstrumentations; } });
 Object.defineProperty(exports, "instrumentationNames", { enumerable: true, get: function () { return sdk_js_1.instrumentationNames; } });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uEAAuE;AACvE,uEAAuE;AACvE,mCAAwJ;AAA/I,+FAAA,KAAK,OAAA;AAAE,iGAAA,OAAO,OAAA;AAAE,iHAAA,uBAAuB,OAAA;AAAE,8GAAA,oBAAoB,OAAA;AAAE,sGAAA,YAAY,OAAA;AAAE,wGAAA,cAAc,OAAA;AACpG,2CAA8C;AAArC,4GAAA,cAAc,OAAA;AACvB,yCAAkF;AAAzE,uGAAA,UAAU,OAAA;AAAE,4GAAA,eAAe,OAAA;AAAE,sGAAA,SAAS,OAAA;AAC/C,yCAAsF;AAA7E,2GAAA,cAAc,OAAA;AAAE,2GAAA,cAAc,OAAA;AAAE,wGAAA,WAAW,OAAA;AACpD,6CAA6I;AAApI,8GAAA,eAAe,OAAA;AAAE,4GAAA,aAAa,OAAA;AAAE,4GAAA,aAAa,OAAA;AAAE,yGAAA,UAAU,OAAA;AAAE,8GAAA,eAAe,OAAA;AAAE,wGAAA,SAAS,OAAA;AAC9F,+CAAkI;AAAzH,iHAAA,iBAAiB,OAAA;AAAE,gHAAA,gBAAgB,OAAA;AAAE,kHAAA,kBAAkB,OAAA;AAAE,wGAAA,QAAQ,OAAA;AAC1E,iCAA4C;AAAnC,0GAAA,iBAAiB,OAAA;AAC1B,iDAA4D;AAAnD,0HAAA,yBAAyB,OAAA;AAClC,yCAAyD;AAAhD,uHAAA,0BAA0B,OAAA;AACnC,2CAA2D;AAAlD,yHAAA,2BAA2B,OAAA;AACpC,2CAA6E;AAApE,6GAAA,eAAe,OAAA;AAAE,4GAAA,cAAc,OAAA;AACxC,2CAAsE;AAA7D,sGAAA,QAAQ,OAAA;AAAE,wGAAA,UAAU,OAAA;AAAE,8GAAA,gBAAgB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uEAAuE;AACvE,uEAAuE;AACvE,mCAA0M;AAAjM,+FAAA,KAAK,OAAA;AAAE,wGAAA,cAAc,OAAA;AAAE,+GAAA,qBAAqB,OAAA;AAAE,iGAAA,OAAO,OAAA;AAAE,iHAAA,uBAAuB,OAAA;AAAE,8GAAA,oBAAoB,OAAA;AAAE,sGAAA,YAAY,OAAA;AAAE,wGAAA,cAAc,OAAA;AAC3I,2CAA8C;AAArC,4GAAA,cAAc,OAAA;AACvB,yCAAkF;AAAzE,uGAAA,UAAU,OAAA;AAAE,4GAAA,eAAe,OAAA;AAAE,sGAAA,SAAS,OAAA;AAC/C,yCAAsF;AAA7E,2GAAA,cAAc,OAAA;AAAE,2GAAA,cAAc,OAAA;AAAE,wGAAA,WAAW,OAAA;AACpD,6CAA6I;AAApI,8GAAA,eAAe,OAAA;AAAE,4GAAA,aAAa,OAAA;AAAE,4GAAA,aAAa,OAAA;AAAE,yGAAA,UAAU,OAAA;AAAE,8GAAA,eAAe,OAAA;AAAE,wGAAA,SAAS,OAAA;AAC9F,+CAAkI;AAAzH,iHAAA,iBAAiB,OAAA;AAAE,gHAAA,gBAAgB,OAAA;AAAE,kHAAA,kBAAkB,OAAA;AAAE,wGAAA,QAAQ,OAAA;AAC1E,iCAA4C;AAAnC,0GAAA,iBAAiB,OAAA;AAC1B,iDAA4D;AAAnD,0HAAA,yBAAyB,OAAA;AAClC,yCAAyD;AAAhD,uHAAA,0BAA0B,OAAA;AACnC,2CAA2D;AAAlD,yHAAA,2BAA2B,OAAA;AACpC,2CAA6E;AAApE,6GAAA,eAAe,OAAA;AAAE,4GAAA,cAAc,OAAA;AACxC,2CAAsE;AAA7D,sGAAA,QAAQ,OAAA;AAAE,wGAAA,UAAU,OAAA;AAAE,8GAAA,gBAAgB,OAAA"}

package/dist/keys.d.ts

@@ -7,3 +7,14 @@ export declare const callSiteContextKey: symbol;
  * match).
  */
 export declare const rootDecisionKey: symbol;
+/**
+ * ownWrapper marks the functions the package's instrumentations wrap a
+ * module's methods with. A wrapper found on a method is unwrapped only
+ * when it is the package's own (a second enable): another SDK's (Sentry's
+ * pg instrumentation) stays, and the package's goes around it.
+ */
+export declare const ownWrapper: unique symbol;
+/** mine reports whether a method is one of the package's own wrappers. */
+export declare function mine(method: unknown): boolean;
+/** marked marks a wrapper as the package's own and returns it. */
+export declare function marked<T extends Function>(wrapper: T): T;

package/dist/keys.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rootDecisionKey = exports.callSiteContextKey = void 0;
+exports.ownWrapper = exports.rootDecisionKey = exports.callSiteContextKey = void 0;
+exports.mine = mine;
+exports.marked = marked;
 // Context keys shared by the processor, the sampler and the entry wrappers.
 const api_1 = require("@opentelemetry/api");
 /** callSiteContextKey carries a call site through the active context. */
@@ -12,4 +14,20 @@ exports.callSiteContextKey = (0, api_1.createContextKey)('rootcat.callsite');
  * match).
  */
 exports.rootDecisionKey = (0, api_1.createContextKey)('rootcat.root-decision');
+/**
+ * ownWrapper marks the functions the package's instrumentations wrap a
+ * module's methods with. A wrapper found on a method is unwrapped only
+ * when it is the package's own (a second enable): another SDK's (Sentry's
+ * pg instrumentation) stays, and the package's goes around it.
+ */
+exports.ownWrapper = Symbol.for('rootcat.node.wrapper');
+/** mine reports whether a method is one of the package's own wrappers. */
+function mine(method) {
+    return typeof method === 'function' && method[exports.ownWrapper] === true;
+}
+/** marked marks a wrapper as the package's own and returns it. */
+function marked(wrapper) {
+    wrapper[exports.ownWrapper] = true;
+    return wrapper;
+}
 //# sourceMappingURL=keys.js.map

package/dist/keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"keys.js","sourceRoot":"","sources":["../src/keys.ts"],"names":[],"mappings":";;;AAAA,4EAA4E;AAC5E,4CAAsD;AAEtD,yEAAyE;AAC5D,QAAA,kBAAkB,GAAG,IAAA,sBAAgB,EAAC,kBAAkB,CAAC,CAAC;AAEvE;;;;;GAKG;AACU,QAAA,eAAe,GAAG,IAAA,sBAAgB,EAAC,uBAAuB,CAAC,CAAC"}
+{"version":3,"file":"keys.js","sourceRoot":"","sources":["../src/keys.ts"],"names":[],"mappings":";;;AAuBA,oBAEC;AAGD,wBAGC;AA/BD,4EAA4E;AAC5E,4CAAsD;AAEtD,yEAAyE;AAC5D,QAAA,kBAAkB,GAAG,IAAA,sBAAgB,EAAC,kBAAkB,CAAC,CAAC;AAEvE;;;;;GAKG;AACU,QAAA,eAAe,GAAG,IAAA,sBAAgB,EAAC,uBAAuB,CAAC,CAAC;AAEzE;;;;;GAKG;AACU,QAAA,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAE7D,0EAA0E;AAC1E,SAAgB,IAAI,CAAC,MAAe;IAClC,OAAO,OAAO,MAAM,KAAK,UAAU,IAAK,MAA6C,CAAC,kBAAU,CAAC,KAAK,IAAI,CAAC;AAC7G,CAAC;AAED,kEAAkE;AAClE,SAAgB,MAAM,CAAqB,OAAU;IAClD,OAA8C,CAAC,kBAAU,CAAC,GAAG,IAAI,CAAC;IACnE,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/pg.js

@@ -13,27 +13,32 @@ exports.PgInstrumentation = void 0;
 const api_1 = require("@opentelemetry/api");
 const instrumentation_1 = require("@opentelemetry/instrumentation");
 const callsite_js_1 = require("./callsite.js");
+const keys_js_1 = require("./keys.js");
 const privacy_js_1 = require("./privacy.js");
 const processor_js_1 = require("./processor.js");
 const maxStatementBytes = 4096;
 const supportedVersions = ['>=8.0.0 <9'];
 class PgInstrumentation extends instrumentation_1.InstrumentationBase {
     constructor(options) {
-        super('@rootcat/node/pg', '0.1.0', options);
+        super('@rootcat/node/pg', '0.2.0', options);
     }
     init() {
         return new instrumentation_1.InstrumentationNodeModuleDefinition('pg', supportedVersions, (moduleExports) => {
             const proto = clientPrototype(moduleExports);
             if (proto) {
-                if ((0, instrumentation_1.isWrapped)(proto.query)) {
+                if ((0, instrumentation_1.isWrapped)(proto.query) && (0, keys_js_1.mine)(proto.query)) {
                     this._unwrap(proto, 'query');
                 }
+                const before = proto.query;
                 this._wrap(proto, 'query', this.wrapQuery);
+                if (proto.query !== before) {
+                    (0, keys_js_1.marked)(proto.query); // not when a guard kept another SDK's wrapper
+                }
             }
             return moduleExports;
         }, (moduleExports) => {
             const proto = clientPrototype(moduleExports);
-            if (proto && (0, instrumentation_1.isWrapped)(proto.query)) {
+            if (proto && (0, instrumentation_1.isWrapped)(proto.query) && (0, keys_js_1.mine)(proto.query)) {
                 this._unwrap(proto, 'query');
             }
         });

package/dist/pg.js.map

@@ -1 +1 @@
-{"version":3,"file":"pg.js","sourceRoot":"","sources":["../src/pg.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pg.js","sourceRoot":"","sources":["../src/pg.ts"],"names":[],"mappings":"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"}

package/dist/pgpool.d.ts

@@ -5,6 +5,13 @@ export interface PgPoolEntryOptions extends InstrumentationConfig {
     depth: number;
     sampling: CallSiteSampling;
     isApp?: (file: string) => boolean;
+    /**
+     * connect false leaves Pool.prototype.connect alone: inside a tracing
+     * Sentry, whose pg instrumentation spans the pool's connect under the
+     * caller's span (and drops it without one), the root context the
+     * package runs connect in would change Sentry's spans.
+     */
+    connect?: boolean;
 }
 export declare class PgPoolEntryInstrumentation extends InstrumentationBase<PgPoolEntryOptions> {
     constructor(options: PgPoolEntryOptions);

package/dist/pgpool.js

@@ -14,6 +14,7 @@ exports.PgPoolEntryInstrumentation = void 0;
 const api_1 = require("@opentelemetry/api");
 const instrumentation_1 = require("@opentelemetry/instrumentation");
 const callsite_js_1 = require("./callsite.js");
+const keys_js_1 = require("./keys.js");
 const processor_js_1 = require("./processor.js");
 function poolPrototype(moduleExports) {
     const proto = moduleExports?.prototype;
@@ -21,26 +22,39 @@ function poolPrototype(moduleExports) {
 }
 class PgPoolEntryInstrumentation extends instrumentation_1.InstrumentationBase {
     constructor(options) {
-        super('@rootcat/node/pg-pool-entry', '0.1.0', options);
+        super('@rootcat/node/pg-pool-entry', '0.2.0', options);
     }
     init() {
         return new instrumentation_1.InstrumentationNodeModuleDefinition('pg-pool', ['>=2.0.0 <4'], (moduleExports) => {
             const proto = poolPrototype(moduleExports);
             if (proto) {
                 for (const name of ['query', 'connect']) {
-                    if ((0, instrumentation_1.isWrapped)(proto[name])) {
+                    if ((0, instrumentation_1.isWrapped)(proto[name]) && (0, keys_js_1.mine)(proto[name])) {
                         this._unwrap(proto, name);
                     }
                 }
+                const beforeQuery = proto.query;
                 this._wrap(proto, 'query', this.wrapQuery);
-                this._wrap(proto, 'connect', wrapConnect);
+                if (proto.query !== beforeQuery) {
+                    (0, keys_js_1.marked)(proto.query); // not when a guard kept another SDK's wrapper
+                }
+                if (this.getConfig().connect !== false) {
+                    const beforeConnect = proto.connect;
+                    this._wrap(proto, 'connect', wrapConnect);
+                    if (proto.connect !== beforeConnect) {
+                        (0, keys_js_1.marked)(proto.connect);
+                    }
+                }
             }
             return moduleExports;
         }, (moduleExports) => {
             const proto = poolPrototype(moduleExports);
             if (proto) {
-                this._unwrap(proto, 'query');
-                this._unwrap(proto, 'connect');
+                for (const name of ['query', 'connect']) {
+                    if ((0, instrumentation_1.isWrapped)(proto[name]) && (0, keys_js_1.mine)(proto[name])) {
+                        this._unwrap(proto, name);
+                    }
+                }
             }
         });
     }

package/dist/pgpool.js.map

@@ -1 +1 @@
-{"version":3,"file":"pgpool.js","sourceRoot":"","sources":["../src/pgpool.ts"],"names":[],"mappings":";;;AAAA,uEAAuE;AACvE,wEAAwE;AACxE,wEAAwE;AACxE,sEAAsE;AACtE,EAAE;AACF,uEAAuE;AACvE,mEAAmE;AACnE,uEAAuE;AACvE,qEAAqE;AACrE,wDAAwD;AACxD,4CAA2D;AAC3D,oEAAiJ;AACjJ,+CAAgD;AAChD,iDAAmE;AAYnE,SAAS,aAAa,CAAC,aAAsB;IAC3C,MAAM,KAAK,GAAI,aAA+D,EAAE,SAAS,CAAC;IAC1F,OAAO,KAAK,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,UAAU,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU,CAAC,CAAC,CAAE,KAAuB,CAAC,CAAC,CAAC,SAAS,CAAC;AAClI,CAAC;AAED,MAAa,0BAA2B,SAAQ,qCAAuC;IACrF,YAAY,OAA2B;QACrC,KAAK,CAAC,6BAA6B,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAES,IAAI;QACZ,OAAO,IAAI,qDAAmC,CAC5C,SAAS,EACT,CAAC,YAAY,CAAC,EACd,CAAC,aAAsB,EAAE,EAAE;YACzB,MAAM,KAAK,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;YAC3C,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,SAAS,CAAU,EAAE,CAAC;oBACjD,IAAI,IAAA,2BAAS,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;wBAC3B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;oBAC5B,CAAC;gBACH,CAAC;gBACD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC3C,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;YAC5C,CAAC;YACD,OAAO,aAAa,CAAC;QACvB,CAAC,EACD,CAAC,aAAsB,EAAE,EAAE;YACzB,MAAM,KAAK,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;YAC3C,IAAI,KAAK,EAAE,CAAC;gBACV,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBAC7B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YACjC,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IAEgB,SAAS,GAAG,CAAC,QAAgB,EAAU,EAAE;QACxD,MAAM,eAAe,GAAG,IAAI,CAAC;QAC7B,OAAO,SAAS,KAAK,CAAgB,GAAG,IAAe;YACrD,IAAI,OAAO,CAAC;YACZ,IAAI,CAAC;gBACH,6DAA6D;gBAC7D,yDAAyD;gBACzD,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;gBAC7B,IAAI,IAAI,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC;oBAClD,IAAI,CAAC,IAAI,CAAC,GAAG,aAAO,CAAC,IAAI,CAAC,aAAO,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,IAAI,CAAW,CAAC,CAAC;gBACpE,CAAC;gBACD,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,EAAE,CAAC;gBAC3C,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAA,6BAAe,EAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;YAC5F,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,GAAG,SAAS,CAAC;YACtB,CAAC;YACD,OAAO,IAAA,yBAAU,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/D,CAAC,CAAC;IACJ,CAAC,CAAC;CACH;AAnDD,gEAmDC;AAED;;;;;;GAMG;AACH,SAAS,WAAW,CAAC,QAAgB;IACnC,OAAO,SAAS,OAAO,CAAgB,GAAG,IAAe;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE,CAAC;YACnC,IAAI,CAAC,CAAC,CAAC,GAAG,aAAO,CAAC,IAAI,CAAC,aAAO,CAAC,MAAM,EAAE,EAAE,QAAkB,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,aAAO,CAAC,IAAI,CAAC,kBAAY,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"pgpool.js","sourceRoot":"","sources":["../src/pgpool.ts"],"names":[],"mappings":"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"}

package/dist/postgresjs.d.ts

@@ -1,14 +1,29 @@
 import { InstrumentationBase, type InstrumentationConfig, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
+import { type CallSiteLocation } from './callsite.js';
 import { type CallSiteSampling } from './processor.js';
 /** PostgresJsOptions configures the instrumentation. */
 export interface PostgresJsOptions extends InstrumentationConfig {
     /** sampling gates the origin parsing, like any capture. */
     sampling: CallSiteSampling;
+    /**
+     * spans false starts no span: another SDK (Sentry, tracing on) has
+     * already started one for the query when handle() runs, and onSite is
+     * handed the query's origin to give that span its call site.
+     */
+    spans?: boolean;
+    /** onSite receives a query's call site when spans is false. */
+    onSite?: (site: CallSiteLocation) => void;
 }
 export declare class PostgresJsInstrumentation extends InstrumentationBase<PostgresJsOptions> {
     private readonly patched;
     /** origins remembers the parsed call site per template, null for none. */
     private readonly origins;
+    /** recording maps a sql function to its site-recording proxy (spans false). */
+    private readonly recording;
+    /** templateSites remembers the captured call site per template (spans false). */
+    private readonly templateSites;
+    /** querySites holds the call site captured for a query until it is handled (spans false). */
+    private readonly querySites;
     constructor(options: PostgresJsOptions);
     protected init(): InstrumentationNodeModuleDefinition;
     /**
@@ -19,6 +34,18 @@ export declare class PostgresJsInstrumentation extends InstrumentationBase<Postg
     private patchModule;
     private unpatchModule;
     private wrapFactory;
+    /**
+     * siteRecording is the sql function as the application gets it when
+     * another SDK (Sentry) spans the queries: the driver's own origin then
+     * cannot name the application, as it keeps four frames and Sentry's
+     * wrapper of the sql function takes the last one. The call site is
+     * captured here instead, where the application calls: once per tagged
+     * template (a template is one place in the source, as the driver's own
+     * origin cache assumes), and per unsafe() call unless an outer layer
+     * (Drizzle) already carries one; queries inside sql.begin() get the
+     * same treatment through the transaction's sql function.
+     */
+    private siteRecording;
     /** patchQueryClass finds Query.prototype through an unexecuted query. */
     private patchQueryClass;
     private readonly wrapHandle;