Merge branch 'develop' into feat/upgrade-playwright-1.56

Author: BYK

.craft.yml

@@ -4,14 +4,14 @@ preReleaseCommand: bash scripts/craft-pre-release.sh
 targets:
   # NPM Targets
   ## 1. Base Packages, node or browser SDKs depend on
-  ## 1.1 Types
-  - name: npm
-    id: '@sentry/types'
-    includeNames: /^sentry-types-\d.*\.tgz$/
-  ## 1.2 Core SDKs
+  ## 1.1 Core SDKs
   - name: npm
     id: '@sentry/core'
     includeNames: /^sentry-core-\d.*\.tgz$/
+    ## 1.2 Types
+  - name: npm
+    id: '@sentry/types'
+    includeNames: /^sentry-types-\d.*\.tgz$/
   - name: npm
     id: '@sentry/node-core'
     includeNames: /^sentry-node-core-\d.*\.tgz$/

.cursor/BUGBOT.md

@@ -45,3 +45,16 @@ Do not flag the issues below if they appear in tests.
       convention as the `SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN` value.
 - When calling `startSpan`, check if error cases are handled. If flag that it might make sense to try/catch and call `captureException`.
 - When calling `generateInstrumentationOnce`, the passed in name MUST match the name of the integration that uses it. If there are more than one instrumentations, they need to follow the pattern `${INSTRUMENTATION_NAME}.some-suffix`.
+
+## Testing Conventions
+
+- When reviewing a `feat` PR, check if the PR includes at least one integration or E2E test.
+  If neither of the two are present, add a comment, recommending to add one.
+- When reviewing a `fix` PR, check if the PR includes at least one unit, integration or e2e test that tests the regression this PR fixes.
+  Usually this means the test failed prior to the fix and passes with the fix.
+  If no tests are present, add a comment recommending to add one.
+- Check that tests actually test the newly added behaviour.
+  For instance, when checking on sent payloads by the SDK, ensure that the newly added data is asserted thoroughly.
+- Flag usage of `expect.objectContaining` and other relaxed assertions, when a test expects something NOT to be included in a payload but there's no respective assertion.
+- Flag usage of conditionals in one test and recommend splitting up the test for the different paths.
+- Flag usage of loops testing multiple scenarios in one test and recommend using `(it)|(test).each` instead.

.github/workflows/build.yml

@@ -992,6 +992,8 @@ jobs:
         working-directory: ${{ runner.temp }}/test-application
         timeout-minutes: 7
         run: ${{ matrix.build-command || 'pnpm test:build' }}
+        env:
+          SENTRY_E2E_WORKSPACE_ROOT: ${{ github.workspace }}
 
       - name: Install Playwright
         uses: ./.github/actions/install-playwright
@@ -1003,6 +1005,8 @@ jobs:
         working-directory: ${{ runner.temp }}/test-application
         timeout-minutes: 10
         run: ${{ matrix.assert-command || 'pnpm test:assert' }}
+        env:
+          SENTRY_E2E_WORKSPACE_ROOT: ${{ github.workspace }}
 
       - name: Upload Playwright Traces
         uses: actions/upload-artifact@v5

.github/workflows/create-issue-for-unreferenced-prs.yml

@@ -41,6 +41,14 @@ jobs:
               return;
             }
 
+            // Bail if this edit was made by the GitHub Actions bot (this workflow)
+            // This prevents infinite loops when we update the PR body with the new issue reference
+            // We check login specifically to not skip edits from other legitimate bots
+            if (context.payload.sender && context.payload.sender.login === 'github-actions[bot]') {
+              console.log(`PR #${pr.number} was edited by github-actions[bot] (this workflow), skipping.`);
+              return;
+            }
+
             // Check if the PR is already approved
             const reviewsResponse = await github.rest.pulls.listReviews({
               owner: context.repo.owner,
@@ -109,7 +117,7 @@ jobs:
             console.log(`Created issue #${issueID}.`);
 
             // Update the PR body to reference the new issue
-            const updatedPrBody = `${prBody}\n\nCloses #${issueID}`;
+            const updatedPrBody = `${prBody}\n\nCloses #${issueID} (added automatically)`;
 
             await github.rest.pulls.update({
               owner: context.repo.owner,

dev-packages/e2e-tests/run.ts

@@ -76,6 +76,8 @@ async function run(): Promise<void> {
     REACT_APP_E2E_TEST_DSN: dsn,
     E2E_TEST_SENTRY_ORG_SLUG: process.env.E2E_TEST_SENTRY_ORG_SLUG || DEFAULT_SENTRY_ORG_SLUG,
     E2E_TEST_SENTRY_PROJECT: process.env.E2E_TEST_SENTRY_PROJECT || DEFAULT_SENTRY_PROJECT,
+    // Pass workspace root so tests copied to temp dirs can find local packages
+    SENTRY_E2E_WORKSPACE_ROOT: resolve(__dirname, '../..'),
   };
 
   const env = {

dev-packages/e2e-tests/test-applications/aws-serverless/src/stack.ts

@@ -15,6 +15,17 @@ const LAYER_DIR = './node_modules/@sentry/aws-serverless/';
 const DEFAULT_NODE_VERSION = '22';
 export const SAM_PORT = 3001;
 
+function resolvePackagesDir(): string {
+  // When running via the e2e test runner, tests are copied to a temp directory
+  // so we need the workspace root passed via env var
+  const workspaceRoot = process.env.SENTRY_E2E_WORKSPACE_ROOT;
+  if (workspaceRoot) {
+    return path.join(workspaceRoot, 'packages');
+  }
+  // Fallback for local development when running from the original location
+  return path.resolve(__dirname, '../../../../../packages');
+}
+
 export class LocalLambdaStack extends Stack {
   sentryLayer: CfnResource;
 
@@ -67,10 +78,48 @@ export class LocalLambdaStack extends Stack {
       const functionName = `${addLayer ? 'Layer' : 'Npm'}${lambdaDir}`;
 
       if (!addLayer) {
+        const lambdaPath = path.resolve(functionsDir, lambdaDir);
+        const packageLockPath = path.join(lambdaPath, 'package-lock.json');
+        const nodeModulesPath = path.join(lambdaPath, 'node_modules');
+
+        // Point the dependency at the locally built packages so tests use the current workspace bits
+        // We need to link all @sentry/* packages that are dependencies of aws-serverless
+        // because otherwise npm will try to install them from the registry, where the current version is not yet published
+        const packagesToLink = ['aws-serverless', 'node', 'core', 'node-core', 'opentelemetry'];
+        const dependencies: Record<string, string> = {};
+
+        const packagesDir = resolvePackagesDir();
+        for (const pkgName of packagesToLink) {
+          const pkgDir = path.join(packagesDir, pkgName);
+          if (!fs.existsSync(pkgDir)) {
+            throw new Error(
+              `[LocalLambdaStack] Workspace package ${pkgName} not found at ${pkgDir}. Did you run the build?`,
+            );
+          }
+          const relativePath = path.relative(lambdaPath, pkgDir);
+          dependencies[`@sentry/${pkgName}`] = `file:${relativePath.replace(/\\/g, '/')}`;
+        }
+
         console.log(`[LocalLambdaStack] Install dependencies for ${functionName}`);
-        const packageJson = { dependencies: { '@sentry/aws-serverless': '* || latest' } };
-        fs.writeFileSync(path.join(functionsDir, lambdaDir, 'package.json'), JSON.stringify(packageJson, null, 2));
-        execFileSync('npm', ['install', '--prefix', path.join(functionsDir, lambdaDir)], { stdio: 'inherit' });
+
+        if (fs.existsSync(packageLockPath)) {
+          // Prevent stale lock files from pinning the published package version
+          fs.rmSync(packageLockPath);
+        }
+
+        if (fs.existsSync(nodeModulesPath)) {
+          // Ensure we reinstall from the workspace instead of reusing cached dependencies
+          fs.rmSync(nodeModulesPath, { recursive: true, force: true });
+        }
+
+        const packageJson = {
+          dependencies,
+        };
+
+        fs.writeFileSync(path.join(lambdaPath, 'package.json'), JSON.stringify(packageJson, null, 2));
+        // Use --install-links to copy files instead of creating symlinks for file: dependencies.
+        // Symlinks don't work inside the Docker container because the target paths don't exist there.
+        execFileSync('npm', ['install', '--install-links', '--prefix', lambdaPath], { stdio: 'inherit' });
       }
 
       new CfnResource(this, functionName, {

dev-packages/e2e-tests/test-applications/aws-serverless/tests/lambda-fixtures.ts

@@ -17,7 +17,7 @@ export const test = base.extend<{ testEnvironment: LocalLambdaStack; lambdaClien
       console.log('[testEnvironment fixture] Setting up AWS Lambda test infrastructure');
 
       execSync('docker network prune -f');
-      execSync(`docker network create --driver bridge ${DOCKER_NETWORK_NAME}`);
+      createDockerNetwork();
 
       const hostIp = await getHostIp();
       const app = new App();
@@ -71,6 +71,8 @@ export const test = base.extend<{ testEnvironment: LocalLambdaStack; lambdaClien
             resolve(void 0);
           }, 5000);
         });
+
+        removeDockerNetwork();
       }
     },
     { scope: 'worker', auto: true },
@@ -88,3 +90,27 @@ export const test = base.extend<{ testEnvironment: LocalLambdaStack; lambdaClien
     await use(lambdaClient);
   },
 });
+
+function createDockerNetwork() {
+  try {
+    execSync(`docker network create --driver bridge ${DOCKER_NETWORK_NAME}`);
+  } catch (error) {
+    const stderr = (error as { stderr?: Buffer }).stderr?.toString() ?? '';
+    if (stderr.includes('already exists')) {
+      console.log(`[testEnvironment fixture] Reusing existing docker network ${DOCKER_NETWORK_NAME}`);
+      return;
+    }
+    throw error;
+  }
+}
+
+function removeDockerNetwork() {
+  try {
+    execSync(`docker network rm ${DOCKER_NETWORK_NAME}`);
+  } catch (error) {
+    const stderr = (error as { stderr?: Buffer }).stderr?.toString() ?? '';
+    if (!stderr.includes('No such network')) {
+      console.warn(`[testEnvironment fixture] Failed to remove docker network ${DOCKER_NETWORK_NAME}: ${stderr}`);
+    }
+  }
+}

dev-packages/e2e-tests/test-applications/aws-serverless/tests/layer.test.ts

@@ -23,7 +23,7 @@ test.describe('Lambda layer', () => {
       data: {
         'sentry.sample_rate': 1,
         'sentry.source': 'custom',
-        'sentry.origin': 'auto.otel.aws-lambda',
+        'sentry.origin': 'auto.otel.aws_lambda',
         'sentry.op': 'function.aws.lambda',
         'cloud.account.id': '012345678912',
         'faas.execution': expect.any(String),
@@ -32,7 +32,7 @@ test.describe('Lambda layer', () => {
         'otel.kind': 'SERVER',
       },
       op: 'function.aws.lambda',
-      origin: 'auto.otel.aws-lambda',
+      origin: 'auto.otel.aws_lambda',
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
       status: 'ok',
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),
@@ -91,7 +91,7 @@ test.describe('Lambda layer', () => {
       data: {
         'sentry.sample_rate': 1,
         'sentry.source': 'custom',
-        'sentry.origin': 'auto.otel.aws-lambda',
+        'sentry.origin': 'auto.otel.aws_lambda',
         'sentry.op': 'function.aws.lambda',
         'cloud.account.id': '012345678912',
         'faas.execution': expect.any(String),
@@ -100,7 +100,7 @@ test.describe('Lambda layer', () => {
         'otel.kind': 'SERVER',
       },
       op: 'function.aws.lambda',
-      origin: 'auto.otel.aws-lambda',
+      origin: 'auto.otel.aws_lambda',
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
       status: 'ok',
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),
@@ -214,7 +214,7 @@ test.describe('Lambda layer', () => {
       data: {
         'sentry.sample_rate': 1,
         'sentry.source': 'custom',
-        'sentry.origin': 'auto.otel.aws-lambda',
+        'sentry.origin': 'auto.otel.aws_lambda',
         'sentry.op': 'function.aws.lambda',
         'cloud.account.id': '012345678912',
         'faas.execution': expect.any(String),
@@ -223,7 +223,7 @@ test.describe('Lambda layer', () => {
         'otel.kind': 'SERVER',
       },
       op: 'function.aws.lambda',
-      origin: 'auto.otel.aws-lambda',
+      origin: 'auto.otel.aws_lambda',
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
       status: 'ok',
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),

dev-packages/e2e-tests/test-applications/aws-serverless/tests/npm.test.ts

@@ -23,7 +23,7 @@ test.describe('NPM package', () => {
       data: {
         'sentry.sample_rate': 1,
         'sentry.source': 'custom',
-        'sentry.origin': 'auto.otel.aws-lambda',
+        'sentry.origin': 'auto.otel.aws_lambda',
         'sentry.op': 'function.aws.lambda',
         'cloud.account.id': '012345678912',
         'faas.execution': expect.any(String),
@@ -32,7 +32,7 @@ test.describe('NPM package', () => {
         'otel.kind': 'SERVER',
       },
       op: 'function.aws.lambda',
-      origin: 'auto.otel.aws-lambda',
+      origin: 'auto.otel.aws_lambda',
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
       status: 'ok',
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),
@@ -91,7 +91,7 @@ test.describe('NPM package', () => {
       data: {
         'sentry.sample_rate': 1,
         'sentry.source': 'custom',
-        'sentry.origin': 'auto.otel.aws-lambda',
+        'sentry.origin': 'auto.otel.aws_lambda',
         'sentry.op': 'function.aws.lambda',
         'cloud.account.id': '012345678912',
         'faas.execution': expect.any(String),
@@ -100,7 +100,7 @@ test.describe('NPM package', () => {
         'otel.kind': 'SERVER',
       },
       op: 'function.aws.lambda',
-      origin: 'auto.otel.aws-lambda',
+      origin: 'auto.otel.aws_lambda',
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
       status: 'ok',
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),

dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/package.json

@@ -26,7 +26,7 @@
     "@sentry/nextjs": "latest || *",
     "@sentry/core": "latest || *",
     "import-in-the-middle": "^1",
-    "next": "16.0.0",
+    "next": "16.0.7",
     "react": "19.1.0",
     "react-dom": "19.1.0",
     "require-in-the-middle": "^7",