Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/nuxt';
import { /* usePinia,*/ useRuntimeConfig } from '#imports';

Sentry.init({
traceLifecycle: 'static',
dsn: useRuntimeConfig().public.sentry.dsn,
tunnel: `http://localhost:3031/`, // proxy server
tracesSampleRate: 1.0,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import * as Sentry from '@sentry/nuxt';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1.0, // Capture 100% of the transactions
tunnel: 'http://localhost:3031/', // proxy server
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export default defineHandler(async event => {
}

case 'error': {
// A successful query runs first so the captured error carries a query breadcrumb: with span
// streaming there is no transaction event left to read breadcrumbs off.
await db.exec('CREATE TABLE IF NOT EXISTS logs (id INTEGER PRIMARY KEY, message TEXT, level TEXT)');
await db.exec(`INSERT INTO logs (message, level) VALUES ('Test log', 'INFO')`);

const stmt = db.prepare('SELECT * FROM nonexistent_table WHERE invalid_column = ?');
await stmt.get(1);
return { success: false, message: 'Should have thrown an error' };
Expand Down
131 changes: 63 additions & 68 deletions dev-packages/e2e-tests/test-applications/nuxt-5/tests/cache.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/nuxt';
import { collectStreamedSpans } from '@sentry-internal/test-utils';

test.describe('Cache Instrumentation', () => {
const SEMANTIC_ATTRIBUTE_CACHE_KEY = 'cache.key';
const SEMANTIC_ATTRIBUTE_CACHE_HIT = 'cache.hit';

async function collectCacheSpans() {
const spans = await collectStreamedSpans('nuxt-5', spans =>
spans.some(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test'),
);
const rootSpan = spans.find(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test');

return spans.filter(
span => span.trace_id === rootSpan?.trace_id && span.attributes['sentry.origin']?.value === 'auto.cache.nuxt',
);
}

test('instruments cachedFunction and cachedEventHandler calls and creates spans with correct attributes', async ({
request,
}) => {
const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

const response = await request.get('/api/cache-test');
expect(response.status()).toBe(200);

const transaction = await transactionPromise;
const allCacheSpans = await cacheSpansPromise;
expect(allCacheSpans.length).toBeGreaterThan(0);

// Helper to find spans by operation
const findSpansByMethod = (method: string) => {
return transaction.spans?.filter(span => span.data?.['db.operation.name'] === method) || [];
};
const findSpansByMethod = (method: string) =>
allCacheSpans.filter(span => span.attributes['db.operation.name']?.value === method);

// Test that we have cache operations from cachedFunction and cachedEventHandler
const allCacheSpans = transaction.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
expect(allCacheSpans?.length).toBeGreaterThan(0);
const getCacheKey = (span: (typeof allCacheSpans)[number]) => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_KEY]?.value;

// Test getItem spans for cachedFunction - should have both cache miss and cache hit
const getItemSpans = findSpansByMethod('getItem');
Expand All@@ -36,34 +40,36 @@ test.describe('Cache Instrumentation', () => {
// Find cache miss (first call to getCachedUser('123'))
const cacheMissSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
!span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
!span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheMissSpan) {
expect(cacheMissSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: false,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheMissSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: false },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Find cache hit (second call to getCachedUser('123'))
const cacheHitSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheHitSpan) {
expect(cacheHitSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: true,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheHitSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: true },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

Expand All@@ -72,42 +78,34 @@ test.describe('Cache Instrumentation', () => {
expect(setItemSpans.length).toBeGreaterThan(0);

const cacheSetSpan = setItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('user:123'),
);
if (cacheSetSpan) {
expect(cacheSetSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.put',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
'db.operation.name': 'setItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheSetSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.put' },
'cache.operation': { type: 'string', value: 'put' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
'db.operation.name': { type: 'string', value: 'setItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Test that we have spans for different cached functions
const dataKeySpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('data:test-key'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('data:test-key'),
);
expect(dataKeySpans.length).toBeGreaterThan(0);

// Test that we have spans for cachedEventHandler
const cachedHandlerSpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('cachedHandler'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('cachedHandler'),
);
expect(cachedHandlerSpans.length).toBeGreaterThan(0);

// Verify all cache spans have OK status
allCacheSpans?.forEach(span => {
// Verify all cache spans have OK status and are nested under the request's root span
allCacheSpans.forEach(span => {
expect(span.status).toBe('ok');
});

// Verify cache spans are properly nested under the transaction
allCacheSpans?.forEach(span => {
expect(span.is_segment).toBe(false);
expect(span.parent_span_id).toBeDefined();
});
});
Expand All@@ -117,41 +115,38 @@ test.describe('Cache Instrumentation', () => {
const uniqueUser = `test-${Date.now()}`;
const uniqueData = `data-${Date.now()}`;

const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

await request.get(`/api/cache-test?user=${uniqueUser}&data=${uniqueData}`);
const transaction1 = await transactionPromise;

// Get all cache-related spans
const allCacheSpans = transaction1.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
const allCacheSpans = await cacheSpansPromise;

// We should have cache operations
expect(allCacheSpans?.length).toBeGreaterThan(0);
expect(allCacheSpans.length).toBeGreaterThan(0);

// Get all getItem operations
const allGetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.get');
const allGetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.get');

// Get all setItem operations
const allSetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.put');
const allSetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.put');

// We should have both get and set operations
expect(allGetItemSpans?.length).toBeGreaterThan(0);
expect(allSetItemSpans?.length).toBeGreaterThan(0);
expect(allGetItemSpans.length).toBeGreaterThan(0);
expect(allSetItemSpans.length).toBeGreaterThan(0);

// Check for cache misses (cache.hit = false)
const cacheMissSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === false);
const cacheMissSpans = allGetItemSpans.filter(
span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === false,
);

// Check for cache hits (cache.hit = true)
const cacheHitSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === true);
const cacheHitSpans = allGetItemSpans.filter(span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === true);

// We should have at least one cache miss (first calls to getCachedUser and getCachedData)
expect(cacheMissSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheMissSpans.length).toBeGreaterThanOrEqual(1);

// We should have at least one cache hit (second calls to getCachedUser and getCachedData)
expect(cacheHitSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheHitSpans.length).toBeGreaterThanOrEqual(1);
});
});
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/nuxt';
import { /* usePinia,*/ useRuntimeConfig } from '#imports';

Sentry.init({
traceLifecycle: 'static',
dsn: useRuntimeConfig().public.sentry.dsn,
tunnel: `http://localhost:3031/`, // proxy server
tracesSampleRate: 1.0,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import * as Sentry from '@sentry/nuxt';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1.0, // Capture 100% of the transactions
tunnel: 'http://localhost:3031/', // proxy server
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export default defineHandler(async event => {
}

case 'error': {
// A successful query runs first so the captured error carries a query breadcrumb: with span
// streaming there is no transaction event left to read breadcrumbs off.
await db.exec('CREATE TABLE IF NOT EXISTS logs (id INTEGER PRIMARY KEY, message TEXT, level TEXT)');
await db.exec(`INSERT INTO logs (message, level) VALUES ('Test log', 'INFO')`);

const stmt = db.prepare('SELECT * FROM nonexistent_table WHERE invalid_column = ?');
await stmt.get(1);
return { success: false, message: 'Should have thrown an error' };
Expand Down
131 changes: 63 additions & 68 deletions dev-packages/e2e-tests/test-applications/nuxt-5/tests/cache.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/nuxt';
import { collectStreamedSpans } from '@sentry-internal/test-utils';

test.describe('Cache Instrumentation', () => {
const SEMANTIC_ATTRIBUTE_CACHE_KEY = 'cache.key';
const SEMANTIC_ATTRIBUTE_CACHE_HIT = 'cache.hit';

async function collectCacheSpans() {
const spans = await collectStreamedSpans('nuxt-5', spans =>
spans.some(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test'),
);
const rootSpan = spans.find(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test');

return spans.filter(
span => span.trace_id === rootSpan?.trace_id && span.attributes['sentry.origin']?.value === 'auto.cache.nuxt',
);
}

test('instruments cachedFunction and cachedEventHandler calls and creates spans with correct attributes', async ({
request,
}) => {
const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

const response = await request.get('/api/cache-test');
expect(response.status()).toBe(200);

const transaction = await transactionPromise;
const allCacheSpans = await cacheSpansPromise;
expect(allCacheSpans.length).toBeGreaterThan(0);

// Helper to find spans by operation
const findSpansByMethod = (method: string) => {
return transaction.spans?.filter(span => span.data?.['db.operation.name'] === method) || [];
};
const findSpansByMethod = (method: string) =>
allCacheSpans.filter(span => span.attributes['db.operation.name']?.value === method);

// Test that we have cache operations from cachedFunction and cachedEventHandler
const allCacheSpans = transaction.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
expect(allCacheSpans?.length).toBeGreaterThan(0);
const getCacheKey = (span: (typeof allCacheSpans)[number]) => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_KEY]?.value;

// Test getItem spans for cachedFunction - should have both cache miss and cache hit
const getItemSpans = findSpansByMethod('getItem');
Expand All@@ -36,34 +40,36 @@ test.describe('Cache Instrumentation', () => {
// Find cache miss (first call to getCachedUser('123'))
const cacheMissSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
!span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
!span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheMissSpan) {
expect(cacheMissSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: false,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheMissSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: false },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Find cache hit (second call to getCachedUser('123'))
const cacheHitSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheHitSpan) {
expect(cacheHitSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: true,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheHitSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: true },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

Expand All@@ -72,42 +78,34 @@ test.describe('Cache Instrumentation', () => {
expect(setItemSpans.length).toBeGreaterThan(0);

const cacheSetSpan = setItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('user:123'),
);
if (cacheSetSpan) {
expect(cacheSetSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.put',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
'db.operation.name': 'setItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheSetSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.put' },
'cache.operation': { type: 'string', value: 'put' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
'db.operation.name': { type: 'string', value: 'setItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Test that we have spans for different cached functions
const dataKeySpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('data:test-key'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('data:test-key'),
);
expect(dataKeySpans.length).toBeGreaterThan(0);

// Test that we have spans for cachedEventHandler
const cachedHandlerSpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('cachedHandler'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('cachedHandler'),
);
expect(cachedHandlerSpans.length).toBeGreaterThan(0);

// Verify all cache spans have OK status
allCacheSpans?.forEach(span => {
// Verify all cache spans have OK status and are nested under the request's root span
allCacheSpans.forEach(span => {
expect(span.status).toBe('ok');
});

// Verify cache spans are properly nested under the transaction
allCacheSpans?.forEach(span => {
expect(span.is_segment).toBe(false);
expect(span.parent_span_id).toBeDefined();
});
});
Expand All@@ -117,41 +115,38 @@ test.describe('Cache Instrumentation', () => {
const uniqueUser = `test-${Date.now()}`;
const uniqueData = `data-${Date.now()}`;

const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

await request.get(`/api/cache-test?user=${uniqueUser}&data=${uniqueData}`);
const transaction1 = await transactionPromise;

// Get all cache-related spans
const allCacheSpans = transaction1.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
const allCacheSpans = await cacheSpansPromise;

// We should have cache operations
expect(allCacheSpans?.length).toBeGreaterThan(0);
expect(allCacheSpans.length).toBeGreaterThan(0);

// Get all getItem operations
const allGetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.get');
const allGetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.get');

// Get all setItem operations
const allSetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.put');
const allSetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.put');

// We should have both get and set operations
expect(allGetItemSpans?.length).toBeGreaterThan(0);
expect(allSetItemSpans?.length).toBeGreaterThan(0);
expect(allGetItemSpans.length).toBeGreaterThan(0);
expect(allSetItemSpans.length).toBeGreaterThan(0);

// Check for cache misses (cache.hit = false)
const cacheMissSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === false);
const cacheMissSpans = allGetItemSpans.filter(
span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === false,
);

// Check for cache hits (cache.hit = true)
const cacheHitSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === true);
const cacheHitSpans = allGetItemSpans.filter(span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === true);

// We should have at least one cache miss (first calls to getCachedUser and getCachedData)
expect(cacheMissSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheMissSpans.length).toBeGreaterThanOrEqual(1);

// We should have at least one cache hit (second calls to getCachedUser and getCachedData)
expect(cacheHitSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheHitSpans.length).toBeGreaterThanOrEqual(1);
});
});
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/nuxt';
import { /* usePinia,*/ useRuntimeConfig } from '#imports';

Sentry.init({
traceLifecycle: 'static',
dsn: useRuntimeConfig().public.sentry.dsn,
tunnel: `http://localhost:3031/`, // proxy server
tracesSampleRate: 1.0,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import * as Sentry from '@sentry/nuxt';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1.0, // Capture 100% of the transactions
tunnel: 'http://localhost:3031/', // proxy server
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export default defineHandler(async event => {
}

case 'error': {
// A successful query runs first so the captured error carries a query breadcrumb: with span
// streaming there is no transaction event left to read breadcrumbs off.
await db.exec('CREATE TABLE IF NOT EXISTS logs (id INTEGER PRIMARY KEY, message TEXT, level TEXT)');
await db.exec(`INSERT INTO logs (message, level) VALUES ('Test log', 'INFO')`);

const stmt = db.prepare('SELECT * FROM nonexistent_table WHERE invalid_column = ?');
await stmt.get(1);
return { success: false, message: 'Should have thrown an error' };
Expand Down
131 changes: 63 additions & 68 deletions dev-packages/e2e-tests/test-applications/nuxt-5/tests/cache.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/nuxt';
import { collectStreamedSpans } from '@sentry-internal/test-utils';

test.describe('Cache Instrumentation', () => {
const SEMANTIC_ATTRIBUTE_CACHE_KEY = 'cache.key';
const SEMANTIC_ATTRIBUTE_CACHE_HIT = 'cache.hit';

async function collectCacheSpans() {
const spans = await collectStreamedSpans('nuxt-5', spans =>
spans.some(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test'),
);
const rootSpan = spans.find(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test');

return spans.filter(
span => span.trace_id === rootSpan?.trace_id && span.attributes['sentry.origin']?.value === 'auto.cache.nuxt',
);
}

test('instruments cachedFunction and cachedEventHandler calls and creates spans with correct attributes', async ({
request,
}) => {
const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

const response = await request.get('/api/cache-test');
expect(response.status()).toBe(200);

const transaction = await transactionPromise;
const allCacheSpans = await cacheSpansPromise;
expect(allCacheSpans.length).toBeGreaterThan(0);

// Helper to find spans by operation
const findSpansByMethod = (method: string) => {
return transaction.spans?.filter(span => span.data?.['db.operation.name'] === method) || [];
};
const findSpansByMethod = (method: string) =>
allCacheSpans.filter(span => span.attributes['db.operation.name']?.value === method);

// Test that we have cache operations from cachedFunction and cachedEventHandler
const allCacheSpans = transaction.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
expect(allCacheSpans?.length).toBeGreaterThan(0);
const getCacheKey = (span: (typeof allCacheSpans)[number]) => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_KEY]?.value;

// Test getItem spans for cachedFunction - should have both cache miss and cache hit
const getItemSpans = findSpansByMethod('getItem');
Expand All@@ -36,34 +40,36 @@ test.describe('Cache Instrumentation', () => {
// Find cache miss (first call to getCachedUser('123'))
const cacheMissSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
!span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
!span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheMissSpan) {
expect(cacheMissSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: false,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheMissSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: false },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Find cache hit (second call to getCachedUser('123'))
const cacheHitSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheHitSpan) {
expect(cacheHitSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: true,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheHitSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: true },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

Expand All@@ -72,42 +78,34 @@ test.describe('Cache Instrumentation', () => {
expect(setItemSpans.length).toBeGreaterThan(0);

const cacheSetSpan = setItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('user:123'),
);
if (cacheSetSpan) {
expect(cacheSetSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.put',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
'db.operation.name': 'setItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheSetSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.put' },
'cache.operation': { type: 'string', value: 'put' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
'db.operation.name': { type: 'string', value: 'setItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Test that we have spans for different cached functions
const dataKeySpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('data:test-key'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('data:test-key'),
);
expect(dataKeySpans.length).toBeGreaterThan(0);

// Test that we have spans for cachedEventHandler
const cachedHandlerSpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('cachedHandler'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('cachedHandler'),
);
expect(cachedHandlerSpans.length).toBeGreaterThan(0);

// Verify all cache spans have OK status
allCacheSpans?.forEach(span => {
// Verify all cache spans have OK status and are nested under the request's root span
allCacheSpans.forEach(span => {
expect(span.status).toBe('ok');
});

// Verify cache spans are properly nested under the transaction
allCacheSpans?.forEach(span => {
expect(span.is_segment).toBe(false);
expect(span.parent_span_id).toBeDefined();
});
});
Expand All@@ -117,41 +115,38 @@ test.describe('Cache Instrumentation', () => {
const uniqueUser = `test-${Date.now()}`;
const uniqueData = `data-${Date.now()}`;

const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

await request.get(`/api/cache-test?user=${uniqueUser}&data=${uniqueData}`);
const transaction1 = await transactionPromise;

// Get all cache-related spans
const allCacheSpans = transaction1.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
const allCacheSpans = await cacheSpansPromise;

// We should have cache operations
expect(allCacheSpans?.length).toBeGreaterThan(0);
expect(allCacheSpans.length).toBeGreaterThan(0);

// Get all getItem operations
const allGetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.get');
const allGetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.get');

// Get all setItem operations
const allSetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.put');
const allSetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.put');

// We should have both get and set operations
expect(allGetItemSpans?.length).toBeGreaterThan(0);
expect(allSetItemSpans?.length).toBeGreaterThan(0);
expect(allGetItemSpans.length).toBeGreaterThan(0);
expect(allSetItemSpans.length).toBeGreaterThan(0);

// Check for cache misses (cache.hit = false)
const cacheMissSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === false);
const cacheMissSpans = allGetItemSpans.filter(
span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === false,
);

// Check for cache hits (cache.hit = true)
const cacheHitSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === true);
const cacheHitSpans = allGetItemSpans.filter(span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === true);

// We should have at least one cache miss (first calls to getCachedUser and getCachedData)
expect(cacheMissSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheMissSpans.length).toBeGreaterThanOrEqual(1);

// We should have at least one cache hit (second calls to getCachedUser and getCachedData)
expect(cacheHitSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheHitSpans.length).toBeGreaterThanOrEqual(1);
});
});
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/nuxt';
import { /* usePinia,*/ useRuntimeConfig } from '#imports';

Sentry.init({
traceLifecycle: 'static',
dsn: useRuntimeConfig().public.sentry.dsn,
tunnel: `http://localhost:3031/`, // proxy server
tracesSampleRate: 1.0,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import * as Sentry from '@sentry/nuxt';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1.0, // Capture 100% of the transactions
tunnel: 'http://localhost:3031/', // proxy server
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export default defineHandler(async event => {
}

case 'error': {
// A successful query runs first so the captured error carries a query breadcrumb: with span
// streaming there is no transaction event left to read breadcrumbs off.
await db.exec('CREATE TABLE IF NOT EXISTS logs (id INTEGER PRIMARY KEY, message TEXT, level TEXT)');
await db.exec(`INSERT INTO logs (message, level) VALUES ('Test log', 'INFO')`);

const stmt = db.prepare('SELECT * FROM nonexistent_table WHERE invalid_column = ?');
await stmt.get(1);
return { success: false, message: 'Should have thrown an error' };
Expand Down
131 changes: 63 additions & 68 deletions dev-packages/e2e-tests/test-applications/nuxt-5/tests/cache.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/nuxt';
import { collectStreamedSpans } from '@sentry-internal/test-utils';

test.describe('Cache Instrumentation', () => {
const SEMANTIC_ATTRIBUTE_CACHE_KEY = 'cache.key';
const SEMANTIC_ATTRIBUTE_CACHE_HIT = 'cache.hit';

async function collectCacheSpans() {
const spans = await collectStreamedSpans('nuxt-5', spans =>
spans.some(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test'),
);
const rootSpan = spans.find(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test');

return spans.filter(
span => span.trace_id === rootSpan?.trace_id && span.attributes['sentry.origin']?.value === 'auto.cache.nuxt',
);
}

test('instruments cachedFunction and cachedEventHandler calls and creates spans with correct attributes', async ({
request,
}) => {
const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

const response = await request.get('/api/cache-test');
expect(response.status()).toBe(200);

const transaction = await transactionPromise;
const allCacheSpans = await cacheSpansPromise;
expect(allCacheSpans.length).toBeGreaterThan(0);

// Helper to find spans by operation
const findSpansByMethod = (method: string) => {
return transaction.spans?.filter(span => span.data?.['db.operation.name'] === method) || [];
};
const findSpansByMethod = (method: string) =>
allCacheSpans.filter(span => span.attributes['db.operation.name']?.value === method);

// Test that we have cache operations from cachedFunction and cachedEventHandler
const allCacheSpans = transaction.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
expect(allCacheSpans?.length).toBeGreaterThan(0);
const getCacheKey = (span: (typeof allCacheSpans)[number]) => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_KEY]?.value;

// Test getItem spans for cachedFunction - should have both cache miss and cache hit
const getItemSpans = findSpansByMethod('getItem');
Expand All@@ -36,34 +40,36 @@ test.describe('Cache Instrumentation', () => {
// Find cache miss (first call to getCachedUser('123'))
const cacheMissSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
!span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
!span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheMissSpan) {
expect(cacheMissSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: false,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheMissSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: false },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Find cache hit (second call to getCachedUser('123'))
const cacheHitSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheHitSpan) {
expect(cacheHitSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: true,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheHitSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: true },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

Expand All@@ -72,42 +78,34 @@ test.describe('Cache Instrumentation', () => {
expect(setItemSpans.length).toBeGreaterThan(0);

const cacheSetSpan = setItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('user:123'),
);
if (cacheSetSpan) {
expect(cacheSetSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.put',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
'db.operation.name': 'setItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheSetSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.put' },
'cache.operation': { type: 'string', value: 'put' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
'db.operation.name': { type: 'string', value: 'setItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Test that we have spans for different cached functions
const dataKeySpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('data:test-key'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('data:test-key'),
);
expect(dataKeySpans.length).toBeGreaterThan(0);

// Test that we have spans for cachedEventHandler
const cachedHandlerSpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('cachedHandler'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('cachedHandler'),
);
expect(cachedHandlerSpans.length).toBeGreaterThan(0);

// Verify all cache spans have OK status
allCacheSpans?.forEach(span => {
// Verify all cache spans have OK status and are nested under the request's root span
allCacheSpans.forEach(span => {
expect(span.status).toBe('ok');
});

// Verify cache spans are properly nested under the transaction
allCacheSpans?.forEach(span => {
expect(span.is_segment).toBe(false);
expect(span.parent_span_id).toBeDefined();
});
});
Expand All@@ -117,41 +115,38 @@ test.describe('Cache Instrumentation', () => {
const uniqueUser = `test-${Date.now()}`;
const uniqueData = `data-${Date.now()}`;

const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

await request.get(`/api/cache-test?user=${uniqueUser}&data=${uniqueData}`);
const transaction1 = await transactionPromise;

// Get all cache-related spans
const allCacheSpans = transaction1.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
const allCacheSpans = await cacheSpansPromise;

// We should have cache operations
expect(allCacheSpans?.length).toBeGreaterThan(0);
expect(allCacheSpans.length).toBeGreaterThan(0);

// Get all getItem operations
const allGetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.get');
const allGetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.get');

// Get all setItem operations
const allSetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.put');
const allSetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.put');

// We should have both get and set operations
expect(allGetItemSpans?.length).toBeGreaterThan(0);
expect(allSetItemSpans?.length).toBeGreaterThan(0);
expect(allGetItemSpans.length).toBeGreaterThan(0);
expect(allSetItemSpans.length).toBeGreaterThan(0);

// Check for cache misses (cache.hit = false)
const cacheMissSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === false);
const cacheMissSpans = allGetItemSpans.filter(
span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === false,
);

// Check for cache hits (cache.hit = true)
const cacheHitSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === true);
const cacheHitSpans = allGetItemSpans.filter(span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === true);

// We should have at least one cache miss (first calls to getCachedUser and getCachedData)
expect(cacheMissSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheMissSpans.length).toBeGreaterThanOrEqual(1);

// We should have at least one cache hit (second calls to getCachedUser and getCachedData)
expect(cacheHitSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheHitSpans.length).toBeGreaterThanOrEqual(1);
});
});
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/nuxt';
import { /* usePinia,*/ useRuntimeConfig } from '#imports';

Sentry.init({
traceLifecycle: 'static',
dsn: useRuntimeConfig().public.sentry.dsn,
tunnel: `http://localhost:3031/`, // proxy server
tracesSampleRate: 1.0,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import * as Sentry from '@sentry/nuxt';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1.0, // Capture 100% of the transactions
tunnel: 'http://localhost:3031/', // proxy server
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export default defineHandler(async event => {
}

case 'error': {
// A successful query runs first so the captured error carries a query breadcrumb: with span
// streaming there is no transaction event left to read breadcrumbs off.
await db.exec('CREATE TABLE IF NOT EXISTS logs (id INTEGER PRIMARY KEY, message TEXT, level TEXT)');
await db.exec(`INSERT INTO logs (message, level) VALUES ('Test log', 'INFO')`);

const stmt = db.prepare('SELECT * FROM nonexistent_table WHERE invalid_column = ?');
await stmt.get(1);
return { success: false, message: 'Should have thrown an error' };
Expand Down
131 changes: 63 additions & 68 deletions dev-packages/e2e-tests/test-applications/nuxt-5/tests/cache.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/nuxt';
import { collectStreamedSpans } from '@sentry-internal/test-utils';

test.describe('Cache Instrumentation', () => {
const SEMANTIC_ATTRIBUTE_CACHE_KEY = 'cache.key';
const SEMANTIC_ATTRIBUTE_CACHE_HIT = 'cache.hit';

async function collectCacheSpans() {
const spans = await collectStreamedSpans('nuxt-5', spans =>
spans.some(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test'),
);
const rootSpan = spans.find(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test');

return spans.filter(
span => span.trace_id === rootSpan?.trace_id && span.attributes['sentry.origin']?.value === 'auto.cache.nuxt',
);
}

test('instruments cachedFunction and cachedEventHandler calls and creates spans with correct attributes', async ({
request,
}) => {
const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

const response = await request.get('/api/cache-test');
expect(response.status()).toBe(200);

const transaction = await transactionPromise;
const allCacheSpans = await cacheSpansPromise;
expect(allCacheSpans.length).toBeGreaterThan(0);

// Helper to find spans by operation
const findSpansByMethod = (method: string) => {
return transaction.spans?.filter(span => span.data?.['db.operation.name'] === method) || [];
};
const findSpansByMethod = (method: string) =>
allCacheSpans.filter(span => span.attributes['db.operation.name']?.value === method);

// Test that we have cache operations from cachedFunction and cachedEventHandler
const allCacheSpans = transaction.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
expect(allCacheSpans?.length).toBeGreaterThan(0);
const getCacheKey = (span: (typeof allCacheSpans)[number]) => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_KEY]?.value;

// Test getItem spans for cachedFunction - should have both cache miss and cache hit
const getItemSpans = findSpansByMethod('getItem');
Expand All@@ -36,34 +40,36 @@ test.describe('Cache Instrumentation', () => {
// Find cache miss (first call to getCachedUser('123'))
const cacheMissSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
!span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
!span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheMissSpan) {
expect(cacheMissSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: false,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheMissSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: false },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Find cache hit (second call to getCachedUser('123'))
const cacheHitSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheHitSpan) {
expect(cacheHitSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: true,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheHitSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: true },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

Expand All@@ -72,42 +78,34 @@ test.describe('Cache Instrumentation', () => {
expect(setItemSpans.length).toBeGreaterThan(0);

const cacheSetSpan = setItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('user:123'),
);
if (cacheSetSpan) {
expect(cacheSetSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.put',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
'db.operation.name': 'setItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheSetSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.put' },
'cache.operation': { type: 'string', value: 'put' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
'db.operation.name': { type: 'string', value: 'setItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Test that we have spans for different cached functions
const dataKeySpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('data:test-key'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('data:test-key'),
);
expect(dataKeySpans.length).toBeGreaterThan(0);

// Test that we have spans for cachedEventHandler
const cachedHandlerSpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('cachedHandler'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('cachedHandler'),
);
expect(cachedHandlerSpans.length).toBeGreaterThan(0);

// Verify all cache spans have OK status
allCacheSpans?.forEach(span => {
// Verify all cache spans have OK status and are nested under the request's root span
allCacheSpans.forEach(span => {
expect(span.status).toBe('ok');
});

// Verify cache spans are properly nested under the transaction
allCacheSpans?.forEach(span => {
expect(span.is_segment).toBe(false);
expect(span.parent_span_id).toBeDefined();
});
});
Expand All@@ -117,41 +115,38 @@ test.describe('Cache Instrumentation', () => {
const uniqueUser = `test-${Date.now()}`;
const uniqueData = `data-${Date.now()}`;

const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

await request.get(`/api/cache-test?user=${uniqueUser}&data=${uniqueData}`);
const transaction1 = await transactionPromise;

// Get all cache-related spans
const allCacheSpans = transaction1.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
const allCacheSpans = await cacheSpansPromise;

// We should have cache operations
expect(allCacheSpans?.length).toBeGreaterThan(0);
expect(allCacheSpans.length).toBeGreaterThan(0);

// Get all getItem operations
const allGetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.get');
const allGetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.get');

// Get all setItem operations
const allSetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.put');
const allSetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.put');

// We should have both get and set operations
expect(allGetItemSpans?.length).toBeGreaterThan(0);
expect(allSetItemSpans?.length).toBeGreaterThan(0);
expect(allGetItemSpans.length).toBeGreaterThan(0);
expect(allSetItemSpans.length).toBeGreaterThan(0);

// Check for cache misses (cache.hit = false)
const cacheMissSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === false);
const cacheMissSpans = allGetItemSpans.filter(
span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === false,
);

// Check for cache hits (cache.hit = true)
const cacheHitSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === true);
const cacheHitSpans = allGetItemSpans.filter(span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === true);

// We should have at least one cache miss (first calls to getCachedUser and getCachedData)
expect(cacheMissSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheMissSpans.length).toBeGreaterThanOrEqual(1);

// We should have at least one cache hit (second calls to getCachedUser and getCachedData)
expect(cacheHitSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheHitSpans.length).toBeGreaterThanOrEqual(1);
});
});
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/nuxt';
import { /* usePinia,*/ useRuntimeConfig } from '#imports';

Sentry.init({
traceLifecycle: 'static',
dsn: useRuntimeConfig().public.sentry.dsn,
tunnel: `http://localhost:3031/`, // proxy server
tracesSampleRate: 1.0,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import * as Sentry from '@sentry/nuxt';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1.0, // Capture 100% of the transactions
tunnel: 'http://localhost:3031/', // proxy server
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export default defineHandler(async event => {
}

case 'error': {
// A successful query runs first so the captured error carries a query breadcrumb: with span
// streaming there is no transaction event left to read breadcrumbs off.
await db.exec('CREATE TABLE IF NOT EXISTS logs (id INTEGER PRIMARY KEY, message TEXT, level TEXT)');
await db.exec(`INSERT INTO logs (message, level) VALUES ('Test log', 'INFO')`);

const stmt = db.prepare('SELECT * FROM nonexistent_table WHERE invalid_column = ?');
await stmt.get(1);
return { success: false, message: 'Should have thrown an error' };
Expand Down
131 changes: 63 additions & 68 deletions dev-packages/e2e-tests/test-applications/nuxt-5/tests/cache.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/nuxt';
import { collectStreamedSpans } from '@sentry-internal/test-utils';

test.describe('Cache Instrumentation', () => {
const SEMANTIC_ATTRIBUTE_CACHE_KEY = 'cache.key';
const SEMANTIC_ATTRIBUTE_CACHE_HIT = 'cache.hit';

async function collectCacheSpans() {
const spans = await collectStreamedSpans('nuxt-5', spans =>
spans.some(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test'),
);
const rootSpan = spans.find(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test');

return spans.filter(
span => span.trace_id === rootSpan?.trace_id && span.attributes['sentry.origin']?.value === 'auto.cache.nuxt',
);
}

test('instruments cachedFunction and cachedEventHandler calls and creates spans with correct attributes', async ({
request,
}) => {
const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

const response = await request.get('/api/cache-test');
expect(response.status()).toBe(200);

const transaction = await transactionPromise;
const allCacheSpans = await cacheSpansPromise;
expect(allCacheSpans.length).toBeGreaterThan(0);

// Helper to find spans by operation
const findSpansByMethod = (method: string) => {
return transaction.spans?.filter(span => span.data?.['db.operation.name'] === method) || [];
};
const findSpansByMethod = (method: string) =>
allCacheSpans.filter(span => span.attributes['db.operation.name']?.value === method);

// Test that we have cache operations from cachedFunction and cachedEventHandler
const allCacheSpans = transaction.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
expect(allCacheSpans?.length).toBeGreaterThan(0);
const getCacheKey = (span: (typeof allCacheSpans)[number]) => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_KEY]?.value;

// Test getItem spans for cachedFunction - should have both cache miss and cache hit
const getItemSpans = findSpansByMethod('getItem');
Expand All@@ -36,34 +40,36 @@ test.describe('Cache Instrumentation', () => {
// Find cache miss (first call to getCachedUser('123'))
const cacheMissSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
!span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
!span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheMissSpan) {
expect(cacheMissSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: false,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheMissSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: false },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Find cache hit (second call to getCachedUser('123'))
const cacheHitSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheHitSpan) {
expect(cacheHitSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: true,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheHitSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: true },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

Expand All@@ -72,42 +78,34 @@ test.describe('Cache Instrumentation', () => {
expect(setItemSpans.length).toBeGreaterThan(0);

const cacheSetSpan = setItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('user:123'),
);
if (cacheSetSpan) {
expect(cacheSetSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.put',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
'db.operation.name': 'setItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheSetSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.put' },
'cache.operation': { type: 'string', value: 'put' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
'db.operation.name': { type: 'string', value: 'setItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Test that we have spans for different cached functions
const dataKeySpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('data:test-key'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('data:test-key'),
);
expect(dataKeySpans.length).toBeGreaterThan(0);

// Test that we have spans for cachedEventHandler
const cachedHandlerSpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('cachedHandler'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('cachedHandler'),
);
expect(cachedHandlerSpans.length).toBeGreaterThan(0);

// Verify all cache spans have OK status
allCacheSpans?.forEach(span => {
// Verify all cache spans have OK status and are nested under the request's root span
allCacheSpans.forEach(span => {
expect(span.status).toBe('ok');
});

// Verify cache spans are properly nested under the transaction
allCacheSpans?.forEach(span => {
expect(span.is_segment).toBe(false);
expect(span.parent_span_id).toBeDefined();
});
});
Expand All@@ -117,41 +115,38 @@ test.describe('Cache Instrumentation', () => {
const uniqueUser = `test-${Date.now()}`;
const uniqueData = `data-${Date.now()}`;

const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

await request.get(`/api/cache-test?user=${uniqueUser}&data=${uniqueData}`);
const transaction1 = await transactionPromise;

// Get all cache-related spans
const allCacheSpans = transaction1.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
const allCacheSpans = await cacheSpansPromise;

// We should have cache operations
expect(allCacheSpans?.length).toBeGreaterThan(0);
expect(allCacheSpans.length).toBeGreaterThan(0);

// Get all getItem operations
const allGetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.get');
const allGetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.get');

// Get all setItem operations
const allSetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.put');
const allSetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.put');

// We should have both get and set operations
expect(allGetItemSpans?.length).toBeGreaterThan(0);
expect(allSetItemSpans?.length).toBeGreaterThan(0);
expect(allGetItemSpans.length).toBeGreaterThan(0);
expect(allSetItemSpans.length).toBeGreaterThan(0);

// Check for cache misses (cache.hit = false)
const cacheMissSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === false);
const cacheMissSpans = allGetItemSpans.filter(
span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === false,
);

// Check for cache hits (cache.hit = true)
const cacheHitSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === true);
const cacheHitSpans = allGetItemSpans.filter(span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === true);

// We should have at least one cache miss (first calls to getCachedUser and getCachedData)
expect(cacheMissSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheMissSpans.length).toBeGreaterThanOrEqual(1);

// We should have at least one cache hit (second calls to getCachedUser and getCachedData)
expect(cacheHitSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheHitSpans.length).toBeGreaterThanOrEqual(1);
});
});
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/nuxt';
import { /* usePinia,*/ useRuntimeConfig } from '#imports';

Sentry.init({
traceLifecycle: 'static',
dsn: useRuntimeConfig().public.sentry.dsn,
tunnel: `http://localhost:3031/`, // proxy server
tracesSampleRate: 1.0,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import * as Sentry from '@sentry/nuxt';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1.0, // Capture 100% of the transactions
tunnel: 'http://localhost:3031/', // proxy server
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export default defineHandler(async event => {
}

case 'error': {
// A successful query runs first so the captured error carries a query breadcrumb: with span
// streaming there is no transaction event left to read breadcrumbs off.
await db.exec('CREATE TABLE IF NOT EXISTS logs (id INTEGER PRIMARY KEY, message TEXT, level TEXT)');
await db.exec(`INSERT INTO logs (message, level) VALUES ('Test log', 'INFO')`);

const stmt = db.prepare('SELECT * FROM nonexistent_table WHERE invalid_column = ?');
await stmt.get(1);
return { success: false, message: 'Should have thrown an error' };
Expand Down
131 changes: 63 additions & 68 deletions dev-packages/e2e-tests/test-applications/nuxt-5/tests/cache.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/nuxt';
import { collectStreamedSpans } from '@sentry-internal/test-utils';

test.describe('Cache Instrumentation', () => {
const SEMANTIC_ATTRIBUTE_CACHE_KEY = 'cache.key';
const SEMANTIC_ATTRIBUTE_CACHE_HIT = 'cache.hit';

async function collectCacheSpans() {
const spans = await collectStreamedSpans('nuxt-5', spans =>
spans.some(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test'),
);
const rootSpan = spans.find(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test');

return spans.filter(
span => span.trace_id === rootSpan?.trace_id && span.attributes['sentry.origin']?.value === 'auto.cache.nuxt',
);
}

test('instruments cachedFunction and cachedEventHandler calls and creates spans with correct attributes', async ({
request,
}) => {
const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

const response = await request.get('/api/cache-test');
expect(response.status()).toBe(200);

const transaction = await transactionPromise;
const allCacheSpans = await cacheSpansPromise;
expect(allCacheSpans.length).toBeGreaterThan(0);

// Helper to find spans by operation
const findSpansByMethod = (method: string) => {
return transaction.spans?.filter(span => span.data?.['db.operation.name'] === method) || [];
};
const findSpansByMethod = (method: string) =>
allCacheSpans.filter(span => span.attributes['db.operation.name']?.value === method);

// Test that we have cache operations from cachedFunction and cachedEventHandler
const allCacheSpans = transaction.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
expect(allCacheSpans?.length).toBeGreaterThan(0);
const getCacheKey = (span: (typeof allCacheSpans)[number]) => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_KEY]?.value;

// Test getItem spans for cachedFunction - should have both cache miss and cache hit
const getItemSpans = findSpansByMethod('getItem');
Expand All@@ -36,34 +40,36 @@ test.describe('Cache Instrumentation', () => {
// Find cache miss (first call to getCachedUser('123'))
const cacheMissSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
!span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
!span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheMissSpan) {
expect(cacheMissSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: false,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheMissSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: false },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Find cache hit (second call to getCachedUser('123'))
const cacheHitSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheHitSpan) {
expect(cacheHitSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: true,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheHitSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: true },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

Expand All@@ -72,42 +78,34 @@ test.describe('Cache Instrumentation', () => {
expect(setItemSpans.length).toBeGreaterThan(0);

const cacheSetSpan = setItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('user:123'),
);
if (cacheSetSpan) {
expect(cacheSetSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.put',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
'db.operation.name': 'setItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheSetSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.put' },
'cache.operation': { type: 'string', value: 'put' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
'db.operation.name': { type: 'string', value: 'setItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Test that we have spans for different cached functions
const dataKeySpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('data:test-key'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('data:test-key'),
);
expect(dataKeySpans.length).toBeGreaterThan(0);

// Test that we have spans for cachedEventHandler
const cachedHandlerSpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('cachedHandler'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('cachedHandler'),
);
expect(cachedHandlerSpans.length).toBeGreaterThan(0);

// Verify all cache spans have OK status
allCacheSpans?.forEach(span => {
// Verify all cache spans have OK status and are nested under the request's root span
allCacheSpans.forEach(span => {
expect(span.status).toBe('ok');
});

// Verify cache spans are properly nested under the transaction
allCacheSpans?.forEach(span => {
expect(span.is_segment).toBe(false);
expect(span.parent_span_id).toBeDefined();
});
});
Expand All@@ -117,41 +115,38 @@ test.describe('Cache Instrumentation', () => {
const uniqueUser = `test-${Date.now()}`;
const uniqueData = `data-${Date.now()}`;

const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

await request.get(`/api/cache-test?user=${uniqueUser}&data=${uniqueData}`);
const transaction1 = await transactionPromise;

// Get all cache-related spans
const allCacheSpans = transaction1.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
const allCacheSpans = await cacheSpansPromise;

// We should have cache operations
expect(allCacheSpans?.length).toBeGreaterThan(0);
expect(allCacheSpans.length).toBeGreaterThan(0);

// Get all getItem operations
const allGetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.get');
const allGetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.get');

// Get all setItem operations
const allSetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.put');
const allSetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.put');

// We should have both get and set operations
expect(allGetItemSpans?.length).toBeGreaterThan(0);
expect(allSetItemSpans?.length).toBeGreaterThan(0);
expect(allGetItemSpans.length).toBeGreaterThan(0);
expect(allSetItemSpans.length).toBeGreaterThan(0);

// Check for cache misses (cache.hit = false)
const cacheMissSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === false);
const cacheMissSpans = allGetItemSpans.filter(
span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === false,
);

// Check for cache hits (cache.hit = true)
const cacheHitSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === true);
const cacheHitSpans = allGetItemSpans.filter(span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === true);

// We should have at least one cache miss (first calls to getCachedUser and getCachedData)
expect(cacheMissSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheMissSpans.length).toBeGreaterThanOrEqual(1);

// We should have at least one cache hit (second calls to getCachedUser and getCachedData)
expect(cacheHitSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheHitSpans.length).toBeGreaterThanOrEqual(1);
});
});
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/nuxt';
import { /* usePinia,*/ useRuntimeConfig } from '#imports';

Sentry.init({
traceLifecycle: 'static',
dsn: useRuntimeConfig().public.sentry.dsn,
tunnel: `http://localhost:3031/`, // proxy server
tracesSampleRate: 1.0,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import * as Sentry from '@sentry/nuxt';

Sentry.init({
traceLifecycle: 'static',
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1.0, // Capture 100% of the transactions
tunnel: 'http://localhost:3031/', // proxy server
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,11 @@ export default defineHandler(async event => {
}

case 'error': {
// A successful query runs first so the captured error carries a query breadcrumb: with span
// streaming there is no transaction event left to read breadcrumbs off.
await db.exec('CREATE TABLE IF NOT EXISTS logs (id INTEGER PRIMARY KEY, message TEXT, level TEXT)');
await db.exec(`INSERT INTO logs (message, level) VALUES ('Test log', 'INFO')`);

const stmt = db.prepare('SELECT * FROM nonexistent_table WHERE invalid_column = ?');
await stmt.get(1);
return { success: false, message: 'Should have thrown an error' };
Expand Down
131 changes: 63 additions & 68 deletions dev-packages/e2e-tests/test-applications/nuxt-5/tests/cache.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/nuxt';
import { collectStreamedSpans } from '@sentry-internal/test-utils';

test.describe('Cache Instrumentation', () => {
const SEMANTIC_ATTRIBUTE_CACHE_KEY = 'cache.key';
const SEMANTIC_ATTRIBUTE_CACHE_HIT = 'cache.hit';

async function collectCacheSpans() {
const spans = await collectStreamedSpans('nuxt-5', spans =>
spans.some(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test'),
);
const rootSpan = spans.find(span => span.is_segment && span.attributes['url.path']?.value === '/api/cache-test');

return spans.filter(
span => span.trace_id === rootSpan?.trace_id && span.attributes['sentry.origin']?.value === 'auto.cache.nuxt',
);
}

test('instruments cachedFunction and cachedEventHandler calls and creates spans with correct attributes', async ({
request,
}) => {
const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

const response = await request.get('/api/cache-test');
expect(response.status()).toBe(200);

const transaction = await transactionPromise;
const allCacheSpans = await cacheSpansPromise;
expect(allCacheSpans.length).toBeGreaterThan(0);

// Helper to find spans by operation
const findSpansByMethod = (method: string) => {
return transaction.spans?.filter(span => span.data?.['db.operation.name'] === method) || [];
};
const findSpansByMethod = (method: string) =>
allCacheSpans.filter(span => span.attributes['db.operation.name']?.value === method);

// Test that we have cache operations from cachedFunction and cachedEventHandler
const allCacheSpans = transaction.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
expect(allCacheSpans?.length).toBeGreaterThan(0);
const getCacheKey = (span: (typeof allCacheSpans)[number]) => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_KEY]?.value;

// Test getItem spans for cachedFunction - should have both cache miss and cache hit
const getItemSpans = findSpansByMethod('getItem');
Expand All@@ -36,34 +40,36 @@ test.describe('Cache Instrumentation', () => {
// Find cache miss (first call to getCachedUser('123'))
const cacheMissSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
!span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
!span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheMissSpan) {
expect(cacheMissSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: false,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheMissSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: false },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Find cache hit (second call to getCachedUser('123'))
const cacheHitSpan = getItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123') &&
span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT],
typeof getCacheKey(span) === 'string' &&
(getCacheKey(span) as string).includes('user:123') &&
span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value,
);
if (cacheHitSpan) {
expect(cacheHitSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.get',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: true,
'db.operation.name': 'getItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheHitSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.get' },
'cache.operation': { type: 'string', value: 'get' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
[SEMANTIC_ATTRIBUTE_CACHE_HIT]: { type: 'boolean', value: true },
'db.operation.name': { type: 'string', value: 'getItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

Expand All@@ -72,42 +78,34 @@ test.describe('Cache Instrumentation', () => {
expect(setItemSpans.length).toBeGreaterThan(0);

const cacheSetSpan = setItemSpans.find(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('user:123'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('user:123'),
);
if (cacheSetSpan) {
expect(cacheSetSpan.data).toMatchObject({
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'cache.put',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.cache.nuxt',
'db.operation.name': 'setItem',
'db.collection.name': expect.stringMatching(/^(cache)?$/),
expect(cacheSetSpan.attributes).toMatchObject({
'sentry.op': { type: 'string', value: 'cache.put' },
'cache.operation': { type: 'string', value: 'put' },
'sentry.origin': { type: 'string', value: 'auto.cache.nuxt' },
'db.operation.name': { type: 'string', value: 'setItem' },
'db.collection.name': { type: 'string', value: expect.stringMatching(/^(cache)?$/) },
});
}

// Test that we have spans for different cached functions
const dataKeySpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('data:test-key'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('data:test-key'),
);
expect(dataKeySpans.length).toBeGreaterThan(0);

// Test that we have spans for cachedEventHandler
const cachedHandlerSpans = getItemSpans.filter(
span =>
typeof span.data?.[SEMANTIC_ATTRIBUTE_CACHE_KEY] === 'string' &&
span.data[SEMANTIC_ATTRIBUTE_CACHE_KEY].includes('cachedHandler'),
span => typeof getCacheKey(span) === 'string' && (getCacheKey(span) as string).includes('cachedHandler'),
);
expect(cachedHandlerSpans.length).toBeGreaterThan(0);

// Verify all cache spans have OK status
allCacheSpans?.forEach(span => {
// Verify all cache spans have OK status and are nested under the request's root span
allCacheSpans.forEach(span => {
expect(span.status).toBe('ok');
});

// Verify cache spans are properly nested under the transaction
allCacheSpans?.forEach(span => {
expect(span.is_segment).toBe(false);
expect(span.parent_span_id).toBeDefined();
});
});
Expand All@@ -117,41 +115,38 @@ test.describe('Cache Instrumentation', () => {
const uniqueUser = `test-${Date.now()}`;
const uniqueData = `data-${Date.now()}`;

const transactionPromise = waitForTransaction('nuxt-5', transactionEvent => {
return transactionEvent.transaction?.includes('GET /api/cache-test') ?? false;
});
const cacheSpansPromise = collectCacheSpans();

await request.get(`/api/cache-test?user=${uniqueUser}&data=${uniqueData}`);
const transaction1 = await transactionPromise;

// Get all cache-related spans
const allCacheSpans = transaction1.spans?.filter(
span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.cache.nuxt',
);
const allCacheSpans = await cacheSpansPromise;

// We should have cache operations
expect(allCacheSpans?.length).toBeGreaterThan(0);
expect(allCacheSpans.length).toBeGreaterThan(0);

// Get all getItem operations
const allGetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.get');
const allGetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.get');

// Get all setItem operations
const allSetItemSpans = allCacheSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'cache.put');
const allSetItemSpans = allCacheSpans.filter(span => span.attributes['sentry.op']?.value === 'cache.put');

// We should have both get and set operations
expect(allGetItemSpans?.length).toBeGreaterThan(0);
expect(allSetItemSpans?.length).toBeGreaterThan(0);
expect(allGetItemSpans.length).toBeGreaterThan(0);
expect(allSetItemSpans.length).toBeGreaterThan(0);

// Check for cache misses (cache.hit = false)
const cacheMissSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === false);
const cacheMissSpans = allGetItemSpans.filter(
span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === false,
);

// Check for cache hits (cache.hit = true)
const cacheHitSpans = allGetItemSpans?.filter(span => span.data?.[SEMANTIC_ATTRIBUTE_CACHE_HIT] === true);
const cacheHitSpans = allGetItemSpans.filter(span => span.attributes[SEMANTIC_ATTRIBUTE_CACHE_HIT]?.value === true);

// We should have at least one cache miss (first calls to getCachedUser and getCachedData)
expect(cacheMissSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheMissSpans.length).toBeGreaterThanOrEqual(1);

// We should have at least one cache hit (second calls to getCachedUser and getCachedData)
expect(cacheHitSpans?.length).toBeGreaterThanOrEqual(1);
expect(cacheHitSpans.length).toBeGreaterThanOrEqual(1);
});
});
Loading
Loading