ref(anthropic)!: Move Anthropic AI integration to @sentry/server-utils

dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts

@@ -18,7 +18,7 @@ import {
   GEN_AI_USAGE_OUTPUT_TOKENS,
   GEN_AI_USAGE_TOTAL_TOKENS,
 } from '@sentry/conventions/attributes';
-import { GEN_AI_REQUEST_STREAM_ATTRIBUTE } from '../../../../../packages/core/src/tracing/ai/gen-ai-attributes';
+import { GEN_AI_REQUEST_STREAM_ATTRIBUTE } from '../../../../../packages/server-utils/src/ai/core/gen-ai-attributes';
 import { getStringAttributeValue, isOrchestrionEnabled } from '../../../utils';
 import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
 

packages/cloudflare/src/index.ts

@@ -77,7 +77,6 @@ export {
   // eslint-disable-next-line typescript/no-deprecated
   inboundFiltersIntegration,
   instrumentGoogleGenAIClient,
-  instrumentAnthropicAiClient,
   eventFiltersIntegration,
   linkedErrorsIntegration,
   requestDataIntegration,
@@ -127,7 +126,7 @@ export { httpServerIntegration } from './integrations/httpServer';
 export { fetchIntegration } from './integrations/fetch';
 export { spotlightIntegration } from './integrations/spotlight';
 export { vercelAIIntegration } from './integrations/tracing/vercelai';
-export { prismaIntegration, instrumentOpenAiClient } from '@sentry/server-utils';
+export { prismaIntegration, instrumentOpenAiClient, instrumentAnthropicAiClient } from '@sentry/server-utils';
 
 // eslint-disable-next-line typescript/no-deprecated
 export { instrumentD1WithSentry } from './instrumentations/worker/instrumentD1';

packages/core/src/server-exports.ts

@@ -60,14 +60,6 @@ export { addVercelAiProcessors, getProviderMetadataAttributes } from './tracing/
 export { getTruncatedJsonString, shouldEnableTruncation, resolveAIRecordingOptions } from './tracing/ai/utils';
 export { _INTERNAL_getSpanContextForToolCallId, _INTERNAL_cleanupToolCallSpanContext } from './tracing/vercel-ai/utils';
 export { toolCallSpanContextMap as _INTERNAL_toolCallSpanContextMap } from './tracing/vercel-ai/constants';
-export {
-  instrumentAnthropicAiClient,
-  extractRequestAttributes as extractAnthropicRequestAttributes,
-  addPrivateRequestAttributes as addAnthropicRequestAttributes,
-  addResponseAttributes as addAnthropicResponseAttributes,
-} from './tracing/anthropic-ai';
-export { instrumentAsyncIterableStream, instrumentMessageStream } from './tracing/anthropic-ai/streaming';
-export { ANTHROPIC_AI_INTEGRATION_NAME } from './tracing/anthropic-ai/constants';
 export {
   instrumentGoogleGenAIClient,
   extractRequestAttributes as extractGoogleGenAIRequestAttributes,
@@ -93,13 +85,6 @@ export { LANGGRAPH_INTEGRATION_NAME } from './tracing/langgraph/constants';
 export type { LangGraphOptions, LangGraphIntegration, CompiledGraph } from './tracing/langgraph/types';
 export { instrumentWorkersAiClient } from './tracing/workers-ai';
 export type { WorkersAiClient, WorkersAiOptions } from './tracing/workers-ai/types';
-export type {
-  AnthropicAiClient,
-  AnthropicAiOptions,
-  // eslint-disable-next-line typescript/no-deprecated
-  AnthropicAiInstrumentedMethod,
-  AnthropicAiResponse,
-} from './tracing/anthropic-ai/types';
 export type {
   GoogleGenAIClient,
   GoogleGenAIChat,

packages/core/src/shared-exports.ts

@@ -466,7 +466,7 @@ export type {
   SerializedStreamedSpanContainer,
   StreamedSpanJSON,
 } from './types/span';
-export type { SpanStatus } from './types/spanStatus';
+export type { SpanStatus, SpanStatusType } from './types/spanStatus';
 export type { Log, LogSeverityLevel } from './types/log';
 export type { SpanLink } from './types/link';
 export type {

packages/node/src/index.ts

@@ -30,7 +30,7 @@ export {
   vercelAiIntegration as vercelAIIntegration,
 } from '@sentry/server-utils/orchestrion';
 export { redisIntegration } from './integrations/tracing/redis';
-export { prismaIntegration, instrumentOpenAiClient } from '@sentry/server-utils';
+export { prismaIntegration, instrumentOpenAiClient, instrumentAnthropicAiClient } from '@sentry/server-utils';
 export { setupHapiErrorHandler } from './integrations/tracing/hapi';
 export { setupKoaErrorHandler } from './integrations/tracing/koa';
 export {
@@ -133,7 +133,6 @@ export {
   updateSpanName,
   supabaseIntegration,
   instrumentSupabaseClient,
-  instrumentAnthropicAiClient,
   instrumentGoogleGenAIClient,
   zodErrorsIntegration,
   profiler,

packages/core/src/tracing/anthropic-ai/constants.ts → packages/server-utils/src/ai/anthropic-ai/constants.ts

@@ -1,4 +1,4 @@
-import type { InstrumentedMethodRegistry } from '../ai/utils';
+import type { InstrumentedMethodRegistry } from '../core/utils';
 
 export const ANTHROPIC_AI_INTEGRATION_NAME = 'Anthropic_AI' as const;
 

packages/core/src/tracing/anthropic-ai/index.ts → packages/server-utils/src/ai/anthropic-ai/index.ts

@@ -1,9 +1,12 @@
 /* eslint-disable typescript-eslint/no-deprecated */
-import { captureException } from '../../exports';
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
-import { SPAN_STATUS_ERROR } from '../../tracing';
-import { startSpan, startSpanManual } from '../../tracing/trace';
-import type { Span, SpanAttributeValue } from '../../types/span';
+import {
+  captureException,
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SPAN_STATUS_ERROR,
+  startSpan,
+  startSpanManual,
+} from '@sentry/core';
+import type { Span, SpanAttributeValue } from '@sentry/core';
 import {
   GEN_AI_OPERATION_NAME,
   GEN_AI_PROMPT,
@@ -20,14 +23,14 @@ import {
   GEN_AI_RESPONSE_TOOL_CALLS,
   GEN_AI_SYSTEM,
 } from '@sentry/conventions/attributes';
-import { GEN_AI_REQUEST_STREAM_ATTRIBUTE } from '../ai/gen-ai-attributes';
-import type { InstrumentedMethodEntry } from '../ai/utils';
+import { GEN_AI_REQUEST_STREAM_ATTRIBUTE } from '../core/gen-ai-attributes';
+import type { InstrumentedMethodEntry } from '../core/utils';
 import {
   resolveAIRecordingOptions,
   setTokenUsageAttributes,
   shouldEnableTruncation,
   wrapPromiseWithMethods,
-} from '../ai/utils';
+} from '../core/utils';
 import { ANTHROPIC_METHOD_REGISTRY } from './constants';
 import { instrumentAsyncIterableStream, instrumentMessageStream } from './streaming';
 import type { AnthropicAiOptions, AnthropicAiResponse, AnthropicAiStreamingEvent, ContentBlock } from './types';

packages/core/src/tracing/anthropic-ai/streaming.ts → packages/server-utils/src/ai/anthropic-ai/streaming.ts

@@ -1,7 +1,6 @@
-import { captureException } from '../../exports';
-import { SPAN_STATUS_ERROR } from '../../tracing';
-import type { Span } from '../../types/span';
-import { endStreamSpan } from '../ai/utils';
+import { captureException, SPAN_STATUS_ERROR } from '@sentry/core';
+import type { Span } from '@sentry/core';
+import { endStreamSpan } from '../core/utils';
 import type { AnthropicAiStreamingEvent } from './types';
 import { mapAnthropicErrorToStatusMessage } from './utils';
 

packages/core/src/tracing/anthropic-ai/utils.ts → packages/server-utils/src/ai/anthropic-ai/utils.ts

@@ -1,10 +1,7 @@
-import { captureException } from '../../exports';
-import { SPAN_STATUS_ERROR } from '../../tracing';
-import type { Span } from '../../types/span';
-import type { SpanStatusType } from '../../types/spanStatus';
+import { captureException, SPAN_STATUS_ERROR, stringify } from '@sentry/core';
+import type { Span, SpanStatusType } from '@sentry/core';
 import { GEN_AI_INPUT_MESSAGES, GEN_AI_SYSTEM_INSTRUCTIONS } from '@sentry/conventions/attributes';
-import { extractSystemInstructions, getTruncatedJsonString } from '../ai/utils';
-import { stringify } from '../../utils/string';
+import { extractSystemInstructions, getTruncatedJsonString } from '../core/utils';
 import type { AnthropicAiResponse } from './types';
 
 /**

packages/server-utils/src/ai/index.ts

@@ -5,3 +5,4 @@
  */
 
 export { instrumentOpenAiClient } from './openai';
+export { instrumentAnthropicAiClient } from './anthropic-ai';

packages/server-utils/src/integrations/tracing-channel/anthropic.ts

@@ -1,19 +1,16 @@
 import { GEN_AI_REQUEST_MODEL } from '@sentry/conventions/attributes';
 import * as diagnosticsChannel from 'node:diagnostics_channel';
-import type { AnthropicAiOptions, AnthropicAiResponse, IntegrationFn, Span, SpanAttributeValue } from '@sentry/core';
+import type { IntegrationFn, Span, SpanAttributeValue } from '@sentry/core';
 import {
   _INTERNAL_shouldSkipAiProviderWrapping,
-  addAnthropicRequestAttributes,
-  addAnthropicResponseAttributes,
   defineIntegration,
-  extractAnthropicRequestAttributes,
-  instrumentAsyncIterableStream,
-  instrumentMessageStream,
-  resolveAIRecordingOptions,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  shouldEnableTruncation,
   startInactiveSpan,
 } from '@sentry/core';
+import { resolveAIRecordingOptions, shouldEnableTruncation } from '../../ai/core/utils';
+import { addPrivateRequestAttributes, addResponseAttributes, extractRequestAttributes } from '../../ai/anthropic-ai';
+import { instrumentAsyncIterableStream, instrumentMessageStream } from '../../ai/anthropic-ai/streaming';
+import type { AnthropicAiOptions, AnthropicAiResponse } from '../../ai/anthropic-ai/types';
 import { CHANNELS } from '../../orchestrion/channels';
 import { bindTracingChannelToSpan } from '../../tracing-channel';
 import { anthropicAiModuleNames } from '../../orchestrion/config/anthropic-ai';
@@ -60,7 +57,7 @@ function instrumentAnthropic(options: AnthropicAiOptions): void {
       data => createGenAiSpan(data, operation, methodPath, options),
       {
         beforeSpanEnd: (span, data) => {
-          addAnthropicResponseAttributes(
+          addResponseAttributes(
             span,
             data.result as AnthropicAiResponse,
             resolveAIRecordingOptions(options).recordOutputs,
@@ -103,7 +100,7 @@ function createGenAiSpan(
   const { recordInputs } = resolveAIRecordingOptions(options);
   const enableTruncation = shouldEnableTruncation(options.enableTruncation);
 
-  const attributes = extractAnthropicRequestAttributes(args, methodPath, operation);
+  const attributes = extractRequestAttributes(args, methodPath, operation);
   const model = (attributes[GEN_AI_REQUEST_MODEL] as string) || 'unknown';
   attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] = ORIGIN;
 
@@ -114,7 +111,7 @@ function createGenAiSpan(
   });
 
   if (recordInputs && params) {
-    addAnthropicRequestAttributes(span, params, enableTruncation);
+    addPrivateRequestAttributes(span, params, enableTruncation);
   }
 
   return span;

packages/server-utils/src/integrations/tracing-channel/langchain.ts

@@ -4,13 +4,13 @@ import {
   _INTERNAL_getLangChainEmbeddingsSpanOptions,
   _INTERNAL_mergeLangChainCallbackHandler,
   _INTERNAL_skipAiProviderWrapping,
-  ANTHROPIC_AI_INTEGRATION_NAME,
   createLangChainCallbackHandler,
   defineIntegration,
   GOOGLE_GENAI_INTEGRATION_NAME,
   LANGCHAIN_INTEGRATION_NAME,
   startInactiveSpan,
 } from '@sentry/core';
+import { ANTHROPIC_AI_INTEGRATION_NAME } from '../../ai/anthropic-ai/constants';
 import { OPENAI_INTEGRATION_NAME } from '../../ai/openai/constants';
 import { CHANNELS } from '../../orchestrion/channels';
 import { langchainEmbeddingsChannels } from '../../orchestrion/config/langchain';

packages/core/test/lib/utils/anthropic-utils.test.ts → packages/server-utils/test/ai/lib/utils/anthropic-utils.test.ts

@@ -3,8 +3,8 @@ import {
   mapAnthropicErrorToStatusMessage,
   messagesFromParams,
   setMessagesAttribute,
-} from '../../../src/tracing/anthropic-ai/utils';
-import type { Span } from '../../../src/types/span';
+} from '../../../../src/ai/anthropic-ai/utils';
+import type { Span } from '@sentry/core';
 
 describe('anthropic-ai-utils', () => {
   describe('mapAnthropicErrorToStatusMessage', () => {

packages/vercel-edge/src/index.ts

@@ -75,7 +75,6 @@ export {
   inboundFiltersIntegration,
   instrumentStateGraph,
   instrumentGoogleGenAIClient,
-  instrumentAnthropicAiClient,
   eventFiltersIntegration,
   linkedErrorsIntegration,
   requestDataIntegration,
@@ -107,7 +106,7 @@ export {
   withStreamedSpan,
   spanStreamingIntegration,
 } from '@sentry/core';
-export { instrumentOpenAiClient } from '@sentry/server-utils/no-diagnostic-channels';
+export { instrumentOpenAiClient, instrumentAnthropicAiClient } from '@sentry/server-utils/no-diagnostic-channels';
 
 export { VercelEdgeClient } from './client';
 export { getDefaultIntegrations, init } from './sdk';