@zintrust/trace 0.4.79 → 0.4.82

package/src/watchers/MailWatcher.ts

@@ -1,22 +1,35 @@
 /**
- * MailWatcher — records mail dispatch intent.
- * Body is never captured; only to/subject/template.
+ * MailWatcher — records mail dispatch intent and rendered content.
  */
 import { TraceContext } from '../context';
 import type { ITraceWatcher, ITraceWatcherConfig, MailContent } from '../types';
 import { EntryType } from '../types';
+import { redactUnknown } from '../utils/redact';
 import { RequestFilter } from '../utils/requestFilter';
 
 let _storage: ITraceWatcherConfig['storage'] | null = null;
+let _redactionFields: string[] = [];
 let _ignoreRoutes: string[] = [];
 
-const emit = (to: string, subject: string, template?: string): void => {
+const emit = (
+  to: string,
+  subject: string,
+  template?: string,
+  text?: string,
+  html?: string
+): void => {
   if (!_storage) return;
   if (RequestFilter.shouldIgnoreCurrentRequest(_ignoreRoutes)) return;
   const content: MailContent = {
     to,
     subject,
     template,
+    ...(typeof text === 'string' && text !== ''
+      ? { text: redactUnknown(text, _redactionFields) as string }
+      : {}),
+    ...(typeof html === 'string' && html !== ''
+      ? { html: redactUnknown(html, _redactionFields) as string }
+      : {}),
     hostname: TraceContext.getHostname(),
   };
   _storage
@@ -38,9 +51,11 @@ export const MailWatcher: ITraceWatcher & { emit: typeof emit } = Object.freeze(
   register({ storage, config }: ITraceWatcherConfig): () => void {
     if (config.watchers.mail === false) return () => undefined;
     _storage = storage;
+    _redactionFields = [...config.redaction.keys, ...config.redaction.body];
     _ignoreRoutes = config.ignoreRoutes;
     return () => {
       _storage = null;
+      _redactionFields = [];
       _ignoreRoutes = [];
     };
   },

package/src/watchers/NotificationWatcher.ts

@@ -2,18 +2,30 @@ import { TraceContext } from '../context';
 import type { ITraceWatcher, ITraceWatcherConfig, NotificationContent } from '../types';
 import { EntryType } from '../types';
 import { AuthTag } from '../utils/authTag';
+import { redactUnknown } from '../utils/redact';
 import { RequestFilter } from '../utils/requestFilter';
 
 let _storage: ITraceWatcherConfig['storage'] | null = null;
+let _redactionFields: string[] = [];
 let _ignoreRoutes: string[] = [];
 
-const emit = (notification: string, channels: string[], notifiable?: string): void => {
+const emit = (
+  notification: string,
+  channels: string[],
+  notifiable?: string,
+  message?: string,
+  payload?: unknown
+): void => {
   if (!_storage) return;
   if (RequestFilter.shouldIgnoreCurrentRequest(_ignoreRoutes)) return;
   const content: NotificationContent = {
     notification,
     channels,
     notifiable,
+    ...(typeof message === 'string' && message !== ''
+      ? { message: redactUnknown(message, _redactionFields) as string }
+      : {}),
+    ...(payload === undefined ? {} : { payload: redactUnknown(payload, _redactionFields) }),
     hostname: TraceContext.getHostname(),
   };
   _storage
@@ -34,9 +46,11 @@ export const NotificationWatcher: ITraceWatcher & { emit: typeof emit } = Object
   register({ storage, config }: ITraceWatcherConfig): () => void {
     if (config.watchers.notification === false) return () => undefined;
     _storage = storage;
+    _redactionFields = [...config.redaction.keys, ...config.redaction.body];
     _ignoreRoutes = config.ignoreRoutes;
     return () => {
       _storage = null;
+      _redactionFields = [];
       _ignoreRoutes = [];
     };
   },

package/src/watchers/QueryWatcher.ts

@@ -36,7 +36,8 @@ export const QueryWatcher: ITraceWatcher = Object.freeze({
       if (isTraceStorageQuery(query)) return;
 
       const batchId = TraceContext.getBatchId();
-      const sql = bindingsInterpolated(query, params);
+      const includeBindings = config.captureQueryBindings !== false;
+      const sql = includeBindings ? bindingsInterpolated(query, params) : query;
       const roundedDuration = Math.round(duration * 100) / 100;
       const hash = TraceStorage.familyHash(query);
       const slow = roundedDuration >= config.slowQueryThreshold;
@@ -44,6 +45,9 @@ export const QueryWatcher: ITraceWatcher = Object.freeze({
       const content: QueryContent = {
         connection: 'default',
         sql,
+        statement: query,
+        ...(includeBindings ? { bindings: [...params] } : {}),
+        bindingsIncluded: includeBindings,
         time: roundedDuration,
         duration: roundedDuration,
         slow,