fix: Use event_id from hint given by top-level hub calls (getsentry#2396)

kamilogorek · web-flow · commit 6cc62f90d1ec · 2020-01-29T11:32:57.000+01:00
diff --git a/packages/core/src/baseclient.ts b/packages/core/src/baseclient.ts
@@ -143,6 +143,7 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
         logger.error(reason);
         this._processing = false;
       });
+
     return eventId;
   }
 
@@ -284,7 +285,7 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
     }
 
     if (prepared.event_id === undefined) {
-      prepared.event_id = uuid4();
+      prepared.event_id = hint && hint.event_id ? hint.event_id : uuid4();
     }
 
     this._addIntegrations(prepared.sdk);
diff --git a/packages/core/test/lib/base.test.ts b/packages/core/test/lib/base.test.ts
@@ -234,6 +234,17 @@ describe('BaseClient', () => {
       });
     });
 
+    test('adds event_id from hint if available', () => {
+      expect.assertions(1);
+      const client = new TestClient({ dsn: PUBLIC_DSN });
+      const scope = new Scope();
+      client.captureEvent({ message: 'message' }, { event_id: 'wat' }, scope);
+      expect(TestBackend.instance!.event!).toEqual({
+        event_id: 'wat',
+        message: 'message',
+      });
+    });
+
     test('adds the configured environment', () => {
       expect.assertions(1);
       const client = new TestClient({

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement`
`143`	`143`	`logger.error(reason);`
`144`	`144`	`this._processing = false;`
`145`	`145`	`});`
	`146`	`+`
`146`	`147`	`return eventId;`
`147`	`148`	`}`
`148`	`149`
`@@ -284,7 +285,7 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement`
`284`	`285`	`}`
`285`	`286`
`286`	`287`	`if (prepared.event_id === undefined) {`
`287`		`- prepared.event_id = uuid4();`
	`288`	`+ prepared.event_id = hint && hint.event_id ? hint.event_id : uuid4();`
`288`	`289`	`}`
`289`	`290`
`290`	`291`	`this._addIntegrations(prepared.sdk);`