@drawbridge/drawbridge-telemetry 0.0.7 → 0.0.9

package/dist/bullmq.cjs

@@ -35,17 +35,18 @@ __export(bullmq_exports, {
 });
 module.exports = __toCommonJS(bullmq_exports);
 var import_crypto = require("crypto");
+var Sentry2 = __toESM(require("@sentry/node"), 1);
 
 // index.js
 var Sentry = __toESM(require("@sentry/node"), 1);
 var import_pino = __toESM(require("pino"), 1);
-var withTraceScope = (traceId, fn) => Sentry.withScope((scope) => {
+var withTraceScope = (traceId, fn) => Sentry.withIsolationScope((scope) => {
   if (traceId) scope.setTag("traceId", traceId);
   return fn(scope);
 });
 var currentTraceId = () => {
   var _a, _b;
-  const scope = Sentry.getCurrentScope();
+  const scope = Sentry.getIsolationScope();
   const data = (_a = scope == null ? void 0 : scope.getScopeData) == null ? void 0 : _a.call(scope);
   return (_b = data == null ? void 0 : data.tags) == null ? void 0 : _b.traceId;
 };
@@ -77,28 +78,66 @@ var enqueueFromWorker = async (queue, name, data, options = {}) => {
     options
   );
 };
-var attachQueueEventsLogger = (queueEvents, queueName, logger2) => {
-  if (!(logger2 == null ? void 0 : logger2.event)) return;
-  queueEvents.on("completed", ({ jobId, returnvalue, prev }) => {
-    logger2.event("job.completed", {
-      jobId,
-      queue: queueName,
-      prev
-    });
+var attachQueueEventsLogger = (queue, queueEvents, logger2) => {
+  if (!(logger2 == null ? void 0 : logger2.emit)) return;
+  const queueName = queue == null ? void 0 : queue.name;
+  const emitInScope = (name, data, traceId) => Sentry2.withIsolationScope((scope) => {
+    if (traceId) scope.setTag("traceId", traceId);
+    if (queueName) scope.setTag("queue", queueName);
+    return logger2.emit(name, data);
   });
-  queueEvents.on("failed", ({ jobId, failedReason, prev }) => {
-    logger2.event("job.failed", {
-      jobId,
-      queue: queueName,
-      failedReason,
-      prev
-    });
+  queueEvents.on("completed", async ({ jobId }) => {
+    var _a;
+    try {
+      const job = await queue.getJob(jobId).catch(() => null);
+      const duration = (job == null ? void 0 : job.finishedOn) && (job == null ? void 0 : job.processedOn) ? job.finishedOn - job.processedOn : null;
+      await emitInScope(
+        "job.completed",
+        {
+          jobId,
+          queue: queueName,
+          name: job == null ? void 0 : job.name,
+          duration,
+          attemptsMade: job == null ? void 0 : job.attemptsMade
+        },
+        (_a = job == null ? void 0 : job.data) == null ? void 0 : _a.__traceId
+      );
+    } catch {
+    }
+  });
+  queueEvents.on("failed", async ({ jobId, failedReason }) => {
+    var _a;
+    try {
+      const job = await queue.getJob(jobId).catch(() => null);
+      await emitInScope(
+        "job.failed",
+        {
+          jobId,
+          queue: queueName,
+          name: job == null ? void 0 : job.name,
+          failedReason,
+          attemptsMade: job == null ? void 0 : job.attemptsMade
+        },
+        (_a = job == null ? void 0 : job.data) == null ? void 0 : _a.__traceId
+      );
+    } catch {
+    }
   });
-  queueEvents.on("stalled", ({ jobId }) => {
-    logger2.event("job.stalled", {
-      jobId,
-      queue: queueName
-    });
+  queueEvents.on("stalled", async ({ jobId }) => {
+    var _a;
+    try {
+      const job = await queue.getJob(jobId).catch(() => null);
+      await emitInScope(
+        "job.stalled",
+        {
+          jobId,
+          queue: queueName,
+          name: job == null ? void 0 : job.name
+        },
+        (_a = job == null ? void 0 : job.data) == null ? void 0 : _a.__traceId
+      );
+    } catch {
+    }
   });
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/bullmq.d.cts

@@ -1,6 +1,6 @@
 import { randomUUID } from 'crypto';
+import * as Sentry from '@sentry/node';
 import { currentTraceId, withTraceScope } from './index.cjs';
-import '@sentry/node';
 import 'pino';
 
 // Wrap a BullMQ worker handler so it runs inside a Sentry scope tagged
@@ -61,42 +61,108 @@ const enqueueFromWorker = async ( queue, name, data, options = {} ) => {
 
 };
 
-// Attach a QueueEvents listener that emits structured `job.completed` and
-// `job.failed` records to the active Sentry logger. Use one per queue.
-// Stage 2 only — Stage 1 ships the helper but it's a no-op until the
-// unified logger lands.
+// Attach a QueueEvents listener that emits `job.completed`, `job.failed`,
+// and `job.stalled` to the unified logger. Called once per (queue, events)
+// pair, typically right after both are constructed.
+//
+// The Queue handle is required because BullMQ's QueueEvents payload doesn't
+// include duration, attempts, or job name on its own — we look those up via
+// queue.getJob( jobId ). The lookup is best-effort: jobs that have already
+// been swept by removeOnComplete / removeOnFail return null, in which case
+// the emit goes out with the fields we do have.
+//
+// duration is measured from worker pickup (processedOn) to finish
+// (finishedOn), i.e. execution time. Queue-wait time (timestamp to
+// processedOn) is not included; if that becomes interesting it can be
+// added as a separate field.
+
+const attachQueueEventsLogger = ( queue, queueEvents, logger ) => {
+
+	if( ! logger?.emit ) return;
+
+	const queueName = queue?.name;
 
-const attachQueueEventsLogger = ( queueEvents, queueName, logger ) => {
+	// QueueEvents listeners fire as plain event-emitter callbacks — they
+	// don't run inside any wrapWorkerHandler scope, so without this
+	// withIsolationScope wrapper the emit's envelope traceId would be
+	// null. Wrap each handler so the emitted job.* row carries the job's
+	// own __traceId (set by enqueueWithTrace / enqueueFromWorker at
+	// enqueue time).
+
+	const emitInScope = ( name, data, traceId ) => Sentry.withIsolationScope( ( scope ) => {
+
+		if( traceId ) scope.setTag( 'traceId', traceId );
+		if( queueName ) scope.setTag( 'queue', queueName );
+
+		return logger.emit( name, data );
+
+	} );
 
-	if( ! logger?.event ) return;
+	queueEvents.on( 'completed', async ({ jobId }) => {
 
-	queueEvents.on( 'completed', ({ jobId, returnvalue, prev }) => {
+		try {
 
-		logger.event( 'job.completed', {
-			jobId,
-			queue : queueName,
-			prev
-		});
+			const job = await queue.getJob( jobId ).catch( () => null );
+
+			const duration = ( job?.finishedOn && job?.processedOn )
+				? job.finishedOn - job.processedOn
+				: null;
+
+			await emitInScope(
+				'job.completed',
+				{
+					jobId,
+					queue : queueName,
+					name : job?.name,
+					duration,
+					attemptsMade : job?.attemptsMade
+				},
+				job?.data?.__traceId
+			);
+
+		} catch {}
 
 	});
 
-	queueEvents.on( 'failed', ({ jobId, failedReason, prev }) => {
+	queueEvents.on( 'failed', async ({ jobId, failedReason }) => {
+
+		try {
+
+			const job = await queue.getJob( jobId ).catch( () => null );
 
-		logger.event( 'job.failed', {
-			jobId,
-			queue : queueName,
-			failedReason,
-			prev
-		});
+			await emitInScope(
+				'job.failed',
+				{
+					jobId,
+					queue : queueName,
+					name : job?.name,
+					failedReason,
+					attemptsMade : job?.attemptsMade
+				},
+				job?.data?.__traceId
+			);
+
+		} catch {}
 
 	});
 
-	queueEvents.on( 'stalled', ({ jobId }) => {
+	queueEvents.on( 'stalled', async ({ jobId }) => {
+
+		try {
+
+			const job = await queue.getJob( jobId ).catch( () => null );
+
+			await emitInScope(
+				'job.stalled',
+				{
+					jobId,
+					queue : queueName,
+					name : job?.name
+				},
+				job?.data?.__traceId
+			);
 
-		logger.event( 'job.stalled', {
-			jobId,
-			queue : queueName
-		});
+		} catch {}
 
 	});
 

package/dist/bullmq.d.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from 'crypto';
+import * as Sentry from '@sentry/node';
 import { currentTraceId, withTraceScope } from './index.js';
-import '@sentry/node';
 import 'pino';
 
 // Wrap a BullMQ worker handler so it runs inside a Sentry scope tagged
@@ -61,42 +61,108 @@ const enqueueFromWorker = async ( queue, name, data, options = {} ) => {
 
 };
 
-// Attach a QueueEvents listener that emits structured `job.completed` and
-// `job.failed` records to the active Sentry logger. Use one per queue.
-// Stage 2 only — Stage 1 ships the helper but it's a no-op until the
-// unified logger lands.
+// Attach a QueueEvents listener that emits `job.completed`, `job.failed`,
+// and `job.stalled` to the unified logger. Called once per (queue, events)
+// pair, typically right after both are constructed.
+//
+// The Queue handle is required because BullMQ's QueueEvents payload doesn't
+// include duration, attempts, or job name on its own — we look those up via
+// queue.getJob( jobId ). The lookup is best-effort: jobs that have already
+// been swept by removeOnComplete / removeOnFail return null, in which case
+// the emit goes out with the fields we do have.
+//
+// duration is measured from worker pickup (processedOn) to finish
+// (finishedOn), i.e. execution time. Queue-wait time (timestamp to
+// processedOn) is not included; if that becomes interesting it can be
+// added as a separate field.
+
+const attachQueueEventsLogger = ( queue, queueEvents, logger ) => {
+
+	if( ! logger?.emit ) return;
+
+	const queueName = queue?.name;
 
-const attachQueueEventsLogger = ( queueEvents, queueName, logger ) => {
+	// QueueEvents listeners fire as plain event-emitter callbacks — they
+	// don't run inside any wrapWorkerHandler scope, so without this
+	// withIsolationScope wrapper the emit's envelope traceId would be
+	// null. Wrap each handler so the emitted job.* row carries the job's
+	// own __traceId (set by enqueueWithTrace / enqueueFromWorker at
+	// enqueue time).
+
+	const emitInScope = ( name, data, traceId ) => Sentry.withIsolationScope( ( scope ) => {
+
+		if( traceId ) scope.setTag( 'traceId', traceId );
+		if( queueName ) scope.setTag( 'queue', queueName );
+
+		return logger.emit( name, data );
+
+	} );
 
-	if( ! logger?.event ) return;
+	queueEvents.on( 'completed', async ({ jobId }) => {
 
-	queueEvents.on( 'completed', ({ jobId, returnvalue, prev }) => {
+		try {
 
-		logger.event( 'job.completed', {
-			jobId,
-			queue : queueName,
-			prev
-		});
+			const job = await queue.getJob( jobId ).catch( () => null );
+
+			const duration = ( job?.finishedOn && job?.processedOn )
+				? job.finishedOn - job.processedOn
+				: null;
+
+			await emitInScope(
+				'job.completed',
+				{
+					jobId,
+					queue : queueName,
+					name : job?.name,
+					duration,
+					attemptsMade : job?.attemptsMade
+				},
+				job?.data?.__traceId
+			);
+
+		} catch {}
 
 	});
 
-	queueEvents.on( 'failed', ({ jobId, failedReason, prev }) => {
+	queueEvents.on( 'failed', async ({ jobId, failedReason }) => {
+
+		try {
+
+			const job = await queue.getJob( jobId ).catch( () => null );
 
-		logger.event( 'job.failed', {
-			jobId,
-			queue : queueName,
-			failedReason,
-			prev
-		});
+			await emitInScope(
+				'job.failed',
+				{
+					jobId,
+					queue : queueName,
+					name : job?.name,
+					failedReason,
+					attemptsMade : job?.attemptsMade
+				},
+				job?.data?.__traceId
+			);
+
+		} catch {}
 
 	});
 
-	queueEvents.on( 'stalled', ({ jobId }) => {
+	queueEvents.on( 'stalled', async ({ jobId }) => {
+
+		try {
+
+			const job = await queue.getJob( jobId ).catch( () => null );
+
+			await emitInScope(
+				'job.stalled',
+				{
+					jobId,
+					queue : queueName,
+					name : job?.name
+				},
+				job?.data?.__traceId
+			);
 
-		logger.event( 'job.stalled', {
-			jobId,
-			queue : queueName
-		});
+		} catch {}
 
 	});
 

package/dist/bullmq.js

@@ -1,10 +1,11 @@
 import {
   currentTraceId,
   withTraceScope
-} from "./chunk-CODZHH5I.js";
+} from "./chunk-WUUTBLMK.js";
 
 // bullmq.js
 import { randomUUID } from "crypto";
+import * as Sentry from "@sentry/node";
 var wrapWorkerHandler = (handler) => async (job) => {
   var _a;
   const traceId = ((_a = job == null ? void 0 : job.data) == null ? void 0 : _a.__traceId) || randomUUID();
@@ -31,28 +32,66 @@ var enqueueFromWorker = async (queue, name, data, options = {}) => {
     options
   );
 };
-var attachQueueEventsLogger = (queueEvents, queueName, logger) => {
-  if (!(logger == null ? void 0 : logger.event)) return;
-  queueEvents.on("completed", ({ jobId, returnvalue, prev }) => {
-    logger.event("job.completed", {
-      jobId,
-      queue: queueName,
-      prev
-    });
+var attachQueueEventsLogger = (queue, queueEvents, logger) => {
+  if (!(logger == null ? void 0 : logger.emit)) return;
+  const queueName = queue == null ? void 0 : queue.name;
+  const emitInScope = (name, data, traceId) => Sentry.withIsolationScope((scope) => {
+    if (traceId) scope.setTag("traceId", traceId);
+    if (queueName) scope.setTag("queue", queueName);
+    return logger.emit(name, data);
   });
-  queueEvents.on("failed", ({ jobId, failedReason, prev }) => {
-    logger.event("job.failed", {
-      jobId,
-      queue: queueName,
-      failedReason,
-      prev
-    });
+  queueEvents.on("completed", async ({ jobId }) => {
+    var _a;
+    try {
+      const job = await queue.getJob(jobId).catch(() => null);
+      const duration = (job == null ? void 0 : job.finishedOn) && (job == null ? void 0 : job.processedOn) ? job.finishedOn - job.processedOn : null;
+      await emitInScope(
+        "job.completed",
+        {
+          jobId,
+          queue: queueName,
+          name: job == null ? void 0 : job.name,
+          duration,
+          attemptsMade: job == null ? void 0 : job.attemptsMade
+        },
+        (_a = job == null ? void 0 : job.data) == null ? void 0 : _a.__traceId
+      );
+    } catch {
+    }
+  });
+  queueEvents.on("failed", async ({ jobId, failedReason }) => {
+    var _a;
+    try {
+      const job = await queue.getJob(jobId).catch(() => null);
+      await emitInScope(
+        "job.failed",
+        {
+          jobId,
+          queue: queueName,
+          name: job == null ? void 0 : job.name,
+          failedReason,
+          attemptsMade: job == null ? void 0 : job.attemptsMade
+        },
+        (_a = job == null ? void 0 : job.data) == null ? void 0 : _a.__traceId
+      );
+    } catch {
+    }
   });
-  queueEvents.on("stalled", ({ jobId }) => {
-    logger.event("job.stalled", {
-      jobId,
-      queue: queueName
-    });
+  queueEvents.on("stalled", async ({ jobId }) => {
+    var _a;
+    try {
+      const job = await queue.getJob(jobId).catch(() => null);
+      await emitInScope(
+        "job.stalled",
+        {
+          jobId,
+          queue: queueName,
+          name: job == null ? void 0 : job.name
+        },
+        (_a = job == null ? void 0 : job.data) == null ? void 0 : _a.__traceId
+      );
+    } catch {
+    }
   });
 };
 export {

package/dist/{chunk-CODZHH5I.js → chunk-WUUTBLMK.js}

@@ -46,12 +46,12 @@ var createLogger = ({ eventWriter, level = "info" } = {}) => {
     }
   };
   const emit = async (name, data = {}) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const scope = Sentry.getIsolationScope();
     const scopeData = (_a = scope == null ? void 0 : scope.getScopeData) == null ? void 0 : _a.call(scope);
-    const traceId = (_b = scopeData == null ? void 0 : scopeData.tags) == null ? void 0 : _b.traceId;
-    const userId = (_c = scopeData == null ? void 0 : scopeData.user) == null ? void 0 : _c.id;
-    const organizationId = (_d = scopeData == null ? void 0 : scopeData.tags) == null ? void 0 : _d.organization;
+    const traceId = ((_b = scopeData == null ? void 0 : scopeData.tags) == null ? void 0 : _b.traceId) || ((_c = data == null ? void 0 : data.telemetry) == null ? void 0 : _c.id) || null;
+    const userId = ((_d = scopeData == null ? void 0 : scopeData.user) == null ? void 0 : _d.id) || (data == null ? void 0 : data.userId) || (data == null ? void 0 : data.user) || null;
+    const organizationId = ((_e = scopeData == null ? void 0 : scopeData.tags) == null ? void 0 : _e.organization) || (data == null ? void 0 : data.organizationId) || (data == null ? void 0 : data.organization) || null;
     log.info(
       { event: name, traceId, userId, organizationId, ...data },
       "event:" + name
@@ -99,13 +99,13 @@ var attachProcessHandlers = () => {
     });
   });
 };
-var withTraceScope = (traceId, fn) => Sentry.withScope((scope) => {
+var withTraceScope = (traceId, fn) => Sentry.withIsolationScope((scope) => {
   if (traceId) scope.setTag("traceId", traceId);
   return fn(scope);
 });
 var currentTraceId = () => {
   var _a, _b;
-  const scope = Sentry.getCurrentScope();
+  const scope = Sentry.getIsolationScope();
   const data = (_a = scope == null ? void 0 : scope.getScopeData) == null ? void 0 : _a.call(scope);
   return (_b = data == null ? void 0 : data.tags) == null ? void 0 : _b.traceId;
 };

package/dist/index.cjs

@@ -87,12 +87,12 @@ var createLogger = ({ eventWriter, level = "info" } = {}) => {
     }
   };
   const emit = async (name, data = {}) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const scope = Sentry.getIsolationScope();
     const scopeData = (_a = scope == null ? void 0 : scope.getScopeData) == null ? void 0 : _a.call(scope);
-    const traceId = (_b = scopeData == null ? void 0 : scopeData.tags) == null ? void 0 : _b.traceId;
-    const userId = (_c = scopeData == null ? void 0 : scopeData.user) == null ? void 0 : _c.id;
-    const organizationId = (_d = scopeData == null ? void 0 : scopeData.tags) == null ? void 0 : _d.organization;
+    const traceId = ((_b = scopeData == null ? void 0 : scopeData.tags) == null ? void 0 : _b.traceId) || ((_c = data == null ? void 0 : data.telemetry) == null ? void 0 : _c.id) || null;
+    const userId = ((_d = scopeData == null ? void 0 : scopeData.user) == null ? void 0 : _d.id) || (data == null ? void 0 : data.userId) || (data == null ? void 0 : data.user) || null;
+    const organizationId = ((_e = scopeData == null ? void 0 : scopeData.tags) == null ? void 0 : _e.organization) || (data == null ? void 0 : data.organizationId) || (data == null ? void 0 : data.organization) || null;
     log.info(
       { event: name, traceId, userId, organizationId, ...data },
       "event:" + name
@@ -140,13 +140,13 @@ var attachProcessHandlers = () => {
     });
   });
 };
-var withTraceScope = (traceId, fn) => Sentry.withScope((scope) => {
+var withTraceScope = (traceId, fn) => Sentry.withIsolationScope((scope) => {
   if (traceId) scope.setTag("traceId", traceId);
   return fn(scope);
 });
 var currentTraceId = () => {
   var _a, _b;
-  const scope = Sentry.getCurrentScope();
+  const scope = Sentry.getIsolationScope();
   const data = (_a = scope == null ? void 0 : scope.getScopeData) == null ? void 0 : _a.call(scope);
   return (_b = data == null ? void 0 : data.tags) == null ? void 0 : _b.traceId;
 };

package/dist/index.d.cts

@@ -115,9 +115,26 @@ const createLogger = ({ eventWriter, level = 'info' } = {}) => {
 		const scope = Sentry.getIsolationScope();
 		const scopeData = scope?.getScopeData?.();
 
-		const traceId = scopeData?.tags?.traceId;
-		const userId = scopeData?.user?.id;
-		const organizationId = scopeData?.tags?.organization;
+		// Envelope fields prefer the active Sentry isolation scope (set by
+		// expressContextMiddleware in Express requests, by withTraceScope in
+		// BullMQ workers). Change-stream-driven emits frequently don't have
+		// an org/user on the scope but DO carry them in the data payload —
+		// fall back to those so the envelope stays populated and admin
+		// queries by `organizationId`/`userId` still match.
+
+		const traceId = scopeData?.tags?.traceId
+			|| data?.telemetry?.id
+			|| null;
+
+		const userId = scopeData?.user?.id
+			|| data?.userId
+			|| data?.user
+			|| null;
+
+		const organizationId = scopeData?.tags?.organization
+			|| data?.organizationId
+			|| data?.organization
+			|| null;
 
 		log.info(
 			{ event : name, traceId, userId, organizationId, ...data },
@@ -210,7 +227,16 @@ const attachProcessHandlers = () => {
 // the forked scope so callers can attach additional tags without re-reading
 // the active scope. Returns whatever fn returns (including promises).
 
-const withTraceScope = ( traceId, fn ) => Sentry.withScope( ( scope ) => {
+// Runs `fn` inside a forked isolation scope tagged with `traceId`.
+// Important: must use withIsolationScope, NOT withScope. `Sentry.withScope`
+// forks the *current* scope, which is invisible to consumers that read
+// from `Sentry.getIsolationScope()` — including our own logger.emit and
+// the pinoIntegration that ships log lines with isolation-scope tags
+// attached. Using the wrong scope was the original cause of every
+// telemetry row showing traceId: null even when wrapWorkerHandler had
+// "set" the tag.
+
+const withTraceScope = ( traceId, fn ) => Sentry.withIsolationScope( ( scope ) => {
 
 	if( traceId ) scope.setTag( 'traceId', traceId );
 
@@ -224,7 +250,12 @@ const withTraceScope = ( traceId, fn ) => Sentry.withScope( ( scope ) => {
 
 const currentTraceId = () => {
 
-	const scope = Sentry.getCurrentScope();
+	// Read from the isolation scope — that's where withTraceScope and
+	// expressContextMiddleware both write traceId. Falling back to
+	// current scope would only pick up tags set inside an explicit
+	// Sentry.withScope block, which nothing in this codebase does.
+
+	const scope = Sentry.getIsolationScope();
 	const data = scope?.getScopeData?.();
 
 	return data?.tags?.traceId;

package/dist/index.d.ts

@@ -115,9 +115,26 @@ const createLogger = ({ eventWriter, level = 'info' } = {}) => {
 		const scope = Sentry.getIsolationScope();
 		const scopeData = scope?.getScopeData?.();
 
-		const traceId = scopeData?.tags?.traceId;
-		const userId = scopeData?.user?.id;
-		const organizationId = scopeData?.tags?.organization;
+		// Envelope fields prefer the active Sentry isolation scope (set by
+		// expressContextMiddleware in Express requests, by withTraceScope in
+		// BullMQ workers). Change-stream-driven emits frequently don't have
+		// an org/user on the scope but DO carry them in the data payload —
+		// fall back to those so the envelope stays populated and admin
+		// queries by `organizationId`/`userId` still match.
+
+		const traceId = scopeData?.tags?.traceId
+			|| data?.telemetry?.id
+			|| null;
+
+		const userId = scopeData?.user?.id
+			|| data?.userId
+			|| data?.user
+			|| null;
+
+		const organizationId = scopeData?.tags?.organization
+			|| data?.organizationId
+			|| data?.organization
+			|| null;
 
 		log.info(
 			{ event : name, traceId, userId, organizationId, ...data },
@@ -210,7 +227,16 @@ const attachProcessHandlers = () => {
 // the forked scope so callers can attach additional tags without re-reading
 // the active scope. Returns whatever fn returns (including promises).
 
-const withTraceScope = ( traceId, fn ) => Sentry.withScope( ( scope ) => {
+// Runs `fn` inside a forked isolation scope tagged with `traceId`.
+// Important: must use withIsolationScope, NOT withScope. `Sentry.withScope`
+// forks the *current* scope, which is invisible to consumers that read
+// from `Sentry.getIsolationScope()` — including our own logger.emit and
+// the pinoIntegration that ships log lines with isolation-scope tags
+// attached. Using the wrong scope was the original cause of every
+// telemetry row showing traceId: null even when wrapWorkerHandler had
+// "set" the tag.
+
+const withTraceScope = ( traceId, fn ) => Sentry.withIsolationScope( ( scope ) => {
 
 	if( traceId ) scope.setTag( 'traceId', traceId );
 
@@ -224,7 +250,12 @@ const withTraceScope = ( traceId, fn ) => Sentry.withScope( ( scope ) => {
 
 const currentTraceId = () => {
 
-	const scope = Sentry.getCurrentScope();
+	// Read from the isolation scope — that's where withTraceScope and
+	// expressContextMiddleware both write traceId. Falling back to
+	// current scope would only pick up tags set inside an explicit
+	// Sentry.withScope block, which nothing in this codebase does.
+
+	const scope = Sentry.getIsolationScope();
 	const data = scope?.getScopeData?.();
 
 	return data?.tags?.traceId;

package/dist/index.js

@@ -8,7 +8,7 @@ import {
   init,
   logger,
   withTraceScope
-} from "./chunk-CODZHH5I.js";
+} from "./chunk-WUUTBLMK.js";
 export {
   Sentry,
   attachProcessHandlers,

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "dependencies": {
-    "@drawbridge/drawbridge-agents": "0.0.4",
+    "@drawbridge/drawbridge-agents": "0.0.5",
     "@sentry/node": "10.27.0",
     "pino": "10.3.1",
     "pino-pretty": "13.1.3"
@@ -60,5 +60,5 @@
     "build": "tsup && npm publish"
   },
   "types": "dist/index.d.ts",
-  "version": "0.0.7"
+  "version": "0.0.9"
 }