fboxrec 0.2.0 → 0.3.0

package/dist/index.d.mts

@@ -94,7 +94,13 @@ declare function start(userConfig?: UserConfig): void;
 declare function trigger(reason?: string): string | null;
 /** Record a custom timeline event (e.g. flightbox.addEvent('cache.miss', { key })). */
 declare function addEvent(name: string, data?: Record<string, unknown>): void;
-/** Disarms recording, stops samplers and watchdogs. Module patches remain but degrade to no-ops. */
+/**
+ * Disarms recording: stops samplers/watchdogs/timers, removes the process
+ * listeners, and restores the module patches (console, http server/client,
+ * fetch, pg). A patch that other tooling wrapped after start() can't be
+ * spliced out safely; it stays in place but passes straight through.
+ * start() may be called again afterwards.
+ */
 declare function stop(): void;
 declare const _default: {
     start: typeof start;

package/dist/index.d.ts

@@ -94,7 +94,13 @@ declare function start(userConfig?: UserConfig): void;
 declare function trigger(reason?: string): string | null;
 /** Record a custom timeline event (e.g. flightbox.addEvent('cache.miss', { key })). */
 declare function addEvent(name: string, data?: Record<string, unknown>): void;
-/** Disarms recording, stops samplers and watchdogs. Module patches remain but degrade to no-ops. */
+/**
+ * Disarms recording: stops samplers/watchdogs/timers, removes the process
+ * listeners, and restores the module patches (console, http server/client,
+ * fetch, pg). A patch that other tooling wrapped after start() can't be
+ * spliced out safely; it stays in place but passes straight through.
+ * start() may be called again afterwards.
+ */
 declare function stop(): void;
 declare const _default: {
     start: typeof start;

package/dist/index.mjs

@@ -4,7 +4,7 @@ import {
   start,
   stop,
   trigger
-} from "./chunk-HACKKJXE.mjs";
+} from "./chunk-4DHWBXXW.mjs";
 export {
   addEvent,
   index_default as default,

package/dist/register.cjs

@@ -677,7 +677,7 @@ var FORMAT_VERSION = 1;
 var MAX_DECOMPRESSED_BYTES = 1024 * 1024 * 1024;
 
 // src/dump/serializer.ts
-var FLIGHTBOX_VERSION = "0.2.0";
+var FLIGHTBOX_VERSION = "0.3.0";
 var DUMP_GZIP_LEVEL = 1;
 var dumpCounter = 0;
 function buildIncident(opts) {
@@ -1468,8 +1468,9 @@ function startWatchdog(agent) {
 // src/instrumentations/http-server.ts
 var http = __toESM(require("http"));
 var import_node_crypto2 = require("crypto");
-var patched = false;
 var agentRef;
+var active2 = false;
+var saved = null;
 function tokenMatches(supplied, expected) {
   const a = (0, import_node_crypto2.createHash)("sha256").update(supplied).digest();
   const b = (0, import_node_crypto2.createHash)("sha256").update(expected).digest();
@@ -1511,12 +1512,12 @@ function handleFlightboxEndpoint(agent, req, res) {
 }
 function instrumentHttpServer(agent) {
   agentRef = agent;
-  if (patched) return;
-  patched = true;
+  active2 = true;
+  if (saved) return;
   const orig = http.Server.prototype.emit;
   const flightboxEmit = function(event) {
     const args = arguments;
-    if (event !== "request") {
+    if (!active2 || event !== "request") {
       return orig.apply(this, args);
     }
     const agent2 = agentRef;
@@ -1569,13 +1570,15 @@ function instrumentHttpServer(agent) {
     }
     return requestStorage.run(ctx, () => orig.apply(this, args));
   };
-  http.Server.prototype.emit = flightboxEmit;
+  saved = { orig, wrapper: flightboxEmit };
+  http.Server.prototype.emit = saved.wrapper;
 }
 
 // src/instrumentations/http-client.ts
 var import_node_module = require("module");
-var patched2 = false;
 var agentRef2;
+var active3 = false;
+var liveWraps = /* @__PURE__ */ new Map();
 function extractTarget(args) {
   let method = "GET";
   let host = "";
@@ -1607,10 +1610,12 @@ function extractTarget(args) {
   return { method: String(method).toUpperCase(), host: String(host), path: String(path8) };
 }
 var nodeRequire = (0, import_node_module.createRequire)(process.cwd() + "/noop.js");
-function wrapModule(mod) {
-  const origRequest = mod.request.bind(mod);
+function wrapModule(key, mod) {
+  const rawRequest = mod.request;
+  const rawGet = mod.get;
+  const origRequest = rawRequest.bind(mod);
   const tracedRequest = function(...args) {
-    if (isShedding()) return origRequest(...args);
+    if (!active3 || isShedding()) return origRequest(...args);
     const agent = agentRef2;
     let spanId = 0n;
     let requestId = 0n;
@@ -1657,18 +1662,27 @@ function wrapModule(mod) {
     }
     return req;
   };
-  mod.request = tracedRequest;
-  mod.get = function(...args) {
+  const tracedGet = function(...args) {
     const req = tracedRequest(...args);
     req.end();
     return req;
   };
+  mod.request = tracedRequest;
+  mod.get = tracedGet;
+  liveWraps.set(key, () => {
+    let clear = true;
+    if (mod.request === tracedRequest) mod.request = rawRequest;
+    else clear = false;
+    if (mod.get === tracedGet) mod.get = rawGet;
+    else clear = false;
+    return clear;
+  });
 }
 function wrapFetch() {
   const origFetch = globalThis.fetch;
   if (typeof origFetch !== "function") return;
-  globalThis.fetch = async function flightboxFetch(input, init) {
-    if (isShedding()) return origFetch(input, init);
+  const wrapper = async function flightboxFetch(input, init) {
+    if (!active3 || isShedding()) return origFetch(input, init);
     const agent = agentRef2;
     let spanId = 0n;
     let requestId = 0n;
@@ -1721,22 +1735,35 @@ function wrapFetch() {
       throw err;
     }
   };
+  globalThis.fetch = wrapper;
+  liveWraps.set("fetch", () => {
+    if (globalThis.fetch === wrapper) {
+      globalThis.fetch = origFetch;
+      return true;
+    }
+    return false;
+  });
 }
 function instrumentHttpClient(agent) {
   agentRef2 = agent;
-  if (patched2) return;
-  patched2 = true;
-  try {
-    wrapModule(nodeRequire("node:http"));
-  } catch {
+  active3 = true;
+  if (!liveWraps.has("http")) {
+    try {
+      wrapModule("http", nodeRequire("node:http"));
+    } catch {
+    }
   }
-  try {
-    wrapModule(nodeRequire("node:https"));
-  } catch {
+  if (!liveWraps.has("https")) {
+    try {
+      wrapModule("https", nodeRequire("node:https"));
+    } catch {
+    }
   }
-  try {
-    wrapFetch();
-  } catch {
+  if (!liveWraps.has("fetch")) {
+    try {
+      wrapFetch();
+    } catch {
+    }
   }
 }
 
@@ -1756,17 +1783,21 @@ function paramShapes(values) {
   return values.slice(0, 32).map((v) => v === null ? "null" : Array.isArray(v) ? "array" : typeof v);
 }
 var agentRef3;
+var active4 = false;
+var queryPatch = null;
+var connectPatch = null;
 function instrumentPg(agent) {
   agentRef3 = agent;
   const recorder = {
     record: ((...args) => agentRef3.recorder.record(...args))
   };
+  active4 = true;
   const pg = loadPg();
   if (!pg?.Client?.prototype?.query) return false;
-  if (!pg.Client.prototype.query.__flightbox) {
+  if (!queryPatch && !pg.Client.prototype.query.__flightbox) {
     const origQuery = pg.Client.prototype.query;
     const wrappedQuery = function(...args) {
-      if (isShedding()) return origQuery.apply(this, args);
+      if (!active4 || isShedding()) return origQuery.apply(this, args);
       let spanId = 0n;
       let requestId = 0n;
       let tStart = 0n;
@@ -1839,13 +1870,14 @@ function instrumentPg(agent) {
       return out;
     };
     wrappedQuery.__flightbox = true;
+    queryPatch = { proto: pg.Client.prototype, orig: origQuery, wrapper: wrappedQuery };
     pg.Client.prototype.query = wrappedQuery;
   }
   const Pool = pg.Pool;
-  if (Pool?.prototype?.connect && !Pool.prototype.connect.__flightbox) {
+  if (Pool?.prototype?.connect && !connectPatch && !Pool.prototype.connect.__flightbox) {
     const origConnect = Pool.prototype.connect;
     const wrappedConnect = function(cb) {
-      if (isShedding()) return origConnect.call(this, cb);
+      if (!active4 || isShedding()) return origConnect.call(this, cb);
       const tStart = nowMono();
       const requestId = currentRequestId();
       const record = () => {
@@ -1872,6 +1904,7 @@ function instrumentPg(agent) {
       return out;
     };
     wrappedConnect.__flightbox = true;
+    connectPatch = { proto: Pool.prototype, orig: origConnect, wrapper: wrappedConnect };
     Pool.prototype.connect = wrappedConnect;
   }
   return true;
@@ -1881,24 +1914,28 @@ function instrumentPg(agent) {
 var import_node_util = require("util");
 var LEVELS = ["log", "info", "warn", "error", "debug"];
 var FORMAT_OPTS = { depth: 2, maxArrayLength: 20, maxStringLength: LIMITS.log };
-var patched3 = false;
 var agentRef4;
+var active5 = false;
+var patches = /* @__PURE__ */ new Map();
 function instrumentConsole(agent) {
   agentRef4 = agent;
-  if (patched3) return;
-  patched3 = true;
+  active5 = true;
   for (const level of LEVELS) {
-    const orig = console[level].bind(console);
-    console[level] = function flightboxConsole(...args) {
+    if (patches.has(level)) continue;
+    const orig = console[level];
+    const bound = orig.bind(console);
+    const wrapper = function flightboxConsole(...args) {
       try {
-        if (!isShedding()) {
+        if (active5 && !isShedding()) {
           const msg = capScrub((0, import_node_util.formatWithOptions)(FORMAT_OPTS, ...args), LIMITS.log);
           agentRef4.recorder.record(8 /* Log */, { level, msg });
         }
       } catch {
       }
-      orig(...args);
+      bound(...args);
     };
+    patches.set(level, { orig, wrapper });
+    console[level] = wrapper;
   }
 }