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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackAsyncIntegration'),
gzip: true,
limit: '34 KB',
limit: '35 KB',
},
// React SDK (ESM)
{
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
// Mock Anthropic client for browser testing
export class MockAnthropic {
constructor(config) {
this.apiKey = config.apiKey;

// Main focus: messages.create functionality
this.messages = {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'msg_mock123',
type: 'message',
role: 'assistant',
model: params.model,
content: [
{
type: 'text',
text: 'Hello from Anthropic mock!',
},
],
stop_reason: 'end_turn',
stop_sequence: null,
usage: {
input_tokens: 10,
output_tokens: 15,
cache_creation_input_tokens: 0,
cache_read_input_tokens: 0,
},
};
return response;
},
countTokens: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock', input_tokens: 0 }),
};

// Minimal implementations for required interface compliance
this.models = {
list: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
get: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
};

this.completions = {
create: async (..._args) => ({ id: 'mock', type: 'completion', model: 'mock' }),
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import { instrumentAnthropicAiClient } from '@sentry/browser';
import { MockAnthropic } from './mocks.js';

const mockClient = new MockAnthropic({
apiKey: 'mock-api-key',
});
Comment on lines +4 to +6

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

m: It isn't ideal for an integration test to mock the client we want to instrument. In our Node integration tests we usually test against the actual libraries (though not sure about AI packages to be fair).

I'm not sure if this works out of the box but we can try adding the packages as dependencies to the browser-integration-tests package.json and then just importing them in the subject files. We bundle each individual integration test suite via webpack so maybe webpack can actually resolve and bundle the dependencies out of the box. If this doesn't work, we should find a way to make this possible. I'm sure this is also a concern for logging libraries used in browser apps.

I'm fine though with merging the PR as-is and following up with replacing the mocks with the actual test apps. Whatever works for you better :)

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We mock the server apis for AI tests usually, yep can do in a follow up, will draft a ticket for this.


const client = instrumentAnthropicAiClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
const response = await client.messages.create({
model: 'claude-3-haiku-20240307',
messages: [{ role: 'user', content: 'What is the capital of France?' }],
temperature: 0.7,
max_tokens: 100,
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Anthropic instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('claude-3-haiku-20240307');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('messages claude-3-haiku-20240307');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.messages');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.anthropic');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'messages',
'gen_ai.system': 'anthropic',
'gen_ai.request.model': 'claude-3-haiku-20240307',
'gen_ai.request.temperature': 0.7,
'gen_ai.response.model': 'claude-3-haiku-20240307',
'gen_ai.response.id': 'msg_mock123',
'gen_ai.usage.input_tokens': 10,
'gen_ai.usage.output_tokens': 15,
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
// Mock Google GenAI client for browser testing
export class MockGoogleGenAI {
constructor(config) {
this.apiKey = config.apiKey;

// models.generateContent functionality
this.models = {
generateContent: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

return {
candidates: [
{
content: {
parts: [
{
text: 'Hello from Google GenAI mock!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
};
},
generateContentStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};

// chats.create implementation
this.chats = {
create: (...args) => {
const params = args[0];
const model = params.model;

return {
modelVersion: model,
sendMessage: async (..._messageArgs) => {
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

const response = {
candidates: [
{
content: {
parts: [
{
text: 'This is a joke from the chat!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
modelVersion: model, // Include model version in response
};
return response;
},
sendMessageStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming chat response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};
},
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import { instrumentGoogleGenAIClient } from '@sentry/browser';
import { MockGoogleGenAI } from './mocks.js';

const mockClient = new MockGoogleGenAI({
apiKey: 'mock-api-key',
});

const client = instrumentGoogleGenAIClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
// Test both chats and models APIs
const chat = client.chats.create({
model: 'gemini-1.5-pro',
config: {
temperature: 0.8,
topP: 0.9,
maxOutputTokens: 150,
},
history: [
{
role: 'user',
parts: [{ text: 'Hello, how are you?' }],
},
],
});

const response = await chat.sendMessage({
message: 'Tell me a joke',
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Google GenAI instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('gemini-1.5-pro');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('chat gemini-1.5-pro create');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.chat');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.google_genai');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'chat',
'gen_ai.system': 'google_genai',
'gen_ai.request.model': 'gemini-1.5-pro',
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
// Mock OpenAI client for browser testing
export class MockOpenAi {
constructor(config) {
this.apiKey = config.apiKey;

this.chat = {
completions: {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'chatcmpl-mock123',
object: 'chat.completion',
created: 1677652288,
model: params.model,
system_fingerprint: 'fp_44709d6fcb',
choices: [
{
index: 0,
message: {
role: 'assistant',
content: 'Hello from OpenAI mock!',
},
finish_reason: 'stop',
},
],
usage: {
prompt_tokens: 10,
completion_tokens: 15,
total_tokens: 25,
},
};
return response;
},
},
};
}
}
Loading
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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackAsyncIntegration'),
gzip: true,
limit: '34 KB',
limit: '35 KB',
},
// React SDK (ESM)
{
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
// Mock Anthropic client for browser testing
export class MockAnthropic {
constructor(config) {
this.apiKey = config.apiKey;

// Main focus: messages.create functionality
this.messages = {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'msg_mock123',
type: 'message',
role: 'assistant',
model: params.model,
content: [
{
type: 'text',
text: 'Hello from Anthropic mock!',
},
],
stop_reason: 'end_turn',
stop_sequence: null,
usage: {
input_tokens: 10,
output_tokens: 15,
cache_creation_input_tokens: 0,
cache_read_input_tokens: 0,
},
};
return response;
},
countTokens: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock', input_tokens: 0 }),
};

// Minimal implementations for required interface compliance
this.models = {
list: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
get: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
};

this.completions = {
create: async (..._args) => ({ id: 'mock', type: 'completion', model: 'mock' }),
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import { instrumentAnthropicAiClient } from '@sentry/browser';
import { MockAnthropic } from './mocks.js';

const mockClient = new MockAnthropic({
apiKey: 'mock-api-key',
});
Comment on lines +4 to +6

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

m: It isn't ideal for an integration test to mock the client we want to instrument. In our Node integration tests we usually test against the actual libraries (though not sure about AI packages to be fair).

I'm not sure if this works out of the box but we can try adding the packages as dependencies to the browser-integration-tests package.json and then just importing them in the subject files. We bundle each individual integration test suite via webpack so maybe webpack can actually resolve and bundle the dependencies out of the box. If this doesn't work, we should find a way to make this possible. I'm sure this is also a concern for logging libraries used in browser apps.

I'm fine though with merging the PR as-is and following up with replacing the mocks with the actual test apps. Whatever works for you better :)

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We mock the server apis for AI tests usually, yep can do in a follow up, will draft a ticket for this.


const client = instrumentAnthropicAiClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
const response = await client.messages.create({
model: 'claude-3-haiku-20240307',
messages: [{ role: 'user', content: 'What is the capital of France?' }],
temperature: 0.7,
max_tokens: 100,
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Anthropic instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('claude-3-haiku-20240307');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('messages claude-3-haiku-20240307');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.messages');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.anthropic');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'messages',
'gen_ai.system': 'anthropic',
'gen_ai.request.model': 'claude-3-haiku-20240307',
'gen_ai.request.temperature': 0.7,
'gen_ai.response.model': 'claude-3-haiku-20240307',
'gen_ai.response.id': 'msg_mock123',
'gen_ai.usage.input_tokens': 10,
'gen_ai.usage.output_tokens': 15,
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
// Mock Google GenAI client for browser testing
export class MockGoogleGenAI {
constructor(config) {
this.apiKey = config.apiKey;

// models.generateContent functionality
this.models = {
generateContent: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

return {
candidates: [
{
content: {
parts: [
{
text: 'Hello from Google GenAI mock!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
};
},
generateContentStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};

// chats.create implementation
this.chats = {
create: (...args) => {
const params = args[0];
const model = params.model;

return {
modelVersion: model,
sendMessage: async (..._messageArgs) => {
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

const response = {
candidates: [
{
content: {
parts: [
{
text: 'This is a joke from the chat!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
modelVersion: model, // Include model version in response
};
return response;
},
sendMessageStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming chat response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};
},
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import { instrumentGoogleGenAIClient } from '@sentry/browser';
import { MockGoogleGenAI } from './mocks.js';

const mockClient = new MockGoogleGenAI({
apiKey: 'mock-api-key',
});

const client = instrumentGoogleGenAIClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
// Test both chats and models APIs
const chat = client.chats.create({
model: 'gemini-1.5-pro',
config: {
temperature: 0.8,
topP: 0.9,
maxOutputTokens: 150,
},
history: [
{
role: 'user',
parts: [{ text: 'Hello, how are you?' }],
},
],
});

const response = await chat.sendMessage({
message: 'Tell me a joke',
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Google GenAI instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('gemini-1.5-pro');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('chat gemini-1.5-pro create');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.chat');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.google_genai');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'chat',
'gen_ai.system': 'google_genai',
'gen_ai.request.model': 'gemini-1.5-pro',
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
// Mock OpenAI client for browser testing
export class MockOpenAi {
constructor(config) {
this.apiKey = config.apiKey;

this.chat = {
completions: {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'chatcmpl-mock123',
object: 'chat.completion',
created: 1677652288,
model: params.model,
system_fingerprint: 'fp_44709d6fcb',
choices: [
{
index: 0,
message: {
role: 'assistant',
content: 'Hello from OpenAI mock!',
},
finish_reason: 'stop',
},
],
usage: {
prompt_tokens: 10,
completion_tokens: 15,
total_tokens: 25,
},
};
return response;
},
},
};
}
}
Loading
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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackAsyncIntegration'),
gzip: true,
limit: '34 KB',
limit: '35 KB',
},
// React SDK (ESM)
{
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
// Mock Anthropic client for browser testing
export class MockAnthropic {
constructor(config) {
this.apiKey = config.apiKey;

// Main focus: messages.create functionality
this.messages = {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'msg_mock123',
type: 'message',
role: 'assistant',
model: params.model,
content: [
{
type: 'text',
text: 'Hello from Anthropic mock!',
},
],
stop_reason: 'end_turn',
stop_sequence: null,
usage: {
input_tokens: 10,
output_tokens: 15,
cache_creation_input_tokens: 0,
cache_read_input_tokens: 0,
},
};
return response;
},
countTokens: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock', input_tokens: 0 }),
};

// Minimal implementations for required interface compliance
this.models = {
list: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
get: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
};

this.completions = {
create: async (..._args) => ({ id: 'mock', type: 'completion', model: 'mock' }),
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import { instrumentAnthropicAiClient } from '@sentry/browser';
import { MockAnthropic } from './mocks.js';

const mockClient = new MockAnthropic({
apiKey: 'mock-api-key',
});
Comment on lines +4 to +6

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

m: It isn't ideal for an integration test to mock the client we want to instrument. In our Node integration tests we usually test against the actual libraries (though not sure about AI packages to be fair).

I'm not sure if this works out of the box but we can try adding the packages as dependencies to the browser-integration-tests package.json and then just importing them in the subject files. We bundle each individual integration test suite via webpack so maybe webpack can actually resolve and bundle the dependencies out of the box. If this doesn't work, we should find a way to make this possible. I'm sure this is also a concern for logging libraries used in browser apps.

I'm fine though with merging the PR as-is and following up with replacing the mocks with the actual test apps. Whatever works for you better :)

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We mock the server apis for AI tests usually, yep can do in a follow up, will draft a ticket for this.


const client = instrumentAnthropicAiClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
const response = await client.messages.create({
model: 'claude-3-haiku-20240307',
messages: [{ role: 'user', content: 'What is the capital of France?' }],
temperature: 0.7,
max_tokens: 100,
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Anthropic instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('claude-3-haiku-20240307');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('messages claude-3-haiku-20240307');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.messages');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.anthropic');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'messages',
'gen_ai.system': 'anthropic',
'gen_ai.request.model': 'claude-3-haiku-20240307',
'gen_ai.request.temperature': 0.7,
'gen_ai.response.model': 'claude-3-haiku-20240307',
'gen_ai.response.id': 'msg_mock123',
'gen_ai.usage.input_tokens': 10,
'gen_ai.usage.output_tokens': 15,
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
// Mock Google GenAI client for browser testing
export class MockGoogleGenAI {
constructor(config) {
this.apiKey = config.apiKey;

// models.generateContent functionality
this.models = {
generateContent: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

return {
candidates: [
{
content: {
parts: [
{
text: 'Hello from Google GenAI mock!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
};
},
generateContentStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};

// chats.create implementation
this.chats = {
create: (...args) => {
const params = args[0];
const model = params.model;

return {
modelVersion: model,
sendMessage: async (..._messageArgs) => {
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

const response = {
candidates: [
{
content: {
parts: [
{
text: 'This is a joke from the chat!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
modelVersion: model, // Include model version in response
};
return response;
},
sendMessageStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming chat response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};
},
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import { instrumentGoogleGenAIClient } from '@sentry/browser';
import { MockGoogleGenAI } from './mocks.js';

const mockClient = new MockGoogleGenAI({
apiKey: 'mock-api-key',
});

const client = instrumentGoogleGenAIClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
// Test both chats and models APIs
const chat = client.chats.create({
model: 'gemini-1.5-pro',
config: {
temperature: 0.8,
topP: 0.9,
maxOutputTokens: 150,
},
history: [
{
role: 'user',
parts: [{ text: 'Hello, how are you?' }],
},
],
});

const response = await chat.sendMessage({
message: 'Tell me a joke',
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Google GenAI instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('gemini-1.5-pro');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('chat gemini-1.5-pro create');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.chat');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.google_genai');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'chat',
'gen_ai.system': 'google_genai',
'gen_ai.request.model': 'gemini-1.5-pro',
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
// Mock OpenAI client for browser testing
export class MockOpenAi {
constructor(config) {
this.apiKey = config.apiKey;

this.chat = {
completions: {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'chatcmpl-mock123',
object: 'chat.completion',
created: 1677652288,
model: params.model,
system_fingerprint: 'fp_44709d6fcb',
choices: [
{
index: 0,
message: {
role: 'assistant',
content: 'Hello from OpenAI mock!',
},
finish_reason: 'stop',
},
],
usage: {
prompt_tokens: 10,
completion_tokens: 15,
total_tokens: 25,
},
};
return response;
},
},
};
}
}
Loading
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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackAsyncIntegration'),
gzip: true,
limit: '34 KB',
limit: '35 KB',
},
// React SDK (ESM)
{
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
// Mock Anthropic client for browser testing
export class MockAnthropic {
constructor(config) {
this.apiKey = config.apiKey;

// Main focus: messages.create functionality
this.messages = {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'msg_mock123',
type: 'message',
role: 'assistant',
model: params.model,
content: [
{
type: 'text',
text: 'Hello from Anthropic mock!',
},
],
stop_reason: 'end_turn',
stop_sequence: null,
usage: {
input_tokens: 10,
output_tokens: 15,
cache_creation_input_tokens: 0,
cache_read_input_tokens: 0,
},
};
return response;
},
countTokens: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock', input_tokens: 0 }),
};

// Minimal implementations for required interface compliance
this.models = {
list: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
get: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
};

this.completions = {
create: async (..._args) => ({ id: 'mock', type: 'completion', model: 'mock' }),
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import { instrumentAnthropicAiClient } from '@sentry/browser';
import { MockAnthropic } from './mocks.js';

const mockClient = new MockAnthropic({
apiKey: 'mock-api-key',
});
Comment on lines +4 to +6

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

m: It isn't ideal for an integration test to mock the client we want to instrument. In our Node integration tests we usually test against the actual libraries (though not sure about AI packages to be fair).

I'm not sure if this works out of the box but we can try adding the packages as dependencies to the browser-integration-tests package.json and then just importing them in the subject files. We bundle each individual integration test suite via webpack so maybe webpack can actually resolve and bundle the dependencies out of the box. If this doesn't work, we should find a way to make this possible. I'm sure this is also a concern for logging libraries used in browser apps.

I'm fine though with merging the PR as-is and following up with replacing the mocks with the actual test apps. Whatever works for you better :)

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We mock the server apis for AI tests usually, yep can do in a follow up, will draft a ticket for this.


const client = instrumentAnthropicAiClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
const response = await client.messages.create({
model: 'claude-3-haiku-20240307',
messages: [{ role: 'user', content: 'What is the capital of France?' }],
temperature: 0.7,
max_tokens: 100,
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Anthropic instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('claude-3-haiku-20240307');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('messages claude-3-haiku-20240307');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.messages');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.anthropic');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'messages',
'gen_ai.system': 'anthropic',
'gen_ai.request.model': 'claude-3-haiku-20240307',
'gen_ai.request.temperature': 0.7,
'gen_ai.response.model': 'claude-3-haiku-20240307',
'gen_ai.response.id': 'msg_mock123',
'gen_ai.usage.input_tokens': 10,
'gen_ai.usage.output_tokens': 15,
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
// Mock Google GenAI client for browser testing
export class MockGoogleGenAI {
constructor(config) {
this.apiKey = config.apiKey;

// models.generateContent functionality
this.models = {
generateContent: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

return {
candidates: [
{
content: {
parts: [
{
text: 'Hello from Google GenAI mock!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
};
},
generateContentStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};

// chats.create implementation
this.chats = {
create: (...args) => {
const params = args[0];
const model = params.model;

return {
modelVersion: model,
sendMessage: async (..._messageArgs) => {
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

const response = {
candidates: [
{
content: {
parts: [
{
text: 'This is a joke from the chat!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
modelVersion: model, // Include model version in response
};
return response;
},
sendMessageStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming chat response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};
},
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import { instrumentGoogleGenAIClient } from '@sentry/browser';
import { MockGoogleGenAI } from './mocks.js';

const mockClient = new MockGoogleGenAI({
apiKey: 'mock-api-key',
});

const client = instrumentGoogleGenAIClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
// Test both chats and models APIs
const chat = client.chats.create({
model: 'gemini-1.5-pro',
config: {
temperature: 0.8,
topP: 0.9,
maxOutputTokens: 150,
},
history: [
{
role: 'user',
parts: [{ text: 'Hello, how are you?' }],
},
],
});

const response = await chat.sendMessage({
message: 'Tell me a joke',
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Google GenAI instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('gemini-1.5-pro');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('chat gemini-1.5-pro create');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.chat');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.google_genai');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'chat',
'gen_ai.system': 'google_genai',
'gen_ai.request.model': 'gemini-1.5-pro',
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
// Mock OpenAI client for browser testing
export class MockOpenAi {
constructor(config) {
this.apiKey = config.apiKey;

this.chat = {
completions: {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'chatcmpl-mock123',
object: 'chat.completion',
created: 1677652288,
model: params.model,
system_fingerprint: 'fp_44709d6fcb',
choices: [
{
index: 0,
message: {
role: 'assistant',
content: 'Hello from OpenAI mock!',
},
finish_reason: 'stop',
},
],
usage: {
prompt_tokens: 10,
completion_tokens: 15,
total_tokens: 25,
},
};
return response;
},
},
};
}
}
Loading
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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackAsyncIntegration'),
gzip: true,
limit: '34 KB',
limit: '35 KB',
},
// React SDK (ESM)
{
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
// Mock Anthropic client for browser testing
export class MockAnthropic {
constructor(config) {
this.apiKey = config.apiKey;

// Main focus: messages.create functionality
this.messages = {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'msg_mock123',
type: 'message',
role: 'assistant',
model: params.model,
content: [
{
type: 'text',
text: 'Hello from Anthropic mock!',
},
],
stop_reason: 'end_turn',
stop_sequence: null,
usage: {
input_tokens: 10,
output_tokens: 15,
cache_creation_input_tokens: 0,
cache_read_input_tokens: 0,
},
};
return response;
},
countTokens: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock', input_tokens: 0 }),
};

// Minimal implementations for required interface compliance
this.models = {
list: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
get: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
};

this.completions = {
create: async (..._args) => ({ id: 'mock', type: 'completion', model: 'mock' }),
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import { instrumentAnthropicAiClient } from '@sentry/browser';
import { MockAnthropic } from './mocks.js';

const mockClient = new MockAnthropic({
apiKey: 'mock-api-key',
});
Comment on lines +4 to +6

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

m: It isn't ideal for an integration test to mock the client we want to instrument. In our Node integration tests we usually test against the actual libraries (though not sure about AI packages to be fair).

I'm not sure if this works out of the box but we can try adding the packages as dependencies to the browser-integration-tests package.json and then just importing them in the subject files. We bundle each individual integration test suite via webpack so maybe webpack can actually resolve and bundle the dependencies out of the box. If this doesn't work, we should find a way to make this possible. I'm sure this is also a concern for logging libraries used in browser apps.

I'm fine though with merging the PR as-is and following up with replacing the mocks with the actual test apps. Whatever works for you better :)

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We mock the server apis for AI tests usually, yep can do in a follow up, will draft a ticket for this.


const client = instrumentAnthropicAiClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
const response = await client.messages.create({
model: 'claude-3-haiku-20240307',
messages: [{ role: 'user', content: 'What is the capital of France?' }],
temperature: 0.7,
max_tokens: 100,
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Anthropic instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('claude-3-haiku-20240307');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('messages claude-3-haiku-20240307');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.messages');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.anthropic');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'messages',
'gen_ai.system': 'anthropic',
'gen_ai.request.model': 'claude-3-haiku-20240307',
'gen_ai.request.temperature': 0.7,
'gen_ai.response.model': 'claude-3-haiku-20240307',
'gen_ai.response.id': 'msg_mock123',
'gen_ai.usage.input_tokens': 10,
'gen_ai.usage.output_tokens': 15,
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
// Mock Google GenAI client for browser testing
export class MockGoogleGenAI {
constructor(config) {
this.apiKey = config.apiKey;

// models.generateContent functionality
this.models = {
generateContent: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

return {
candidates: [
{
content: {
parts: [
{
text: 'Hello from Google GenAI mock!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
};
},
generateContentStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};

// chats.create implementation
this.chats = {
create: (...args) => {
const params = args[0];
const model = params.model;

return {
modelVersion: model,
sendMessage: async (..._messageArgs) => {
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

const response = {
candidates: [
{
content: {
parts: [
{
text: 'This is a joke from the chat!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
modelVersion: model, // Include model version in response
};
return response;
},
sendMessageStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming chat response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};
},
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import { instrumentGoogleGenAIClient } from '@sentry/browser';
import { MockGoogleGenAI } from './mocks.js';

const mockClient = new MockGoogleGenAI({
apiKey: 'mock-api-key',
});

const client = instrumentGoogleGenAIClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
// Test both chats and models APIs
const chat = client.chats.create({
model: 'gemini-1.5-pro',
config: {
temperature: 0.8,
topP: 0.9,
maxOutputTokens: 150,
},
history: [
{
role: 'user',
parts: [{ text: 'Hello, how are you?' }],
},
],
});

const response = await chat.sendMessage({
message: 'Tell me a joke',
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Google GenAI instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('gemini-1.5-pro');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('chat gemini-1.5-pro create');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.chat');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.google_genai');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'chat',
'gen_ai.system': 'google_genai',
'gen_ai.request.model': 'gemini-1.5-pro',
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
// Mock OpenAI client for browser testing
export class MockOpenAi {
constructor(config) {
this.apiKey = config.apiKey;

this.chat = {
completions: {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'chatcmpl-mock123',
object: 'chat.completion',
created: 1677652288,
model: params.model,
system_fingerprint: 'fp_44709d6fcb',
choices: [
{
index: 0,
message: {
role: 'assistant',
content: 'Hello from OpenAI mock!',
},
finish_reason: 'stop',
},
],
usage: {
prompt_tokens: 10,
completion_tokens: 15,
total_tokens: 25,
},
};
return response;
},
},
};
}
}
Loading
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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackAsyncIntegration'),
gzip: true,
limit: '34 KB',
limit: '35 KB',
},
// React SDK (ESM)
{
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
// Mock Anthropic client for browser testing
export class MockAnthropic {
constructor(config) {
this.apiKey = config.apiKey;

// Main focus: messages.create functionality
this.messages = {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'msg_mock123',
type: 'message',
role: 'assistant',
model: params.model,
content: [
{
type: 'text',
text: 'Hello from Anthropic mock!',
},
],
stop_reason: 'end_turn',
stop_sequence: null,
usage: {
input_tokens: 10,
output_tokens: 15,
cache_creation_input_tokens: 0,
cache_read_input_tokens: 0,
},
};
return response;
},
countTokens: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock', input_tokens: 0 }),
};

// Minimal implementations for required interface compliance
this.models = {
list: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
get: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
};

this.completions = {
create: async (..._args) => ({ id: 'mock', type: 'completion', model: 'mock' }),
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import { instrumentAnthropicAiClient } from '@sentry/browser';
import { MockAnthropic } from './mocks.js';

const mockClient = new MockAnthropic({
apiKey: 'mock-api-key',
});
Comment on lines +4 to +6

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

m: It isn't ideal for an integration test to mock the client we want to instrument. In our Node integration tests we usually test against the actual libraries (though not sure about AI packages to be fair).

I'm not sure if this works out of the box but we can try adding the packages as dependencies to the browser-integration-tests package.json and then just importing them in the subject files. We bundle each individual integration test suite via webpack so maybe webpack can actually resolve and bundle the dependencies out of the box. If this doesn't work, we should find a way to make this possible. I'm sure this is also a concern for logging libraries used in browser apps.

I'm fine though with merging the PR as-is and following up with replacing the mocks with the actual test apps. Whatever works for you better :)

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We mock the server apis for AI tests usually, yep can do in a follow up, will draft a ticket for this.


const client = instrumentAnthropicAiClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
const response = await client.messages.create({
model: 'claude-3-haiku-20240307',
messages: [{ role: 'user', content: 'What is the capital of France?' }],
temperature: 0.7,
max_tokens: 100,
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Anthropic instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('claude-3-haiku-20240307');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('messages claude-3-haiku-20240307');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.messages');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.anthropic');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'messages',
'gen_ai.system': 'anthropic',
'gen_ai.request.model': 'claude-3-haiku-20240307',
'gen_ai.request.temperature': 0.7,
'gen_ai.response.model': 'claude-3-haiku-20240307',
'gen_ai.response.id': 'msg_mock123',
'gen_ai.usage.input_tokens': 10,
'gen_ai.usage.output_tokens': 15,
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
// Mock Google GenAI client for browser testing
export class MockGoogleGenAI {
constructor(config) {
this.apiKey = config.apiKey;

// models.generateContent functionality
this.models = {
generateContent: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

return {
candidates: [
{
content: {
parts: [
{
text: 'Hello from Google GenAI mock!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
};
},
generateContentStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};

// chats.create implementation
this.chats = {
create: (...args) => {
const params = args[0];
const model = params.model;

return {
modelVersion: model,
sendMessage: async (..._messageArgs) => {
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

const response = {
candidates: [
{
content: {
parts: [
{
text: 'This is a joke from the chat!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
modelVersion: model, // Include model version in response
};
return response;
},
sendMessageStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming chat response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};
},
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import { instrumentGoogleGenAIClient } from '@sentry/browser';
import { MockGoogleGenAI } from './mocks.js';

const mockClient = new MockGoogleGenAI({
apiKey: 'mock-api-key',
});

const client = instrumentGoogleGenAIClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
// Test both chats and models APIs
const chat = client.chats.create({
model: 'gemini-1.5-pro',
config: {
temperature: 0.8,
topP: 0.9,
maxOutputTokens: 150,
},
history: [
{
role: 'user',
parts: [{ text: 'Hello, how are you?' }],
},
],
});

const response = await chat.sendMessage({
message: 'Tell me a joke',
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Google GenAI instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('gemini-1.5-pro');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('chat gemini-1.5-pro create');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.chat');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.google_genai');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'chat',
'gen_ai.system': 'google_genai',
'gen_ai.request.model': 'gemini-1.5-pro',
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
// Mock OpenAI client for browser testing
export class MockOpenAi {
constructor(config) {
this.apiKey = config.apiKey;

this.chat = {
completions: {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'chatcmpl-mock123',
object: 'chat.completion',
created: 1677652288,
model: params.model,
system_fingerprint: 'fp_44709d6fcb',
choices: [
{
index: 0,
message: {
role: 'assistant',
content: 'Hello from OpenAI mock!',
},
finish_reason: 'stop',
},
],
usage: {
prompt_tokens: 10,
completion_tokens: 15,
total_tokens: 25,
},
};
return response;
},
},
};
}
}
Loading
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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackAsyncIntegration'),
gzip: true,
limit: '34 KB',
limit: '35 KB',
},
// React SDK (ESM)
{
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
// Mock Anthropic client for browser testing
export class MockAnthropic {
constructor(config) {
this.apiKey = config.apiKey;

// Main focus: messages.create functionality
this.messages = {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'msg_mock123',
type: 'message',
role: 'assistant',
model: params.model,
content: [
{
type: 'text',
text: 'Hello from Anthropic mock!',
},
],
stop_reason: 'end_turn',
stop_sequence: null,
usage: {
input_tokens: 10,
output_tokens: 15,
cache_creation_input_tokens: 0,
cache_read_input_tokens: 0,
},
};
return response;
},
countTokens: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock', input_tokens: 0 }),
};

// Minimal implementations for required interface compliance
this.models = {
list: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
get: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
};

this.completions = {
create: async (..._args) => ({ id: 'mock', type: 'completion', model: 'mock' }),
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import { instrumentAnthropicAiClient } from '@sentry/browser';
import { MockAnthropic } from './mocks.js';

const mockClient = new MockAnthropic({
apiKey: 'mock-api-key',
});
Comment on lines +4 to +6

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

m: It isn't ideal for an integration test to mock the client we want to instrument. In our Node integration tests we usually test against the actual libraries (though not sure about AI packages to be fair).

I'm not sure if this works out of the box but we can try adding the packages as dependencies to the browser-integration-tests package.json and then just importing them in the subject files. We bundle each individual integration test suite via webpack so maybe webpack can actually resolve and bundle the dependencies out of the box. If this doesn't work, we should find a way to make this possible. I'm sure this is also a concern for logging libraries used in browser apps.

I'm fine though with merging the PR as-is and following up with replacing the mocks with the actual test apps. Whatever works for you better :)

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We mock the server apis for AI tests usually, yep can do in a follow up, will draft a ticket for this.


const client = instrumentAnthropicAiClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
const response = await client.messages.create({
model: 'claude-3-haiku-20240307',
messages: [{ role: 'user', content: 'What is the capital of France?' }],
temperature: 0.7,
max_tokens: 100,
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Anthropic instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('claude-3-haiku-20240307');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('messages claude-3-haiku-20240307');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.messages');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.anthropic');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'messages',
'gen_ai.system': 'anthropic',
'gen_ai.request.model': 'claude-3-haiku-20240307',
'gen_ai.request.temperature': 0.7,
'gen_ai.response.model': 'claude-3-haiku-20240307',
'gen_ai.response.id': 'msg_mock123',
'gen_ai.usage.input_tokens': 10,
'gen_ai.usage.output_tokens': 15,
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
// Mock Google GenAI client for browser testing
export class MockGoogleGenAI {
constructor(config) {
this.apiKey = config.apiKey;

// models.generateContent functionality
this.models = {
generateContent: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

return {
candidates: [
{
content: {
parts: [
{
text: 'Hello from Google GenAI mock!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
};
},
generateContentStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};

// chats.create implementation
this.chats = {
create: (...args) => {
const params = args[0];
const model = params.model;

return {
modelVersion: model,
sendMessage: async (..._messageArgs) => {
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

const response = {
candidates: [
{
content: {
parts: [
{
text: 'This is a joke from the chat!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
modelVersion: model, // Include model version in response
};
return response;
},
sendMessageStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming chat response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};
},
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import { instrumentGoogleGenAIClient } from '@sentry/browser';
import { MockGoogleGenAI } from './mocks.js';

const mockClient = new MockGoogleGenAI({
apiKey: 'mock-api-key',
});

const client = instrumentGoogleGenAIClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
// Test both chats and models APIs
const chat = client.chats.create({
model: 'gemini-1.5-pro',
config: {
temperature: 0.8,
topP: 0.9,
maxOutputTokens: 150,
},
history: [
{
role: 'user',
parts: [{ text: 'Hello, how are you?' }],
},
],
});

const response = await chat.sendMessage({
message: 'Tell me a joke',
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Google GenAI instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('gemini-1.5-pro');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('chat gemini-1.5-pro create');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.chat');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.google_genai');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'chat',
'gen_ai.system': 'google_genai',
'gen_ai.request.model': 'gemini-1.5-pro',
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
// Mock OpenAI client for browser testing
export class MockOpenAi {
constructor(config) {
this.apiKey = config.apiKey;

this.chat = {
completions: {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'chatcmpl-mock123',
object: 'chat.completion',
created: 1677652288,
model: params.model,
system_fingerprint: 'fp_44709d6fcb',
choices: [
{
index: 0,
message: {
role: 'assistant',
content: 'Hello from OpenAI mock!',
},
finish_reason: 'stop',
},
],
usage: {
prompt_tokens: 10,
completion_tokens: 15,
total_tokens: 25,
},
};
return response;
},
},
};
}
}
Loading
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
2 changes: 1 addition & 1 deletion .size-limit.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'feedbackAsyncIntegration'),
gzip: true,
limit: '34 KB',
limit: '35 KB',
},
// React SDK (ESM)
{
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
// Mock Anthropic client for browser testing
export class MockAnthropic {
constructor(config) {
this.apiKey = config.apiKey;

// Main focus: messages.create functionality
this.messages = {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'msg_mock123',
type: 'message',
role: 'assistant',
model: params.model,
content: [
{
type: 'text',
text: 'Hello from Anthropic mock!',
},
],
stop_reason: 'end_turn',
stop_sequence: null,
usage: {
input_tokens: 10,
output_tokens: 15,
cache_creation_input_tokens: 0,
cache_read_input_tokens: 0,
},
};
return response;
},
countTokens: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock', input_tokens: 0 }),
};

// Minimal implementations for required interface compliance
this.models = {
list: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
get: async (..._args) => ({ id: 'mock', type: 'model', model: 'mock' }),
};

this.completions = {
create: async (..._args) => ({ id: 'mock', type: 'completion', model: 'mock' }),
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
import { instrumentAnthropicAiClient } from '@sentry/browser';
import { MockAnthropic } from './mocks.js';

const mockClient = new MockAnthropic({
apiKey: 'mock-api-key',
});
Comment on lines +4 to +6

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

m: It isn't ideal for an integration test to mock the client we want to instrument. In our Node integration tests we usually test against the actual libraries (though not sure about AI packages to be fair).

I'm not sure if this works out of the box but we can try adding the packages as dependencies to the browser-integration-tests package.json and then just importing them in the subject files. We bundle each individual integration test suite via webpack so maybe webpack can actually resolve and bundle the dependencies out of the box. If this doesn't work, we should find a way to make this possible. I'm sure this is also a concern for logging libraries used in browser apps.

I'm fine though with merging the PR as-is and following up with replacing the mocks with the actual test apps. Whatever works for you better :)

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We mock the server apis for AI tests usually, yep can do in a follow up, will draft a ticket for this.


const client = instrumentAnthropicAiClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
const response = await client.messages.create({
model: 'claude-3-haiku-20240307',
messages: [{ role: 'user', content: 'What is the capital of France?' }],
temperature: 0.7,
max_tokens: 100,
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Anthropic instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('claude-3-haiku-20240307');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('messages claude-3-haiku-20240307');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.messages');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.anthropic');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'messages',
'gen_ai.system': 'anthropic',
'gen_ai.request.model': 'claude-3-haiku-20240307',
'gen_ai.request.temperature': 0.7,
'gen_ai.response.model': 'claude-3-haiku-20240307',
'gen_ai.response.id': 'msg_mock123',
'gen_ai.usage.input_tokens': 10,
'gen_ai.usage.output_tokens': 15,
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
// Mock Google GenAI client for browser testing
export class MockGoogleGenAI {
constructor(config) {
this.apiKey = config.apiKey;

// models.generateContent functionality
this.models = {
generateContent: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

return {
candidates: [
{
content: {
parts: [
{
text: 'Hello from Google GenAI mock!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
};
},
generateContentStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};

// chats.create implementation
this.chats = {
create: (...args) => {
const params = args[0];
const model = params.model;

return {
modelVersion: model,
sendMessage: async (..._messageArgs) => {
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

const response = {
candidates: [
{
content: {
parts: [
{
text: 'This is a joke from the chat!',
},
],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
usageMetadata: {
promptTokenCount: 8,
candidatesTokenCount: 12,
totalTokenCount: 20,
},
modelVersion: model, // Include model version in response
};
return response;
},
sendMessageStream: async () => {
// Return a promise that resolves to an async generator
return (async function* () {
yield {
candidates: [
{
content: {
parts: [{ text: 'Streaming chat response' }],
role: 'model',
},
finishReason: 'stop',
index: 0,
},
],
};
})();
},
};
},
};
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import { instrumentGoogleGenAIClient } from '@sentry/browser';
import { MockGoogleGenAI } from './mocks.js';

const mockClient = new MockGoogleGenAI({
apiKey: 'mock-api-key',
});

const client = instrumentGoogleGenAIClient(mockClient);

// Test that manual instrumentation doesn't crash the browser
// The instrumentation automatically creates spans
// Test both chats and models APIs
const chat = client.chats.create({
model: 'gemini-1.5-pro',
config: {
temperature: 0.8,
topP: 0.9,
maxOutputTokens: 150,
},
history: [
{
role: 'user',
parts: [{ text: 'Hello, how are you?' }],
},
],
});

const response = await chat.sendMessage({
message: 'Tell me a joke',
});

console.log('Received response', response);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import { expect } from '@playwright/test';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';

// These tests are not exhaustive because the instrumentation is
// already tested in the node integration tests and we merely
// want to test that the instrumentation does not crash in the browser
// and that gen_ai transactions are sent.

sentryTest('manual Google GenAI instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
const transactionPromise = waitForTransactionRequest(page, event => {
return !!event.transaction?.includes('gemini-1.5-pro');
});

const url = await getLocalTestUrl({ testDir: __dirname });
await page.goto(url);

const req = await transactionPromise;

const eventData = envelopeRequestParser(req);

// Verify it's a gen_ai transaction
expect(eventData.transaction).toBe('chat gemini-1.5-pro create');
expect(eventData.contexts?.trace?.op).toBe('gen_ai.chat');
expect(eventData.contexts?.trace?.origin).toBe('auto.ai.google_genai');
expect(eventData.contexts?.trace?.data).toMatchObject({
'gen_ai.operation.name': 'chat',
'gen_ai.system': 'google_genai',
'gen_ai.request.model': 'gemini-1.5-pro',
});
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
debug: true,
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
// Mock OpenAI client for browser testing
export class MockOpenAi {
constructor(config) {
this.apiKey = config.apiKey;

this.chat = {
completions: {
create: async (...args) => {
const params = args[0];
// Simulate processing time
await new Promise(resolve => setTimeout(resolve, 10));

if (params.model === 'error-model') {
const error = new Error('Model not found');
error.status = 404;
error.headers = { 'x-request-id': 'mock-request-123' };
throw error;
}

const response = {
id: 'chatcmpl-mock123',
object: 'chat.completion',
created: 1677652288,
model: params.model,
system_fingerprint: 'fp_44709d6fcb',
choices: [
{
index: 0,
message: {
role: 'assistant',
content: 'Hello from OpenAI mock!',
},
finish_reason: 'stop',
},
],
usage: {
prompt_tokens: 10,
completion_tokens: 15,
total_tokens: 25,
},
};
return response;
},
},
};
}
}
Loading
Loading