Merge branch 'develop' into first-round-v5

Author: RulaKhaled

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+Work in this release was contributed by @Karibash. Thank you for your contribution!
+
 ## 10.5.0
 
 - feat(core): better cause data extraction ([#17375](https://github.com/getsentry/sentry-javascript/pull/17375))

dev-packages/e2e-tests/test-applications/aws-serverless/src/lambda-functions-layer/ErrorEsm/index.mjs

@@ -0,0 +1,3 @@
+export const handler = async () => {
+  throw new Error('test esm');
+};

dev-packages/e2e-tests/test-applications/aws-serverless/src/lambda-functions-layer/TracingEsm/index.mjs

@@ -2,7 +2,7 @@ import * as Sentry from '@sentry/aws-serverless';
 
 import * as http from 'node:http';
 
-export const handler = Sentry.wrapHandler(async () => {
+export const handler = async () => {
   await Sentry.startSpan({ name: 'manual-span', op: 'test' }, async () => {
     await new Promise(resolve => {
       http.get('http://example.com', res => {
@@ -16,4 +16,4 @@ export const handler = Sentry.wrapHandler(async () => {
       });
     });
   });
-});
+};

dev-packages/e2e-tests/test-applications/aws-serverless/src/lambda-functions-npm/TracingCjs/index.js

@@ -1,7 +1,7 @@
 const http = require('http');
 const Sentry = require('@sentry/aws-serverless');
 
-exports.handler = Sentry.wrapHandler(async () => {
+exports.handler = async () => {
   await new Promise(resolve => {
     const req = http.request(
       {
@@ -21,4 +21,4 @@ exports.handler = Sentry.wrapHandler(async () => {
   });
 
   Sentry.startSpan({ name: 'manual-span', op: 'manual' }, () => {});
-});
+};

dev-packages/e2e-tests/test-applications/aws-serverless/src/lambda-functions-npm/TracingEsm/index.mjs

@@ -1,7 +1,7 @@
 import * as http from 'node:http';
 import * as Sentry from '@sentry/aws-serverless';
 
-export const handler = Sentry.wrapHandler(async () => {
+export const handler = async () => {
   await new Promise(resolve => {
     const req = http.request(
       {
@@ -21,4 +21,4 @@ export const handler = Sentry.wrapHandler(async () => {
   });
 
   Sentry.startSpan({ name: 'manual-span', op: 'manual' }, () => {});
-});
+};

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

@@ -160,7 +160,35 @@ test.describe('Lambda layer', () => {
         type: 'Error',
         value: 'test',
         mechanism: {
-          type: 'auto.function.aws-serverless.handler',
+          type: 'auto.function.aws-serverless.otel',
+          handled: false,
+        },
+      }),
+    );
+  });
+
+  test('capturing errors works in ESM', async ({ lambdaClient }) => {
+    const errorEventPromise = waitForError('aws-serverless-lambda-sam', errorEvent => {
+      return errorEvent?.exception?.values?.[0]?.value === 'test esm';
+    });
+
+    await lambdaClient.send(
+      new InvokeCommand({
+        FunctionName: 'LayerErrorEsm',
+        Payload: JSON.stringify({}),
+      }),
+    );
+
+    const errorEvent = await errorEventPromise;
+
+    // shows the SDK sent an error event
+    expect(errorEvent.exception?.values).toHaveLength(1);
+    expect(errorEvent.exception?.values?.[0]).toEqual(
+      expect.objectContaining({
+        type: 'Error',
+        value: 'test esm',
+        mechanism: {
+          type: 'auto.function.aws-serverless.otel',
           handled: false,
         },
       }),

dev-packages/e2e-tests/test-applications/browser-webworker-vite/src/worker.ts

@@ -1,8 +1,6 @@
 import * as Sentry from '@sentry/browser';
 
-// type cast necessary because TS thinks this file is part of the main
-// thread where self is of type `Window` instead of `Worker`
-Sentry.registerWebWorker({ self: self as unknown as Worker });
+Sentry.registerWebWorker({ self });
 
 // Let the main thread know the worker is ready
 self.postMessage({

dev-packages/e2e-tests/test-applications/browser-webworker-vite/src/worker2.ts

@@ -1,8 +1,6 @@
 import * as Sentry from '@sentry/browser';
 
-// type cast necessary because TS thinks this file is part of the main
-// thread where self is of type `Window` instead of `Worker`
-Sentry.registerWebWorker({ self: self as unknown as Worker });
+Sentry.registerWebWorker({ self });
 
 // Let the main thread know the worker is ready
 self.postMessage({

dev-packages/e2e-tests/test-applications/browser-webworker-vite/src/worker3.ts

@@ -1,8 +1,6 @@
 import * as Sentry from '@sentry/browser';
 
-// type cast necessary because TS thinks this file is part of the main
-// thread where self is of type `Window` instead of `Worker`
-Sentry.registerWebWorker({ self: self as unknown as Worker });
+Sentry.registerWebWorker({ self });
 
 // Let the main thread know the worker is ready
 self.postMessage({

dev-packages/e2e-tests/test-applications/browser-webworker-vite/tsconfig.json

@@ -3,8 +3,9 @@
     "target": "ES2022",
     "useDefineForClassFields": true,
     "module": "ESNext",
-    "lib": ["ES2022", "DOM", "DOM.Iterable"],
-    "skipLibCheck": true,
+    "lib": ["ES2022", "DOM", "DOM.Iterable", "WebWorker"],
+    "skipLibCheck": false,
+    "skipDefaultLibCheck": true,
 
     /* Bundler mode */
     "moduleResolution": "bundler",