@drawbridge/drawbridge-telemetry 0.0.1 → 0.0.3

package/README.md

@@ -21,8 +21,6 @@ Requires `@sentry/core` >= 10 as a peer dependency. Backend services satisfy thi
 
 ## Naming conventions
 
-Codified in the plan at `~/.claude/plans/yes-lets-see-it-enumerated-bumblebee.md`. Summary:
-
 - **Event names** — `<noun>.<verb>` past tense, lowercase, dot-separated. Verbs match drawbridge-api's action status vocabulary (`processing` / `succeeded` / `failed`; never `pending` / `completed`). Nouns are singular and match Mongo collection names.
 - **Tag keys** — camelCase. Canonical `traceId` everywhere; `X-Request-Id` header stays for wire compat.
 - **Event envelope** — `{ name, traceId, userId, organizationId, data: {...}, createdAt }`.
@@ -52,10 +50,10 @@ Sentry events for request     BullMQ worker
 
 For cron-style repeatable BullMQ jobs (no parent request or change event), synthesize a `__traceId` at enqueue time — pass it via `data.__traceId` to `enqueueFromWorker`.
 
-## Build
+## Build & publish
 
 ```sh
-npm run build
+npm run build    # tsup + npm publish
 ```
 
-Builds CJS + ESM bundles into `dist/` and publishes. Bump `version` in package.json before publishing.
+Bump `version` in `package.json` before publishing.

package/dist/bullmq.cjs

@@ -34,6 +34,7 @@ __export(bullmq_exports, {
   wrapWorkerHandler: () => wrapWorkerHandler
 });
 module.exports = __toCommonJS(bullmq_exports);
+var import_crypto = require("crypto");
 var Sentry2 = __toESM(require("@sentry/core"), 1);
 
 // index.js
@@ -50,9 +51,9 @@ var currentTraceId = () => {
 };
 
 // bullmq.js
-var wrapWorkerHandler = (handler) => async (jobData, job) => {
+var wrapWorkerHandler = (handler) => async (job) => {
   var _a;
-  const traceId = (_a = job == null ? void 0 : job.data) == null ? void 0 : _a.__traceId;
+  const traceId = ((_a = job == null ? void 0 : job.data) == null ? void 0 : _a.__traceId) || (0, import_crypto.randomUUID)();
   return withTraceScope(traceId, (scope) => {
     if (job == null ? void 0 : job.queueName) {
       scope.setTag("queue", job.queueName);
@@ -62,7 +63,7 @@ var wrapWorkerHandler = (handler) => async (jobData, job) => {
       scope.setTag("jobName", job.name);
     }
     ;
-    return handler(jobData, job);
+    return handler(job);
   });
 };
 var enqueueFromWorker = async (queue, name, data, options = {}) => {

package/dist/bullmq.d.cts

@@ -1,19 +1,22 @@
+import { randomUUID } from 'crypto';
 import { currentTraceId, withTraceScope } from './index.cjs';
 import '@sentry/core';
 
 // Wrap a BullMQ worker handler so it runs inside a Sentry scope tagged
-// with the job's traceId, queue name, and job name. The wrapped handler
-// keeps the same `( jobData, job )` signature the existing queue-factory
-// uses, so worker code itself doesn't change.
+// with the job's traceId, queue name, and job name. Matches BullMQ's
+// native single-arg `( job )` callback shape — pass it directly to
+// `new Worker( name, wrapWorkerHandler( handler ), ... )`.
 //
-// The traceId originates from one of two places:
+// The traceId originates from one of three places:
 //   - HTTP request: the API's req.id is forwarded as job.data.__traceId
 //   - Change stream: the Mongo resume token (_id._data) is forwarded
-// Either way, the wrapper just reads job.data.__traceId.
+//   - Synthesized: any job arriving with no __traceId gets a fresh UUID,
+//     so cron / repeatable jobs (no parent context) still produce
+//     correlated downstream events.
 
-const wrapWorkerHandler = ( handler ) => async ( jobData, job ) => {
+const wrapWorkerHandler = ( handler ) => async ( job ) => {
 
-	const traceId = job?.data?.__traceId;
+	const traceId = job?.data?.__traceId || randomUUID();
 
 	return withTraceScope( traceId, ( scope ) => {
 
@@ -27,7 +30,7 @@ const wrapWorkerHandler = ( handler ) => async ( jobData, job ) => {
 			scope.setTag( 'jobName', job.name );
 
 		}
-		return handler( jobData, job );
+		return handler( job );
 
 	} );
 

package/dist/bullmq.d.ts

@@ -1,19 +1,22 @@
+import { randomUUID } from 'crypto';
 import { currentTraceId, withTraceScope } from './index.js';
 import '@sentry/core';
 
 // Wrap a BullMQ worker handler so it runs inside a Sentry scope tagged
-// with the job's traceId, queue name, and job name. The wrapped handler
-// keeps the same `( jobData, job )` signature the existing queue-factory
-// uses, so worker code itself doesn't change.
+// with the job's traceId, queue name, and job name. Matches BullMQ's
+// native single-arg `( job )` callback shape — pass it directly to
+// `new Worker( name, wrapWorkerHandler( handler ), ... )`.
 //
-// The traceId originates from one of two places:
+// The traceId originates from one of three places:
 //   - HTTP request: the API's req.id is forwarded as job.data.__traceId
 //   - Change stream: the Mongo resume token (_id._data) is forwarded
-// Either way, the wrapper just reads job.data.__traceId.
+//   - Synthesized: any job arriving with no __traceId gets a fresh UUID,
+//     so cron / repeatable jobs (no parent context) still produce
+//     correlated downstream events.
 
-const wrapWorkerHandler = ( handler ) => async ( jobData, job ) => {
+const wrapWorkerHandler = ( handler ) => async ( job ) => {
 
-	const traceId = job?.data?.__traceId;
+	const traceId = job?.data?.__traceId || randomUUID();
 
 	return withTraceScope( traceId, ( scope ) => {
 
@@ -27,7 +30,7 @@ const wrapWorkerHandler = ( handler ) => async ( jobData, job ) => {
 			scope.setTag( 'jobName', job.name );
 
 		}
-		return handler( jobData, job );
+		return handler( job );
 
 	} );
 

package/dist/bullmq.js

@@ -4,10 +4,11 @@ import {
 } from "./chunk-SRV5HFQT.js";
 
 // bullmq.js
+import { randomUUID } from "crypto";
 import * as Sentry from "@sentry/core";
-var wrapWorkerHandler = (handler) => async (jobData, job) => {
+var wrapWorkerHandler = (handler) => async (job) => {
   var _a;
-  const traceId = (_a = job == null ? void 0 : job.data) == null ? void 0 : _a.__traceId;
+  const traceId = ((_a = job == null ? void 0 : job.data) == null ? void 0 : _a.__traceId) || randomUUID();
   return withTraceScope(traceId, (scope) => {
     if (job == null ? void 0 : job.queueName) {
       scope.setTag("queue", job.queueName);
@@ -17,7 +18,7 @@ var wrapWorkerHandler = (handler) => async (jobData, job) => {
       scope.setTag("jobName", job.name);
     }
     ;
-    return handler(jobData, job);
+    return handler(job);
   });
 };
 var enqueueFromWorker = async (queue, name, data, options = {}) => {

package/dist/express.cjs

@@ -29,27 +29,17 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // express.js
 var express_exports = {};
 __export(express_exports, {
+  applyRequestContext: () => applyRequestContext,
   expressContextMiddleware: () => expressContextMiddleware
 });
 module.exports = __toCommonJS(express_exports);
 var Sentry = __toESM(require("@sentry/core"), 1);
-var expressContextMiddleware = () => (req, res, next) => {
+var applyRequestContext = (req) => {
   const scope = Sentry.getCurrentScope();
   if (req == null ? void 0 : req.id) {
     scope.setTag("traceId", req.id);
   }
   ;
-  if (req == null ? void 0 : req.user) {
-    scope.setUser({
-      id: req.user.id || req.user._id,
-      email: req.user.email
-    });
-  }
-  ;
-  if (req == null ? void 0 : req.organization) {
-    scope.setTag("organization", req.organization.id || req.organization._id);
-  }
-  ;
   if (req == null ? void 0 : req.method) {
     scope.setTag("method", req.method);
   }
@@ -58,9 +48,25 @@ var expressContextMiddleware = () => (req, res, next) => {
     scope.setTag("route", req.path);
   }
   ;
+  const user = (req == null ? void 0 : req.authenticated) || (req == null ? void 0 : req.user);
+  if (user) {
+    scope.setUser({
+      id: user.id || user._id,
+      email: user.email
+    });
+  }
+  ;
+  if (req == null ? void 0 : req.organization) {
+    scope.setTag("organization", req.organization.id || req.organization._id);
+  }
+  ;
+};
+var expressContextMiddleware = () => (req, res, next) => {
+  applyRequestContext(req);
   next();
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  applyRequestContext,
   expressContextMiddleware
 });

package/dist/express.d.cts

@@ -1,16 +1,14 @@
 import * as Sentry from '@sentry/core';
 
-// Express middleware that tags the active Sentry scope with the current
-// user/organization/route/method/traceId. Mount AFTER auth resolution (so
-// req.user and req.organization are populated) and AFTER any req.id
-// middleware (so req.id exists to use as the traceId).
+// Apply all available context tags from a request to the active Sentry
+// scope. Idempotent — safe to call multiple times as the request enriches
+// (e.g. once at request entry for traceId/method/path, again from auth
+// middleware once req.authenticated and req.organization are populated).
 //
-// Every Sentry event captured during this request — and any downstream
-// BullMQ jobs that propagate the traceId via job.data.__traceId — is
-// filterable by these tags. Without this, errors arrive in Sentry as
-// anonymous stack traces.
+// Reads from req.authenticated first (drawbridge-api convention) and
+// falls back to req.user for compatibility with other services.
 
-const expressContextMiddleware = () => ( req, res, next ) => {
+const applyRequestContext = ( req ) => {
 
 	const scope = Sentry.getCurrentScope();
 
@@ -19,11 +17,27 @@ const expressContextMiddleware = () => ( req, res, next ) => {
 		scope.setTag( 'traceId', req.id );
 
 	}
-	if( req?.user ){
+	if( req?.method ){
+
+		scope.setTag( 'method', req.method );
+
+	}
+	// req.route is set by Express only AFTER route matching, which hasn't
+	// happened yet at request-entry middleware time. Use req.path as a
+	// best-effort route tag — aggregation by route pattern is left to a
+	// future res.on('finish') refinement.
+	if( req?.path ){
+
+		scope.setTag( 'route', req.path );
+
+	}
+	const user = req?.authenticated || req?.user;
+
+	if( user ){
 
 		scope.setUser({
-			id : req.user.id || req.user._id,
-			email : req.user.email
+			id : user.id || user._id,
+			email : user.email
 		});
 
 	}
@@ -32,22 +46,21 @@ const expressContextMiddleware = () => ( req, res, next ) => {
 		scope.setTag( 'organization', req.organization.id || req.organization._id );
 
 	}
-	if( req?.method ){
+};
 
-		scope.setTag( 'method', req.method );
+// Express middleware factory — runs `applyRequestContext` at request entry
+// and calls next. Tags user/organization opportunistically (only if auth
+// has already populated them); for per-route auth patterns, call
+// `applyRequestContext( req )` again from inside auth middleware after
+// req.authenticated is set so user/org tags apply to the rest of the
+// request's async context.
 
-	}
-	// req.route is set by Express only AFTER route matching, which hasn't
-	// happened yet at middleware time. Use req.path as a best-effort route
-	// tag — it captures the URL hit; aggregation by route pattern is left
-	// to a future res.on('finish') refinement.
-	if( req?.path ){
+const expressContextMiddleware = () => ( req, res, next ) => {
 
-		scope.setTag( 'route', req.path );
+	applyRequestContext( req );
 
-	}
 	next();
 
 };
 
-export { expressContextMiddleware };
+export { applyRequestContext, expressContextMiddleware };

package/dist/express.d.ts

@@ -1,16 +1,14 @@
 import * as Sentry from '@sentry/core';
 
-// Express middleware that tags the active Sentry scope with the current
-// user/organization/route/method/traceId. Mount AFTER auth resolution (so
-// req.user and req.organization are populated) and AFTER any req.id
-// middleware (so req.id exists to use as the traceId).
+// Apply all available context tags from a request to the active Sentry
+// scope. Idempotent — safe to call multiple times as the request enriches
+// (e.g. once at request entry for traceId/method/path, again from auth
+// middleware once req.authenticated and req.organization are populated).
 //
-// Every Sentry event captured during this request — and any downstream
-// BullMQ jobs that propagate the traceId via job.data.__traceId — is
-// filterable by these tags. Without this, errors arrive in Sentry as
-// anonymous stack traces.
+// Reads from req.authenticated first (drawbridge-api convention) and
+// falls back to req.user for compatibility with other services.
 
-const expressContextMiddleware = () => ( req, res, next ) => {
+const applyRequestContext = ( req ) => {
 
 	const scope = Sentry.getCurrentScope();
 
@@ -19,11 +17,27 @@ const expressContextMiddleware = () => ( req, res, next ) => {
 		scope.setTag( 'traceId', req.id );
 
 	}
-	if( req?.user ){
+	if( req?.method ){
+
+		scope.setTag( 'method', req.method );
+
+	}
+	// req.route is set by Express only AFTER route matching, which hasn't
+	// happened yet at request-entry middleware time. Use req.path as a
+	// best-effort route tag — aggregation by route pattern is left to a
+	// future res.on('finish') refinement.
+	if( req?.path ){
+
+		scope.setTag( 'route', req.path );
+
+	}
+	const user = req?.authenticated || req?.user;
+
+	if( user ){
 
 		scope.setUser({
-			id : req.user.id || req.user._id,
-			email : req.user.email
+			id : user.id || user._id,
+			email : user.email
 		});
 
 	}
@@ -32,22 +46,21 @@ const expressContextMiddleware = () => ( req, res, next ) => {
 		scope.setTag( 'organization', req.organization.id || req.organization._id );
 
 	}
-	if( req?.method ){
+};
 
-		scope.setTag( 'method', req.method );
+// Express middleware factory — runs `applyRequestContext` at request entry
+// and calls next. Tags user/organization opportunistically (only if auth
+// has already populated them); for per-route auth patterns, call
+// `applyRequestContext( req )` again from inside auth middleware after
+// req.authenticated is set so user/org tags apply to the rest of the
+// request's async context.
 
-	}
-	// req.route is set by Express only AFTER route matching, which hasn't
-	// happened yet at middleware time. Use req.path as a best-effort route
-	// tag — it captures the URL hit; aggregation by route pattern is left
-	// to a future res.on('finish') refinement.
-	if( req?.path ){
+const expressContextMiddleware = () => ( req, res, next ) => {
 
-		scope.setTag( 'route', req.path );
+	applyRequestContext( req );
 
-	}
 	next();
 
 };
 
-export { expressContextMiddleware };
+export { applyRequestContext, expressContextMiddleware };

package/dist/express.js

@@ -1,22 +1,11 @@
 // express.js
 import * as Sentry from "@sentry/core";
-var expressContextMiddleware = () => (req, res, next) => {
+var applyRequestContext = (req) => {
   const scope = Sentry.getCurrentScope();
   if (req == null ? void 0 : req.id) {
     scope.setTag("traceId", req.id);
   }
   ;
-  if (req == null ? void 0 : req.user) {
-    scope.setUser({
-      id: req.user.id || req.user._id,
-      email: req.user.email
-    });
-  }
-  ;
-  if (req == null ? void 0 : req.organization) {
-    scope.setTag("organization", req.organization.id || req.organization._id);
-  }
-  ;
   if (req == null ? void 0 : req.method) {
     scope.setTag("method", req.method);
   }
@@ -25,8 +14,24 @@ var expressContextMiddleware = () => (req, res, next) => {
     scope.setTag("route", req.path);
   }
   ;
+  const user = (req == null ? void 0 : req.authenticated) || (req == null ? void 0 : req.user);
+  if (user) {
+    scope.setUser({
+      id: user.id || user._id,
+      email: user.email
+    });
+  }
+  ;
+  if (req == null ? void 0 : req.organization) {
+    scope.setTag("organization", req.organization.id || req.organization._id);
+  }
+  ;
+};
+var expressContextMiddleware = () => (req, res, next) => {
+  applyRequestContext(req);
   next();
 };
 export {
+  applyRequestContext,
   expressContextMiddleware
 };

package/package.json

@@ -1,9 +1,5 @@
 {
   "type": "module",
-  "dependencies": {
-    "tsup": "8.5.1",
-    "typescript": "5.9.3"
-  },
   "peerDependencies": {
     "@sentry/core": ">=10"
   },
@@ -13,7 +9,9 @@
     }
   },
   "devDependencies": {
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.27.0",
+    "tsup": "8.5.1",
+    "typescript": "5.9.3"
   },
   "exports": {
     ".": {
@@ -52,5 +50,5 @@
     "build": "tsup && npm publish"
   },
   "types": "dist/index.d.ts",
-  "version": "0.0.1"
+  "version": "0.0.3"
 }