Rendered Before Long Animation Frame
+
+
+
+
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-enabled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-enabled/test.ts
new file mode 100644
index 000000000000..850e75dbed1f
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-enabled/test.ts
@@ -0,0 +1,112 @@
+import type { Route } from '@playwright/test';
+import { expect } from '@playwright/test';
+import type { Event } from '@sentry/types';
+
+import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/browser';
+import { sentryTest } from '../../../../utils/fixtures';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
+
+sentryTest(
+ 'should capture long animation frame for top-level script.',
+ async ({ browserName, getLocalTestPath, page }) => {
+ // Long animation frames only work on chrome
+ if (shouldSkipTracingTest() || browserName !== 'chromium') {
+ sentryTest.skip();
+ }
+
+ await page.route('**/path/to/script.js', (route: Route) =>
+ route.fulfill({ path: `${__dirname}/assets/script.js` }),
+ );
+
+ const url = await getLocalTestPath({ testDir: __dirname });
+
+ const promise = getFirstSentryEnvelopeRequestRendered Before Long Task
+
+
+
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-non-chromium/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-non-chromium/test.ts
new file mode 100644
index 000000000000..65fb6664ac82
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-non-chromium/test.ts
@@ -0,0 +1,27 @@
+import type { Route } from '@playwright/test';
+import { expect } from '@playwright/test';
+import type { Event } from '@sentry/types';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
+
+sentryTest(
+ 'should not capture long animation frame or long task when browser is non-chromium',
+ async ({ browserName, getLocalTestPath, page }) => {
+ // Only test non-chromium browsers
+ if (shouldSkipTracingTest() || browserName === 'chromium') {
+ sentryTest.skip();
+ }
+
+ await page.route('**/path/to/script.js', (route: Route) =>
+ route.fulfill({ path: `${__dirname}/assets/script.js` }),
+ );
+
+ const url = await getLocalTestPath({ testDir: __dirname });
+
+ const eventData = await getFirstSentryEnvelopeRequestRendered Before Long Animation Frame
+
+
+
+
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-and-animation-frame-enabled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-and-animation-frame-enabled/test.ts
new file mode 100644
index 000000000000..1949e44bd398
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-and-animation-frame-enabled/test.ts
@@ -0,0 +1,114 @@
+import type { Route } from '@playwright/test';
+import { expect } from '@playwright/test';
+import type { Event } from '@sentry/types';
+
+import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/browser';
+import { sentryTest } from '../../../../utils/fixtures';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
+
+sentryTest(
+ 'should capture long animation frame for top-level script.',
+ async ({ browserName, getLocalTestPath, page }) => {
+ // Long animation frames only work on chrome
+ if (shouldSkipTracingTest() || browserName !== 'chromium') {
+ sentryTest.skip();
+ }
+
+ // Long animation frame should take priority over long tasks
+
+ await page.route('**/path/to/script.js', (route: Route) =>
+ route.fulfill({ path: `${__dirname}/assets/script.js` }),
+ );
+
+ const url = await getLocalTestPath({ testDir: __dirname });
+
+ const promise = getFirstSentryEnvelopeRequestRendered Before Long Task
+
+
+
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-no-animation-frame/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-no-animation-frame/test.ts
new file mode 100644
index 000000000000..6189758c0340
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-no-animation-frame/test.ts
@@ -0,0 +1,37 @@
+import type { Route } from '@playwright/test';
+import { expect } from '@playwright/test';
+import type { Event } from '@sentry/types';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
+
+sentryTest('should capture long task.', async ({ browserName, getLocalTestPath, page }) => {
+ // Long tasks only work on chrome
+ if (shouldSkipTracingTest() || browserName !== 'chromium') {
+ sentryTest.skip();
+ }
+
+ await page.route('**/path/to/script.js', (route: Route) => route.fulfill({ path: `${__dirname}/assets/script.js` }));
+
+ const url = await getLocalTestPath({ testDir: __dirname });
+
+ const eventData = await getFirstSentryEnvelopeRequestI am a blank page
;
+ return (
+
+
+ );
}
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app/tests/client-inp.test.ts b/dev-packages/e2e-tests/test-applications/create-remix-app/tests/client-inp.test.ts
new file mode 100644
index 000000000000..8fe1993db3f8
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app/tests/client-inp.test.ts
@@ -0,0 +1,198 @@
+import { expect, test } from '@playwright/test';
+import { waitForEnvelopeItem, waitForTransaction } from '@sentry-internal/test-utils';
+
+test('sends an INP span during pageload', async ({ page }) => {
+ const inpSpanPromise = waitForEnvelopeItem('create-remix-app', item => {
+ return item[0].type === 'span';
+ });
+
+ await page.goto(`/`);
+
+ await page.click('#exception-button');
+
+ await page.waitForTimeout(500);
+
+ // Page hide to trigger INP
+ await page.evaluate(() => {
+ window.dispatchEvent(new Event('pagehide'));
+ });
+
+ const inpSpan = await inpSpanPromise;
+
+ expect(inpSpan[1]).toEqual({
+ data: {
+ 'sentry.origin': 'auto.http.browser.inp',
+ 'sentry.op': 'ui.interaction.click',
+ release: 'e2e-test',
+ environment: 'qa',
+ transaction: 'routes/_index',
+ 'sentry.exclusive_time': expect.any(Number),
+ 'sentry.sample_rate': 1,
+ 'sentry.source': 'custom',
+ replay_id: expect.any(String),
+ 'user_agent.original': expect.stringContaining('Chrome'),
+ },
+ description: 'body > div > input#exception-button[type="button"]',
+ op: 'ui.interaction.click',
+ parent_span_id: expect.any(String),
+ is_segment: true,
+ span_id: expect.any(String),
+ start_timestamp: expect.any(Number),
+ timestamp: expect.any(Number),
+ trace_id: expect.any(String),
+ origin: 'auto.http.browser.inp',
+ exclusive_time: expect.any(Number),
+ measurements: { inp: { unit: 'millisecond', value: expect.any(Number) } },
+ segment_id: expect.any(String),
+ });
+});
+
+test('sends an INP span after pageload', async ({ page }) => {
+ const transactionPromise = waitForTransaction('create-remix-app', transactionEvent => {
+ return transactionEvent.contexts?.trace?.op === 'pageload' && transactionEvent.transaction === 'routes/_index';
+ });
+
+ await page.goto(`/`);
+
+ await transactionPromise;
+
+ const inpSpanPromise1 = waitForEnvelopeItem('create-remix-app', item => {
+ return item[0].type === 'span';
+ });
+
+ await page.click('#exception-button');
+
+ await page.waitForTimeout(500);
+
+ // Page hide to trigger INP
+ await page.evaluate(() => {
+ window.dispatchEvent(new Event('pagehide'));
+ });
+
+ const inpSpan1 = await inpSpanPromise1;
+
+ expect(inpSpan1[1]).toEqual({
+ data: {
+ 'sentry.origin': 'auto.http.browser.inp',
+ 'sentry.op': 'ui.interaction.click',
+ release: 'e2e-test',
+ environment: 'qa',
+ transaction: 'routes/_index',
+ 'sentry.exclusive_time': expect.any(Number),
+ 'sentry.sample_rate': 1,
+ 'sentry.source': 'custom',
+ replay_id: expect.any(String),
+ 'user_agent.original': expect.stringContaining('Chrome'),
+ },
+ description: 'body > div > input#exception-button[type="button"]',
+ op: 'ui.interaction.click',
+ parent_span_id: expect.any(String),
+ is_segment: true,
+ span_id: expect.any(String),
+ start_timestamp: expect.any(Number),
+ timestamp: expect.any(Number),
+ trace_id: expect.any(String),
+ origin: 'auto.http.browser.inp',
+ exclusive_time: expect.any(Number),
+ measurements: { inp: { unit: 'millisecond', value: expect.any(Number) } },
+ segment_id: expect.any(String),
+ });
+});
+
+test('sends an INP span during navigation', async ({ page }) => {
+ page.on('console', msg => console.log(msg.text()));
+ const inpSpanPromise = waitForEnvelopeItem('create-remix-app', item => {
+ return item[0].type === 'span';
+ });
+
+ await page.goto(`/`);
+
+ await page.click('#navigation');
+
+ await page.waitForTimeout(500);
+
+ // Page hide to trigger INP
+ await page.evaluate(() => {
+ window.dispatchEvent(new Event('pagehide'));
+ });
+
+ const inpSpan = await inpSpanPromise;
+
+ expect(inpSpan[1]).toEqual({
+ data: {
+ 'sentry.origin': 'auto.http.browser.inp',
+ 'sentry.op': 'ui.interaction.click',
+ release: 'e2e-test',
+ environment: 'qa',
+ transaction: 'routes/user.$id',
+ 'sentry.exclusive_time': expect.any(Number),
+ replay_id: expect.any(String),
+ 'user_agent.original': expect.stringContaining('Chrome'),
+ },
+ description: 'I am a blank page
+
+ unreachable
; +} diff --git a/dev-packages/e2e-tests/test-applications/nextjs-15/app/streaming-rsc-error/[param]/client-page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-15/app/streaming-rsc-error/[param]/client-page.tsx new file mode 100644 index 000000000000..7b66c3fbdeef --- /dev/null +++ b/dev-packages/e2e-tests/test-applications/nextjs-15/app/streaming-rsc-error/[param]/client-page.tsx @@ -0,0 +1,8 @@ +'use client'; + +import { use } from 'react'; + +export function RenderPromise({ stringPromise }: { stringPromise: Promise{children}
+ {scripts}
+
+
+ )}
+ />
+));
diff --git a/dev-packages/e2e-tests/test-applications/solidstart/src/instrument.server.mjs b/dev-packages/e2e-tests/test-applications/solidstart/src/instrument.server.mjs
new file mode 100644
index 000000000000..4146470295e1
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/solidstart/src/instrument.server.mjs
@@ -0,0 +1,8 @@
+import * as Sentry from '@sentry/solidstart';
+
+Sentry.init({
+ dsn: process.env.E2E_TEST_DSN,
+ environment: 'qa', // dynamic sampling bias to keep transactions
+ tracesSampleRate: 1.0, // Capture 100% of the transactions
+ tunnel: 'http://localhost:3031/', // proxy server
+});
diff --git a/dev-packages/e2e-tests/test-applications/solidstart/src/routes/client-error.tsx b/dev-packages/e2e-tests/test-applications/solidstart/src/routes/client-error.tsx
new file mode 100644
index 000000000000..e997e4fbb1e3
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/solidstart/src/routes/client-error.tsx
@@ -0,0 +1,75 @@
+import * as Sentry from '@sentry/solidstart';
+import type { ParentProps } from 'solid-js';
+import { ErrorBoundary, createSignal, onMount } from 'solid-js';
+
+const SentryErrorBoundary = Sentry.withSentryErrorBoundary(ErrorBoundary);
+
+const [count, setCount] = createSignal(1);
+const [caughtError, setCaughtError] = createSignal(false);
+
+export default function ClientErrorPage() {
+ return (
+
+
+
+
+
+
+ Error Boundary Fallback
+
+
+
+ {error.message}
+ Welcome to Solid Start
++ Visit docs.solidjs.com/solid-start to read the documentation +
+-
+
- + Client error + +
- + + User 5 + + +
- + + User 6 + + +
User ID: {params.id}
;
+}
diff --git a/dev-packages/e2e-tests/test-applications/solidstart/start-event-proxy.mjs b/dev-packages/e2e-tests/test-applications/solidstart/start-event-proxy.mjs
new file mode 100644
index 000000000000..d45a7a013f36
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/solidstart/start-event-proxy.mjs
@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+ port: 3031,
+ proxyServerName: 'solidstart',
+});
diff --git a/dev-packages/e2e-tests/test-applications/solidstart/tests/errorboundary.test.ts b/dev-packages/e2e-tests/test-applications/solidstart/tests/errorboundary.test.ts
new file mode 100644
index 000000000000..a4edf3c46236
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/solidstart/tests/errorboundary.test.ts
@@ -0,0 +1,90 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/test-utils';
+
+test('captures an exception', async ({ page }) => {
+ const errorEventPromise = waitForError('solidstart', errorEvent => {
+ return (
+ !errorEvent.type &&
+ errorEvent.exception?.values?.[0]?.value ===
+ 'Error 1 thrown from Sentry ErrorBoundary in Solid Start E2E test app'
+ );
+ });
+
+ await page.goto('/client-error');
+ await page.locator('#caughtErrorBtn').click();
+ const errorEvent = await errorEventPromise;
+
+ expect(errorEvent).toMatchObject({
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'Error 1 thrown from Sentry ErrorBoundary in Solid Start E2E test app',
+ mechanism: {
+ type: 'generic',
+ handled: true,
+ },
+ },
+ ],
+ },
+ transaction: '/client-error',
+ });
+});
+
+test('captures a second exception after resetting the boundary', async ({ page }) => {
+ const firstErrorEventPromise = waitForError('solidstart', errorEvent => {
+ return (
+ !errorEvent.type &&
+ errorEvent.exception?.values?.[0]?.value ===
+ 'Error 1 thrown from Sentry ErrorBoundary in Solid Start E2E test app'
+ );
+ });
+
+ await page.goto('/client-error');
+ await page.locator('#caughtErrorBtn').click();
+ const firstErrorEvent = await firstErrorEventPromise;
+
+ expect(firstErrorEvent).toMatchObject({
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'Error 1 thrown from Sentry ErrorBoundary in Solid Start E2E test app',
+ mechanism: {
+ type: 'generic',
+ handled: true,
+ },
+ },
+ ],
+ },
+ transaction: '/client-error',
+ });
+
+ const secondErrorEventPromise = waitForError('solidstart', errorEvent => {
+ return (
+ !errorEvent.type &&
+ errorEvent.exception?.values?.[0]?.value ===
+ 'Error 2 thrown from Sentry ErrorBoundary in Solid Start E2E test app'
+ );
+ });
+
+ await page.locator('#errorBoundaryResetBtn').click();
+ await page.locator('#caughtErrorBtn').click();
+ const secondErrorEvent = await secondErrorEventPromise;
+
+ expect(secondErrorEvent).toMatchObject({
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'Error 2 thrown from Sentry ErrorBoundary in Solid Start E2E test app',
+ mechanism: {
+ type: 'generic',
+ handled: true,
+ },
+ },
+ ],
+ },
+ transaction: '/client-error',
+ });
+});
diff --git a/dev-packages/e2e-tests/test-applications/solidstart/tests/errors.client.test.ts b/dev-packages/e2e-tests/test-applications/solidstart/tests/errors.client.test.ts
new file mode 100644
index 000000000000..c9ab1db244b5
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/solidstart/tests/errors.client.test.ts
@@ -0,0 +1,32 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/test-utils';
+
+test.describe('client-side errors', () => {
+ test('captures error thrown on click', async ({ page }) => {
+ const errorPromise = waitForError('solidstart', async errorEvent => {
+ return errorEvent?.exception?.values?.[0]?.value === 'Error thrown from Solid Start E2E test app';
+ });
+
+ await page.goto(`/client-error`);
+ await page.locator('#errorBtn').click();
+ const error = await errorPromise;
+
+ expect(error).toMatchObject({
+ exception: {
+ values: [
+ {
+ type: 'Error',
+ value: 'Error thrown from Solid Start E2E test app',
+ mechanism: {
+ type: 'instrument',
+ handled: false,
+ },
+ },
+ ],
+ },
+ transaction: '/client-error',
+ });
+ expect(error.tags).toMatchObject({ runtime: 'browser' });
+ expect(error.transaction).toEqual('/client-error');
+ });
+});
diff --git a/dev-packages/e2e-tests/test-applications/solidstart/tests/performance.client.test.ts b/dev-packages/e2e-tests/test-applications/solidstart/tests/performance.client.test.ts
new file mode 100644
index 000000000000..6e5f43e016c8
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/solidstart/tests/performance.client.test.ts
@@ -0,0 +1,93 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('sends a pageload transaction', async ({ page }) => {
+ const transactionPromise = waitForTransaction('solidstart', async transactionEvent => {
+ return transactionEvent?.transaction === '/' && transactionEvent.contexts?.trace?.op === 'pageload';
+ });
+
+ await page.goto('/');
+ const pageloadTransaction = await transactionPromise;
+
+ expect(pageloadTransaction).toMatchObject({
+ contexts: {
+ trace: {
+ op: 'pageload',
+ origin: 'auto.pageload.browser',
+ },
+ },
+ transaction: '/',
+ transaction_info: {
+ source: 'url',
+ },
+ });
+});
+
+test('sends a navigation transaction', async ({ page }) => {
+ const transactionPromise = waitForTransaction('solidstart', async transactionEvent => {
+ return transactionEvent?.transaction === '/users/5' && transactionEvent.contexts?.trace?.op === 'navigation';
+ });
+
+ await page.goto(`/`);
+ await page.locator('#navLink').click();
+ const navigationTransaction = await transactionPromise;
+
+ expect(navigationTransaction).toMatchObject({
+ contexts: {
+ trace: {
+ op: 'navigation',
+ origin: 'auto.navigation.solidstart.solidrouter',
+ },
+ },
+ transaction: '/users/5',
+ transaction_info: {
+ source: 'url',
+ },
+ });
+});
+
+test('updates the transaction when using the back button', async ({ page }) => {
+ // Solid Router sends a `-1` navigation when using the back button.
+ // The sentry solidRouterBrowserTracingIntegration tries to update such
+ // transactions with the proper name once the `useLocation` hook triggers.
+ const navigationTxnPromise = waitForTransaction('solidstart', async transactionEvent => {
+ return transactionEvent?.transaction === '/users/6' && transactionEvent.contexts?.trace?.op === 'navigation';
+ });
+
+ await page.goto(`/`);
+ await page.locator('#navLinkUserBack').click();
+ const navigationTxn = await navigationTxnPromise;
+
+ expect(navigationTxn).toMatchObject({
+ contexts: {
+ trace: {
+ op: 'navigation',
+ origin: 'auto.navigation.solidstart.solidrouter',
+ },
+ },
+ transaction: '/users/6',
+ transaction_info: {
+ source: 'url',
+ },
+ });
+
+ const backNavigationTxnPromise = waitForTransaction('solidstart', async transactionEvent => {
+ return transactionEvent?.transaction === '/' && transactionEvent.contexts?.trace?.op === 'navigation';
+ });
+
+ await page.goBack();
+ const backNavigationTxn = await backNavigationTxnPromise;
+
+ expect(backNavigationTxn).toMatchObject({
+ contexts: {
+ trace: {
+ op: 'navigation',
+ origin: 'auto.navigation.solidstart.solidrouter',
+ },
+ },
+ transaction: '/',
+ transaction_info: {
+ source: 'url',
+ },
+ });
+});
diff --git a/dev-packages/e2e-tests/test-applications/solidstart/tsconfig.json b/dev-packages/e2e-tests/test-applications/solidstart/tsconfig.json
new file mode 100644
index 000000000000..6f11292cc5d8
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/solidstart/tsconfig.json
@@ -0,0 +1,19 @@
+{
+ "compilerOptions": {
+ "target": "ESNext",
+ "module": "ESNext",
+ "moduleResolution": "node",
+ "allowSyntheticDefaultImports": true,
+ "esModuleInterop": true,
+ "jsx": "preserve",
+ "jsxImportSource": "solid-js",
+ "allowJs": true,
+ "strict": true,
+ "noEmit": true,
+ "types": ["vinxi/types/client", "vitest/globals", "@testing-library/jest-dom"],
+ "isolatedModules": true,
+ "paths": {
+ "~/*": ["./src/*"]
+ }
+ }
+}
diff --git a/dev-packages/e2e-tests/test-applications/solidstart/vitest.config.ts b/dev-packages/e2e-tests/test-applications/solidstart/vitest.config.ts
new file mode 100644
index 000000000000..6c2b639dc300
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/solidstart/vitest.config.ts
@@ -0,0 +1,10 @@
+import solid from 'vite-plugin-solid';
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+ plugins: [solid()],
+ resolve: {
+ conditions: ['development', 'browser'],
+ },
+ envPrefix: 'PUBLIC_',
+});
diff --git a/dev-packages/e2e-tests/verdaccio-config/config.yaml b/dev-packages/e2e-tests/verdaccio-config/config.yaml
index 973d2173aefa..67ee55a9d9ce 100644
--- a/dev-packages/e2e-tests/verdaccio-config/config.yaml
+++ b/dev-packages/e2e-tests/verdaccio-config/config.yaml
@@ -62,6 +62,12 @@ packages:
unpublish: $all
# proxy: npmjs # Don't proxy for E2E tests!
+ '@sentry/cloudflare':
+ access: $all
+ publish: $all
+ unpublish: $all
+ # proxy: npmjs # Don't proxy for E2E tests!
+
'@sentry/deno':
access: $all
publish: $all
diff --git a/dev-packages/node-integration-tests/src/index.ts b/dev-packages/node-integration-tests/src/index.ts
index 08afc11fe7ea..4bd0a9ccce25 100644
--- a/dev-packages/node-integration-tests/src/index.ts
+++ b/dev-packages/node-integration-tests/src/index.ts
@@ -20,13 +20,17 @@ export function loggingTransport(_options: BaseTransportOptions): Transport {
/**
* Starts an express server and sends the port to the runner
+ * @param app Express app
+ * @param port Port to start the app on. USE WITH CAUTION! By default a random port will be chosen.
+ * Setting this port to something specific is useful for local debugging but dangerous for
+ * CI/CD environments where port collisions can cause flakes!
*/
-export function startExpressServerAndSendPortToRunner(app: Express): void {
- const server = app.listen(0, () => {
+export function startExpressServerAndSendPortToRunner(app: Express, port: number | undefined = undefined): void {
+ const server = app.listen(port || 0, () => {
const address = server.address() as AddressInfo;
// eslint-disable-next-line no-console
- console.log(`{"port":${address.port}}`);
+ console.log(`{"port":${port || address.port}}`);
});
}
diff --git a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts
index 593ccff485fe..5bf91f7653c1 100644
--- a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts
@@ -9,7 +9,6 @@ describe('GraphQL/Apollo Tests', () => {
data: {
'graphql.operation.type': 'query',
'graphql.source': '{hello}',
- 'otel.kind': 'INTERNAL',
'sentry.origin': 'auto.graphql.otel.graphql',
},
description: 'query',
@@ -31,7 +30,6 @@ describe('GraphQL/Apollo Tests', () => {
'graphql.operation.name': 'Mutation',
'graphql.operation.type': 'mutation',
'graphql.source': 'mutation Mutation($email: String) {\n login(email: $email)\n}',
- 'otel.kind': 'INTERNAL',
'sentry.origin': 'auto.graphql.otel.graphql',
},
description: 'mutation Mutation',
diff --git a/dev-packages/node-integration-tests/suites/tracing/connect/test.ts b/dev-packages/node-integration-tests/suites/tracing/connect/test.ts
index e343e6edf6fd..ad49a4e4532d 100644
--- a/dev-packages/node-integration-tests/suites/tracing/connect/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/connect/test.ts
@@ -15,7 +15,6 @@ describe('connect auto-instrumentation', () => {
'connect.name': '/',
'connect.type': 'request_handler',
'http.route': '/',
- 'otel.kind': 'INTERNAL',
'sentry.origin': 'auto.http.otel.connect',
'sentry.op': 'request_handler.connect',
}),
diff --git a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/server-ignoreIncomingRequests.js b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/server-ignoreIncomingRequests.js
new file mode 100644
index 000000000000..f1e5d9870fcf
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/server-ignoreIncomingRequests.js
@@ -0,0 +1,38 @@
+const { loggingTransport } = require('@sentry-internal/node-integration-tests');
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ tracesSampleRate: 1.0,
+ transport: loggingTransport,
+
+ integrations: [
+ Sentry.httpIntegration({
+ ignoreIncomingRequests: url => {
+ return url.includes('/liveness');
+ },
+ }),
+ ],
+});
+
+// express must be required after Sentry is initialized
+const express = require('express');
+const cors = require('cors');
+const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');
+
+const app = express();
+
+app.use(cors());
+
+app.get('/test', (_req, res) => {
+ res.send({ response: 'response 1' });
+});
+
+app.get('/liveness', (_req, res) => {
+ res.send({ response: 'liveness' });
+});
+
+Sentry.setupExpressErrorHandler(app);
+
+startExpressServerAndSendPortToRunner(app);
diff --git a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/server-ignoreOutgoingRequests.js b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/server-ignoreOutgoingRequests.js
new file mode 100644
index 000000000000..ce520c999259
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/server-ignoreOutgoingRequests.js
@@ -0,0 +1,42 @@
+const { loggingTransport } = require('@sentry-internal/node-integration-tests');
+const Sentry = require('@sentry/node');
+const http = require('http');
+
+Sentry.init({
+ dsn: 'https://public@dsn.ingest.sentry.io/1337',
+ release: '1.0',
+ tracesSampleRate: 1.0,
+ transport: loggingTransport,
+
+ integrations: [
+ Sentry.httpIntegration({
+ ignoreOutgoingRequests: url => {
+ return url.includes('example.com');
+ },
+ }),
+ ],
+});
+
+// express must be required after Sentry is initialized
+const express = require('express');
+const cors = require('cors');
+const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');
+
+const app = express();
+
+app.use(cors());
+
+app.get('/test', (_req, response) => {
+ http
+ .request('http://example.com/', res => {
+ res.on('data', () => {});
+ res.on('end', () => {
+ response.send({ response: 'done' });
+ });
+ })
+ .end();
+});
+
+Sentry.setupExpressErrorHandler(app);
+
+startExpressServerAndSendPortToRunner(app);
diff --git a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts
index 6be5d36e2ee3..aebe0dd676ba 100644
--- a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts
@@ -75,4 +75,59 @@ describe('httpIntegration', () => {
.start(done)
.makeRequest('get', '/test');
});
+
+ test("doesn't create a root span for incoming requests ignored via `ignoreIncomingRequests`", done => {
+ const runner = createRunner(__dirname, 'server-ignoreIncomingRequests.js')
+ .expect({
+ transaction: {
+ contexts: {
+ trace: {
+ span_id: expect.any(String),
+ trace_id: expect.any(String),
+ data: {
+ url: expect.stringMatching(/\/test$/),
+ 'http.response.status_code': 200,
+ },
+ op: 'http.server',
+ status: 'ok',
+ },
+ },
+ transaction: 'GET /test',
+ },
+ })
+ .start(done);
+
+ runner.makeRequest('get', '/liveness'); // should be ignored
+ runner.makeRequest('get', '/test');
+ });
+
+ test("doesn't create child spans for outgoing requests ignored via `ignoreOutgoingRequests`", done => {
+ const runner = createRunner(__dirname, 'server-ignoreOutgoingRequests.js')
+ .expect({
+ transaction: {
+ contexts: {
+ trace: {
+ span_id: expect.any(String),
+ trace_id: expect.any(String),
+ data: {
+ url: expect.stringMatching(/\/test$/),
+ 'http.response.status_code': 200,
+ },
+ op: 'http.server',
+ status: 'ok',
+ },
+ },
+ transaction: 'GET /test',
+ spans: [
+ expect.objectContaining({ op: 'middleware.express', description: 'query' }),
+ expect.objectContaining({ op: 'middleware.express', description: 'expressInit' }),
+ expect.objectContaining({ op: 'middleware.express', description: 'corsMiddleware' }),
+ expect.objectContaining({ op: 'request_handler.express', description: '/test' }),
+ ],
+ },
+ })
+ .start(done);
+
+ runner.makeRequest('get', '/test');
+ });
});
diff --git a/dev-packages/node-integration-tests/suites/tracing/nestjs/test.ts b/dev-packages/node-integration-tests/suites/tracing/nestjs/test.ts
index abb9cf6f0bdd..2b42f23c857a 100644
--- a/dev-packages/node-integration-tests/suites/tracing/nestjs/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/nestjs/test.ts
@@ -27,7 +27,6 @@ conditionalTest({ min: 16 })('nestjs auto instrumentation', () => {
'nestjs.callback': 'getHello',
'nestjs.controller': 'AppController',
'nestjs.type': 'request_context',
- 'otel.kind': 'INTERNAL',
'sentry.op': 'http',
}),
}),
diff --git a/dev-packages/node-integration-tests/suites/tracing/prisma-orm/test.ts b/dev-packages/node-integration-tests/suites/tracing/prisma-orm/test.ts
index 3c96c6d80779..dd92de5d0292 100644
--- a/dev-packages/node-integration-tests/suites/tracing/prisma-orm/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/prisma-orm/test.ts
@@ -11,7 +11,6 @@ conditionalTest({ min: 16 })('Prisma ORM Tests', () => {
method: 'create',
model: 'User',
name: 'User.create',
- 'otel.kind': 'INTERNAL',
'sentry.origin': 'auto.db.otel.prisma',
},
description: 'prisma:client:operation',
@@ -19,7 +18,6 @@ conditionalTest({ min: 16 })('Prisma ORM Tests', () => {
}),
expect.objectContaining({
data: {
- 'otel.kind': 'INTERNAL',
'sentry.origin': 'auto.db.otel.prisma',
},
description: 'prisma:client:serialize',
@@ -27,7 +25,6 @@ conditionalTest({ min: 16 })('Prisma ORM Tests', () => {
}),
expect.objectContaining({
data: {
- 'otel.kind': 'INTERNAL',
'sentry.origin': 'auto.db.otel.prisma',
},
description: 'prisma:client:connect',
@@ -35,7 +32,6 @@ conditionalTest({ min: 16 })('Prisma ORM Tests', () => {
}),
expect.objectContaining({
data: {
- 'otel.kind': 'INTERNAL',
'sentry.origin': 'auto.db.otel.prisma',
},
description: 'prisma:engine',
@@ -44,7 +40,6 @@ conditionalTest({ min: 16 })('Prisma ORM Tests', () => {
expect.objectContaining({
data: {
'db.type': 'postgres',
- 'otel.kind': 'INTERNAL',
'sentry.origin': 'auto.db.otel.prisma',
},
description: 'prisma:engine:connection',
@@ -55,7 +50,6 @@ conditionalTest({ min: 16 })('Prisma ORM Tests', () => {
'db.statement': expect.stringContaining(
'INSERT INTO "public"."User" ("createdAt","email","name") VALUES ($1,$2,$3) RETURNING "public"."User"."id", "public"."User"."createdAt", "public"."User"."email", "public"."User"."name" /* traceparent',
),
- 'otel.kind': 'INTERNAL',
'sentry.origin': 'auto.db.otel.prisma',
'db.system': 'prisma',
'sentry.op': 'db',
@@ -67,7 +61,6 @@ conditionalTest({ min: 16 })('Prisma ORM Tests', () => {
}),
expect.objectContaining({
data: {
- 'otel.kind': 'INTERNAL',
'sentry.origin': 'auto.db.otel.prisma',
},
description: 'prisma:engine:serialize',
@@ -75,7 +68,6 @@ conditionalTest({ min: 16 })('Prisma ORM Tests', () => {
}),
expect.objectContaining({
data: {
- 'otel.kind': 'INTERNAL',
'sentry.origin': 'auto.db.otel.prisma',
},
description: 'prisma:engine:response_json_serialization',
@@ -86,7 +78,6 @@ conditionalTest({ min: 16 })('Prisma ORM Tests', () => {
method: 'findMany',
model: 'User',
name: 'User.findMany',
- 'otel.kind': 'INTERNAL',
'sentry.origin': 'auto.db.otel.prisma',
},
description: 'prisma:client:operation',
@@ -94,7 +85,6 @@ conditionalTest({ min: 16 })('Prisma ORM Tests', () => {
}),
expect.objectContaining({
data: {
- 'otel.kind': 'INTERNAL',
'sentry.origin': 'auto.db.otel.prisma',
},
description: 'prisma:client:serialize',
@@ -102,7 +92,6 @@ conditionalTest({ min: 16 })('Prisma ORM Tests', () => {
}),
expect.objectContaining({
data: {
- 'otel.kind': 'INTERNAL',
'sentry.origin': 'auto.db.otel.prisma',
},
description: 'prisma:engine',
diff --git a/dev-packages/node-integration-tests/suites/tsconfig.json b/dev-packages/node-integration-tests/suites/tsconfig.json
index 120c3aff3716..c8f7f2d29f65 100644
--- a/dev-packages/node-integration-tests/suites/tsconfig.json
+++ b/dev-packages/node-integration-tests/suites/tsconfig.json
@@ -1,3 +1,9 @@
{
"extends": "../tsconfig.test.json",
+
+ "compilerOptions": {
+ // Although this seems wrong to include `DOM` here, it's necessary to make
+ // global fetch available in tests in lower Node versions.
+ "lib": ["DOM", "ES2018"],
+ }
}
diff --git a/dev-packages/node-integration-tests/tsconfig.json b/dev-packages/node-integration-tests/tsconfig.json
index 92db70d5ca09..9ef29d983a08 100644
--- a/dev-packages/node-integration-tests/tsconfig.json
+++ b/dev-packages/node-integration-tests/tsconfig.json
@@ -4,6 +4,9 @@
"include": ["utils/**/*.ts", "src/**/*.ts"],
"compilerOptions": {
+ // Although this seems wrong to include `DOM` here, it's necessary to make
+ // global fetch available in tests in lower Node versions.
+ "lib": ["DOM", "ES2018"],
// package-specific options
"esModuleInterop": true,
"types": ["node", "jest"]
diff --git a/dev-packages/node-integration-tests/tsconfig.test.json b/dev-packages/node-integration-tests/tsconfig.test.json
index 5a37b90c4fe2..3bd3452a3ead 100644
--- a/dev-packages/node-integration-tests/tsconfig.test.json
+++ b/dev-packages/node-integration-tests/tsconfig.test.json
@@ -4,6 +4,9 @@
"include": ["suites/**/*.ts"],
"compilerOptions": {
+ // Although this seems wrong to include `DOM` here, it's necessary to make
+ // global fetch available in tests in lower Node versions.
+ "lib": ["DOM", "ES2018"],
// should include all types from `./tsconfig.json` plus types for all test frameworks used
"types": ["node", "jest"]
diff --git a/dev-packages/test-utils/.eslintrc.js b/dev-packages/test-utils/.eslintrc.js
index 175b9389af00..98318aea5c41 100644
--- a/dev-packages/test-utils/.eslintrc.js
+++ b/dev-packages/test-utils/.eslintrc.js
@@ -3,5 +3,12 @@ module.exports = {
node: true,
},
extends: ['../../.eslintrc.js'],
- overrides: [],
+ overrides: [
+ {
+ files: ['**/*.ts'],
+ rules: {
+ '@sentry-internal/sdk/no-optional-chaining': 'off',
+ },
+ },
+ ],
};
diff --git a/dev-packages/test-utils/src/playwright-config.ts b/dev-packages/test-utils/src/playwright-config.ts
index 33de29f5a7fc..a48ca969ad06 100644
--- a/dev-packages/test-utils/src/playwright-config.ts
+++ b/dev-packages/test-utils/src/playwright-config.ts
@@ -2,8 +2,8 @@ import type { PlaywrightTestConfig } from '@playwright/test';
/** Get a playwright config to use in an E2E test app. */
export function getPlaywrightConfig(
- options: {
- startCommand: string;
+ options?: {
+ startCommand?: string;
port?: number;
eventProxyPort?: number;
eventProxyFile?: string;
@@ -11,10 +11,10 @@ export function getPlaywrightConfig(
overwriteConfig?: Partial
+
+
+
+# Official Sentry SDK for Cloudflare [UNRELEASED]
+
+[](https://www.npmjs.com/package/@sentry/cloudflare)
+[](https://www.npmjs.com/package/@sentry/cloudflare)
+[](https://www.npmjs.com/package/@sentry/cloudflare)
+
+## Links
+
+- [Official SDK Docs](https://docs.sentry.io/quickstart/)
+- [TypeDoc](http://getsentry.github.io/sentry-javascript/)
+
+**Note: This SDK is unreleased. Please follow the
+[tracking GH issue](https://github.com/getsentry/sentry-javascript/issues/12620) for updates.**
+
+## Usage
+
+TODO: Add usage instructions here.
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
new file mode 100644
index 000000000000..eff219dd1cf8
--- /dev/null
+++ b/packages/cloudflare/package.json
@@ -0,0 +1,76 @@
+{
+ "name": "@sentry/cloudflare",
+ "version": "8.17.0",
+ "description": "Offical Sentry SDK for Cloudflare Workers and Pages",
+ "repository": "git://github.com/getsentry/sentry-javascript.git",
+ "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/cloudflare",
+ "author": "Sentry",
+ "license": "MIT",
+ "engines": {
+ "node": ">=14.18"
+ },
+ "files": [
+ "/build"
+ ],
+ "main": "build/cjs/index.js",
+ "module": "build/esm/index.js",
+ "types": "build/types/index.d.ts",
+ "exports": {
+ "./package.json": "./package.json",
+ ".": {
+ "import": {
+ "types": "./build/types/index.d.ts",
+ "default": "./build/esm/index.js"
+ },
+ "require": {
+ "types": "./build/types/index.d.ts",
+ "default": "./build/cjs/index.js"
+ }
+ }
+ },
+ "typesVersions": {
+ "<4.9": {
+ "build/types/index.d.ts": [
+ "build/types-ts3.8/index.d.ts"
+ ]
+ }
+ },
+ "publishConfig": {
+ "access": "public"
+ },
+ "dependencies": {
+ "@sentry/core": "8.17.0",
+ "@sentry/types": "8.17.0",
+ "@sentry/utils": "8.17.0"
+ },
+ "devDependencies": {
+ "@cloudflare/workers-types": "^4.20240620.0",
+ "miniflare": "^3.20240701.0",
+ "wrangler": "^3.63.2"
+ },
+ "scripts": {
+ "build": "run-p build:transpile build:types",
+ "build:dev": "yarn build",
+ "build:transpile": "rollup -c rollup.npm.config.mjs",
+ "build:types": "run-s build:types:core build:types:downlevel",
+ "build:types:core": "tsc -p tsconfig.types.json",
+ "build:types:downlevel": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",
+ "build:watch": "run-p build:transpile:watch build:types:watch",
+ "build:dev:watch": "yarn build:watch",
+ "build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
+ "build:types:watch": "tsc -p tsconfig.types.json --watch",
+ "build:tarball": "npm pack",
+ "circularDepCheck": "madge --circular src/index.ts",
+ "clean": "rimraf build coverage sentry-cloudflare-*.tgz",
+ "fix": "eslint . --format stylish --fix",
+ "lint": "eslint . --format stylish",
+ "test": "yarn test:unit",
+ "test:unit": "vitest run",
+ "test:watch": "vitest --watch",
+ "yalc:publish": "yalc publish --push --sig"
+ },
+ "volta": {
+ "extends": "../../package.json"
+ },
+ "sideEffects": false
+}
diff --git a/packages/cloudflare/rollup.npm.config.mjs b/packages/cloudflare/rollup.npm.config.mjs
new file mode 100644
index 000000000000..84a06f2fb64a
--- /dev/null
+++ b/packages/cloudflare/rollup.npm.config.mjs
@@ -0,0 +1,3 @@
+import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';
+
+export default makeNPMConfigVariants(makeBaseNPMConfig());
diff --git a/packages/cloudflare/src/debug-build.ts b/packages/cloudflare/src/debug-build.ts
new file mode 100644
index 000000000000..60aa50940582
--- /dev/null
+++ b/packages/cloudflare/src/debug-build.ts
@@ -0,0 +1,8 @@
+declare const __DEBUG_BUILD__: boolean;
+
+/**
+ * This serves as a build time flag that will be true by default, but false in non-debug builds or if users replace `__SENTRY_DEBUG__` in their generated code.
+ *
+ * ATTENTION: This constant must never cross package boundaries (i.e. be exported) to guarantee that it can be used for tree shaking.
+ */
+export const DEBUG_BUILD = __DEBUG_BUILD__;
diff --git a/packages/cloudflare/src/index.ts b/packages/cloudflare/src/index.ts
new file mode 100644
index 000000000000..cb0ff5c3b541
--- /dev/null
+++ b/packages/cloudflare/src/index.ts
@@ -0,0 +1 @@
+export {};
diff --git a/packages/cloudflare/test/fixtures/worker.mjs b/packages/cloudflare/test/fixtures/worker.mjs
new file mode 100644
index 000000000000..2023f7471c43
--- /dev/null
+++ b/packages/cloudflare/test/fixtures/worker.mjs
@@ -0,0 +1,8 @@
+/**
+ * @type {import('@cloudflare/workers-types').ExportedHandler}
+ */
+export default {
+ async fetch(_request, _env, _ctx) {
+ return new Response('Hello Sentry!');
+ },
+};
diff --git a/packages/cloudflare/test/index.test.ts b/packages/cloudflare/test/index.test.ts
new file mode 100644
index 000000000000..30bd1f0962f6
--- /dev/null
+++ b/packages/cloudflare/test/index.test.ts
@@ -0,0 +1,17 @@
+import { describe, expect, test } from 'vitest';
+
+import { Miniflare } from 'miniflare';
+
+describe('index', () => {
+ test('simple test', async () => {
+ const mf = new Miniflare({
+ scriptPath: './test/fixtures/worker.mjs',
+ modules: true,
+ port: 8787,
+ });
+
+ const res = await mf.dispatchFetch('http://localhost:8787/');
+ expect(await res.text()).toBe('Hello Sentry!');
+ await mf.dispose();
+ });
+});
diff --git a/packages/cloudflare/test/tsconfig.json b/packages/cloudflare/test/tsconfig.json
new file mode 100644
index 000000000000..120c3aff3716
--- /dev/null
+++ b/packages/cloudflare/test/tsconfig.json
@@ -0,0 +1,3 @@
+{
+ "extends": "../tsconfig.test.json",
+}
diff --git a/packages/cloudflare/tsconfig.json b/packages/cloudflare/tsconfig.json
new file mode 100644
index 000000000000..18b3ec720bfe
--- /dev/null
+++ b/packages/cloudflare/tsconfig.json
@@ -0,0 +1,9 @@
+{
+ "extends": "../../tsconfig.json",
+
+ "include": ["src/**/*"],
+
+ "compilerOptions": {
+ "types": ["@cloudflare/workers-types"]
+ }
+}
diff --git a/packages/cloudflare/tsconfig.test.json b/packages/cloudflare/tsconfig.test.json
new file mode 100644
index 000000000000..42d9d0df227e
--- /dev/null
+++ b/packages/cloudflare/tsconfig.test.json
@@ -0,0 +1,9 @@
+{
+ "extends": "./tsconfig.json",
+
+ "include": ["test/**/*"],
+
+ "compilerOptions": {
+ // other package-specific, test-specific options
+ }
+}
diff --git a/packages/cloudflare/tsconfig.types.json b/packages/cloudflare/tsconfig.types.json
new file mode 100644
index 000000000000..65455f66bd75
--- /dev/null
+++ b/packages/cloudflare/tsconfig.types.json
@@ -0,0 +1,10 @@
+{
+ "extends": "./tsconfig.json",
+
+ "compilerOptions": {
+ "declaration": true,
+ "declarationMap": true,
+ "emitDeclarationOnly": true,
+ "outDir": "build/types"
+ }
+}
diff --git a/packages/core/src/baseclient.ts b/packages/core/src/baseclient.ts
index 1ad35e291013..9c4b43bd9c9d 100644
--- a/packages/core/src/baseclient.ts
+++ b/packages/core/src/baseclient.ts
@@ -459,27 +459,19 @@ export abstract class BaseClient