diff --git a/packages/replay/src/replay.ts b/packages/replay/src/replay.ts index 1cbfc40cec94..de4547eda8bd 100644 --- a/packages/replay/src/replay.ts +++ b/packages/replay/src/replay.ts @@ -938,7 +938,7 @@ export class ReplayContainer implements ReplayContainerInterface { segment_id, }; - const replayEvent = await getReplayEvent({ scope, client, event: baseEvent }); + const replayEvent = await getReplayEvent({ scope, client, replayId, event: baseEvent }); if (!replayEvent) { // Taken from baseclient's `_processEvent` method, where this is handled for errors/transactions @@ -971,7 +971,7 @@ export class ReplayContainer implements ReplayContainerInterface { "replay_id": "eventId", "segment_id": 3, "platform": "javascript", - "event_id": "generated-uuid", + "event_id": "eventId", "environment": "production", "sdk": { "integrations": [ diff --git a/packages/replay/src/util/getReplayEvent.ts b/packages/replay/src/util/getReplayEvent.ts index f41c6f549515..5a0cfd0ac8ff 100644 --- a/packages/replay/src/util/getReplayEvent.ts +++ b/packages/replay/src/util/getReplayEvent.ts @@ -4,13 +4,15 @@ import { Client, ReplayEvent } from '@sentry/types'; export async function getReplayEvent({ client, scope, + replayId: event_id, event, }: { client: Client; scope: Scope; + replayId: string; event: ReplayEvent; }): Promise { - const preparedEvent = (await prepareEvent(client.getOptions(), event, {}, scope)) as ReplayEvent | null; + const preparedEvent = (await prepareEvent(client.getOptions(), event, { event_id }, scope)) as ReplayEvent | null; // If e.g. a global event processor returned null if (!preparedEvent) { diff --git a/packages/replay/test/unit/util/getReplayEvent.test.ts b/packages/replay/test/unit/util/getReplayEvent.test.ts index 2ac30c1a053c..31ab71747771 100644 --- a/packages/replay/test/unit/util/getReplayEvent.test.ts +++ b/packages/replay/test/unit/util/getReplayEvent.test.ts @@ -33,10 +33,11 @@ describe('getReplayEvent', () => { trace_ids: ['trace-ID'], urls: ['https://sentry.io/'], replay_id: replayId, + event_id: replayId, segment_id: 3, }; - const replayEvent = await getReplayEvent({ scope, client, event }); + const replayEvent = await getReplayEvent({ scope, client, replayId, event }); expect(replayEvent).toEqual({ type: 'replay_event', @@ -47,8 +48,7 @@ describe('getReplayEvent', () => { replay_id: 'replay-ID', segment_id: 3, platform: 'javascript', - // generated uuid with 32 chars - event_id: expect.stringMatching(/^\w{32}$/), + event_id: 'replay-ID', environment: 'production', sdk: { name: 'sentry.javascript.browser',