fix(core): Fix racecondition that modifies in-flight sessions (#8203)

getsentry · May 24, 2023 · df59f66 · df59f66
1 parent 55ff2a1
commit df59f66
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/core/src/envelope.ts b/packages/core/src/envelope.ts
@@ -48,7 +48,7 @@ export function createSessionEnvelope(
   };
 
   const envelopeItem: SessionItem =
-    'aggregates' in session ? [{ type: 'sessions' }, session] : [{ type: 'session' }, session];
+    'aggregates' in session ? [{ type: 'sessions' }, session] : [{ type: 'session' }, session.toJSON()];
 
   return createEnvelope<SessionEnvelope>(envelopeHeaders, [envelopeItem]);
 }

diff --git a/packages/types/src/envelope.ts b/packages/types/src/envelope.ts
@@ -4,7 +4,7 @@ import type { DsnComponents } from './dsn';
 import type { Event } from './event';
 import type { ReplayEvent, ReplayRecordingData } from './replay';
 import type { SdkInfo } from './sdkinfo';
-import type { Session, SessionAggregates } from './session';
+import type { SerializedSession, Session, SessionAggregates } from './session';
 import type { Transaction } from './transaction';
 import type { UserFeedback } from './user';
 
@@ -76,7 +76,8 @@ export type EventItem = BaseEnvelopeItem<EventItemHeaders, Event>;
 export type AttachmentItem = BaseEnvelopeItem<AttachmentItemHeaders, string | Uint8Array>;
 export type UserFeedbackItem = BaseEnvelopeItem<UserFeedbackItemHeaders, UserFeedback>;
 export type SessionItem =
-  | BaseEnvelopeItem<SessionItemHeaders, Session>
+  // TODO(v8): Only allow serialized session here (as opposed to Session or SerializedSesison)
+  | BaseEnvelopeItem<SessionItemHeaders, Session | SerializedSession>
   | BaseEnvelopeItem<SessionAggregatesItemHeaders, SessionAggregates>;
 export type ClientReportItem = BaseEnvelopeItem<ClientReportItemHeaders, ClientReport>;
 export type CheckInItem = BaseEnvelopeItem<CheckInItemHeaders, SerializedCheckIn>;