diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5238ffaa9178..923006621c7a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -783,18 +783,19 @@ jobs: id: versions run: | echo "echo node=$(jq -r '.volta.node' package.json)" >> $GITHUB_OUTPUT - - name: Run E2E tests - env: - E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }} - E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }} - E2E_TEST_DSN: ${{ secrets.E2E_TEST_DSN }} - E2E_TEST_SENTRY_ORG_SLUG: 'sentry-javascript-sdks' - E2E_TEST_SENTRY_TEST_PROJECT: 'sentry-javascript-e2e-tests' - E2E_TEST_SHARD: ${{ matrix.shard }} - E2E_TEST_SHARD_AMOUNT: 3 - run: | - cd packages/e2e-tests - yarn test:e2e + # Temporarily disabling e2e tests + # - name: Run E2E tests + # env: + # E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }} + # E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }} + # E2E_TEST_DSN: ${{ secrets.E2E_TEST_DSN }} + # E2E_TEST_SENTRY_ORG_SLUG: 'sentry-javascript-sdks' + # E2E_TEST_SENTRY_TEST_PROJECT: 'sentry-javascript-e2e-tests' + # E2E_TEST_SHARD: ${{ matrix.shard }} + # E2E_TEST_SHARD_AMOUNT: 3 + # run: | + # cd packages/e2e-tests + # yarn test:e2e job_required_tests: name: All required tests passed or skipped diff --git a/packages/nextjs/test/integration/app/layout.tsx b/packages/nextjs/test/integration/app/layout.tsx new file mode 100644 index 000000000000..c8f9cee0b787 --- /dev/null +++ b/packages/nextjs/test/integration/app/layout.tsx @@ -0,0 +1,7 @@ +export default function Layout({ children }: { children: React.ReactNode }) { + return ( + + {children} + + ); +} diff --git a/packages/nextjs/test/integration/test/client/tracingFetch.test.ts b/packages/nextjs/test/integration/test/client/tracingFetch.test.ts index f4b464ac55fa..7c3256c5e6a7 100644 --- a/packages/nextjs/test/integration/test/client/tracingFetch.test.ts +++ b/packages/nextjs/test/integration/test/client/tracingFetch.test.ts @@ -31,7 +31,7 @@ test('should correctly instrument `fetch` for performance tracing', async ({ pag expect(transaction[0].spans).toEqual( expect.arrayContaining([ expect.objectContaining({ - data: { method: 'GET', url: 'http://example.com', type: 'fetch' }, + data: { 'http.method': 'GET', url: 'http://example.com', type: 'fetch' }, description: 'GET http://example.com', op: 'http.client', parent_span_id: expect.any(String), diff --git a/packages/nextjs/test/run-integration-tests.sh b/packages/nextjs/test/run-integration-tests.sh index 30ecce9db907..0eff88612e95 100755 --- a/packages/nextjs/test/run-integration-tests.sh +++ b/packages/nextjs/test/run-integration-tests.sh @@ -57,8 +57,8 @@ for NEXTJS_VERSION in 10 11 12 13; do exit 0 fi - # Next.js v13 requires at least Node v14 - if [ "$NODE_MAJOR" -lt "14" ] && [ "$NEXTJS_VERSION" -ge "13" ]; then + # Next.js v13 requires at least Node v16 + if [ "$NODE_MAJOR" -lt "16" ] && [ "$NEXTJS_VERSION" -ge "13" ]; then echo "[nextjs@$NEXTJS_VERSION] Not compatible with Node $NODE_MAJOR" exit 0 fi diff --git a/packages/tracing-internal/src/browser/request.ts b/packages/tracing-internal/src/browser/request.ts index 819831a276f5..99da1ed8cb2d 100644 --- a/packages/tracing-internal/src/browser/request.ts +++ b/packages/tracing-internal/src/browser/request.ts @@ -191,13 +191,14 @@ export function fetchCallback( const activeTransaction = currentSpan && currentSpan.transaction; if (currentSpan && activeTransaction) { + const { method, url } = handlerData.fetchData; const span = currentSpan.startChild({ data: { - ...handlerData.fetchData, + url, type: 'fetch', - 'http.method': handlerData.fetchData.method, + 'http.method': method, }, - description: `${handlerData.fetchData.method} ${handlerData.fetchData.url}`, + description: `${method} ${url}`, op: 'http.client', });