Merged
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 numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ 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,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -666,6 +667,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -682,6 +684,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand DownExpand Up@@ -716,6 +719,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
// Only the last message (with filtered media) should be kept
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -534,6 +535,7 @@ describe('Google GenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(
/^\[\{"role":"user","parts":\[\{"text":"C+"\}\]\}\]$/,
),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand All@@ -555,6 +557,7 @@ describe('Google GenAI integration', () => {
parts: [{ text: 'This is a small message that fits within the limit' }],
},
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -224,6 +225,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -240,6 +242,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -256,6 +259,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -267,6 +268,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -283,6 +285,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -299,6 +302,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@ describe('OpenAI integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -289,6 +290,7 @@ describe('OpenAI integration', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -620,6 +622,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present (truncation happened) and should be a JSON array of a single index
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand All@@ -638,6 +641,7 @@ describe('OpenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand DownExpand Up@@ -674,6 +678,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present and should include truncated string input (contains only As)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^A+$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe('OpenAI integration (V6)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -288,6 +289,7 @@ describe('OpenAI integration (V6)', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -335,15 +337,15 @@ describe('OpenAI integration (V6)', () => {
// Check that custom options are respected
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
}),
}),
// Check that custom options are respected for streaming
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true, // Should be marked as stream
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -337,7 +337,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -411,7 +411,7 @@ describe('Vercel AI integration', () => {
data: {
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['tool-calls'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -329,7 +329,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -378,7 +378,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.model.provider': 'mock-provider',
'vercel.ai.operationId': 'ai.generateText.doGenerate',
'vercel.ai.pipeline.name': 'generateText.doGenerate',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
'vercel.ai.prompt.toolChoice': expect.any(String),
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/ai/gen-ai-attributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ export const GEN_AI_OPERATION_NAME_ATTRIBUTE = 'gen_ai.operation.name';
/**
* Original length of messages array, used to indicate truncations had occured
*/
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'gen_ai.input.messages.original_length';
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'sentry.sdk_meta.gen_ai.input.messages.original_length';

/**
* The prompt messages
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/anthropic-ai/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ export function shouldInstrument(methodPath: string): methodPath is AnthropicAiI
* Set the messages and messages original length attributes.
*/
export function setMessagesAttribute(span: Span, messages: unknown): void {
const length = Array.isArray(messages) ? messages.length : undefined;
const length = Array.isArray(messages) ? messages.length : 1;
if (length !== 0) {
span.setAttributes({
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: getTruncatedJsonString(messages),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/tracing/openai/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,11 @@ function addRequestAttributes(span: Span, params: Record<string, unknown>, opera
const truncatedInput = getTruncatedJsonString(src);
span.setAttribute(GEN_AI_INPUT_MESSAGES_ATTRIBUTE, truncatedInput);

// Record original length if it's an array
// Record original length
if (Array.isArray(src)) {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, src.length);
} else {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, 1);
}
}

Expand Down
6 changes: 4 additions & 2 deletions packages/core/test/lib/utils/anthropic-utils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,21 +86,23 @@ describe('anthropic-ai-utils', () => {
setMessagesAttribute(span, [{ role: 'user', content }]);
const result = [{ role: 'user', content: 'A'.repeat(19972) }];
expect(mock.attributes).toStrictEqual({
'gen_ai.input.messages.original_length': 1,
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': JSON.stringify(result),
});
});

it('removes length when setting new value ', () => {
it('sets length to 1 for non-array input', () => {
setMessagesAttribute(span, { content: 'hello, world' });
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});

it('ignores empty array', () => {
setMessagesAttribute(span, []);
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
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 numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ 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,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -666,6 +667,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -682,6 +684,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand DownExpand Up@@ -716,6 +719,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
// Only the last message (with filtered media) should be kept
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -534,6 +535,7 @@ describe('Google GenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(
/^\[\{"role":"user","parts":\[\{"text":"C+"\}\]\}\]$/,
),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand All@@ -555,6 +557,7 @@ describe('Google GenAI integration', () => {
parts: [{ text: 'This is a small message that fits within the limit' }],
},
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -224,6 +225,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -240,6 +242,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -256,6 +259,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -267,6 +268,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -283,6 +285,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -299,6 +302,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@ describe('OpenAI integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -289,6 +290,7 @@ describe('OpenAI integration', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -620,6 +622,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present (truncation happened) and should be a JSON array of a single index
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand All@@ -638,6 +641,7 @@ describe('OpenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand DownExpand Up@@ -674,6 +678,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present and should include truncated string input (contains only As)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^A+$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe('OpenAI integration (V6)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -288,6 +289,7 @@ describe('OpenAI integration (V6)', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -335,15 +337,15 @@ describe('OpenAI integration (V6)', () => {
// Check that custom options are respected
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
}),
}),
// Check that custom options are respected for streaming
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true, // Should be marked as stream
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -337,7 +337,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -411,7 +411,7 @@ describe('Vercel AI integration', () => {
data: {
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['tool-calls'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -329,7 +329,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -378,7 +378,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.model.provider': 'mock-provider',
'vercel.ai.operationId': 'ai.generateText.doGenerate',
'vercel.ai.pipeline.name': 'generateText.doGenerate',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
'vercel.ai.prompt.toolChoice': expect.any(String),
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/ai/gen-ai-attributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ export const GEN_AI_OPERATION_NAME_ATTRIBUTE = 'gen_ai.operation.name';
/**
* Original length of messages array, used to indicate truncations had occured
*/
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'gen_ai.input.messages.original_length';
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'sentry.sdk_meta.gen_ai.input.messages.original_length';

/**
* The prompt messages
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/anthropic-ai/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ export function shouldInstrument(methodPath: string): methodPath is AnthropicAiI
* Set the messages and messages original length attributes.
*/
export function setMessagesAttribute(span: Span, messages: unknown): void {
const length = Array.isArray(messages) ? messages.length : undefined;
const length = Array.isArray(messages) ? messages.length : 1;
if (length !== 0) {
span.setAttributes({
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: getTruncatedJsonString(messages),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/tracing/openai/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,11 @@ function addRequestAttributes(span: Span, params: Record<string, unknown>, opera
const truncatedInput = getTruncatedJsonString(src);
span.setAttribute(GEN_AI_INPUT_MESSAGES_ATTRIBUTE, truncatedInput);

// Record original length if it's an array
// Record original length
if (Array.isArray(src)) {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, src.length);
} else {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, 1);
}
}

Expand Down
6 changes: 4 additions & 2 deletions packages/core/test/lib/utils/anthropic-utils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,21 +86,23 @@ describe('anthropic-ai-utils', () => {
setMessagesAttribute(span, [{ role: 'user', content }]);
const result = [{ role: 'user', content: 'A'.repeat(19972) }];
expect(mock.attributes).toStrictEqual({
'gen_ai.input.messages.original_length': 1,
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': JSON.stringify(result),
});
});

it('removes length when setting new value ', () => {
it('sets length to 1 for non-array input', () => {
setMessagesAttribute(span, { content: 'hello, world' });
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});

it('ignores empty array', () => {
setMessagesAttribute(span, []);
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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 numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ 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,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -666,6 +667,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -682,6 +684,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand DownExpand Up@@ -716,6 +719,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
// Only the last message (with filtered media) should be kept
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -534,6 +535,7 @@ describe('Google GenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(
/^\[\{"role":"user","parts":\[\{"text":"C+"\}\]\}\]$/,
),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand All@@ -555,6 +557,7 @@ describe('Google GenAI integration', () => {
parts: [{ text: 'This is a small message that fits within the limit' }],
},
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -224,6 +225,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -240,6 +242,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -256,6 +259,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -267,6 +268,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -283,6 +285,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -299,6 +302,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@ describe('OpenAI integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -289,6 +290,7 @@ describe('OpenAI integration', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -620,6 +622,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present (truncation happened) and should be a JSON array of a single index
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand All@@ -638,6 +641,7 @@ describe('OpenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand DownExpand Up@@ -674,6 +678,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present and should include truncated string input (contains only As)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^A+$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe('OpenAI integration (V6)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -288,6 +289,7 @@ describe('OpenAI integration (V6)', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -335,15 +337,15 @@ describe('OpenAI integration (V6)', () => {
// Check that custom options are respected
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
}),
}),
// Check that custom options are respected for streaming
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true, // Should be marked as stream
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -337,7 +337,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -411,7 +411,7 @@ describe('Vercel AI integration', () => {
data: {
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['tool-calls'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -329,7 +329,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -378,7 +378,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.model.provider': 'mock-provider',
'vercel.ai.operationId': 'ai.generateText.doGenerate',
'vercel.ai.pipeline.name': 'generateText.doGenerate',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
'vercel.ai.prompt.toolChoice': expect.any(String),
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/ai/gen-ai-attributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ export const GEN_AI_OPERATION_NAME_ATTRIBUTE = 'gen_ai.operation.name';
/**
* Original length of messages array, used to indicate truncations had occured
*/
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'gen_ai.input.messages.original_length';
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'sentry.sdk_meta.gen_ai.input.messages.original_length';

/**
* The prompt messages
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/anthropic-ai/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ export function shouldInstrument(methodPath: string): methodPath is AnthropicAiI
* Set the messages and messages original length attributes.
*/
export function setMessagesAttribute(span: Span, messages: unknown): void {
const length = Array.isArray(messages) ? messages.length : undefined;
const length = Array.isArray(messages) ? messages.length : 1;
if (length !== 0) {
span.setAttributes({
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: getTruncatedJsonString(messages),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/tracing/openai/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,11 @@ function addRequestAttributes(span: Span, params: Record<string, unknown>, opera
const truncatedInput = getTruncatedJsonString(src);
span.setAttribute(GEN_AI_INPUT_MESSAGES_ATTRIBUTE, truncatedInput);

// Record original length if it's an array
// Record original length
if (Array.isArray(src)) {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, src.length);
} else {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, 1);
}
}

Expand Down
6 changes: 4 additions & 2 deletions packages/core/test/lib/utils/anthropic-utils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,21 +86,23 @@ describe('anthropic-ai-utils', () => {
setMessagesAttribute(span, [{ role: 'user', content }]);
const result = [{ role: 'user', content: 'A'.repeat(19972) }];
expect(mock.attributes).toStrictEqual({
'gen_ai.input.messages.original_length': 1,
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': JSON.stringify(result),
});
});

it('removes length when setting new value ', () => {
it('sets length to 1 for non-array input', () => {
setMessagesAttribute(span, { content: 'hello, world' });
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});

it('ignores empty array', () => {
setMessagesAttribute(span, []);
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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 numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ 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,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -666,6 +667,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -682,6 +684,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand DownExpand Up@@ -716,6 +719,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
// Only the last message (with filtered media) should be kept
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -534,6 +535,7 @@ describe('Google GenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(
/^\[\{"role":"user","parts":\[\{"text":"C+"\}\]\}\]$/,
),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand All@@ -555,6 +557,7 @@ describe('Google GenAI integration', () => {
parts: [{ text: 'This is a small message that fits within the limit' }],
},
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -224,6 +225,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -240,6 +242,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -256,6 +259,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -267,6 +268,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -283,6 +285,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -299,6 +302,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@ describe('OpenAI integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -289,6 +290,7 @@ describe('OpenAI integration', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -620,6 +622,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present (truncation happened) and should be a JSON array of a single index
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand All@@ -638,6 +641,7 @@ describe('OpenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand DownExpand Up@@ -674,6 +678,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present and should include truncated string input (contains only As)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^A+$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe('OpenAI integration (V6)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -288,6 +289,7 @@ describe('OpenAI integration (V6)', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -335,15 +337,15 @@ describe('OpenAI integration (V6)', () => {
// Check that custom options are respected
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
}),
}),
// Check that custom options are respected for streaming
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true, // Should be marked as stream
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -337,7 +337,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -411,7 +411,7 @@ describe('Vercel AI integration', () => {
data: {
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['tool-calls'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -329,7 +329,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -378,7 +378,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.model.provider': 'mock-provider',
'vercel.ai.operationId': 'ai.generateText.doGenerate',
'vercel.ai.pipeline.name': 'generateText.doGenerate',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
'vercel.ai.prompt.toolChoice': expect.any(String),
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/ai/gen-ai-attributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ export const GEN_AI_OPERATION_NAME_ATTRIBUTE = 'gen_ai.operation.name';
/**
* Original length of messages array, used to indicate truncations had occured
*/
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'gen_ai.input.messages.original_length';
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'sentry.sdk_meta.gen_ai.input.messages.original_length';

/**
* The prompt messages
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/anthropic-ai/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ export function shouldInstrument(methodPath: string): methodPath is AnthropicAiI
* Set the messages and messages original length attributes.
*/
export function setMessagesAttribute(span: Span, messages: unknown): void {
const length = Array.isArray(messages) ? messages.length : undefined;
const length = Array.isArray(messages) ? messages.length : 1;
if (length !== 0) {
span.setAttributes({
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: getTruncatedJsonString(messages),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/tracing/openai/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,11 @@ function addRequestAttributes(span: Span, params: Record<string, unknown>, opera
const truncatedInput = getTruncatedJsonString(src);
span.setAttribute(GEN_AI_INPUT_MESSAGES_ATTRIBUTE, truncatedInput);

// Record original length if it's an array
// Record original length
if (Array.isArray(src)) {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, src.length);
} else {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, 1);
}
}

Expand Down
6 changes: 4 additions & 2 deletions packages/core/test/lib/utils/anthropic-utils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,21 +86,23 @@ describe('anthropic-ai-utils', () => {
setMessagesAttribute(span, [{ role: 'user', content }]);
const result = [{ role: 'user', content: 'A'.repeat(19972) }];
expect(mock.attributes).toStrictEqual({
'gen_ai.input.messages.original_length': 1,
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': JSON.stringify(result),
});
});

it('removes length when setting new value ', () => {
it('sets length to 1 for non-array input', () => {
setMessagesAttribute(span, { content: 'hello, world' });
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});

it('ignores empty array', () => {
setMessagesAttribute(span, []);
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
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 numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ 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,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -666,6 +667,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -682,6 +684,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand DownExpand Up@@ -716,6 +719,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
// Only the last message (with filtered media) should be kept
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -534,6 +535,7 @@ describe('Google GenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(
/^\[\{"role":"user","parts":\[\{"text":"C+"\}\]\}\]$/,
),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand All@@ -555,6 +557,7 @@ describe('Google GenAI integration', () => {
parts: [{ text: 'This is a small message that fits within the limit' }],
},
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -224,6 +225,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -240,6 +242,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -256,6 +259,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -267,6 +268,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -283,6 +285,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -299,6 +302,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@ describe('OpenAI integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -289,6 +290,7 @@ describe('OpenAI integration', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -620,6 +622,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present (truncation happened) and should be a JSON array of a single index
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand All@@ -638,6 +641,7 @@ describe('OpenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand DownExpand Up@@ -674,6 +678,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present and should include truncated string input (contains only As)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^A+$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe('OpenAI integration (V6)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -288,6 +289,7 @@ describe('OpenAI integration (V6)', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -335,15 +337,15 @@ describe('OpenAI integration (V6)', () => {
// Check that custom options are respected
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
}),
}),
// Check that custom options are respected for streaming
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true, // Should be marked as stream
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -337,7 +337,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -411,7 +411,7 @@ describe('Vercel AI integration', () => {
data: {
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['tool-calls'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -329,7 +329,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -378,7 +378,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.model.provider': 'mock-provider',
'vercel.ai.operationId': 'ai.generateText.doGenerate',
'vercel.ai.pipeline.name': 'generateText.doGenerate',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
'vercel.ai.prompt.toolChoice': expect.any(String),
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/ai/gen-ai-attributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ export const GEN_AI_OPERATION_NAME_ATTRIBUTE = 'gen_ai.operation.name';
/**
* Original length of messages array, used to indicate truncations had occured
*/
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'gen_ai.input.messages.original_length';
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'sentry.sdk_meta.gen_ai.input.messages.original_length';

/**
* The prompt messages
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/anthropic-ai/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ export function shouldInstrument(methodPath: string): methodPath is AnthropicAiI
* Set the messages and messages original length attributes.
*/
export function setMessagesAttribute(span: Span, messages: unknown): void {
const length = Array.isArray(messages) ? messages.length : undefined;
const length = Array.isArray(messages) ? messages.length : 1;
if (length !== 0) {
span.setAttributes({
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: getTruncatedJsonString(messages),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/tracing/openai/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,11 @@ function addRequestAttributes(span: Span, params: Record<string, unknown>, opera
const truncatedInput = getTruncatedJsonString(src);
span.setAttribute(GEN_AI_INPUT_MESSAGES_ATTRIBUTE, truncatedInput);

// Record original length if it's an array
// Record original length
if (Array.isArray(src)) {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, src.length);
} else {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, 1);
}
}

Expand Down
6 changes: 4 additions & 2 deletions packages/core/test/lib/utils/anthropic-utils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,21 +86,23 @@ describe('anthropic-ai-utils', () => {
setMessagesAttribute(span, [{ role: 'user', content }]);
const result = [{ role: 'user', content: 'A'.repeat(19972) }];
expect(mock.attributes).toStrictEqual({
'gen_ai.input.messages.original_length': 1,
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': JSON.stringify(result),
});
});

it('removes length when setting new value ', () => {
it('sets length to 1 for non-array input', () => {
setMessagesAttribute(span, { content: 'hello, world' });
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});

it('ignores empty array', () => {
setMessagesAttribute(span, []);
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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 numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ 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,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -666,6 +667,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -682,6 +684,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand DownExpand Up@@ -716,6 +719,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
// Only the last message (with filtered media) should be kept
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -534,6 +535,7 @@ describe('Google GenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(
/^\[\{"role":"user","parts":\[\{"text":"C+"\}\]\}\]$/,
),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand All@@ -555,6 +557,7 @@ describe('Google GenAI integration', () => {
parts: [{ text: 'This is a small message that fits within the limit' }],
},
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -224,6 +225,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -240,6 +242,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -256,6 +259,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -267,6 +268,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -283,6 +285,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -299,6 +302,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@ describe('OpenAI integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -289,6 +290,7 @@ describe('OpenAI integration', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -620,6 +622,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present (truncation happened) and should be a JSON array of a single index
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand All@@ -638,6 +641,7 @@ describe('OpenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand DownExpand Up@@ -674,6 +678,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present and should include truncated string input (contains only As)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^A+$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe('OpenAI integration (V6)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -288,6 +289,7 @@ describe('OpenAI integration (V6)', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -335,15 +337,15 @@ describe('OpenAI integration (V6)', () => {
// Check that custom options are respected
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
}),
}),
// Check that custom options are respected for streaming
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true, // Should be marked as stream
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -337,7 +337,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -411,7 +411,7 @@ describe('Vercel AI integration', () => {
data: {
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['tool-calls'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -329,7 +329,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -378,7 +378,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.model.provider': 'mock-provider',
'vercel.ai.operationId': 'ai.generateText.doGenerate',
'vercel.ai.pipeline.name': 'generateText.doGenerate',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
'vercel.ai.prompt.toolChoice': expect.any(String),
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/ai/gen-ai-attributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ export const GEN_AI_OPERATION_NAME_ATTRIBUTE = 'gen_ai.operation.name';
/**
* Original length of messages array, used to indicate truncations had occured
*/
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'gen_ai.input.messages.original_length';
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'sentry.sdk_meta.gen_ai.input.messages.original_length';

/**
* The prompt messages
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/anthropic-ai/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ export function shouldInstrument(methodPath: string): methodPath is AnthropicAiI
* Set the messages and messages original length attributes.
*/
export function setMessagesAttribute(span: Span, messages: unknown): void {
const length = Array.isArray(messages) ? messages.length : undefined;
const length = Array.isArray(messages) ? messages.length : 1;
if (length !== 0) {
span.setAttributes({
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: getTruncatedJsonString(messages),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/tracing/openai/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,11 @@ function addRequestAttributes(span: Span, params: Record<string, unknown>, opera
const truncatedInput = getTruncatedJsonString(src);
span.setAttribute(GEN_AI_INPUT_MESSAGES_ATTRIBUTE, truncatedInput);

// Record original length if it's an array
// Record original length
if (Array.isArray(src)) {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, src.length);
} else {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, 1);
}
}

Expand Down
6 changes: 4 additions & 2 deletions packages/core/test/lib/utils/anthropic-utils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,21 +86,23 @@ describe('anthropic-ai-utils', () => {
setMessagesAttribute(span, [{ role: 'user', content }]);
const result = [{ role: 'user', content: 'A'.repeat(19972) }];
expect(mock.attributes).toStrictEqual({
'gen_ai.input.messages.original_length': 1,
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': JSON.stringify(result),
});
});

it('removes length when setting new value ', () => {
it('sets length to 1 for non-array input', () => {
setMessagesAttribute(span, { content: 'hello, world' });
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});

it('ignores empty array', () => {
setMessagesAttribute(span, []);
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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 numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ 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,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -666,6 +667,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -682,6 +684,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand DownExpand Up@@ -716,6 +719,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
// Only the last message (with filtered media) should be kept
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -534,6 +535,7 @@ describe('Google GenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(
/^\[\{"role":"user","parts":\[\{"text":"C+"\}\]\}\]$/,
),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand All@@ -555,6 +557,7 @@ describe('Google GenAI integration', () => {
parts: [{ text: 'This is a small message that fits within the limit' }],
},
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -224,6 +225,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -240,6 +242,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -256,6 +259,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -267,6 +268,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -283,6 +285,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -299,6 +302,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@ describe('OpenAI integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -289,6 +290,7 @@ describe('OpenAI integration', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -620,6 +622,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present (truncation happened) and should be a JSON array of a single index
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand All@@ -638,6 +641,7 @@ describe('OpenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand DownExpand Up@@ -674,6 +678,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present and should include truncated string input (contains only As)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^A+$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe('OpenAI integration (V6)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -288,6 +289,7 @@ describe('OpenAI integration (V6)', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -335,15 +337,15 @@ describe('OpenAI integration (V6)', () => {
// Check that custom options are respected
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
}),
}),
// Check that custom options are respected for streaming
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true, // Should be marked as stream
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -337,7 +337,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -411,7 +411,7 @@ describe('Vercel AI integration', () => {
data: {
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['tool-calls'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -329,7 +329,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -378,7 +378,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.model.provider': 'mock-provider',
'vercel.ai.operationId': 'ai.generateText.doGenerate',
'vercel.ai.pipeline.name': 'generateText.doGenerate',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
'vercel.ai.prompt.toolChoice': expect.any(String),
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/ai/gen-ai-attributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ export const GEN_AI_OPERATION_NAME_ATTRIBUTE = 'gen_ai.operation.name';
/**
* Original length of messages array, used to indicate truncations had occured
*/
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'gen_ai.input.messages.original_length';
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'sentry.sdk_meta.gen_ai.input.messages.original_length';

/**
* The prompt messages
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/anthropic-ai/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ export function shouldInstrument(methodPath: string): methodPath is AnthropicAiI
* Set the messages and messages original length attributes.
*/
export function setMessagesAttribute(span: Span, messages: unknown): void {
const length = Array.isArray(messages) ? messages.length : undefined;
const length = Array.isArray(messages) ? messages.length : 1;
if (length !== 0) {
span.setAttributes({
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: getTruncatedJsonString(messages),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/tracing/openai/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,11 @@ function addRequestAttributes(span: Span, params: Record<string, unknown>, opera
const truncatedInput = getTruncatedJsonString(src);
span.setAttribute(GEN_AI_INPUT_MESSAGES_ATTRIBUTE, truncatedInput);

// Record original length if it's an array
// Record original length
if (Array.isArray(src)) {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, src.length);
} else {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, 1);
}
}

Expand Down
6 changes: 4 additions & 2 deletions packages/core/test/lib/utils/anthropic-utils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,21 +86,23 @@ describe('anthropic-ai-utils', () => {
setMessagesAttribute(span, [{ role: 'user', content }]);
const result = [{ role: 'user', content: 'A'.repeat(19972) }];
expect(mock.attributes).toStrictEqual({
'gen_ai.input.messages.original_length': 1,
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': JSON.stringify(result),
});
});

it('removes length when setting new value ', () => {
it('sets length to 1 for non-array input', () => {
setMessagesAttribute(span, { content: 'hello, world' });
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});

it('ignores empty array', () => {
setMessagesAttribute(span, []);
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
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 numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ 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,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -666,6 +667,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -682,6 +684,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand DownExpand Up@@ -716,6 +719,7 @@ describe('Anthropic integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
// Only the last message (with filtered media) should be kept
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
Expand DownExpand Up@@ -534,6 +535,7 @@ describe('Google GenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(
/^\[\{"role":"user","parts":\[\{"text":"C+"\}\]\}\]$/,
),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand All@@ -555,6 +557,7 @@ describe('Google GenAI integration', () => {
parts: [{ text: 'This is a small message that fits within the limit' }],
},
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'generate_content gemini-1.5-flash',
op: 'gen_ai.generate_content',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, describe, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -224,6 +225,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -240,6 +242,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -256,6 +259,7 @@ describe('LangChain integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '
import { afterAll, expect } from 'vitest';
import {
GEN_AI_INPUT_MESSAGES_ATTRIBUTE,
GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE,
GEN_AI_OPERATION_NAME_ATTRIBUTE,
GEN_AI_REQUEST_MAX_TOKENS_ATTRIBUTE,
GEN_AI_REQUEST_MODEL_ATTRIBUTE,
Expand DownExpand Up@@ -267,6 +268,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
// Messages should be present and should include truncated string input (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -283,6 +285,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
}),
Expand All@@ -299,6 +302,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.langchain',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-5-sonnet-20241022',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
// Small message should be kept intact
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -214,6 +214,7 @@ describe('OpenAI integration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -289,6 +290,7 @@ describe('OpenAI integration', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -620,6 +622,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present (truncation happened) and should be a JSON array of a single index
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand All@@ -638,6 +641,7 @@ describe('OpenAI integration', () => {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: JSON.stringify([
{ role: 'user', content: 'This is a small message that fits within the limit' },
]),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 3,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand DownExpand Up@@ -674,6 +678,7 @@ describe('OpenAI integration', () => {
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
// Messages should be present and should include truncated string input (contains only As)
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.stringMatching(/^A+$/),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
}),
description: 'chat gpt-3.5-turbo',
op: 'gen_ai.chat',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,6 +213,7 @@ describe('OpenAI integration (V6)', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.openai',
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-3.5-turbo',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Translate this to French: Hello',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: 'Response to: Translate this to French: Hello',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: '["completed"]',
Expand DownExpand Up@@ -288,6 +289,7 @@ describe('OpenAI integration (V6)', () => {
[GEN_AI_SYSTEM_ATTRIBUTE]: 'openai',
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gpt-4',
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true,
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: 'Test streaming responses API',
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]:
'Streaming response to: Test streaming responses APITest streaming responses API',
Expand DownExpand Up@@ -335,15 +337,15 @@ describe('OpenAI integration (V6)', () => {
// Check that custom options are respected
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
}),
}),
// Check that custom options are respected for streaming
expect.objectContaining({
data: expect.objectContaining({
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 2,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String), // Should include messages when recordInputs: true
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String), // Should include response text when recordOutputs: true
[GEN_AI_REQUEST_STREAM_ATTRIBUTE]: true, // Should be marked as stream
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -337,7 +337,7 @@ describe('Vercel AI integration', () => {
expect.objectContaining({
data: {
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand DownExpand Up@@ -411,7 +411,7 @@ describe('Vercel AI integration', () => {
data: {
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'mock-model-id',
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['tool-calls'],
[GEN_AI_RESPONSE_ID_ATTRIBUTE]: expect.any(String),
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -329,7 +329,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.response.id': expect.any(String),
[GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: expect.any(String),
'vercel.ai.response.timestamp': expect.any(String),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
[GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: ['stop'],
[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
Expand DownExpand Up@@ -378,7 +378,7 @@ describe('Vercel AI integration (V5)', () => {
'vercel.ai.model.provider': 'mock-provider',
'vercel.ai.operationId': 'ai.generateText.doGenerate',
'vercel.ai.pipeline.name': 'generateText.doGenerate',
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: expect.any(Number),
[GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE]: 1,
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: expect.any(String),
'vercel.ai.prompt.toolChoice': expect.any(String),
[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE]: EXPECTED_AVAILABLE_TOOLS_JSON,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/ai/gen-ai-attributes.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ export const GEN_AI_OPERATION_NAME_ATTRIBUTE = 'gen_ai.operation.name';
/**
* Original length of messages array, used to indicate truncations had occured
*/
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'gen_ai.input.messages.original_length';
export const GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE = 'sentry.sdk_meta.gen_ai.input.messages.original_length';

/**
* The prompt messages
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tracing/anthropic-ai/utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ export function shouldInstrument(methodPath: string): methodPath is AnthropicAiI
* Set the messages and messages original length attributes.
*/
export function setMessagesAttribute(span: Span, messages: unknown): void {
const length = Array.isArray(messages) ? messages.length : undefined;
const length = Array.isArray(messages) ? messages.length : 1;
if (length !== 0) {
span.setAttributes({
[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]: getTruncatedJsonString(messages),
Expand Down
4 changes: 3 additions & 1 deletion packages/core/src/tracing/openai/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,11 @@ function addRequestAttributes(span: Span, params: Record<string, unknown>, opera
const truncatedInput = getTruncatedJsonString(src);
span.setAttribute(GEN_AI_INPUT_MESSAGES_ATTRIBUTE, truncatedInput);

// Record original length if it's an array
// Record original length
if (Array.isArray(src)) {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, src.length);
} else {
span.setAttribute(GEN_AI_INPUT_MESSAGES_ORIGINAL_LENGTH_ATTRIBUTE, 1);
}
}

Expand Down
6 changes: 4 additions & 2 deletions packages/core/test/lib/utils/anthropic-utils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,21 +86,23 @@ describe('anthropic-ai-utils', () => {
setMessagesAttribute(span, [{ role: 'user', content }]);
const result = [{ role: 'user', content: 'A'.repeat(19972) }];
expect(mock.attributes).toStrictEqual({
'gen_ai.input.messages.original_length': 1,
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': JSON.stringify(result),
});
});

it('removes length when setting new value ', () => {
it('sets length to 1 for non-array input', () => {
setMessagesAttribute(span, { content: 'hello, world' });
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});

it('ignores empty array', () => {
setMessagesAttribute(span, []);
expect(mock.attributes).toStrictEqual({
'sentry.sdk_meta.gen_ai.input.messages.original_length': 1,
'gen_ai.input.messages': '{"content":"hello, world"}',
});
});
Expand Down
Loading