Merge branch 'develop' into sig/astro-waitUntil

Author: s1gr1d

.github/dependabot.yml

@@ -13,13 +13,10 @@ updates:
     schedule:
       interval: 'weekly'
     allow:
-      - dependency-name: "@sentry/cli"
-      - dependency-name: "@sentry/vite-plugin"
-      - dependency-name: "@sentry/webpack-plugin"
-      - dependency-name: "@sentry/rollup-plugin"
-      - dependency-name: "@sentry/esbuild-plugin"
+      - dependency-name: "@sentry/*"
       - dependency-name: "@opentelemetry/*"
       - dependency-name: "@prisma/instrumentation"
+      - dependency-name: "opentelemetry-instrumentation-remix"
     versioning-strategy: increase
     commit-message:
       prefix: feat

.github/workflows/build.yml

@@ -437,7 +437,7 @@ jobs:
         with:
           node-version-file: 'package.json'
       - name: Set up Deno
-        uses: denoland/setup-deno@v1.5.1
+        uses: denoland/setup-deno@v2.0.1
         with:
           deno-version: v1.38.5
       - name: Restore caches
@@ -858,7 +858,7 @@ jobs:
     if: always() && needs.job_e2e_prepare.result == 'success'
     needs: [job_get_metadata, job_build, job_e2e_prepare]
     runs-on: ubuntu-20.04
-    timeout-minutes: 10
+    timeout-minutes: 15
     env:
       # We just use a dummy DSN here, only send to the tunnel anyhow
       E2E_TEST_DSN: 'https://username@domain/123'
@@ -1070,7 +1070,7 @@ jobs:
       github.actor != 'dependabot[bot]'
     needs: [job_get_metadata, job_build, job_e2e_prepare]
     runs-on: ubuntu-20.04
-    timeout-minutes: 10
+    timeout-minutes: 15
     env:
       E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }}
       E2E_TEST_DSN: ${{ secrets.E2E_TEST_DSN }}
@@ -1234,7 +1234,7 @@ jobs:
       )
     needs: [job_get_metadata, job_build, job_e2e_prepare]
     runs-on: ubuntu-20.04
-    timeout-minutes: 10
+    timeout-minutes: 15
     env:
       E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }}
       E2E_TEST_DSN: ${{ secrets.E2E_TEST_DSN }}
@@ -1345,48 +1345,6 @@ jobs:
         run: |
           echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
 
-  overhead_metrics:
-    name: Overhead metrics
-    needs: [job_get_metadata, job_build]
-    runs-on: ubuntu-20.04
-    timeout-minutes: 30
-    if: |
-      contains(github.event.pull_request.labels.*.name, 'ci-overhead-measurements')
-    steps:
-      - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.HEAD_COMMIT }}
-      - name: Set up Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: 'package.json'
-      - name: Restore caches
-        uses: ./.github/actions/restore-cache
-        with:
-          dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
-
-      - name: Collect
-        run: yarn ci:collect
-        working-directory: dev-packages/overhead-metrics
-
-      - name: Process
-        id: process
-        run: yarn ci:process
-        working-directory: dev-packages/overhead-metrics
-        # Don't run on forks - the PR comment cannot be added.
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-
-      - name: Upload results
-        uses: actions/upload-artifact@v4
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
-        with:
-          name: ${{ steps.process.outputs.artifactName }}
-          path: ${{ steps.process.outputs.artifactPath }}
-          retention-days: 7
-
   job_compile_bindings_profiling_node:
     name: Compile & Test Profiling Bindings (v${{ matrix.node }}) ${{ matrix.target_platform || matrix.os }}, ${{ matrix.node || matrix.container }}, ${{ matrix.arch || matrix.container }}, ${{ contains(matrix.container, 'alpine') && 'musl' || 'glibc'  }}
     needs: [job_get_metadata, job_build]

.github/workflows/codeql-analysis.yml

@@ -14,6 +14,9 @@ name: 'CI: CodeQL'
 on:
   push:
     branches: [develop]
+    branches-ignore:
+      # Ignore dependabot branches
+      - "dependabot/**"
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [develop]

dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-sdk-disabled/init.js

@@ -0,0 +1,18 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+window.fetchCallCount = 0;
+window.spanEnded = false;
+
+const originalWindowFetch = window.fetch;
+window.fetch = (...args) => {
+  window.fetchCallCount++;
+  return originalWindowFetch(...args);
+};
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  tracesSampleRate: 1.0,
+  enabled: false,
+});

dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-sdk-disabled/subject.js

@@ -0,0 +1,3 @@
+Sentry.startSpan({ name: 'standalone_segment_span', experimental: { standalone: true } }, () => {});
+
+window.spanEnded = true;

dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-sdk-disabled/test.ts

@@ -0,0 +1,22 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { shouldSkipTracingTest } from '../../../../utils/helpers';
+
+sentryTest("doesn't send a standalone span envelope if SDK is disabled", async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
+  const url = await getLocalTestPath({ testDir: __dirname });
+  await page.goto(url);
+
+  // @ts-expect-error this exists in the test init/subject
+  await page.waitForFunction(() => !!window.spanEnded);
+  await page.waitForTimeout(2000);
+
+  // @ts-expect-error this exists in the test init
+  const fetchCallCount = await page.evaluate(() => window.fetchCallCount);
+  // We expect no fetch calls because the SDK is disabled
+  expect(fetchCallCount).toBe(0);
+});

dev-packages/e2e-tests/test-applications/debug-id-sourcemaps/package.json

@@ -13,7 +13,7 @@
     "@sentry/node": "latest || *"
   },
   "devDependencies": {
-    "rollup": "^4.0.2",
+    "rollup": "^4.24.2",
     "vitest": "^0.34.6",
     "@sentry/rollup-plugin": "2.22.6"
   },

dev-packages/e2e-tests/test-applications/nextjs-13/sentry.client.config.ts

@@ -1,3 +1,5 @@
+'use client';
+
 import * as Sentry from '@sentry/nextjs';
 
 Sentry.init({

dev-packages/e2e-tests/test-applications/nextjs-14/sentry.client.config.ts

@@ -1,3 +1,5 @@
+'use client';
+
 import * as Sentry from '@sentry/nextjs';
 
 Sentry.init({

dev-packages/e2e-tests/test-applications/nextjs-15/sentry.client.config.ts

@@ -1,3 +1,5 @@
+'use client';
+
 import * as Sentry from '@sentry/nextjs';
 
 Sentry.init({

dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.client.config.ts

@@ -1,3 +1,5 @@
+'use client';
+
 import * as Sentry from '@sentry/nextjs';
 
 Sentry.init({

dev-packages/e2e-tests/test-applications/nextjs-t3/sentry.client.config.ts

@@ -1,3 +1,5 @@
+'use client';
+
 import * as Sentry from '@sentry/nextjs';
 
 Sentry.init({

dev-packages/e2e-tests/test-applications/nextjs-turbo/app/layout.tsx

@@ -1,7 +1,12 @@
+import { HackComponentToRunSideEffectsInSentryClientConfig } from '../sentry.client.config';
+
 export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <html lang="en">
-      <body>{children}</body>
+      <body>
+        <HackComponentToRunSideEffectsInSentryClientConfig />
+        {children}
+      </body>
     </html>
   );
 }

dev-packages/e2e-tests/test-applications/nextjs-turbo/next-env.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+/// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

dev-packages/e2e-tests/test-applications/nextjs-turbo/pages/[param]/pages-router-client-trace-propagation.tsx

@@ -0,0 +1,10 @@
+export default function Page() {
+  <p>Hello World!</p>;
+}
+
+// getServerSideProps makes this page dynamic and allows tracing data to be inserted
+export async function getServerSideProps() {
+  return {
+    props: {},
+  };
+}

dev-packages/e2e-tests/test-applications/nextjs-turbo/pages/_app.tsx

@@ -0,0 +1,6 @@
+import type { AppProps } from 'next/app';
+import '../sentry.client.config';
+
+export default function CustomApp({ Component, pageProps }: AppProps) {
+  return <Component {...pageProps} />;
+}

dev-packages/e2e-tests/test-applications/nextjs-turbo/sentry.client.config.ts

@@ -1,9 +1,17 @@
+'use client';
+
 import * as Sentry from '@sentry/nextjs';
 
-Sentry.init({
-  environment: 'qa', // dynamic sampling bias to keep transactions
-  dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
-  tunnel: `http://localhost:3031/`, // proxy server
-  tracesSampleRate: 1.0,
-  sendDefaultPii: true,
-});
+if (typeof window !== 'undefined') {
+  Sentry.init({
+    environment: 'qa', // dynamic sampling bias to keep transactions
+    dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
+    tunnel: `http://localhost:3031/`, // proxy server
+    tracesSampleRate: 1.0,
+    sendDefaultPii: true,
+  });
+}
+
+export function HackComponentToRunSideEffectsInSentryClientConfig() {
+  return null;
+}

dev-packages/e2e-tests/test-applications/nextjs-turbo/tests/rsc-error.test.ts renamed to dev-packages/e2e-tests/test-applications/nextjs-turbo/tests/app-router/rsc-error.test.ts

@@ -0,0 +1,20 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Should propagate traces from server to client in pages router', async ({ page }) => {
+  const serverTransactionPromise = waitForTransaction('nextjs-turbo', async transactionEvent => {
+    return transactionEvent?.transaction === 'GET /[param]/pages-router-client-trace-propagation';
+  });
+
+  const pageloadTransactionPromise = waitForTransaction('nextjs-turbo', async transactionEvent => {
+    return transactionEvent?.transaction === '/[param]/pages-router-client-trace-propagation';
+  });
+
+  await page.goto(`/123/pages-router-client-trace-propagation`);
+
+  const serverTransaction = await serverTransactionPromise;
+  const pageloadTransaction = await pageloadTransactionPromise;
+
+  expect(serverTransaction.contexts?.trace?.trace_id).toBeDefined();
+  expect(pageloadTransaction.contexts?.trace?.trace_id).toBe(serverTransaction.contexts?.trace?.trace_id);
+});

dev-packages/e2e-tests/test-applications/nextjs-turbo/tests/pages-router/client-trace-propagation.test.ts

@@ -24,7 +24,7 @@
     "@typescript-eslint/parser": "^7.2.0",
     "@vitejs/plugin-react-swc": "^3.5.0",
     "typescript": "^5.2.2",
-    "vite": "^5.2.0",
+    "vite": "^5.2.14",
     "@playwright/test": "^1.44.1",
     "@sentry-internal/test-utils": "link:../../../test-utils"
   },