@reproapp/node-sdk 0.0.47 → 0.0.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reproapp/node-sdk",
-  "version": "0.0.47",
+  "version": "0.0.48",
   "description": "Repro Nest SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,8 +12,8 @@
     "build": "tsc -p tsconfig.json",
     "dev": "tsc -p tsconfig.json --watch --preserveWatchOutput",
     "prepublishOnly": "npm run build",
-    "test": "npm run build && node test/trace-source-exclude.test.js && node test/unawaited.test.js && node test/integration-unawaited.js && node test/request-flush-timing.test.js && node test/request-capture-background.test.js && node test/init-auto-http-server.test.js && node test/backend-live-mode.test.js && node test/client-performance-regression.test.js && node test/request-manifest-priority.test.js && node test/runtime-no-double-invoke.test.js && node test/express-trace-http-args.test.js && node test/trace-batch-size.test.js && node test/sdk-background-priority.test.js && node test/sdk-background-timeout-isolation.test.js && node test/runtime-service-registration.test.js && node test/ingest-queue-retention.test.js && node test/ingest-high-priority-retention.test.js && node test/ingest-high-priority-fairness.test.js && node test/ingest-critical-retention.test.js && node test/ingest-critical-retry-retention.test.js && node test/ingest-batching.test.js && node test/ingest-timeout.test.js && node -r ./tracer/register test/promise-map.test.js && node test/disable-subtree.test.js && node test/circular-capture.test.js && node test/wrap-plugin-arrow-args.test.js && node test/wrap-plugin-super-call.test.js && node test/function-arg-identity.test.js && node test/privacy-service-scope.test.js && node test/privacy-policy-index.test.js && node test/policy-capture-attestation.test.js && node test/privacy-runtime-policy.test.js && node test/runtime-privacy-materialization.test.js && node test/kafka-runtime-privacy-policy.test.js && node test/amqplib-integration.test.js && node test/mongodb-integration.test.js && node test/mongodb-esm-import-hook.test.js && node test/mongodb-suppression-cleanup.test.js && node test/postgresql-integration.test.js",
-    "test:containers": "npm run build && node test/runtime-no-double-invoke.testcontainers.test.js && node test/wrap-plugin-super-call.testcontainers.test.js && node test/function-arg-identity.testcontainers.test.js && node test/mongodb-mongoose-native-suppression.testcontainers.test.js && node test/policy-session-completion.testcontainers.test.js && node test/postgresql-integrations.testcontainers.test.js"
+    "test": "npm run build && node test/semantic-serialization.test.js && node test/semantic-serialization-trace.test.js && node test/content-addressed-trace-values.test.js && node test/session-storage-budget.test.js && node test/trace-source-exclude.test.js && node test/unawaited.test.js && node test/integration-unawaited.js && node test/request-flush-timing.test.js && node test/request-capture-background.test.js && node test/init-auto-http-server.test.js && node test/backend-live-mode.test.js && node test/client-performance-regression.test.js && node test/request-manifest-priority.test.js && node test/runtime-no-double-invoke.test.js && node test/express-trace-http-args.test.js && node test/trace-batch-size.test.js && node test/sdk-background-priority.test.js && node test/sdk-background-timeout-isolation.test.js && node test/runtime-service-registration.test.js && node test/ingest-queue-retention.test.js && node test/ingest-high-priority-retention.test.js && node test/ingest-high-priority-fairness.test.js && node test/ingest-critical-retention.test.js && node test/ingest-critical-retry-retention.test.js && node test/ingest-batching.test.js && node test/ingest-timeout.test.js && node -r ./tracer/register test/promise-map.test.js && node test/disable-subtree.test.js && node test/circular-capture.test.js && node test/wrap-plugin-arrow-args.test.js && node test/wrap-plugin-super-call.test.js && node test/function-arg-identity.test.js && node test/privacy-service-scope.test.js && node test/privacy-policy-index.test.js && node test/policy-capture-attestation.test.js && node test/privacy-runtime-policy.test.js && node test/runtime-privacy-materialization.test.js && node test/kafka-runtime-privacy-policy.test.js && node test/amqplib-integration.test.js && node test/mongodb-integration.test.js && node test/mongodb-esm-import-hook.test.js && node test/mongodb-suppression-cleanup.test.js && node test/postgresql-integration.test.js",
+    "test:containers": "npm run build && node test/runtime-no-double-invoke.testcontainers.test.js && node test/wrap-plugin-super-call.testcontainers.test.js && node test/function-arg-identity.testcontainers.test.js && node test/mongodb-mongoose-native-suppression.testcontainers.test.js && node test/content-addressed-mongodb.testcontainers.test.js && node test/policy-session-completion.testcontainers.test.js && node test/postgresql-integrations.testcontainers.test.js"
   },
   "peerDependencies": {
     "express": "^5.1.0",

package/src/index.ts

@@ -2,7 +2,7 @@ import type { Request, Response, NextFunction } from 'express';
 import type { Schema, Model, Query } from 'mongoose';
 import * as mongoose from 'mongoose';
 import { AsyncLocalStorage } from 'async_hooks';
-import { randomUUID } from 'crypto';
+import { createHmac, randomUUID } from 'crypto';
 import { createRequire } from 'module';
 import { join } from 'path';
 import { pathToFileURL } from 'url';
@@ -28,6 +28,7 @@ import {
     type RuntimePrivacySurface,
     type RuntimePrivacyTraceContext,
 } from './privacy';
+import { projectSemanticInfrastructureValue } from './semantic-serialization';
 
 /**
  * ============================= IMPORTANT =============================
@@ -418,6 +419,7 @@ type TraceValueBatchEntry = {
 };
 
 type TraceMaterializationConfig = {
+    tenantId: string;
     appId: string;
     appSecret?: string;
     appName?: string;
@@ -431,6 +433,7 @@ type TraceMaterializationWorkerPayload = {
     masking: NormalizedMaskingConfig | null;
     privacy: NormalizedRuntimePrivacyPolicy | null;
     fullValueCaptureEnabled: boolean;
+    valueNamespace?: string;
 };
 
 type TraceMaterializationWorkerRequest = {
@@ -1224,6 +1227,7 @@ type RequestCaptureScopeState = {
     privacyMode: 'policy' | 'fallback' | 'raw';
     privacyPolicyFingerprint?: string;
     privacyStatementCount: number;
+    emittedValueDefinitionIds: Set<string>;
 };
 
 function createRequestCaptureScope(
@@ -1251,6 +1255,7 @@ function createRequestCaptureScope(
         privacyMode,
         privacyPolicyFingerprint: privacy?.fingerprint,
         privacyStatementCount: privacy?.statements.length ?? 0,
+        emittedValueDefinitionIds: new Set(),
     };
 }
 
@@ -2828,7 +2833,11 @@ const TRACE_MAX_EVENTS_PER_REQUEST = (() => {
 const TRACE_MAX_BATCHES_PER_REQUEST = (() => {
     const env = Number(process.env.REPRO_TRACE_MAX_BATCHES_PER_REQUEST);
     if (Number.isFinite(env) && env > 0) return Math.trunc(env);
-    return Math.ceil(TRACE_MAX_EVENTS_PER_REQUEST / TRACE_BATCH_SIZE);
+    // Byte-based splitting can legitimately produce one batch per event when
+    // every event owns a distinct large value. The event limit remains the
+    // hard upper bound; deriving this from the count-only batch size silently
+    // dropped otherwise valid events after ten batches.
+    return TRACE_MAX_EVENTS_PER_REQUEST;
 })();
 const TRACE_FLUSH_DELAY_MS = 20;
 // Choose how to order trace events in payloads.
@@ -3180,6 +3189,17 @@ function sanitizeTraceValue(
     const mongoPlaceholder = describeMongoPlaceholder(value);
     if (mongoPlaceholder) return mongoPlaceholder;
 
+    const semanticProjection = projectSemanticInfrastructureValue(value);
+    if (semanticProjection) {
+        return sanitizeTraceValue(
+            semanticProjection.value,
+            depth,
+            seen,
+            options,
+            valuePath,
+        );
+    }
+
     if (isThenable(value)) {
         return { __type: 'Promise', state: 'pending' };
     }
@@ -3403,6 +3423,7 @@ async function materializePendingTraceEvents(
         masking: NormalizedMaskingConfig | null;
         resolvePrivacy: () => NormalizedRuntimePrivacyPolicy | null;
         captureScope?: RequestCaptureScopeState | null;
+        valueNamespace?: string;
     },
 ): Promise<TraceEventRecord[]> {
     for (const evt of events) {
@@ -3420,6 +3441,7 @@ async function materializePendingTraceEvents(
             trace: candidate,
             masking: params.masking,
             privacy: activePrivacy,
+            valueNamespace: params.valueNamespace,
         };
         const traceValueMetadata = {
             fn: evt.fn,
@@ -3556,6 +3578,7 @@ async function materializePendingTraceEventsAsync(
         masking: NormalizedMaskingConfig | null;
         resolvePrivacy: () => NormalizedRuntimePrivacyPolicy | null;
         captureScope?: RequestCaptureScopeState | null;
+        valueNamespace?: string;
     },
 ): Promise<TraceEventRecord[]> {
     if (!events.some((evt) => evt.__reproPending)) {
@@ -3583,6 +3606,7 @@ async function materializePendingTraceEventsAsync(
         return await materializePendingTraceEventsOffThread(events, {
             events,
             cfg: {
+                tenantId: params.cfg.tenantId,
                 appId: params.cfg.appId,
                 appSecret: params.cfg.appSecret,
                 appName: params.cfg.appName,
@@ -3592,6 +3616,7 @@ async function materializePendingTraceEventsAsync(
             masking: params.masking,
             privacy,
             fullValueCaptureEnabled: __FULL_VALUE_CAPTURE_ENABLED,
+            valueNamespace: params.valueNamespace,
         });
     } catch (err) {
         try {
@@ -3627,6 +3652,7 @@ export async function __materializePendingTraceEventsForWorker(
             maskReq: payload.maskReq,
             masking: payload.masking,
             resolvePrivacy: () => payload.privacy,
+            valueNamespace: payload.valueNamespace,
         });
         return materialized.map((event) => {
             const entries = getEventTraceValueEntries(event);
@@ -4435,6 +4461,7 @@ type FullValueCaptureContext = {
     masking: NormalizedMaskingConfig | null;
     privacy: NormalizedRuntimePrivacyPolicy | null;
     db?: RuntimePrivacyDbContext | null;
+    valueNamespace?: string;
 };
 
 const TRACE_FULL_VALUE_ENTRY_SYMBOL = Symbol('repro.traceFullValueEntries');
@@ -4840,6 +4867,18 @@ function cloneFullValueCandidate(
     const mongoPlaceholder = describeMongoPlaceholder(value);
     if (mongoPlaceholder) return undefined;
 
+    const semanticProjection = projectSemanticInfrastructureValue(value);
+    if (semanticProjection) {
+        return cloneFullValueCandidate(
+            semanticProjection.value,
+            ctx,
+            limits,
+            depth,
+            seen,
+            valuePath,
+        );
+    }
+
     if (isThenable(value)) return undefined;
     if (shouldSkipFullValueObject(value)) return undefined;
 
@@ -5067,6 +5106,18 @@ async function cloneFullValueCandidateAsync(
     const mongoPlaceholder = describeMongoPlaceholder(value);
     if (mongoPlaceholder) return undefined;
 
+    const semanticProjection = projectSemanticInfrastructureValue(value);
+    if (semanticProjection) {
+        return cloneFullValueCandidateAsync(
+            semanticProjection.value,
+            ctx,
+            limits,
+            depth,
+            seen,
+            valuePath,
+        );
+    }
+
     if (isThenable(value)) return undefined;
     if (shouldSkipFullValueObject(value)) return undefined;
 
@@ -5213,12 +5264,18 @@ function getEventTraceValueEntries(event: TraceEventRecord | PendingTraceEventRe
     return undefined;
 }
 
-function collectBatchTraceValueEntries(batch: TraceEventRecord[], batchIndex: number): TraceValueBatchEntry[] {
+function collectBatchTraceValueEntries(
+    batch: TraceEventRecord[],
+    batchIndex: number,
+    emittedValueIds: Set<string> = new Set(),
+): TraceValueBatchEntry[] {
     const collected: TraceValueBatchEntry[] = [];
     batch.forEach((event, eventIndex) => {
         const entries = getEventTraceValueEntries(event);
         if (!Array.isArray(entries) || !entries.length) return;
         entries.forEach((entry) => {
+            if (emittedValueIds.has(entry.id)) return;
+            emittedValueIds.add(entry.id);
             collected.push({
                 ...entry,
                 batchIndex,
@@ -5237,13 +5294,44 @@ function serializedByteLength(value: any): number {
     }
 }
 
+function contentAddressedValueId(
+    target: TraceValueBatchEntry['target'],
+    candidateSerialized: string,
+    capture: FullValueCaptureContext,
+): string {
+    const config = capture.runtimeConfig;
+    const signingKey = String(
+        config.appSecret ||
+        `${config.tenantId || 'tenant'}:${config.appId || 'app'}`,
+    );
+    const namespace = String(
+        capture.valueNamespace ||
+        `${config.tenantId || 'tenant'}:${config.appId || 'app'}`,
+    );
+    const digest = createHmac('sha256', signingKey)
+        .update('repro-captured-value-v1\0')
+        .update(namespace)
+        .update('\0')
+        .update(target)
+        .update('\0')
+        .update(candidateSerialized)
+        .digest('hex')
+        .slice(0, 40);
+    return `rv1_${digest}`;
+}
+
 function estimateTraceBatchSerializedBytes(
     batch: TraceEventRecord[],
     requestRid: string,
     actionId: string | null | undefined,
     batchIndex: number,
+    previouslyEmittedValueIds: ReadonlySet<string> = new Set(),
 ): number {
-    const traceValues = collectBatchTraceValueEntries(batch, batchIndex);
+    const traceValues = collectBatchTraceValueEntries(
+        batch,
+        batchIndex,
+        new Set(previouslyEmittedValueIds),
+    );
     return serializedByteLength({
         actionId: actionId ?? null,
         trace: batch,
@@ -5267,15 +5355,26 @@ function chunkTraceEventsForTransport(
     const boundedEvents = boundTraceEventsForTransport(events);
     const countBatches = chunkArray(boundedEvents, TRACE_BATCH_SIZE);
     const sizedBatches: TraceEventRecord[][] = [];
+    const emittedValueIds = new Set<string>();
     let current: TraceEventRecord[] = [];
 
+    const commitCurrent = (): void => {
+        if (!current.length) return;
+        collectBatchTraceValueEntries(
+            current,
+            sizedBatches.length,
+            emittedValueIds,
+        );
+        sizedBatches.push(current);
+        current = [];
+    };
+
     for (const event of countBatches.flat()) {
         if (sizedBatches.length >= TRACE_MAX_BATCHES_PER_REQUEST) {
             break;
         }
         if (current.length >= TRACE_BATCH_SIZE) {
-            sizedBatches.push(current);
-            current = [];
+            commitCurrent();
             if (sizedBatches.length >= TRACE_MAX_BATCHES_PER_REQUEST) {
                 break;
             }
@@ -5287,15 +5386,15 @@ function chunkTraceEventsForTransport(
             requestRid,
             actionId,
             batchIndex,
+            emittedValueIds,
         );
 
         if (
             current.length > 0 &&
             estimatedBytes > TRACE_BATCH_MAX_SERIALIZED_BYTES
         ) {
-            sizedBatches.push(current);
+            commitCurrent();
             if (sizedBatches.length >= TRACE_MAX_BATCHES_PER_REQUEST) {
-                current = [];
                 break;
             }
             current = [event];
@@ -5309,7 +5408,7 @@ function chunkTraceEventsForTransport(
         current.length > 0 &&
         sizedBatches.length < TRACE_MAX_BATCHES_PER_REQUEST
     ) {
-        sizedBatches.push(current);
+        commitCurrent();
     }
 
     return sizedBatches;
@@ -5381,7 +5480,11 @@ function createCapturedValueEntry(
         return undefined;
     }
 
-    const valueId = randomUUID();
+    const valueId = contentAddressedValueId(
+        params.target,
+        candidateSerialized,
+        params.capture,
+    );
     const projectedKind =
         candidate && typeof candidate === 'object'
             ? ((candidate as Record<string, any>).__kind || (candidate as Record<string, any>).__type)
@@ -5463,7 +5566,11 @@ async function createCapturedValueEntryAsync(
         return undefined;
     }
 
-    const valueId = randomUUID();
+    const valueId = contentAddressedValueId(
+        params.target,
+        candidateSerialized,
+        params.capture,
+    );
     const projectedKind =
         candidate && typeof candidate === 'object'
             ? ((candidate as Record<string, any>).__kind || (candidate as Record<string, any>).__type)
@@ -5486,6 +5593,18 @@ async function createCapturedValueEntryAsync(
     };
 }
 
+function appendCapturedValueDefinition(
+    sink: TraceValueBatchEntry[],
+    entry: TraceValueBatchEntry | undefined,
+    captureScope?: RequestCaptureScopeState | null,
+): void {
+    if (!entry) return;
+    const emitted = captureScope?.emittedValueDefinitionIds;
+    if (emitted?.has(entry.id)) return;
+    emitted?.add(entry.id);
+    sink.push(entry);
+}
+
 function maybeCaptureRequestValue(
     params: {
         target: 'request.headers' | 'request.body' | 'request.params' | 'request.query' | 'response.body';
@@ -5497,9 +5616,7 @@ function maybeCaptureRequestValue(
 ): TraceValueCaptureRef | undefined {
     const result = createCapturedValueEntry(params);
     if (!result) return undefined;
-    if (result.entry) {
-        sink.push(result.entry);
-    }
+    appendCapturedValueDefinition(sink, result.entry);
     return result.captureRef;
 }
 
@@ -5526,9 +5643,7 @@ async function maybeCaptureRequestValueAsync(
         return { status: 'failed-policy' };
     }
     if (!result) return undefined;
-    if (result.entry) {
-        sink.push(result.entry);
-    }
+    appendCapturedValueDefinition(sink, result.entry, captureScope);
     return result.captureRef;
 }
 
@@ -5578,9 +5693,7 @@ function maybeCaptureDbValue(
 ): TraceValueCaptureRef | undefined {
     const result = createCapturedValueEntry(params);
     if (!result) return undefined;
-    if (result.entry) {
-        sink.push(result.entry);
-    }
+    appendCapturedValueDefinition(sink, result.entry);
     return result.captureRef;
 }
 
@@ -5607,9 +5720,7 @@ async function maybeCaptureDbValueAsync(
         return { status: 'failed-policy' };
     }
     if (!result) return undefined;
-    if (result.entry) {
-        sink.push(result.entry);
-    }
+    appendCapturedValueDefinition(sink, result.entry, captureScope);
     return result.captureRef;
 }
 
@@ -5664,7 +5775,7 @@ async function maybeCaptureDbValueFromCandidatesAsync(
         }
         if (!result) continue;
         if (result.entry) {
-            sink.push(result.entry);
+            appendCapturedValueDefinition(sink, result.entry, captureScope);
             return result.captureRef;
         }
         if (!skippedRef) {
@@ -6240,6 +6351,7 @@ export function reproMiddleware(cfg: ReproMiddlewareConfig) {
                             trace: endpointTraceCtx,
                             masking,
                             privacy: activePrivacy,
+                            valueNamespace: sid,
                         },
                     }, requestValueEntries, captureScope);
                 const paramsValueCapture = await maybeCaptureRequestValueAsync({
@@ -6253,6 +6365,7 @@ export function reproMiddleware(cfg: ReproMiddlewareConfig) {
                         trace: endpointTraceCtx,
                         masking,
                         privacy: activePrivacy,
+                        valueNamespace: sid,
                     },
                 }, requestValueEntries, captureScope);
                 const queryValueCapture = await maybeCaptureRequestValueAsync({
@@ -6266,6 +6379,7 @@ export function reproMiddleware(cfg: ReproMiddlewareConfig) {
                         trace: endpointTraceCtx,
                         masking,
                         privacy: activePrivacy,
+                        valueNamespace: sid,
                     },
                 }, requestValueEntries, captureScope);
                 const headersValueCapture = await maybeCaptureRequestValueAsync({
@@ -6279,6 +6393,7 @@ export function reproMiddleware(cfg: ReproMiddlewareConfig) {
                         trace: endpointTraceCtx,
                         masking,
                         privacy: activePrivacy,
+                        valueNamespace: sid,
                     },
                 }, requestValueEntries, captureScope);
                 const respBodyValueCapture = capturedBody === undefined
@@ -6294,6 +6409,7 @@ export function reproMiddleware(cfg: ReproMiddlewareConfig) {
                             trace: endpointTraceCtx,
                             masking,
                             privacy: activePrivacy,
+                            valueNamespace: sid,
                         },
                     }, requestValueEntries, captureScope);
 
@@ -6302,7 +6418,7 @@ export function reproMiddleware(cfg: ReproMiddlewareConfig) {
                         ? Math.max(0, finishedAt - t0)
                         : Date.now() - t0;
                 const requestPayload: Record<string, any> = {
-                    rid,
+            rid,
                     method: req.method,
                     url,
                     path,
@@ -6516,6 +6632,7 @@ export function reproMiddleware(cfg: ReproMiddlewareConfig) {
                                 masking,
                                 resolvePrivacy,
                                 captureScope,
+                                valueNamespace: sid,
                             });
                             const baseEvents = balanceTraceEvents(materializedEvents.slice());
                             const orderedEvents = TRACE_ORDER_MODE === 'tree'
@@ -6550,9 +6667,14 @@ export function reproMiddleware(cfg: ReproMiddlewareConfig) {
                         emitRequestCaptureManifest(traceBatches.length);
 
                         try {
+                            const emittedValueIds = new Set<string>();
                             for (let i = 0; i < traceBatches.length; i++) {
                                 const batch = traceBatches[i];
-                                const traceValues = collectBatchTraceValueEntries(batch, i);
+                                const traceValues = collectBatchTraceValueEntries(
+                                    batch,
+                                    i,
+                                    emittedValueIds,
+                                );
 
                                 post(captureCfg, sid, {
                                     entries: [{
@@ -7162,12 +7284,6 @@ function dehydrateComplexValue(value: any) {
         }
     } catch {}
 
-    const ctor = (value as any)?.constructor?.name;
-    if (ctor && ctor !== 'Object') {
-        const plain = safeJson(value);
-        if (plain !== undefined) return plain;
-    }
-
     return value;
 }
 
@@ -7242,6 +7358,7 @@ async function emitDbQueryAsync(cfg: any, sid?: string, aid?: string, payload?:
         masking: null,
         privacy,
         db: dbContext,
+        valueNamespace: sid,
     };
     const dbValues: TraceValueBatchEntry[] = [];
     const pkValueCapture = pkMaterialization.skipped ? undefined : await maybeCaptureDbValueAsync({
@@ -7249,37 +7366,37 @@ async function emitDbQueryAsync(cfg: any, sid?: string, aid?: string, payload?:
         rawValue: payload.pk,
         previewValue: pkPreview,
         capture,
-    }, dbValues);
+    }, dbValues, ctx.captureScope);
     const beforeValueCapture = beforeMaterialization.skipped ? undefined : await maybeCaptureDbValueAsync({
         target: 'db.before',
         rawValue: payload.before,
         previewValue: beforePreview,
         capture,
-    }, dbValues);
+    }, dbValues, ctx.captureScope);
     const afterValueCapture = afterMaterialization.skipped ? undefined : await maybeCaptureDbValueAsync({
         target: 'db.after',
         rawValue: payload.after,
         previewValue: afterPreview,
         capture,
-    }, dbValues);
+    }, dbValues, ctx.captureScope);
     const queryValueCapture = queryMaterialization.skipped ? undefined : await maybeCaptureDbValueAsync({
         target: 'db.query',
         rawValue: querySource,
         previewValue: queryPreview,
         capture,
-    }, dbValues);
+    }, dbValues, ctx.captureScope);
     const resultMetaValueCapture = resultMetaMaterialization.skipped ? undefined : await maybeCaptureDbValueFromCandidatesAsync({
         target: 'db.resultMeta',
         rawValues: buildResultMetaFullValueCandidates(payload.resultMetaRaw, resultMetaSource),
         previewValue: resultMetaPreview,
         capture,
-    }, dbValues);
+    }, dbValues, ctx.captureScope);
     const errorValueCapture = errorMaterialization.skipped ? undefined : await maybeCaptureDbValueAsync({
         target: 'db.error',
         rawValue: payload.error,
         previewValue: errorPreview,
         capture,
-    }, dbValues);
+    }, dbValues, ctx.captureScope);
     const dbEntry = attachSpanContext({
         type: payload.type ?? 'mongo',
         collection: payload.collection,
@@ -7884,6 +8001,7 @@ function recordKafkaTraceEvent(
         trace: candidate,
         masking,
         privacy,
+        valueNamespace: getCtx().sid,
     };
     const traceValueMetadata = {
         fn: evt.fn,
@@ -8052,6 +8170,7 @@ async function recordKafkaTraceEventAsync(
         maskReq,
         masking,
         resolvePrivacy: () => getRuntimePrivacyState(cfg).policy ?? null,
+        valueNamespace: getCtx().sid,
     });
     sink.push(...materializedEvents);
 }
@@ -8072,10 +8191,11 @@ function buildKafkaTraceEntries(
         requestRid,
         actionId,
     );
+    const emittedValueIds = new Set<string>();
     return batches.map((batch, index) => ({
         actionId: actionId ?? null,
         trace: batch,
-        traceValues: collectBatchTraceValueEntries(batch, index),
+        traceValues: collectBatchTraceValueEntries(batch, index, emittedValueIds),
         traceBatch: {
             rid: requestRid,
             index,
@@ -8117,6 +8237,7 @@ function scheduleKafkaTraceFlush(
                         masking,
                         resolvePrivacy: () => getRuntimePrivacyState(cfg).policy ?? null,
                         captureScope,
+                        valueNamespace: sid,
                     });
                     entries = buildKafkaTraceEntries(actionId, requestRid, materializedEvents);
                 }
@@ -11773,5 +11894,6 @@ export const __reproTestHooks = {
     estimateTraceBatchSerializedBytesForTest: estimateTraceBatchSerializedBytes,
     sanitizeTraceValueForPrivacyForTest: sanitizeTraceValueForPrivacy,
     sanitizeMaterializedTraceValueForTest: sanitizeMaterializedTraceValue,
+    projectSemanticInfrastructureValueForTest: projectSemanticInfrastructureValue,
     getEventTraceValueEntriesForTest: getEventTraceValueEntries,
 };