fix(logger): let the request context own requestId and keep absent fields from erasing it

An explicit requestId on a line, or one bound with withMetadata, replaced the request context's id in the JSON line, and an undefined one deleted it, so a line could stop correlating with its request. Inside a request context the context's id is now authoritative, matching the OpenTelemetry export; a requestId passed with a line names the request only outside one. Undefined fields no longer erase fields the line already carries.

v2 chat logs its mothership request id as simRequestId. Request ids that defaulted to 'unknown' default to generateRequestId().

log-message-tag now sees optional calls, computed levels, withMetadata-derived loggers and log-named receivers, follows let prefixes, resolves names per function, and only treats an interpolated requestId or reqId, and log* helpers or .call(logger), as message sources.

Author: waleedlatif1

apps/sim/app/api/v2/chat/route.ts

@@ -200,7 +200,7 @@ export const POST = withRouteHandler(
 
     const messageId = generateId()
     const requestId = generateId()
-    let reqLogger = logger.withMetadata({ messageId, requestId })
+    let reqLogger = logger.withMetadata({ messageId, simRequestId: requestId })
 
     try {
       const workspaceAccess = await assertActiveWorkspaceAccess(workspaceId, userId)
@@ -284,7 +284,7 @@ export const POST = withRouteHandler(
         return v2Error('INTERNAL_ERROR', 'Internal server error')
       }
       const chatId = resolvedChat.chatId
-      reqLogger = logger.withMetadata({ chatId, messageId, requestId })
+      reqLogger = logger.withMetadata({ chatId, messageId, simRequestId: requestId })
 
       /**
        * Write this turn's display copy to the conversation the route just

apps/sim/ee/workspace-forking/lib/copy/cleanup-failed.ts

@@ -11,6 +11,7 @@ import { createLogger } from '@sim/logger'
 import { getErrorMessage } from '@sim/utils/errors'
 import { isRecordLike } from '@sim/utils/object'
 import { and, asc, eq, exists, gt, inArray, isNull, notExists, sql } from 'drizzle-orm'
+import { generateRequestId } from '@/lib/core/utils/request'
 import type { SubBlockRecord } from '@/lib/workflows/persistence/remap-internal-ids'
 import { invalidateDeployedStateCache } from '@/lib/workflows/persistence/utils'
 import {
@@ -116,7 +117,7 @@ export async function clearFailedForkResourceReferences(params: {
   deployedTargetWorkflowIds?: string[]
   requestId?: string
 }): Promise<{ cleared: number; clearingFailed: boolean }> {
-  const { childWorkspaceId, failures, requestId = 'unknown' } = params
+  const { childWorkspaceId, failures, requestId = generateRequestId() } = params
   if (failures.length === 0) return { cleared: 0, clearingFailed: false }
 
   const failedKnowledgeBaseIds = failures.flatMap((failure) =>

apps/sim/ee/workspace-forking/lib/copy/content-copy-runner.ts

@@ -3,6 +3,7 @@ import { createLogger } from '@sim/logger'
 import { getErrorMessage } from '@sim/utils/errors'
 import { isTriggerDevEnabled } from '@/lib/core/config/env-flags'
 import { runDetached } from '@/lib/core/utils/background'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { finishBackgroundWork } from '@/ee/workspace-forking/lib/background-work/store'
 import { clearFailedForkResourceReferences } from '@/ee/workspace-forking/lib/copy/cleanup-failed'
 import type { BlobCopyTask } from '@/ee/workspace-forking/lib/copy/copy-files'
@@ -219,7 +220,7 @@ export async function scheduleForkContentCopy(
   payload: ForkContentCopyPayload,
   options: { detachedLabel: string; requestId?: string }
 ): Promise<void> {
-  const { detachedLabel, requestId = 'unknown' } = options
+  const { detachedLabel, requestId = generateRequestId() } = options
   try {
     if (isTriggerDevEnabled) {
       const [{ forkContentCopyTask }, { tasks }, { resolveTriggerRegion }] = await Promise.all([

apps/sim/ee/workspace-forking/lib/copy/copy-files.ts

@@ -9,6 +9,7 @@ import {
   lockWorkspaceStorageForMutationInTx,
   resolveStorageBillingContext,
 } from '@/lib/billing/storage'
+import { generateRequestId } from '@/lib/core/utils/request'
 import type { DbOrTx } from '@/lib/db/types'
 import {
   allocateUniqueWorkspaceFileName,
@@ -270,7 +271,7 @@ export async function planForkFileCopies(params: {
  */
 export async function executeForkFileBlobCopies(
   blobTasks: BlobCopyTask[],
-  requestId = 'unknown',
+  requestId = generateRequestId(),
   contentRefMaps?: ForkContentRefMaps,
   control?: ForkCopyControl
 ): Promise<{ copied: number; failed: number; failedTargetKeys: string[] }> {

apps/sim/ee/workspace-forking/lib/copy/copy-resources.ts

@@ -42,6 +42,7 @@ import {
   type StorageBillingContext,
 } from '@/lib/billing/storage'
 import { mapWithConcurrency } from '@/lib/core/utils/concurrency'
+import { generateRequestId } from '@/lib/core/utils/request'
 import type { DbOrTx } from '@/lib/db/types'
 import {
   type DurableSecretProvenance,
@@ -1113,7 +1114,7 @@ export async function copyForkResourceContent(params: {
   requestId?: string
   control?: ForkCopyControl
 }): Promise<{ copied: number; failed: number; failures: ForkFailedResource[] }> {
-  const { contentPlan, contentRefMaps, control, requestId = 'unknown' } = params
+  const { contentPlan, contentRefMaps, control, requestId = generateRequestId() } = params
   const { childWorkspaceId, userId } = contentPlan
 
   let copiedResources = 0

apps/sim/ee/workspace-forking/lib/copy/copy-workflows.ts

@@ -4,6 +4,7 @@ import { generateId } from '@sim/utils/id'
 import { isRecordLike } from '@sim/utils/object'
 import { and, eq, inArray, isNull } from 'drizzle-orm'
 import type { FolderResourceType } from '@/lib/api/contracts/folders'
+import { generateRequestId } from '@/lib/core/utils/request'
 import type { DbOrTx } from '@/lib/db/types'
 import { buildFolderPathIndex, ROOT_FOLDER_PATH } from '@/lib/folders/paths'
 import { assertFolderCollectionHasRoom } from '@/lib/folders/queries'
@@ -499,7 +500,7 @@ export async function copyWorkflowStateIntoTarget(
     nameRegistry,
     resolveBlockId,
     triggerPathByBlockId,
-    requestId = 'unknown',
+    requestId = generateRequestId(),
   } = params
 
   const targetFolderId = sourceMeta.folderId ? (folderIdMap.get(sourceMeta.folderId) ?? null) : null

apps/sim/ee/workspace-forking/lib/create-fork.ts

@@ -7,6 +7,7 @@ import { generateId } from '@sim/utils/id'
 import { and, eq } from 'drizzle-orm'
 import type { Workspace } from '@/lib/api/contracts/workspaces'
 import { enqueueOutboxEvent } from '@/lib/core/outbox/service'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { requireForkProject } from '@/lib/projects/membership'
 import { buildDefaultWorkflowArtifacts } from '@/lib/workflows/defaults'
 import { insertNewWorkflowRow } from '@/lib/workflows/persistence/new-workflow-row'
@@ -146,7 +147,7 @@ const FORK_KIND_TO_RESOURCE_TYPE: Partial<Record<ForkRemapKind, ForkResourceType
  * all credential references) are cleared; env-var references are preserved.
  */
 export async function createFork(params: CreateForkParams): Promise<CreateForkResult> {
-  const { source, policy, userId, requestId = 'unknown' } = params
+  const { source, policy, userId, requestId = generateRequestId() } = params
   const admission = params.admission
   if (admission) {
     const receipt = await findWorkspaceOperationReceipt(

apps/sim/ee/workspace-forking/lib/promote/promote.ts

@@ -9,6 +9,7 @@ import type {
   ForkSyncBlocker,
   PromoteCopyResources,
 } from '@/lib/api/contracts/workspace-fork'
+import { generateRequestId } from '@/lib/core/utils/request'
 import type { DbOrTx } from '@/lib/db/types'
 import { MAX_FOLDERS_PER_WORKSPACE } from '@/lib/folders/constants'
 import { isFolderPathEffectivelyLocked } from '@/lib/folders/paths'
@@ -510,7 +511,7 @@ function groupDependentOverrides(
  */
 export async function promoteFork(params: PromoteForkParams): Promise<PromoteForkResult> {
   const { edge, sourceWorkspaceId, targetWorkspaceId, direction, userId } = params
-  const requestId = params.requestId ?? 'unknown'
+  const requestId = params.requestId ?? generateRequestId()
   const admission = params.admission
   const revisionScope = { sourceWorkspaceId, targetWorkspaceId, edge }
   if (admission) {

apps/sim/lib/execution/payloads/materialization.server.ts

@@ -2,6 +2,7 @@ import type { Principal } from '@sim/auth/principal'
 import { createLogger, type Logger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
 import { OrchestrationError } from '@/lib/core/orchestration/types'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { isPayloadSizeLimitError } from '@/lib/core/utils/stream-limits'
 import { isUserFileWithMetadata } from '@/lib/core/utils/user-file'
 import { getExecutionKeyParts } from '@/lib/execution/payloads/access-keys'
@@ -398,7 +399,7 @@ export async function readUserFileContentWithContributors(
   let contributingFiles: readonly WorkspaceFileSecretProvenanceIdentity[] | undefined
   let renderedContributingFiles: readonly WorkspaceFileSecretProvenanceIdentity[] | undefined
   const log = getLogger(options)
-  const requestId = options.requestId ?? 'unknown'
+  const requestId = options.requestId ?? generateRequestId()
 
   try {
     const servable = await downloadServableFileFromStorage(file, requestId, log, {

apps/sim/lib/uploads/utils/user-file-base64.server.ts

@@ -4,6 +4,7 @@ import { createLogger } from '@sim/logger'
 import { isPlainRecord } from '@sim/utils/object'
 import { getRedisClient } from '@/lib/core/config/redis'
 import { getRedisBudgetKeys, getRedisBudgetLimits } from '@/lib/core/redis/byte-budget.server'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { isUserFileWithMetadata } from '@/lib/core/utils/user-file'
 import { recordMaterializedAccessKeys } from '@/lib/execution/payloads/access-keys'
 import {
@@ -444,7 +445,7 @@ async function resolveBase64(
     return { base64: null }
   }
 
-  const requestId = options.requestId ?? 'unknown'
+  const requestId = options.requestId ?? generateRequestId()
   try {
     const result = await readUserFileContentWithContributors(file, {
       requestId,