@zintrust/trace 0.5.2 → 0.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/trace",
-  "version": "0.5.2",
+  "version": "0.5.5",
   "description": "Trace assistant for ZinTrust: logs requests, queries, exceptions, jobs, and more.",
   "private": false,
   "type": "module",
@@ -40,7 +40,7 @@
     "node": ">=20.0.0"
   },
   "peerDependencies": {
-    "@zintrust/core": "^0.5.1"
+    "@zintrust/core": "^0.5.2"
   },
   "publishConfig": {
     "access": "public"
@@ -56,4 +56,4 @@
     "build": "tsc -p tsconfig.json && tsc -p tsconfig.migrations.json && node ../../scripts/fix-dist-esm-imports.mjs dist",
     "prepublishOnly": "npm run build"
   }
-}
+}

package/src/config.ts

@@ -6,6 +6,7 @@ import type {
   TraceClientRequestCaptureRule,
   TraceClientRequestWatcherToggle,
   TraceConfigOverrides,
+  TraceContentDispatchConfig,
   TraceFilterRule,
   TraceRequestWatcherConfig,
   TraceWatcherToggle,
@@ -233,6 +234,25 @@ const mergeWatchers = (
   };
 };
 
+const mergeContentDispatch = (
+  base: TraceContentDispatchConfig,
+  override?: TraceConfigOverrides['contentDispatch']
+): TraceContentDispatchConfig => {
+  const workerOverride = override?.worker;
+
+  return {
+    ...base,
+    ...override,
+    worker:
+      workerOverride === undefined
+        ? base.worker
+        : {
+            ...base.worker,
+            ...workerOverride,
+          },
+  };
+};
+
 const DEFAULTS: ITraceConfig = Object.freeze({
   enabled: false,
   connection: undefined,
@@ -243,6 +263,17 @@ const DEFAULTS: ITraceConfig = Object.freeze({
   captureCachePayloads: false,
   captureQueryBindings: true,
   logMinLevel: 'info',
+  contentDispatch: {
+    driver: undefined,
+    queueName: 'trace-content',
+    enqueueTimeoutMs: 25,
+    worker: {
+      enabled: true,
+      intervalMs: 1000,
+      maxDurationMs: 250,
+      concurrency: 1,
+    },
+  },
   watchers: {},
   redaction: {
     keys: [
@@ -310,6 +341,7 @@ export const TraceConfig = Object.freeze({
     return Object.freeze({
       ...DEFAULTS,
       ...overrides,
+      contentDispatch: mergeContentDispatch(DEFAULTS.contentDispatch, overrides.contentDispatch),
       watchers: mergeWatchers(DEFAULTS.watchers, overrides.watchers),
       redaction: {
         keys: mergeStringLists(DEFAULTS.redaction.keys, overrides.redaction?.keys),

package/src/index.ts

@@ -94,6 +94,8 @@ export type {
   RequestContent,
   ScheduleContent,
   TraceConfigOverrides,
+  TraceContentDispatchConfig,
+  TraceContentDispatchWorkerConfig,
   ViewContent,
   WatcherToggles,
 } from './types';

package/src/register.ts

@@ -309,6 +309,28 @@ if (!traceAlreadyInitialized && Env) {
     const logMinLevelRaw = Env.get('TRACE_LOG_LEVEL', '').trim();
     const captureCachePayloadsRaw = Env.get('TRACE_CACHE_PAYLOADS', '').trim();
     const captureQueryBindingsRaw = Env.get('TRACE_QUERY_BINDINGS', '').trim();
+    const contentDispatchDriverRaw = Env.get('TRACE_CONTENT_QUEUE_DRIVER', '').trim();
+    const contentDispatchQueueRaw = Env.get('TRACE_CONTENT_QUEUE_NAME', '').trim();
+    const contentDispatchEnqueueTimeoutRaw = Env.get(
+      'TRACE_CONTENT_QUEUE_ENQUEUE_TIMEOUT_MS',
+      ''
+    ).trim();
+    const contentDispatchWorkerEnabledRaw = Env.get(
+      'TRACE_CONTENT_QUEUE_WORKER_ENABLED',
+      ''
+    ).trim();
+    const contentDispatchWorkerIntervalRaw = Env.get(
+      'TRACE_CONTENT_QUEUE_WORKER_INTERVAL_MS',
+      ''
+    ).trim();
+    const contentDispatchWorkerDurationRaw = Env.get(
+      'TRACE_CONTENT_QUEUE_WORKER_MAX_DURATION_MS',
+      ''
+    ).trim();
+    const contentDispatchWorkerConcurrencyRaw = Env.get(
+      'TRACE_CONTENT_QUEUE_WORKER_CONCURRENCY',
+      ''
+    ).trim();
     const redactionKeys = parseEnvList(Env.get('TRACE_REDACT_KEYS', ''));
     const redactionHeaders = parseEnvList(Env.get('TRACE_REDACT_HEADERS', ''));
     const redactionBody = parseEnvList(Env.get('TRACE_REDACT_BODY', ''));
@@ -335,6 +357,33 @@ if (!traceAlreadyInitialized && Env) {
       parseEnvBool(captureCachePayloadsRaw) ?? startupOverrides?.captureCachePayloads;
     const captureQueryBindings =
       parseEnvBool(captureQueryBindingsRaw) ?? startupOverrides?.captureQueryBindings;
+    const contentDispatchDriver =
+      contentDispatchDriverRaw === ''
+        ? startupOverrides?.contentDispatch?.driver
+        : contentDispatchDriverRaw;
+    const contentDispatchQueueName =
+      contentDispatchQueueRaw === ''
+        ? startupOverrides?.contentDispatch?.queueName
+        : contentDispatchQueueRaw;
+    const contentDispatchEnqueueTimeout =
+      contentDispatchEnqueueTimeoutRaw === ''
+        ? startupOverrides?.contentDispatch?.enqueueTimeoutMs
+        : Number.parseInt(contentDispatchEnqueueTimeoutRaw, 10);
+    const contentDispatchWorkerEnabled =
+      parseEnvBool(contentDispatchWorkerEnabledRaw) ??
+      startupOverrides?.contentDispatch?.worker?.enabled;
+    const contentDispatchWorkerInterval =
+      contentDispatchWorkerIntervalRaw === ''
+        ? startupOverrides?.contentDispatch?.worker?.intervalMs
+        : Number.parseInt(contentDispatchWorkerIntervalRaw, 10);
+    const contentDispatchWorkerDuration =
+      contentDispatchWorkerDurationRaw === ''
+        ? startupOverrides?.contentDispatch?.worker?.maxDurationMs
+        : Number.parseInt(contentDispatchWorkerDurationRaw, 10);
+    const contentDispatchWorkerConcurrency =
+      contentDispatchWorkerConcurrencyRaw === ''
+        ? startupOverrides?.contentDispatch?.worker?.concurrency
+        : Number.parseInt(contentDispatchWorkerConcurrencyRaw, 10);
     const redaction = buildTraceRedactionOverrides({
       startupOverrides,
       redactionBody,
@@ -342,6 +391,9 @@ if (!traceAlreadyInitialized && Env) {
       redactionKeys,
       redactionQuery,
     });
+    const defaultContentDispatch = TraceConfig.defaults().contentDispatch;
+    const startupContentDispatch = startupOverrides?.contentDispatch;
+    const startupContentDispatchWorker = startupContentDispatch?.worker;
 
     const config = TraceConfig.merge({
       ...startupOverrides,
@@ -356,6 +408,46 @@ if (!traceAlreadyInitialized && Env) {
         : {}),
       ...(typeof captureCachePayloads === 'boolean' ? { captureCachePayloads } : {}),
       ...(typeof captureQueryBindings === 'boolean' ? { captureQueryBindings } : {}),
+      contentDispatch: {
+        ...defaultContentDispatch,
+        ...startupContentDispatch,
+        ...(typeof contentDispatchDriver === 'string' && contentDispatchDriver !== ''
+          ? { driver: contentDispatchDriver }
+          : {}),
+        ...(typeof contentDispatchQueueName === 'string' && contentDispatchQueueName !== ''
+          ? { queueName: contentDispatchQueueName }
+          : {}),
+        ...(typeof contentDispatchEnqueueTimeout === 'number' &&
+        Number.isFinite(contentDispatchEnqueueTimeout)
+          ? { enqueueTimeoutMs: contentDispatchEnqueueTimeout }
+          : {}),
+        worker: {
+          ...defaultContentDispatch.worker,
+          ...startupContentDispatchWorker,
+          enabled:
+            typeof contentDispatchWorkerEnabled === 'boolean'
+              ? contentDispatchWorkerEnabled
+              : (startupContentDispatchWorker?.enabled ?? defaultContentDispatch.worker.enabled),
+          intervalMs:
+            typeof contentDispatchWorkerInterval === 'number' &&
+            Number.isFinite(contentDispatchWorkerInterval)
+              ? contentDispatchWorkerInterval
+              : (startupContentDispatchWorker?.intervalMs ??
+                defaultContentDispatch.worker.intervalMs),
+          maxDurationMs:
+            typeof contentDispatchWorkerDuration === 'number' &&
+            Number.isFinite(contentDispatchWorkerDuration)
+              ? contentDispatchWorkerDuration
+              : (startupContentDispatchWorker?.maxDurationMs ??
+                defaultContentDispatch.worker.maxDurationMs),
+          concurrency:
+            typeof contentDispatchWorkerConcurrency === 'number' &&
+            Number.isFinite(contentDispatchWorkerConcurrency)
+              ? contentDispatchWorkerConcurrency
+              : (startupContentDispatchWorker?.concurrency ??
+                defaultContentDispatch.worker.concurrency),
+        },
+      },
       logMinLevel,
       ...(redaction === undefined ? {} : { redaction }),
     });
@@ -384,7 +476,8 @@ if (!traceAlreadyInitialized && Env) {
         TraceContentRedaction.wrapStorage(
           TraceEntryFiltering.wrapStorage(TraceStorage.resolveStorage(storageDb), config),
           config.redaction
-        )
+        ),
+        config
       ),
       {
         connectionName: resolvedConnectionName,