Merge branch 'develop' into nh/align-error-span-status

Author: nicohrubec

dev-packages/e2e-tests/test-applications/nextjs-16-cf-workers/tests/cloudflare-runtime.test.ts

@@ -1,7 +1,8 @@
 import { expect, test } from '@playwright/test';
 import { waitForError } from '@sentry-internal/test-utils';
 
-test.describe('Cloudflare Runtime', () => {
+// TODO(https://github.com/opennextjs/opennextjs-cloudflare/issues/1141): Unskip once opennext supports prefetch-hints.json
+test.describe.skip('Cloudflare Runtime', () => {
   test('Should report cloudflare as the runtime in API route error events', async ({ request }) => {
     const errorEventPromise = waitForError('nextjs-16-cf-workers', errorEvent => {
       return !!errorEvent?.exception?.values?.some(value =>

dev-packages/e2e-tests/test-applications/nextjs-16-cf-workers/tests/isr-routes.test.ts

@@ -1,7 +1,8 @@
 import { expect, test } from '@playwright/test';
 import { waitForTransaction } from '@sentry-internal/test-utils';
 
-test('should remove sentry-trace and baggage meta tags on ISR dynamic route page load', async ({ page }) => {
+// TODO(https://github.com/opennextjs/opennextjs-cloudflare/issues/1141): Unskip once opennext supports prefetch-hints.json
+test.skip('should remove sentry-trace and baggage meta tags on ISR dynamic route page load', async ({ page }) => {
   // Navigate to ISR page
   await page.goto('/isr-test/laptop');
 
@@ -13,7 +14,8 @@ test('should remove sentry-trace and baggage meta tags on ISR dynamic route page
   await expect(page.locator('meta[name="baggage"]')).toHaveCount(0);
 });
 
-test('should remove sentry-trace and baggage meta tags on ISR static route', async ({ page }) => {
+// TODO(https://github.com/opennextjs/opennextjs-cloudflare/issues/1141): Unskip once opennext supports prefetch-hints.json
+test.skip('should remove sentry-trace and baggage meta tags on ISR static route', async ({ page }) => {
   // Navigate to ISR static page
   await page.goto('/isr-test/static');
 
@@ -25,7 +27,8 @@ test('should remove sentry-trace and baggage meta tags on ISR static route', asy
   await expect(page.locator('meta[name="baggage"]')).toHaveCount(0);
 });
 
-test('should remove meta tags for different ISR dynamic route values', async ({ page }) => {
+// TODO(https://github.com/opennextjs/opennextjs-cloudflare/issues/1141): Unskip once opennext supports prefetch-hints.json
+test.skip('should remove meta tags for different ISR dynamic route values', async ({ page }) => {
   // Test with 'phone' (one of the pre-generated static params)
   await page.goto('/isr-test/phone');
   await expect(page.locator('#isr-product-id')).toHaveText('phone');
@@ -41,7 +44,8 @@ test('should remove meta tags for different ISR dynamic route values', async ({
   await expect(page.locator('meta[name="baggage"]')).toHaveCount(0);
 });
 
-test('should create unique transactions for ISR pages on each visit', async ({ page }) => {
+// TODO(https://github.com/opennextjs/opennextjs-cloudflare/issues/1141): Unskip once opennext supports prefetch-hints.json
+test.skip('should create unique transactions for ISR pages on each visit', async ({ page }) => {
   const traceIds: string[] = [];
 
   // Load the same ISR page 5 times to ensure cached HTML meta tags are consistently removed
@@ -71,7 +75,8 @@ test('should create unique transactions for ISR pages on each visit', async ({ p
   expect(uniqueTraceIds.size).toBe(5);
 });
 
-test('ISR route should be identified correctly in the route manifest', async ({ page }) => {
+// TODO(https://github.com/opennextjs/opennextjs-cloudflare/issues/1141): Unskip once opennext supports prefetch-hints.json
+test.skip('ISR route should be identified correctly in the route manifest', async ({ page }) => {
   const transactionPromise = waitForTransaction('nextjs-16-cf-workers', async transactionEvent => {
     return transactionEvent.transaction === '/isr-test/:product' && transactionEvent.contexts?.trace?.op === 'pageload';
   });

dev-packages/e2e-tests/test-applications/nextjs-16-cf-workers/tests/parameterized-routes.test.ts

@@ -1,7 +1,8 @@
 import { expect, test } from '@playwright/test';
 import { waitForTransaction } from '@sentry-internal/test-utils';
 
-test('should create a parameterized transaction when the `app` directory is used', async ({ page }) => {
+// TODO(https://github.com/opennextjs/opennextjs-cloudflare/issues/1141): Unskip once opennext supports prefetch-hints.json
+test.skip('should create a parameterized transaction when the `app` directory is used', async ({ page }) => {
   const transactionPromise = waitForTransaction('nextjs-16-cf-workers', async transactionEvent => {
     return (
       transactionEvent.transaction === '/parameterized/:one' && transactionEvent.contexts?.trace?.op === 'pageload'
@@ -47,7 +48,8 @@ test('should create a parameterized transaction when the `app` directory is used
   });
 });
 
-test('should create a static transaction when the `app` directory is used and the route is not parameterized', async ({
+// TODO(https://github.com/opennextjs/opennextjs-cloudflare/issues/1141): Unskip once opennext supports prefetch-hints.json
+test.skip('should create a static transaction when the `app` directory is used and the route is not parameterized', async ({
   page,
 }) => {
   const transactionPromise = waitForTransaction('nextjs-16-cf-workers', async transactionEvent => {
@@ -95,7 +97,8 @@ test('should create a static transaction when the `app` directory is used and th
   });
 });
 
-test('should create a partially parameterized transaction when the `app` directory is used', async ({ page }) => {
+// TODO(https://github.com/opennextjs/opennextjs-cloudflare/issues/1141): Unskip once opennext supports prefetch-hints.json
+test.skip('should create a partially parameterized transaction when the `app` directory is used', async ({ page }) => {
   const transactionPromise = waitForTransaction('nextjs-16-cf-workers', async transactionEvent => {
     return (
       transactionEvent.transaction === '/parameterized/:one/beep' && transactionEvent.contexts?.trace?.op === 'pageload'
@@ -141,7 +144,8 @@ test('should create a partially parameterized transaction when the `app` directo
   });
 });
 
-test('should create a nested parameterized transaction when the `app` directory is used.', async ({ page }) => {
+// TODO(https://github.com/opennextjs/opennextjs-cloudflare/issues/1141): Unskip once opennext supports prefetch-hints.json
+test.skip('should create a nested parameterized transaction when the `app` directory is used.', async ({ page }) => {
   const transactionPromise = waitForTransaction('nextjs-16-cf-workers', async transactionEvent => {
     return (
       transactionEvent.transaction === '/parameterized/:one/beep/:two' &&

dev-packages/e2e-tests/test-applications/nextjs-16-cf-workers/tests/prefetch-spans.test.ts

@@ -2,7 +2,8 @@ import { expect, test } from '@playwright/test';
 import { waitForTransaction } from '@sentry-internal/test-utils';
 import { isDevMode } from './isDevMode';
 
-test('Prefetch client spans should have a http.request.prefetch attribute', async ({ page }) => {
+// TODO(https://github.com/opennextjs/opennextjs-cloudflare/issues/1141): Unskip once opennext supports prefetch-hints.json
+test.skip('Prefetch client spans should have a http.request.prefetch attribute', async ({ page }) => {
   test.skip(isDevMode, "Prefetch requests don't have the prefetch header in dev mode");
 
   const pageloadTransactionPromise = waitForTransaction('nextjs-16-cf-workers', async transactionEvent => {

dev-packages/e2e-tests/test-applications/nextjs-16-cf-workers/tests/streaming-rsc-error.test.ts

@@ -1,7 +1,8 @@
 import { expect, test } from '@playwright/test';
 import { waitForError, waitForTransaction } from '@sentry-internal/test-utils';
 
-test('Should capture errors for crashing streaming promises in server components when `Sentry.captureRequestError` is added to the `onRequestError` hook', async ({
+// TODO(https://github.com/opennextjs/opennextjs-cloudflare/issues/1141): Unskip once opennext supports prefetch-hints.json
+test.skip('Should capture errors for crashing streaming promises in server components when `Sentry.captureRequestError` is added to the `onRequestError` hook', async ({
   page,
 }) => {
   const errorEventPromise = waitForError('nextjs-16-cf-workers', errorEvent => {