Merge remote-tracking branch 'upstream/master' into feat/separate-source-reading

Author: timfish

packages/hub/src/hub.ts

@@ -185,7 +185,7 @@ export class Hub implements HubInterface {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   public captureException(exception: any, hint?: EventHint): string {
-    const eventId = (this._lastEventId = uuid4());
+    const eventId = (this._lastEventId = hint && hint.event_id ? hint.event_id : uuid4());
     let finalHint = hint;
 
     // If there's no explicit hint provided, mimic the same thing that would happen
@@ -216,7 +216,7 @@ export class Hub implements HubInterface {
    * @inheritDoc
    */
   public captureMessage(message: string, level?: Severity, hint?: EventHint): string {
-    const eventId = (this._lastEventId = uuid4());
+    const eventId = (this._lastEventId = hint && hint.event_id ? hint.event_id : uuid4());
     let finalHint = hint;
 
     // If there's no explicit hint provided, mimic the same thing that would happen
@@ -247,7 +247,7 @@ export class Hub implements HubInterface {
    * @inheritDoc
    */
   public captureEvent(event: Event, hint?: EventHint): string {
-    const eventId = uuid4();
+    const eventId = hint && hint.event_id ? hint.event_id : uuid4();
     if (event.type !== 'transaction') {
       this._lastEventId = eventId;
     }

packages/hub/test/hub.test.ts

@@ -222,6 +222,14 @@ describe('Hub', () => {
       expect(testClient.captureException.mock.calls[0][1].event_id).toBeTruthy();
     });
 
+    test('should keep event_id from hint', () => {
+      const testClient = makeClient();
+      const hub = new Hub(testClient);
+      const id = Math.random().toString();
+      hub.captureException('a', { event_id: id });
+      expect(testClient.captureException.mock.calls[0][1].event_id).toBe(id);
+    });
+
     test('should generate hint if not provided in the call', () => {
       const testClient = makeClient();
       const hub = new Hub(testClient);
@@ -248,6 +256,14 @@ describe('Hub', () => {
       expect(testClient.captureMessage.mock.calls[0][2].event_id).toBeTruthy();
     });
 
+    test('should keep event_id from hint', () => {
+      const testClient = makeClient();
+      const hub = new Hub(testClient);
+      const id = Math.random().toString();
+      hub.captureMessage('a', undefined, { event_id: id });
+      expect(testClient.captureMessage.mock.calls[0][2].event_id).toBe(id);
+    });
+
     test('should generate hint if not provided in the call', () => {
       const testClient = makeClient();
       const hub = new Hub(testClient);
@@ -279,6 +295,17 @@ describe('Hub', () => {
       expect(testClient.captureEvent.mock.calls[0][1].event_id).toBeTruthy();
     });
 
+    test('should keep event_id from hint', () => {
+      const event: Event = {
+        extra: { b: 3 },
+      };
+      const testClient = makeClient();
+      const hub = new Hub(testClient);
+      const id = Math.random().toString();
+      hub.captureEvent(event, { event_id: id });
+      expect(testClient.captureEvent.mock.calls[0][1].event_id).toBe(id);
+    });
+
     test('sets lastEventId', () => {
       const event: Event = {
         extra: { b: 3 },

packages/nextjs/package.json

@@ -48,7 +48,7 @@
     "build:dev:watch": "run-s build:watch",
     "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***",
     "build:esm:watch": "tsc -p tsconfig.esm.json --watch",
-    "circularDepCheck": "madge --circular src/index.client.ts && madge --circular src/index.server.ts",
+    "circularDepCheck": "madge --circular src/index.client.ts && madge --circular --exclude 'config/types\\.ts' src/index.server.ts # see https://github.com/pahen/madge/issues/306",
     "clean": "rimraf dist esm coverage *.js *.js.map *.d.ts",
     "fix": "run-s fix:eslint fix:prettier",
     "fix:eslint": "eslint . --format stylish --fix",

packages/nextjs/src/index.server.ts

@@ -127,6 +127,7 @@ function filterTransactions(event: Event): Event | null {
 }
 
 export { withSentryConfig } from './config';
+export { SentryWebpackPluginOptions } from './config/types';
 export { withSentry } from './utils/withSentry';
 
 // Wrap various server methods to enable error monitoring and tracing. (Note: This only happens for non-Vercel

packages/wasm/rollup.config.js

@@ -10,7 +10,9 @@ const terserInstance = terser({
     // We need those full names to correctly detect our internal frames for stripping.
     // I listed all of them here just for the clarity sake, as they are all used in the frames manipulation process.
     reserved: ['captureException', 'captureMessage', 'sentryWrapped'],
-    properties: false,
+    properties: {
+      regex: /^_[^_]/,
+    },
   },
   output: {
     comments: false,