.

Author: nicohrubec

packages/core/src/index.ts

@@ -170,7 +170,7 @@ export {
 export * as metrics from './metrics/public-api';
 export type { MetricOptions } from './metrics/public-api';
 export { createConsolaReporter } from './integrations/consola';
-export { addVercelAiProcessors, processVercelAiSpanAttributes } from './tracing/vercel-ai';
+export { addVercelAiProcessors } from './tracing/vercel-ai';
 export { _INTERNAL_getSpanContextForToolCallId, _INTERNAL_cleanupToolCallSpanContext } from './tracing/vercel-ai/utils';
 export { toolCallSpanContextMap as _INTERNAL_toolCallSpanContextMap } from './tracing/vercel-ai/constants';
 export { instrumentOpenAiClient } from './tracing/openai';

packages/core/src/tracing/vercel-ai/index.ts

@@ -27,6 +27,7 @@ import {
 } from '../ai/gen-ai-attributes';
 import { SPAN_TO_OPERATION_NAME, toolCallSpanContextMap, toolDescriptionMap } from './constants';
 import type { TokenSummary } from './types';
+import { hasSpanStreamingEnabled } from '../spans/hasSpanStreamingEnabled';
 import {
   accumulateTokensForParent,
   applyAccumulatedTokens,
@@ -456,8 +457,15 @@ function processGenerateSpan(span: Span, name: string, attributes: SpanAttribute
     span.updateName(`${operationName} ${modelId}`);
   }
 
-  // Store tool descriptions in the toolDescriptionMap so processSpan can apply them to execute_tool spans
-  if (attributes[AI_PROMPT_TOOLS_ATTRIBUTE] && Array.isArray(attributes[AI_PROMPT_TOOLS_ATTRIBUTE])) {
+  // Store tool descriptions in the toolDescriptionMap so processSpan can apply them to execute_tool spans.
+  // This is only needed for span streaming (transaction path handles this separately)
+  const client = getClient();
+  if (
+    client &&
+    hasSpanStreamingEnabled(client) &&
+    attributes[AI_PROMPT_TOOLS_ATTRIBUTE] &&
+    Array.isArray(attributes[AI_PROMPT_TOOLS_ATTRIBUTE])
+  ) {
     const descriptions = new Map<string, string>();
 
     // parse tool names and descriptions from tool string array