@drawbridge/drawbridge-telemetry 0.0.5 → 0.0.7

package/dist/bullmq.cjs

@@ -38,6 +38,7 @@ var import_crypto = require("crypto");
 
 // index.js
 var Sentry = __toESM(require("@sentry/node"), 1);
+var import_pino = __toESM(require("pino"), 1);
 var withTraceScope = (traceId, fn) => Sentry.withScope((scope) => {
   if (traceId) scope.setTag("traceId", traceId);
   return fn(scope);

package/dist/bullmq.d.cts

@@ -1,6 +1,7 @@
 import { randomUUID } from 'crypto';
 import { currentTraceId, withTraceScope } from './index.cjs';
 import '@sentry/node';
+import 'pino';
 
 // Wrap a BullMQ worker handler so it runs inside a Sentry scope tagged
 // with the job's traceId, queue name, and job name. Matches BullMQ's

package/dist/bullmq.d.ts

@@ -1,6 +1,7 @@
 import { randomUUID } from 'crypto';
 import { currentTraceId, withTraceScope } from './index.js';
 import '@sentry/node';
+import 'pino';
 
 // Wrap a BullMQ worker handler so it runs inside a Sentry scope tagged
 // with the job's traceId, queue name, and job name. Matches BullMQ's

package/dist/bullmq.js

@@ -1,7 +1,7 @@
 import {
   currentTraceId,
   withTraceScope
-} from "./chunk-O6EHU4U7.js";
+} from "./chunk-CODZHH5I.js";
 
 // bullmq.js
 import { randomUUID } from "crypto";

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

@@ -1,16 +1,72 @@
 // index.js
 import * as Sentry from "@sentry/node";
+import pino from "pino";
 var init2 = (config = {}) => Sentry.init({
   dsn: process.env.SENTRY_DSN,
   enableLogs: true,
   environment: process.env.SENTRY_ENVIRONMENT || "localhost",
   tracesSampleRate: 0.1,
   profilesSampleRate: 0.05,
-  ...config
+  ...config,
+  integrations: [
+    Sentry.pinoIntegration(),
+    ...config.integrations || []
+  ]
 });
 var captureException2 = (error, options) => Sentry.captureException(error, options);
 var captureMessage2 = (message, options) => Sentry.captureMessage(message, options);
 var logger2 = Sentry.logger;
+var createLogger = ({ eventWriter, level = "info" } = {}) => {
+  const isProd = process.env.SENTRY_ENVIRONMENT === "production";
+  const pinoConfig = isProd ? { level } : {
+    level,
+    transport: {
+      target: "pino-pretty",
+      options: {
+        colorize: true,
+        translateTime: "SYS:standard"
+      }
+    }
+  };
+  const log = pino(pinoConfig);
+  const info = (message, data = {}) => log.info(data, message);
+  const warn = (message, data = {}) => log.warn(data, message);
+  const error = (first, second) => {
+    if (first instanceof Error) {
+      Sentry.captureException(first, second);
+      log.error(
+        { err: first, ...second },
+        first.message
+      );
+    } else if ((second == null ? void 0 : second.err) instanceof Error) {
+      Sentry.captureException(second.err);
+      log.error(second, first);
+    } else {
+      log.error(second || {}, first);
+    }
+  };
+  const emit = async (name, data = {}) => {
+    var _a, _b, _c, _d;
+    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;
+    log.info(
+      { event: name, traceId, userId, organizationId, ...data },
+      "event:" + name
+    );
+    if (eventWriter) {
+      await eventWriter(name, {
+        traceId,
+        userId,
+        organizationId,
+        data
+      });
+    }
+  };
+  return { info, warn, error, emit };
+};
 var attached = false;
 var attachProcessHandlers = () => {
   if (attached) return;
@@ -60,6 +116,7 @@ export {
   captureException2 as captureException,
   captureMessage2 as captureMessage,
   logger2 as logger,
+  createLogger,
   attachProcessHandlers,
   withTraceScope,
   currentTraceId

package/dist/index.cjs

@@ -33,6 +33,7 @@ __export(index_exports, {
   attachProcessHandlers: () => attachProcessHandlers,
   captureException: () => captureException2,
   captureMessage: () => captureMessage2,
+  createLogger: () => createLogger,
   currentTraceId: () => currentTraceId,
   init: () => init2,
   logger: () => logger2,
@@ -40,17 +41,73 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var Sentry = __toESM(require("@sentry/node"), 1);
+var import_pino = __toESM(require("pino"), 1);
 var init2 = (config = {}) => Sentry.init({
   dsn: process.env.SENTRY_DSN,
   enableLogs: true,
   environment: process.env.SENTRY_ENVIRONMENT || "localhost",
   tracesSampleRate: 0.1,
   profilesSampleRate: 0.05,
-  ...config
+  ...config,
+  integrations: [
+    Sentry.pinoIntegration(),
+    ...config.integrations || []
+  ]
 });
 var captureException2 = (error, options) => Sentry.captureException(error, options);
 var captureMessage2 = (message, options) => Sentry.captureMessage(message, options);
 var logger2 = Sentry.logger;
+var createLogger = ({ eventWriter, level = "info" } = {}) => {
+  const isProd = process.env.SENTRY_ENVIRONMENT === "production";
+  const pinoConfig = isProd ? { level } : {
+    level,
+    transport: {
+      target: "pino-pretty",
+      options: {
+        colorize: true,
+        translateTime: "SYS:standard"
+      }
+    }
+  };
+  const log = (0, import_pino.default)(pinoConfig);
+  const info = (message, data = {}) => log.info(data, message);
+  const warn = (message, data = {}) => log.warn(data, message);
+  const error = (first, second) => {
+    if (first instanceof Error) {
+      Sentry.captureException(first, second);
+      log.error(
+        { err: first, ...second },
+        first.message
+      );
+    } else if ((second == null ? void 0 : second.err) instanceof Error) {
+      Sentry.captureException(second.err);
+      log.error(second, first);
+    } else {
+      log.error(second || {}, first);
+    }
+  };
+  const emit = async (name, data = {}) => {
+    var _a, _b, _c, _d;
+    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;
+    log.info(
+      { event: name, traceId, userId, organizationId, ...data },
+      "event:" + name
+    );
+    if (eventWriter) {
+      await eventWriter(name, {
+        traceId,
+        userId,
+        organizationId,
+        data
+      });
+    }
+  };
+  return { info, warn, error, emit };
+};
 var attached = false;
 var attachProcessHandlers = () => {
   if (attached) return;
@@ -99,6 +156,7 @@ var currentTraceId = () => {
   attachProcessHandlers,
   captureException,
   captureMessage,
+  createLogger,
   currentTraceId,
   init,
   logger,

package/dist/index.d.cts

@@ -1,12 +1,18 @@
 import * as Sentry from '@sentry/node';
 export { Sentry };
+import pino from 'pino';
 
 // Project-standard Sentry.init wrapper. Sets the conventions used across
 // drawbridge-api / -sync / -webhooks (enableLogs, tracesSampleRate,
-// profilesSampleRate, environment) so each service's init call collapses
-// to dsn + any overrides.
+// profilesSampleRate, environment, pinoIntegration) so each service's init
+// call collapses to dsn + any overrides.
 //
-// Defaults are conservative. Override per service as needed.
+// pinoIntegration() ships with @sentry/node >=10.18 — captures pino logger
+// output as Sentry Logs with the active scope tags attached. Required for
+// createLogger() to flow through to Sentry.
+//
+// Defaults are conservative. Override per service as needed. Consumer-passed
+// integrations append to ours rather than replacing them.
 
 const init = ( config = {} ) => Sentry.init({
 	dsn : process.env.SENTRY_DSN,
@@ -14,7 +20,11 @@ const init = ( config = {} ) => Sentry.init({
 	environment : process.env.SENTRY_ENVIRONMENT || 'localhost',
 	tracesSampleRate : 0.1,
 	profilesSampleRate : 0.05,
-	...config
+	...config,
+	integrations : [
+		Sentry.pinoIntegration(),
+		...( config.integrations || [] )
+	]
 });
 
 // Named re-exports of the Sentry surface services actually use. Keep this
@@ -24,11 +34,113 @@ const captureException = ( error, options ) => Sentry.captureException( error, o
 
 const captureMessage = ( message, options ) => Sentry.captureMessage( message, options );
 
-// Sentry.logger is the structured-logs surface (ships to Sentry Logs).
-// Exposed as `logger` so callers do `logger.info(...)` / `logger.error(...)`.
+// Sentry.logger is the raw structured-logs surface (ships to Sentry Logs).
+// Exposed as `logger` for one-off `logger.info(...)` / `logger.error(...)`
+// without instantiating a per-service Pino instance. Prefer createLogger()
+// in service code — it adds pretty local stdout, Sentry.captureException
+// dispatch for Error-typed args, and the .event() method for writing
+// domain events to a service-provided eventWriter (Mongo telemetry
+// collection in drawbridge-api).
 
 const logger = Sentry.logger;
 
+// Build a per-service logger. Pino does the local write (pretty stdout in
+// non-production, JSON in production); Sentry.pinoIntegration in init()
+// auto-captures the same lines as Sentry Logs with active-scope tags
+// (user / organization / traceId / route / method) already attached.
+//
+//   info / warn   – structured log line
+//   error         – log line; if first arg is Error (or `data.err` is),
+//                   also calls Sentry.captureException so the throw lands
+//                   in Sentry Issues with the same scope context
+//   emit(n, d)    – emits a Pino info line tagged `event:<n>`, then calls
+//                   eventWriter( name, { traceId, userId, organizationId,
+//                   data }) so the caller can persist to its store
+//                   (drawbridge-api wraps controller.create with the
+//                   `telemetry` collection)
+//
+// Reads traceId / userId / organizationId from the active Sentry isolation
+// scope so call sites pass only the event-specific payload.
+
+const createLogger = ({ eventWriter, level = 'info' } = {}) => {
+
+	const isProd = process.env.SENTRY_ENVIRONMENT === 'production';
+
+	const pinoConfig = isProd
+		? { level }
+		: {
+			level,
+			transport : {
+				target : 'pino-pretty',
+				options : {
+					colorize : true,
+					translateTime : 'SYS:standard'
+				}
+			}
+		};
+
+	const log = pino( pinoConfig );
+
+	const info = ( message, data = {} ) => log.info( data, message );
+
+	const warn = ( message, data = {} ) => log.warn( data, message );
+
+	const error = ( first, second ) => {
+
+		if( first instanceof Error ){
+
+			Sentry.captureException( first, second );
+
+			log.error(
+				{ err : first, ...second },
+				first.message
+			);
+
+		} else if( second?.err instanceof Error ){
+
+			Sentry.captureException( second.err );
+
+			log.error( second, first );
+
+		} else {
+
+			log.error( second || {}, first );
+
+		}
+
+	};
+
+	const emit = async ( name, data = {} ) => {
+
+		const scope = Sentry.getIsolationScope();
+		const scopeData = scope?.getScopeData?.();
+
+		const traceId = scopeData?.tags?.traceId;
+		const userId = scopeData?.user?.id;
+		const organizationId = scopeData?.tags?.organization;
+
+		log.info(
+			{ event : name, traceId, userId, organizationId, ...data },
+			'event:' + name
+		);
+
+		if( eventWriter ){
+
+			await eventWriter( name, {
+				traceId,
+				userId,
+				organizationId,
+				data
+			});
+
+		}
+
+	};
+
+	return { info, warn, error, emit };
+
+};
+
 // Diagnostic process-level handlers. Surfaces unhandled async errors to
 // Sentry (without these, modern Node defaults silently exit) and logs
 // exit-path signals to stderr so an operator can diagnose crashes.
@@ -119,4 +231,4 @@ const currentTraceId = () => {
 
 };
 
-export { attachProcessHandlers, captureException, captureMessage, currentTraceId, init, logger, withTraceScope };
+export { attachProcessHandlers, captureException, captureMessage, createLogger, currentTraceId, init, logger, withTraceScope };

package/dist/index.d.ts

@@ -1,12 +1,18 @@
 import * as Sentry from '@sentry/node';
 export { Sentry };
+import pino from 'pino';
 
 // Project-standard Sentry.init wrapper. Sets the conventions used across
 // drawbridge-api / -sync / -webhooks (enableLogs, tracesSampleRate,
-// profilesSampleRate, environment) so each service's init call collapses
-// to dsn + any overrides.
+// profilesSampleRate, environment, pinoIntegration) so each service's init
+// call collapses to dsn + any overrides.
 //
-// Defaults are conservative. Override per service as needed.
+// pinoIntegration() ships with @sentry/node >=10.18 — captures pino logger
+// output as Sentry Logs with the active scope tags attached. Required for
+// createLogger() to flow through to Sentry.
+//
+// Defaults are conservative. Override per service as needed. Consumer-passed
+// integrations append to ours rather than replacing them.
 
 const init = ( config = {} ) => Sentry.init({
 	dsn : process.env.SENTRY_DSN,
@@ -14,7 +20,11 @@ const init = ( config = {} ) => Sentry.init({
 	environment : process.env.SENTRY_ENVIRONMENT || 'localhost',
 	tracesSampleRate : 0.1,
 	profilesSampleRate : 0.05,
-	...config
+	...config,
+	integrations : [
+		Sentry.pinoIntegration(),
+		...( config.integrations || [] )
+	]
 });
 
 // Named re-exports of the Sentry surface services actually use. Keep this
@@ -24,11 +34,113 @@ const captureException = ( error, options ) => Sentry.captureException( error, o
 
 const captureMessage = ( message, options ) => Sentry.captureMessage( message, options );
 
-// Sentry.logger is the structured-logs surface (ships to Sentry Logs).
-// Exposed as `logger` so callers do `logger.info(...)` / `logger.error(...)`.
+// Sentry.logger is the raw structured-logs surface (ships to Sentry Logs).
+// Exposed as `logger` for one-off `logger.info(...)` / `logger.error(...)`
+// without instantiating a per-service Pino instance. Prefer createLogger()
+// in service code — it adds pretty local stdout, Sentry.captureException
+// dispatch for Error-typed args, and the .event() method for writing
+// domain events to a service-provided eventWriter (Mongo telemetry
+// collection in drawbridge-api).
 
 const logger = Sentry.logger;
 
+// Build a per-service logger. Pino does the local write (pretty stdout in
+// non-production, JSON in production); Sentry.pinoIntegration in init()
+// auto-captures the same lines as Sentry Logs with active-scope tags
+// (user / organization / traceId / route / method) already attached.
+//
+//   info / warn   – structured log line
+//   error         – log line; if first arg is Error (or `data.err` is),
+//                   also calls Sentry.captureException so the throw lands
+//                   in Sentry Issues with the same scope context
+//   emit(n, d)    – emits a Pino info line tagged `event:<n>`, then calls
+//                   eventWriter( name, { traceId, userId, organizationId,
+//                   data }) so the caller can persist to its store
+//                   (drawbridge-api wraps controller.create with the
+//                   `telemetry` collection)
+//
+// Reads traceId / userId / organizationId from the active Sentry isolation
+// scope so call sites pass only the event-specific payload.
+
+const createLogger = ({ eventWriter, level = 'info' } = {}) => {
+
+	const isProd = process.env.SENTRY_ENVIRONMENT === 'production';
+
+	const pinoConfig = isProd
+		? { level }
+		: {
+			level,
+			transport : {
+				target : 'pino-pretty',
+				options : {
+					colorize : true,
+					translateTime : 'SYS:standard'
+				}
+			}
+		};
+
+	const log = pino( pinoConfig );
+
+	const info = ( message, data = {} ) => log.info( data, message );
+
+	const warn = ( message, data = {} ) => log.warn( data, message );
+
+	const error = ( first, second ) => {
+
+		if( first instanceof Error ){
+
+			Sentry.captureException( first, second );
+
+			log.error(
+				{ err : first, ...second },
+				first.message
+			);
+
+		} else if( second?.err instanceof Error ){
+
+			Sentry.captureException( second.err );
+
+			log.error( second, first );
+
+		} else {
+
+			log.error( second || {}, first );
+
+		}
+
+	};
+
+	const emit = async ( name, data = {} ) => {
+
+		const scope = Sentry.getIsolationScope();
+		const scopeData = scope?.getScopeData?.();
+
+		const traceId = scopeData?.tags?.traceId;
+		const userId = scopeData?.user?.id;
+		const organizationId = scopeData?.tags?.organization;
+
+		log.info(
+			{ event : name, traceId, userId, organizationId, ...data },
+			'event:' + name
+		);
+
+		if( eventWriter ){
+
+			await eventWriter( name, {
+				traceId,
+				userId,
+				organizationId,
+				data
+			});
+
+		}
+
+	};
+
+	return { info, warn, error, emit };
+
+};
+
 // Diagnostic process-level handlers. Surfaces unhandled async errors to
 // Sentry (without these, modern Node defaults silently exit) and logs
 // exit-path signals to stderr so an operator can diagnose crashes.
@@ -119,4 +231,4 @@ const currentTraceId = () => {
 
 };
 
-export { attachProcessHandlers, captureException, captureMessage, currentTraceId, init, logger, withTraceScope };
+export { attachProcessHandlers, captureException, captureMessage, createLogger, currentTraceId, init, logger, withTraceScope };

package/dist/index.js

@@ -3,16 +3,18 @@ import {
   attachProcessHandlers,
   captureException,
   captureMessage,
+  createLogger,
   currentTraceId,
   init,
   logger,
   withTraceScope
-} from "./chunk-O6EHU4U7.js";
+} from "./chunk-CODZHH5I.js";
 export {
   Sentry,
   attachProcessHandlers,
   captureException,
   captureMessage,
+  createLogger,
   currentTraceId,
   init,
   logger,

package/dist/nextjs.cjs

@@ -16,6 +16,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
   // If the importer is in node compatibility mode or this is not an ESM
   // file that has been converted to a CommonJS file using a Babel-
@@ -34,12 +35,11 @@ __export(nextjs_exports, {
   captureMessage: () => captureMessage2,
   captureRequestError: () => captureRequestError2,
   init: () => init2,
-  logger: () => logger2,
-  withSentryConfig: () => import_nextjs.withSentryConfig
+  logger: () => logger2
 });
 module.exports = __toCommonJS(nextjs_exports);
 var Sentry = __toESM(require("@sentry/nextjs"), 1);
-var import_nextjs = require("@sentry/nextjs");
+__reExport(nextjs_exports, require("@sentry/nextjs"), module.exports);
 var init2 = (config = {}) => Sentry.init({
   dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
   enableLogs: true,
@@ -59,5 +59,5 @@ var logger2 = Sentry.logger;
   captureRequestError,
   init,
   logger,
-  withSentryConfig
+  ...require("@sentry/nextjs")
 });

package/dist/nextjs.d.cts

@@ -1,6 +1,6 @@
 import * as Sentry from '@sentry/nextjs';
+export * from '@sentry/nextjs';
 export { Sentry };
-export { withSentryConfig } from '@sentry/nextjs';
 
 // @sentry/nextjs surface routed through drawbridge-telemetry so consumer
 // apps (drawbridge-app-web, drawbridge-share) never import @sentry/nextjs

package/dist/nextjs.d.ts

@@ -1,6 +1,6 @@
 import * as Sentry from '@sentry/nextjs';
+export * from '@sentry/nextjs';
 export { Sentry };
-export { withSentryConfig } from '@sentry/nextjs';
 
 // @sentry/nextjs surface routed through drawbridge-telemetry so consumer
 // apps (drawbridge-app-web, drawbridge-share) never import @sentry/nextjs

package/dist/nextjs.js

@@ -1,6 +1,6 @@
 // nextjs.js
 import * as Sentry from "@sentry/nextjs";
-import { withSentryConfig } from "@sentry/nextjs";
+export * from "@sentry/nextjs";
 var init2 = (config = {}) => Sentry.init({
   dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
   enableLogs: true,
@@ -18,6 +18,5 @@ export {
   captureMessage2 as captureMessage,
   captureRequestError2 as captureRequestError,
   init2 as init,
-  logger2 as logger,
-  withSentryConfig
+  logger2 as logger
 };

package/package.json

@@ -2,7 +2,9 @@
   "type": "module",
   "dependencies": {
     "@drawbridge/drawbridge-agents": "0.0.4",
-    "@sentry/node": "10.27.0"
+    "@sentry/node": "10.27.0",
+    "pino": "10.3.1",
+    "pino-pretty": "13.1.3"
   },
   "peerDependencies": {
     "@sentry/nextjs": ">=10"
@@ -58,5 +60,5 @@
     "build": "tsup && npm publish"
   },
   "types": "dist/index.d.ts",
-  "version": "0.0.5"
+  "version": "0.0.7"
 }