@drawbridge/drawbridge-telemetry 0.0.1 → 0.0.2

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

@@ -52,5 +52,5 @@
     "build": "tsup && npm publish"
   },
   "types": "dist/index.d.ts",
-  "version": "0.0.1"
+  "version": "0.0.2"
 }