Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { afterAll, describe, expect } from 'vitest';
import {
ANTHROPIC_AI_RESPONSE_TIMESTAMP_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
Expand Down Expand Up @@ -84,7 +83,6 @@ describe('Anthropic integration', () => {
// Fourth span - models.retrieve
expect.objectContaining({
data: expect.objectContaining({
[ANTHROPIC_AI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2024-05-08T05:20:00.000Z',
[GEN_AI_OPERATION_NAME_ATTRIBUTE]: 'models',
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'gen_ai.models',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
Expand Down Expand Up @@ -212,7 +210,6 @@ describe('Anthropic integration', () => {
// Fourth - models.retrieve with PII
expect.objectContaining({
data: expect.objectContaining({
[ANTHROPIC_AI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2024-05-08T05:20:00.000Z',
[GEN_AI_OPERATION_NAME_ATTRIBUTE]: 'models',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: 'claude-3-haiku-20240307',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ import {
GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE,
GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE,
GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE,
OPENAI_RESPONSE_ID_ATTRIBUTE,
OPENAI_RESPONSE_MODEL_ATTRIBUTE,
OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE,
OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE,
OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE,
} from '../../../../../../packages/core/src/tracing/ai/gen-ai-attributes';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner';

Expand Down Expand Up @@ -99,11 +94,6 @@ describe('OpenAI Tool Calls integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 15,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 25,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 40,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'chatcmpl-tools-123',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-4',
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:40.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 25,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 15,
},
description: 'chat gpt-4',
op: 'gen_ai.chat',
Expand All @@ -127,11 +117,6 @@ describe('OpenAI Tool Calls integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 15,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 25,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 40,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'chatcmpl-stream-tools-123',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-4',
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:45.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 25,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 15,
},
description: 'chat gpt-4',
op: 'gen_ai.chat',
Expand All @@ -153,11 +138,6 @@ describe('OpenAI Tool Calls integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 8,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 12,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 20,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'resp_tools_789',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-4',
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:32:00.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 12,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 8,
},
description: 'chat gpt-4',
op: 'gen_ai.chat',
Expand All @@ -181,11 +161,6 @@ describe('OpenAI Tool Calls integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 8,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 12,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 20,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'resp_stream_tools_789',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-4',
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:50.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 12,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 8,
},
description: 'chat gpt-4',
op: 'gen_ai.chat',
Expand Down Expand Up @@ -217,11 +192,6 @@ describe('OpenAI Tool Calls integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 15,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 25,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 40,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'chatcmpl-tools-123',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-4',
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:40.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 25,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 15,
},
description: 'chat gpt-4',
op: 'gen_ai.chat',
Expand All @@ -248,11 +218,6 @@ describe('OpenAI Tool Calls integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 15,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 25,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 40,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'chatcmpl-stream-tools-123',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-4',
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:45.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 25,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 15,
},
description: 'chat gpt-4',
op: 'gen_ai.chat',
Expand All @@ -277,11 +242,6 @@ describe('OpenAI Tool Calls integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 8,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 12,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 20,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'resp_tools_789',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-4',
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:32:00.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 12,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 8,
},
description: 'chat gpt-4',
op: 'gen_ai.chat',
Expand All @@ -308,11 +268,6 @@ describe('OpenAI Tool Calls integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 8,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 12,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 20,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'resp_stream_tools_789',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-4',
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:50.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 12,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 8,
},
description: 'chat gpt-4',
op: 'gen_ai.chat',
Expand Down
61 changes: 0 additions & 61 deletions dev-packages/node-integration-tests/suites/tracing/openai/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ import {
GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE,
GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE,
GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE,
OPENAI_RESPONSE_ID_ATTRIBUTE,
OPENAI_RESPONSE_MODEL_ATTRIBUTE,
OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE,
OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE,
OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE,
} from '../../../../../packages/core/src/tracing/ai/gen-ai-attributes';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

Expand All @@ -52,11 +47,6 @@ describe('OpenAI integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 15,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 25,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'chatcmpl-mock123',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:28.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 15,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 10,
},
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand All @@ -77,11 +67,6 @@ describe('OpenAI integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 5,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 8,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 13,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'resp_mock456',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:30.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 8,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 5,
},
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand Down Expand Up @@ -118,12 +103,7 @@ describe('OpenAI integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 12,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 18,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 30,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'chatcmpl-stream-123',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_RESPONSE_STREAMING_ATTRIBUTE]: true,
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:40.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 18,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 12,
},
description: 'chat gpt-4',
op: 'gen_ai.chat',
Expand All @@ -145,12 +125,7 @@ describe('OpenAI integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 6,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 10,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 16,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'resp_stream_456',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_RESPONSE_STREAMING_ATTRIBUTE]: true,
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:50.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 10,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 6,
},
description: 'chat gpt-4',
op: 'gen_ai.chat',
Expand Down Expand Up @@ -199,11 +174,6 @@ describe('OpenAI integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 15,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 25,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'chatcmpl-mock123',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:28.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 15,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 10,
},
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand All @@ -227,11 +197,6 @@ describe('OpenAI integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 5,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 8,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 13,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'resp_mock456',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:30.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 8,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 5,
},
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand Down Expand Up @@ -276,12 +241,7 @@ describe('OpenAI integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 12,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 18,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 30,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'chatcmpl-stream-123',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_RESPONSE_STREAMING_ATTRIBUTE]: true,
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:40.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 18,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 12,
}),
description: 'chat gpt-4',
op: 'gen_ai.chat',
Expand All @@ -307,12 +267,7 @@ describe('OpenAI integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 6,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 10,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 16,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'resp_stream_456',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_RESPONSE_STREAMING_ATTRIBUTE]: true,
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:50.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 10,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 6,
}),
description: 'chat gpt-4',
op: 'gen_ai.chat',
Expand Down Expand Up @@ -406,8 +361,6 @@ describe('OpenAI integration', () => {
[GEN_AI_RESPONSE_MODEL_ATTRIBUTE]: 'text-embedding-3-small',
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 10,
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'text-embedding-3-small',
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 10,
},
description: 'embeddings text-embedding-3-small',
op: 'gen_ai.embeddings',
Expand Down Expand Up @@ -448,8 +401,6 @@ describe('OpenAI integration', () => {
[GEN_AI_RESPONSE_MODEL_ATTRIBUTE]: 'text-embedding-3-small',
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 10,
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'text-embedding-3-small',
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 10,
},
description: 'embeddings text-embedding-3-small',
op: 'gen_ai.embeddings',
Expand Down Expand Up @@ -483,8 +434,6 @@ describe('OpenAI integration', () => {
[GEN_AI_RESPONSE_MODEL_ATTRIBUTE]: 'text-embedding-3-small',
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 10,
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'text-embedding-3-small',
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 10,
},
description: 'embeddings text-embedding-3-small',
op: 'gen_ai.embeddings',
Expand Down Expand Up @@ -542,11 +491,6 @@ describe('OpenAI integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 15,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 25,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'chatcmpl-mock123',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:28.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 15,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 10,
},
op: 'gen_ai.chat',
origin: 'auto.ai.openai',
Expand Down Expand Up @@ -589,11 +533,6 @@ describe('OpenAI integration', () => {
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 15,
[GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 25,
[OPENAI_RESPONSE_ID_ATTRIBUTE]: 'chatcmpl-mock123',
[OPENAI_RESPONSE_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[OPENAI_RESPONSE_TIMESTAMP_ATTRIBUTE]: '2023-03-01T06:31:28.000Z',
[OPENAI_USAGE_COMPLETION_TOKENS_ATTRIBUTE]: 15,
[OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE]: 10,
},
op: 'gen_ai.chat',
origin: 'auto.ai.openai',
Expand Down
Loading
Loading