Merge branch 'develop' into sig/astro-4-tests

Author: s1gr1d

MIGRATION.md

@@ -6,10 +6,7 @@ These docs walk through how to migrate our JavaScript SDKs through different maj
 - Upgrading from [SDK 6.x to 7.x](./docs/migration/v6-to-v7.md)
 - Upgrading from [SDK 7.x to 8.x](./docs/migration/v7-to-v8.md)
 - Upgrading from [SDK 8.x to 9.x](./docs/migration/v8-to-v9.md)
-  <<<<<<< HEAD
-- # Upgrading from [SDK 9.x to 10.x](#upgrading-from-9x-to-10x)
-- Upgrading from [SDK 9.x to 10.x](#upgrading-from-8x-to-9x)
-  > > > > > > > f726d5ab5 (chore: Add migration guide for v10 and move v8->v9 guide to docs)
+- Upgrading from [SDK 9.x to 10.x](#upgrading-from-9x-to-10x)
 
 # Upgrading from 9.x to 10.x
 
@@ -42,6 +39,27 @@ Updates and fixes for version 9 will be published as `SentryNodeServerlessSDKv9`
 - `BaseClient` was removed, use `Client` as a direct replacement.
 - `hasTracingEnabled` was removed, use `hasSpansEnabled` as a direct replacement.
 - `logger` and type `Logger` were removed, use `debug` and type `SentryDebugLogger` instead.
+- The `_experiments.enableLogs` and `_experiments.beforeSendLog` options were removed, use the top-level `enableLogs` and `beforeSendLog` options instead.
+
+```js
+// before
+Sentry.init({
+  _experiments: {
+    enableLogs: true,
+    beforeSendLog: log => {
+      return log;
+    },
+  },
+});
+
+// after
+Sentry.init({
+  enableLogs: true,
+  beforeSendLog: log => {
+    return log;
+  },
+});
+```
 
 ## No Version Support Timeline
 

dev-packages/browser-integration-tests/suites/public-api/logger/init.js

@@ -4,7 +4,5 @@ window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
-  _experiments: {
-    enableLogs: true,
-  },
+  enableLogs: true,
 });

dev-packages/browser-integration-tests/suites/public-api/logger/integration/init.js

@@ -4,8 +4,6 @@ window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
-  _experiments: {
-    enableLogs: true,
-  },
+  enableLogs: true,
   integrations: [Sentry.consoleLoggingIntegration()],
 });

dev-packages/e2e-tests/test-applications/aws-lambda-layer-cjs/package.json

@@ -18,5 +18,8 @@
   },
   "volta": {
     "extends": "../../package.json"
+  },
+  "sentryTest": {
+    "skip": true
   }
 }

dev-packages/e2e-tests/test-applications/aws-lambda-layer-esm/.npmrc

@@ -0,0 +1,2 @@
+@sentry:registry=http://127.0.0.1:4873
+@sentry-internal:registry=http://127.0.0.1:4873

dev-packages/e2e-tests/test-applications/aws-lambda-layer-esm/package.json

@@ -0,0 +1,26 @@
+{
+  "name": "aws-lambda-layer-esm",
+  "version": "1.0.0",
+  "private": true,
+  "scripts": {
+    "start": "node src/run.mjs",
+    "test": "playwright test",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml",
+    "test:build": "pnpm install",
+    "test:assert": "pnpm test"
+  },
+  "//": "Link from local Lambda layer build",
+  "dependencies": {
+    "@sentry/aws-serverless": "link:../../../../packages/aws-serverless/build/aws/dist-serverless/nodejs/node_modules/@sentry/aws-serverless"
+  },
+  "devDependencies": {
+    "@sentry-internal/test-utils": "link:../../../test-utils",
+    "@playwright/test": "~1.53.2"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  },
+  "sentryTest": {
+    "skip": true
+  }
+}

dev-packages/e2e-tests/test-applications/aws-lambda-layer-esm/playwright.config.ts

@@ -0,0 +1,3 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+export default getPlaywrightConfig();

dev-packages/e2e-tests/test-applications/aws-lambda-layer-esm/src/lambda-function.mjs

@@ -0,0 +1,21 @@
+import * as Sentry from '@sentry/aws-serverless';
+
+import * as http from 'node:http';
+
+async function handle() {
+  await Sentry.startSpan({ name: 'manual-span', op: 'test' }, async () => {
+    await new Promise(resolve => {
+      http.get('http://example.com', res => {
+        res.on('data', d => {
+          process.stdout.write(d);
+        });
+
+        res.on('end', () => {
+          resolve();
+        });
+      });
+    });
+  });
+}
+
+export { handle };

dev-packages/e2e-tests/test-applications/aws-lambda-layer-esm/src/run-lambda.mjs

@@ -0,0 +1,8 @@
+import { handle } from './lambda-function.mjs';
+
+const event = {};
+const context = {
+  invokedFunctionArn: 'arn:aws:lambda:us-east-1:123453789012:function:my-lambda',
+  functionName: 'my-lambda',
+};
+await handle(event, context);

dev-packages/e2e-tests/test-applications/aws-lambda-layer-esm/src/run.mjs

@@ -0,0 +1,17 @@
+import child_process from 'node:child_process';
+
+child_process.execSync('node ./src/run-lambda.mjs', {
+  stdio: 'inherit',
+  env: {
+    ...process.env,
+    // On AWS, LAMBDA_TASK_ROOT is usually /var/task but for testing, we set it to the CWD to correctly apply our handler
+    LAMBDA_TASK_ROOT: process.cwd(),
+    _HANDLER: 'src/lambda-function.handle',
+
+    NODE_OPTIONS: '--import @sentry/aws-serverless/awslambda-auto',
+    SENTRY_DSN: 'http://public@localhost:3031/1337',
+    SENTRY_TRACES_SAMPLE_RATE: '1.0',
+    SENTRY_DEBUG: 'true',
+  },
+  cwd: process.cwd(),
+});