@zintrust/trace 1.6.2 → 1.6.4

package/dist/register.js

@@ -291,11 +291,6 @@ const createTraceWatcherArgs = async (core, Env, config) => {
     globalTraceRegisterState.__zintrust_system_trace_connection_name__ = resolvedConnectionName;
     globalTraceRegisterState.__zintrust_system_trace_observe_connection_name__ =
         resolvedObservedConnectionName;
-    const observedDb = core.useDatabase?.(undefined, resolvedObservedConnectionName);
-    assertTraceConnectionResolved(core, observedDb, {
-        connectionName: resolvedObservedConnectionName,
-        envKey: 'TRACE_QUERY_CONNECTION',
-    });
     let resolvedStorage;
     if (config.proxy.enabled) {
         resolvedStorage = ProxyTraceStorage.create({
@@ -315,6 +310,11 @@ const createTraceWatcherArgs = async (core, Env, config) => {
         await assertTraceStorageReady(core, storageDb, resolvedConnectionName);
         resolvedStorage = TraceStorage.resolveStorage(storageDb);
     }
+    const observedDb = core.useDatabase?.(undefined, resolvedObservedConnectionName);
+    assertTraceConnectionResolved(core, observedDb, {
+        connectionName: resolvedObservedConnectionName,
+        envKey: 'TRACE_QUERY_CONNECTION',
+    });
     const storage = TraceWriteDiagnostics.wrapStorage(TraceContentBudget.wrapStorage(TraceContentRedaction.wrapStorage(TraceEntryFiltering.wrapStorage(TraceServiceTag.wrapStorage(resolvedStorage, config), config), config.redaction), config), {
         connectionName: resolvedConnectionName,
         logger: core.Logger,

package/dist/storage/TraceEntryFiltering.js

@@ -2,7 +2,6 @@ import { TraceContext } from '../context.js';
 import { EntryType } from '../types.js';
 import { TraceEntryFilter } from '../utils/entryFilter.js';
 import { RequestFilter } from '../utils/requestFilter.js';
-const MAX_IGNORED_BATCHES = 512;
 const isObjectValue = (value) => {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 };
@@ -13,51 +12,27 @@ const getEntryUri = (entry) => {
     const uri = content?.['uri'];
     return typeof uri === 'string' && uri.trim() !== '' ? uri : undefined;
 };
-const createIgnoredBatchTracker = () => {
-    const ignoredBatchIds = new Set();
-    const ignoredBatchOrder = [];
-    const remember = (batchId) => {
-        if (ignoredBatchIds.has(batchId))
-            return;
-        ignoredBatchIds.add(batchId);
-        ignoredBatchOrder.push(batchId);
-        if (ignoredBatchOrder.length <= MAX_IGNORED_BATCHES)
-            return;
-        const evictedBatchId = ignoredBatchOrder.shift();
-        if (evictedBatchId !== undefined) {
-            ignoredBatchIds.delete(evictedBatchId);
-        }
-    };
-    const has = (batchId) => {
-        return ignoredBatchIds.has(batchId);
-    };
-    return Object.freeze({ has, remember });
-};
-const shouldDropForIgnoredRequest = (entry, config, tracker) => {
-    if (tracker.has(entry.batchId)) {
-        return true;
-    }
+const shouldDropForIgnoredRequest = (entry, config) => {
+    if (entry.type !== EntryType.REQUEST)
+        return false;
     const currentPath = TraceContext.getRequestPath();
     if (typeof currentPath === 'string' &&
         currentPath !== '' &&
         RequestFilter.matchesIgnoredPath(currentPath, config)) {
-        tracker.remember(entry.batchId);
         return true;
     }
     const uri = getEntryUri(entry);
     if (typeof uri === 'string' && RequestFilter.matchesIgnoredPath(uri, config)) {
-        tracker.remember(entry.batchId);
         return true;
     }
     return false;
 };
 export const TraceEntryFiltering = Object.freeze({
     wrapStorage(storage, config) {
-        const ignoredBatchTracker = createIgnoredBatchTracker();
         return Object.freeze({
             ...storage,
             async writeEntry(entry) {
-                if (shouldDropForIgnoredRequest(entry, config, ignoredBatchTracker))
+                if (shouldDropForIgnoredRequest(entry, config))
                     return;
                 if (!TraceEntryFilter.shouldCapture(entry, config))
                     return;

package/dist/watchers/QueryWatcher.js

@@ -5,7 +5,6 @@ import { TraceContext } from '../context.js';
 import { TraceStorage } from '../storage/index.js';
 import { EntryType } from '../types.js';
 import { AuthTag } from '../utils/authTag.js';
-import { RequestFilter } from '../utils/requestFilter.js';
 let _storage = null;
 let _config = null;
 const bindingsInterpolated = (sql, params) => {
@@ -29,8 +28,6 @@ const isTraceStorageQuery = (sql) => {
 const emit = (query, params, duration, connection = 'default') => {
     if (_storage === null || _config === null)
         return;
-    if (RequestFilter.shouldIgnoreCurrentRequest(_config.ignoreRoutes, _config.ignorePaths))
-        return;
     if (isTraceStorageQuery(query))
         return;
     const batchId = TraceContext.getBatchId();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zintrust/trace",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "description": "Trace assistant for ZinTrust: logs requests, queries, exceptions, jobs, and more.",
   "private": false,
   "type": "module",