some renames

Author: nicohrubec

packages/core/src/index.ts

@@ -146,7 +146,7 @@ export * as metrics from './metrics/public-api';
 export type { MetricOptions } from './metrics/public-api';
 export { createConsolaReporter } from './integrations/consola';
 export { addVercelAiProcessors } from './tracing/vercel-ai';
-export { _INTERNAL_getSpanForToolCallId, _INTERNAL_cleanupToolCallSpan } from './tracing/vercel-ai/utils';
+export { _INTERNAL_getSpanContextForToolCallId, _INTERNAL_cleanupToolCallSpan } from './tracing/vercel-ai/utils';
 export { instrumentOpenAiClient } from './tracing/openai';
 export { OPENAI_INTEGRATION_NAME } from './tracing/openai/constants';
 export { instrumentAnthropicAiClient } from './tracing/anthropic-ai';

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

@@ -3,7 +3,7 @@ import type { ToolCallSpanContext } from './types';
 // Global map to track tool call IDs to their corresponding span contexts.
 // This allows us to capture tool errors and link them to the correct span
 // without keeping full Span objects (and their potentially large attributes) alive.
-export const toolCallSpanMap = new Map<string, ToolCallSpanContext>();
+export const toolCallSpanContextMap = new Map<string, ToolCallSpanContext>();
 
 // Operation sets for efficient mapping to OpenTelemetry semantic convention values
 export const INVOKE_AGENT_OPS = new Set([

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

@@ -19,7 +19,7 @@ import {
   GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE,
   GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE,
 } from '../ai/gen-ai-attributes';
-import { EMBEDDINGS_OPS, GENERATE_CONTENT_OPS, INVOKE_AGENT_OPS, RERANK_OPS, toolCallSpanMap } from './constants';
+import { EMBEDDINGS_OPS, GENERATE_CONTENT_OPS, INVOKE_AGENT_OPS, RERANK_OPS, toolCallSpanContextMap } from './constants';
 import type { TokenSummary } from './types';
 import {
   accumulateTokensForParent,
@@ -238,7 +238,7 @@ function processToolCallSpan(span: Span, attributes: SpanAttributes): void {
   const toolCallId = attributes[GEN_AI_TOOL_CALL_ID_ATTRIBUTE];
 
   if (typeof toolCallId === 'string') {
-    toolCallSpanMap.set(toolCallId, span.spanContext());
+    toolCallSpanContextMap.set(toolCallId, span.spanContext());
   }
 
   // https://opentelemetry.io/docs/specs/semconv/registry/attributes/gen-ai/#gen-ai-tool-type

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

@@ -17,7 +17,7 @@ import {
   GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE,
 } from '../ai/gen-ai-attributes';
 import { extractSystemInstructions, getTruncatedJsonString } from '../ai/utils';
-import { toolCallSpanMap } from './constants';
+import { toolCallSpanContextMap } from './constants';
 import type { TokenSummary, ToolCallSpanContext } from './types';
 import { AI_PROMPT_ATTRIBUTE, AI_PROMPT_MESSAGES_ATTRIBUTE } from './vercel-ai-attributes';
 
@@ -77,15 +77,15 @@ export function applyAccumulatedTokens(
 /**
  * Get the span context associated with a tool call ID.
  */
-export function _INTERNAL_getSpanForToolCallId(toolCallId: string): ToolCallSpanContext | undefined {
-  return toolCallSpanMap.get(toolCallId);
+export function _INTERNAL_getSpanContextForToolCallId(toolCallId: string): ToolCallSpanContext | undefined {
+  return toolCallSpanContextMap.get(toolCallId);
 }
 
 /**
  * Clean up the span mapping for a tool call ID
  */
 export function _INTERNAL_cleanupToolCallSpan(toolCallId: string): void {
-  toolCallSpanMap.delete(toolCallId);
+  toolCallSpanContextMap.delete(toolCallId);
 }
 
 /**

packages/core/test/lib/tracing/vercel-ai-tool-call-span-map.test.ts

@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it } from 'vitest';
 import { addVercelAiProcessors } from '../../../src/tracing/vercel-ai';
-import { toolCallSpanMap } from '../../../src/tracing/vercel-ai/constants';
-import { _INTERNAL_cleanupToolCallSpan, _INTERNAL_getSpanForToolCallId } from '../../../src/tracing/vercel-ai/utils';
+import { toolCallSpanContextMap } from '../../../src/tracing/vercel-ai/constants';
+import { _INTERNAL_cleanupToolCallSpan, _INTERNAL_getSpanContextForToolCallId } from '../../../src/tracing/vercel-ai/utils';
 import {
   AI_TOOL_CALL_ID_ATTRIBUTE,
   AI_TOOL_CALL_NAME_ATTRIBUTE,
@@ -79,7 +79,7 @@ function createToolCallSpan(params: {
 
 describe('vercel-ai tool call span context map', () => {
   beforeEach(() => {
-    toolCallSpanMap.clear();
+    toolCallSpanContextMap.clear();
   });
 
   it('stores toolCallId -> span context on spanStart', () => {
@@ -97,12 +97,12 @@ describe('vercel-ai tool call span context map', () => {
 
     client.emit('spanStart', span);
 
-    expect(_INTERNAL_getSpanForToolCallId('tool-call-1')).toMatchObject({
+    expect(_INTERNAL_getSpanContextForToolCallId('tool-call-1')).toMatchObject({
       traceId: 'trace-id-1',
       spanId: 'span-id-1',
     });
 
     _INTERNAL_cleanupToolCallSpan('tool-call-1');
-    expect(_INTERNAL_getSpanForToolCallId('tool-call-1')).toBeUndefined();
+    expect(_INTERNAL_getSpanContextForToolCallId('tool-call-1')).toBeUndefined();
   });
 });

packages/node/src/integrations/tracing/vercelai/instrumentation.ts

@@ -2,7 +2,7 @@ import type { InstrumentationConfig, InstrumentationModuleDefinition } from '@op
 import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
 import {
   _INTERNAL_cleanupToolCallSpan,
-  _INTERNAL_getSpanForToolCallId,
+  _INTERNAL_getSpanContextForToolCallId,
   addNonEnumerableProperty,
   captureException,
   getActiveSpan,
@@ -108,7 +108,7 @@ function checkResultForToolErrors(result: unknown): void {
     }
 
     // Try to get the span context associated with this tool call ID
-    const spanContext = _INTERNAL_getSpanForToolCallId(item.toolCallId);
+    const spanContext = _INTERNAL_getSpanContextForToolCallId(item.toolCallId);
 
     if (spanContext) {
       // We have a span context, so link the error using span and trace IDs from the span