Otel v3

Author: Sg312

apps/sim/app/api/billing/update-cost/route.ts

@@ -4,14 +4,14 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { recordUsage } from '@/lib/billing/core/usage-log'
 import { checkAndBillOverageThreshold } from '@/lib/billing/threshold-billing'
+import { BillingRouteOutcome } from '@/lib/copilot/generated/trace-attribute-values-v1'
 import { TraceAttr } from '@/lib/copilot/generated/trace-attributes-v1'
 import { TraceSpan } from '@/lib/copilot/generated/trace-spans-v1'
 import { checkInternalApiKey } from '@/lib/copilot/request/http'
 import { withIncomingGoSpan } from '@/lib/copilot/request/otel'
 import { isBillingEnabled } from '@/lib/core/config/feature-flags'
 import { type AtomicClaimResult, billingIdempotency } from '@/lib/core/idempotency/service'
 import { generateRequestId } from '@/lib/core/utils/request'
-import { BillingRouteOutcome } from '@/lib/copilot/generated/trace-attribute-values-v1'
 
 const logger = createLogger('BillingUpdateCostAPI')
 

apps/sim/app/api/copilot/api-keys/validate/route.ts

@@ -5,11 +5,11 @@ import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkServerSideUsageLimits } from '@/lib/billing/calculations/usage-monitor'
+import { CopilotValidateOutcome } from '@/lib/copilot/generated/trace-attribute-values-v1'
 import { TraceAttr } from '@/lib/copilot/generated/trace-attributes-v1'
 import { TraceSpan } from '@/lib/copilot/generated/trace-spans-v1'
 import { checkInternalApiKey } from '@/lib/copilot/request/http'
 import { withIncomingGoSpan } from '@/lib/copilot/request/otel'
-import { CopilotValidateOutcome } from '@/lib/copilot/generated/trace-attribute-values-v1'
 
 const logger = createLogger('CopilotApiKeysValidate')
 
@@ -33,7 +33,10 @@ export async function POST(req: NextRequest) {
       try {
         const auth = checkInternalApiKey(req)
         if (!auth.success) {
-          span.setAttribute(TraceAttr.CopilotValidateOutcome, CopilotValidateOutcome.InternalAuthFailed)
+          span.setAttribute(
+            TraceAttr.CopilotValidateOutcome,
+            CopilotValidateOutcome.InternalAuthFailed
+          )
           span.setAttribute(TraceAttr.HttpStatusCode, 401)
           return new NextResponse(null, { status: 401 })
         }

apps/sim/app/api/copilot/chat/abort/route.ts

@@ -2,14 +2,14 @@ import { createLogger } from '@sim/logger'
 import { NextResponse } from 'next/server'
 import { getLatestRunForStream } from '@/lib/copilot/async-runs/repository'
 import { SIM_AGENT_API_URL } from '@/lib/copilot/constants'
+import { CopilotAbortOutcome } from '@/lib/copilot/generated/trace-attribute-values-v1'
 import { TraceAttr } from '@/lib/copilot/generated/trace-attributes-v1'
 import { TraceSpan } from '@/lib/copilot/generated/trace-spans-v1'
 import { fetchGo } from '@/lib/copilot/request/go/fetch'
 import { authenticateCopilotRequestSessionOnly } from '@/lib/copilot/request/http'
 import { withCopilotSpan, withIncomingGoSpan } from '@/lib/copilot/request/otel'
 import { abortActiveStream, waitForPendingChatStream } from '@/lib/copilot/request/session'
 import { env } from '@/lib/core/config/env'
-import { CopilotAbortOutcome } from '@/lib/copilot/generated/trace-attribute-values-v1'
 
 const logger = createLogger('CopilotChatAbortAPI')
 const GO_EXPLICIT_ABORT_TIMEOUT_MS = 3000

apps/sim/app/api/copilot/chat/stop/route.ts

@@ -6,12 +6,12 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { normalizeMessage, type PersistedMessage } from '@/lib/copilot/chat/persisted-message'
+import { CopilotStopOutcome } from '@/lib/copilot/generated/trace-attribute-values-v1'
 import { TraceAttr } from '@/lib/copilot/generated/trace-attributes-v1'
 import { TraceSpan } from '@/lib/copilot/generated/trace-spans-v1'
 import { withIncomingGoSpan } from '@/lib/copilot/request/otel'
 import { taskPubSub } from '@/lib/copilot/tasks'
 import { generateId } from '@/lib/core/utils/uuid'
-import { CopilotStopOutcome } from '@/lib/copilot/generated/trace-attribute-values-v1'
 
 const logger = createLogger('CopilotChatStopAPI')
 

apps/sim/app/api/copilot/chat/stream/route.ts

@@ -6,11 +6,11 @@ import {
   MothershipStreamV1CompletionStatus,
   MothershipStreamV1EventType,
 } from '@/lib/copilot/generated/mothership-stream-v1'
-import { TraceAttr } from '@/lib/copilot/generated/trace-attributes-v1'
 import {
   CopilotResumeOutcome,
   CopilotTransport,
 } from '@/lib/copilot/generated/trace-attribute-values-v1'
+import { TraceAttr } from '@/lib/copilot/generated/trace-attributes-v1'
 import { contextFromRequestHeaders } from '@/lib/copilot/request/go/propagation'
 import { authenticateCopilotRequestSessionOnly } from '@/lib/copilot/request/http'
 import { getCopilotTracer } from '@/lib/copilot/request/otel'
@@ -144,9 +144,7 @@ export async function GET(request: NextRequest) {
     'copilot.resume.request',
     {
       attributes: {
-        [TraceAttr.CopilotTransport]: batchMode
-          ? CopilotTransport.Batch
-          : CopilotTransport.Stream,
+        [TraceAttr.CopilotTransport]: batchMode ? CopilotTransport.Batch : CopilotTransport.Stream,
         [TraceAttr.StreamId]: streamId,
         [TraceAttr.UserId]: authenticatedUserId,
         [TraceAttr.CopilotResumeAfterCursor]: afterCursor || '0',

apps/sim/app/api/copilot/confirm/route.ts

@@ -13,6 +13,7 @@ import {
   getRunSegment,
   upsertAsyncToolCall,
 } from '@/lib/copilot/async-runs/repository'
+import { CopilotConfirmOutcome } from '@/lib/copilot/generated/trace-attribute-values-v1'
 import { TraceAttr } from '@/lib/copilot/generated/trace-attributes-v1'
 import { TraceSpan } from '@/lib/copilot/generated/trace-spans-v1'
 import { publishToolConfirmation } from '@/lib/copilot/persistence/tool-confirm'
@@ -25,7 +26,6 @@ import {
   createUnauthorizedResponse,
 } from '@/lib/copilot/request/http'
 import { withIncomingGoSpan } from '@/lib/copilot/request/otel'
-import { CopilotConfirmOutcome } from '@/lib/copilot/generated/trace-attribute-values-v1'
 
 const logger = createLogger('CopilotConfirmAPI')
 

apps/sim/app/workspace/[workspaceId]/components/message-actions/message-actions.tsx

@@ -138,15 +138,16 @@ export function MessageActions({ content, chatId, userQuery, requestId }: Messag
     }
   }, [])
 
-  // Render the action row whenever there's ANYTHING to act on. For a
-  // normal assistant turn that's `content`; for an aborted / error /
-  // content-less turn it's the `requestId` alone — users still need to
-  // be able to grab the trace ID for bug reports in those cases.
   const hasContent = Boolean(content)
-  if (!hasContent && !requestId) return null
-
   const canSubmitFeedback = Boolean(chatId && userQuery)
 
+  // Render the action row whenever there's something the user can
+  // actually act on: copy the message, or open the feedback modal
+  // (thumbs up / down). Request ID alone is not a reason to render the
+  // row anymore — it's only exposed from inside the thumbs-down modal,
+  // which requires both chatId and userQuery.
+  if (!hasContent && !canSubmitFeedback) return null
+
   return (
     <>
       <div className='flex items-center gap-0.5'>
@@ -197,27 +198,15 @@ export function MessageActions({ content, chatId, userQuery, requestId }: Messag
             </Tooltip.Root>
           </>
         )}
-        {requestId && (
-          <Tooltip.Root>
-            <Tooltip.Trigger asChild>
-              <button
-                type='button'
-                aria-label='Copy request ID'
-                onClick={copyRequestId}
-                className={BUTTON_CLASS}
-              >
-                {copiedRequestId ? (
-                  <Check className={ICON_CLASS} />
-                ) : (
-                  <Copy className={ICON_CLASS} />
-                )}
-              </button>
-            </Tooltip.Trigger>
-            <Tooltip.Content side='top'>
-              {copiedRequestId ? 'Copied request ID' : 'Copy request ID'}
-            </Tooltip.Content>
-          </Tooltip.Root>
-        )}
+        {/*
+          Intentionally NO root-row "Copy request ID" button here — it
+          rendered as an ambiguous standalone Copy icon next to the
+          message Copy icon, which was confusing (two indistinguishable
+          copy buttons side by side). The request ID only needs to be
+          grabbable from the thumbs-down feedback modal below, which is
+          the surface we actually want people to use when reporting a
+          bad response.
+        */}
       </div>
 
       <Modal open={pendingFeedback !== null} onOpenChange={handleModalClose}>

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts

@@ -1833,7 +1833,7 @@ export function useChat(
       try {
         const pendingLines: string[] = []
 
-        readLoop: while (true) {
+        while (true) {
           if (pendingLines.length === 0) {
             // Once the terminal `complete` event has been processed,
             // don't read another chunk — we've drained everything
@@ -2955,9 +2955,7 @@ export function useChat(
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
-            ...(streamTraceparentRef.current
-              ? { traceparent: streamTraceparentRef.current }
-              : {}),
+            ...(streamTraceparentRef.current ? { traceparent: streamTraceparentRef.current } : {}),
           },
           body: JSON.stringify({
             chatId,

apps/sim/lib/copilot/chat/post.ts

@@ -21,11 +21,7 @@ import { generateWorkspaceContext } from '@/lib/copilot/chat/workspace-context'
 import { COPILOT_REQUEST_MODES } from '@/lib/copilot/constants'
 import { TraceAttr } from '@/lib/copilot/generated/trace-attributes-v1'
 import { TraceSpan } from '@/lib/copilot/generated/trace-spans-v1'
-import {
-  createBadRequestResponse,
-  createRequestTracker,
-  createUnauthorizedResponse,
-} from '@/lib/copilot/request/http'
+import { createBadRequestResponse, createUnauthorizedResponse } from '@/lib/copilot/request/http'
 import { createSSEStream, SSE_RESPONSE_HEADERS } from '@/lib/copilot/request/lifecycle/start'
 import { startCopilotOtelRoot, withCopilotSpan } from '@/lib/copilot/request/otel'
 import {
@@ -609,17 +605,27 @@ async function resolveBranch(params: {
 }
 
 export async function handleUnifiedChatPost(req: NextRequest) {
-  const tracker = createRequestTracker(false)
   let actualChatId: string | undefined
   let userMessageId = ''
   let chatStreamLockAcquired = false
-  // Started once we know the streamId (= userMessageId). Every subsequent
-  // span (persistUserMessage, createRunSegment, the whole SSE stream, etc.)
-  // nests under this root via AsyncLocalStorage / explicit propagation,
-  // and the stream's terminal code path calls finish() when the request
-  // actually ends. Errors thrown from the handler before the stream
-  // starts are finished here in the catch below.
+  // Started once we've parsed the body (need userMessageId to stamp as
+  // streamId). Every subsequent span (persistUserMessage,
+  // createRunSegment, the whole SSE stream, etc.) nests under this
+  // root via AsyncLocalStorage / explicit propagation, and the stream's
+  // terminal code path calls finish() when the request actually ends.
+  // Errors thrown from the handler before the stream starts are
+  // finished here in the catch below.
   let otelRoot: ReturnType<typeof startCopilotOtelRoot> | undefined
+  // `requestId` is the canonical logical ID for this HTTP request —
+  // same value that flows into `request.id`/`sim.request_id` span
+  // attributes, the persisted `msg.requestId`, and eventually the
+  // Grafana trace-ID search box. Derived from otelRoot.requestId (= the
+  // OTel trace ID of the root span) as soon as that's created. Stays
+  // empty only in the narrow window before otelRoot is set — errors in
+  // that window can't be correlated to any trace anyway, and their log
+  // line carries the error message + stack which is the actually
+  // useful info.
+  let requestId = ''
   const executionId = crypto.randomUUID()
   const runId = crypto.randomUUID()
 
@@ -635,7 +641,11 @@ export async function handleUnifiedChatPost(req: NextRequest) {
     userMessageId = body.userMessageId || crypto.randomUUID()
 
     otelRoot = startCopilotOtelRoot({
-      requestId: tracker.requestId,
+      // No explicit requestId — startCopilotOtelRoot derives it from
+      // the span's OTel trace ID so `msg.requestId` on the UI side
+      // ends up being the same value Grafana uses. See the scope
+      // doc-comment and the call site for why this is the desired
+      // direction of the unification.
       streamId: userMessageId,
       executionId,
       runId,
@@ -646,6 +656,12 @@ export async function handleUnifiedChatPost(req: NextRequest) {
       // by setInputMessages above.
       userMessagePreview: body.message,
     })
+    // Promote the OTel-derived ID to the handler-level `requestId` so
+    // every downstream consumer (logs, orchestrator, onComplete,
+    // onError, persisted assistant message) uses the same value.
+    if (otelRoot.requestId) {
+      requestId = otelRoot.requestId
+    }
     // Emit `gen_ai.input.messages` on the root agent span for OTel
     // GenAI spec compliance (Honeycomb's Gen AI view keys off this).
     // Gated on OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT
@@ -800,7 +816,7 @@ export async function handleUnifiedChatPost(req: NextRequest) {
             message: body.message,
             workspaceId,
             chatId: actualChatId,
-            requestId: tracker.requestId,
+            requestId,
           }),
         otelRoot!.context
       )
@@ -908,7 +924,7 @@ export async function handleUnifiedChatPost(req: NextRequest) {
         message: body.message,
         titleModel: branch.titleModel,
         ...(branch.titleProvider ? { titleProvider: branch.titleProvider } : {}),
-        requestId: tracker.requestId,
+        requestId,
         workspaceId,
         otelRoot: otelRoot!,
         orchestrateOptions: {
@@ -925,15 +941,15 @@ export async function handleUnifiedChatPost(req: NextRequest) {
           onComplete: buildOnComplete({
             chatId: actualChatId,
             userMessageId,
-            requestId: tracker.requestId,
+            requestId,
             workspaceId,
             notifyWorkspaceStatus: branch.notifyWorkspaceStatus,
             otelRoot,
           }),
           onError: buildOnError({
             chatId: actualChatId,
             userMessageId,
-            requestId: tracker.requestId,
+            requestId,
             workspaceId,
             notifyWorkspaceStatus: branch.notifyWorkspaceStatus,
           }),
@@ -970,7 +986,7 @@ export async function handleUnifiedChatPost(req: NextRequest) {
       )
     }
 
-    logger.error(`[${tracker.requestId}] Error handling unified chat request`, {
+    logger.error(`[${requestId}] Error handling unified chat request`, {
       error: error instanceof Error ? error.message : 'Unknown error',
       stack: error instanceof Error ? error.stack : undefined,
     })

apps/sim/lib/copilot/chat/terminal-state.ts

@@ -2,10 +2,10 @@ import { db } from '@sim/db'
 import { copilotChats } from '@sim/db/schema'
 import { and, eq, sql } from 'drizzle-orm'
 import type { PersistedMessage } from '@/lib/copilot/chat/persisted-message'
+import { CopilotChatFinalizeOutcome } from '@/lib/copilot/generated/trace-attribute-values-v1'
 import { TraceAttr } from '@/lib/copilot/generated/trace-attributes-v1'
 import { TraceSpan } from '@/lib/copilot/generated/trace-spans-v1'
 import { withCopilotSpan } from '@/lib/copilot/request/otel'
-import { CopilotChatFinalizeOutcome } from '@/lib/copilot/generated/trace-attribute-values-v1'
 
 interface FinalizeAssistantTurnParams {
   chatId: string
@@ -66,7 +66,10 @@ export async function finalizeAssistantTurn({
             messages: sql`${copilotChats.messages} || ${JSON.stringify([assistantMessage])}::jsonb`,
           })
           .where(updateWhere)
-        span.setAttribute(TraceAttr.ChatFinalizeOutcome, CopilotChatFinalizeOutcome.AppendedAssistant)
+        span.setAttribute(
+          TraceAttr.ChatFinalizeOutcome,
+          CopilotChatFinalizeOutcome.AppendedAssistant
+        )
         return
       }