From 2a68ccf0ffab089bf945264814eebffb3a0eff3c Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Fri, 9 Dec 2022 09:41:59 +0100
Subject: [PATCH] ref: PR fixes

---
 packages/core/src/envelope.ts      | 5 ++++-
 packages/types/src/datacategory.ts | 2 ++
 packages/types/src/envelope.ts     | 3 ++-
 packages/utils/src/envelope.ts     | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/envelope.ts b/packages/core/src/envelope.ts
index 023955df2208..55736bf4312c 100644
--- a/packages/core/src/envelope.ts
+++ b/packages/core/src/envelope.ts
@@ -68,7 +68,10 @@ export function createEventEnvelope(
   tunnel?: string,
 ): EventEnvelope {
   const sdkInfo = getSdkMetadataForEnvelopeHeader(metadata);
-  const eventType = event.type || 'event';
+
+  // TODO: Handle replay_event here
+  // Currently, this is done by replay, but we want to upstream this here
+  const eventType = event.type && event.type !== 'replay_event' ? event.type : 'event';
 
   enhanceEventWithSdkInfo(event, metadata && metadata.sdk);
 
diff --git a/packages/types/src/datacategory.ts b/packages/types/src/datacategory.ts
index dee9fc16d270..d917e53a4b74 100644
--- a/packages/types/src/datacategory.ts
+++ b/packages/types/src/datacategory.ts
@@ -10,6 +10,8 @@ export type DataCategory =
   | 'error'
   // Transaction type event
   | 'transaction'
+  // Replay type event
+  | 'replay_event'
   // Events with `event_type` csp, hpkp, expectct, expectstaple
   | 'security'
   // Attachment bytes stored (unused for rate limiting
diff --git a/packages/types/src/envelope.ts b/packages/types/src/envelope.ts
index 70ab2739c037..ab987cf8ef60 100644
--- a/packages/types/src/envelope.ts
+++ b/packages/types/src/envelope.ts
@@ -26,7 +26,8 @@ export type EnvelopeItemType =
   | 'sessions'
   | 'transaction'
   | 'attachment'
-  | 'event';
+  | 'event'
+  | 'replay_event';
 
 export type BaseEnvelopeHeaders = {
   [key: string]: unknown;
diff --git a/packages/utils/src/envelope.ts b/packages/utils/src/envelope.ts
index a52ec8b4b52e..15a99f5c2f04 100644
--- a/packages/utils/src/envelope.ts
+++ b/packages/utils/src/envelope.ts
@@ -133,6 +133,7 @@ const ITEM_TYPE_TO_DATA_CATEGORY_MAP: Record<EnvelopeItemType, DataCategory> = {
   event: 'error',
   client_report: 'internal',
   user_report: 'default',
+  replay_event: 'replay_event',
 };
 
 /**