Replace ReplayNetworkRequestData, which has start/endTimestamp, with ReplayNetworkRequestOrResponse added into NetworkRequestData

Author: ryan953

packages/replay/src/index.ts

@@ -9,4 +9,3 @@ export type {
   SpanFrameEvent,
   EventType,
 } from './types';
-

packages/replay/src/types/performance.ts

@@ -1,4 +1,4 @@
-import type { ReplayNetworkRequestData } from './replay';
+import type { ReplayNetworkRequestOrResponse } from './replay';
 
 export type AllPerformanceEntry = PerformancePaintTiming | PerformanceResourceTiming | PerformanceNavigationTiming;
 
@@ -126,13 +126,15 @@ export interface NetworkRequestData {
   statusCode?: number;
   requestBodySize?: number;
   responseBodySize?: number;
+  request?: ReplayNetworkRequestOrResponse;
+  response?: ReplayNetworkRequestOrResponse;
 }
 
 export interface HistoryData {
   previous: string;
 }
 
-export type AllEntryData = AllPerformanceEntryData | MemoryData | NetworkRequestData | ReplayNetworkRequestData | HistoryData;
+export type AllEntryData = AllPerformanceEntryData | MemoryData | NetworkRequestData | HistoryData;
 
 export interface ReplayPerformanceEntry<T> {
   /**

packages/replay/src/types/replayFrame.ts

@@ -1,5 +1,5 @@
 import type { EventType } from '@sentry-internal/rrweb';
-import type { Breadcrumb, FetchBreadcrumbData, XhrBreadcrumbData } from '@sentry/types';
+import type { Breadcrumb } from '@sentry/types';
 
 import type {
   HistoryData,
@@ -10,7 +10,6 @@ import type {
   PaintData,
   ResourceData,
 } from './performance';
-import type { ReplayNetworkRequestData } from './replay';
 
 interface BaseBreadcrumbFrame {
   timestamp: number;
@@ -52,23 +51,11 @@ interface ClickFrame extends BaseBreadcrumbFrame {
   data: ClickFrameData;
 }
 
-interface FetchFrame extends BaseBreadcrumbFrame {
-  category: 'fetch';
-  type: 'http';
-  data: FetchBreadcrumbData;
-}
-
 interface InputFrame extends BaseBreadcrumbFrame {
   category: 'ui.input';
   message: string;
 }
 
-interface XhrFrame extends BaseBreadcrumbFrame {
-  category: 'xhr';
-  type: 'http';
-  data: XhrBreadcrumbData;
-}
-
 /* Breadcrumbs from Replay */
 interface MutationFrameData {
   count: number;
@@ -126,9 +113,7 @@ interface OptionFrame {
 export type BreadcrumbFrame =
   | ConsoleFrame
   | ClickFrame
-  | FetchFrame
   | InputFrame
-  | XhrFrame
   | KeyboardEventFrame
   | BlurFrame
   | FocusFrame
@@ -144,6 +129,11 @@ interface BaseSpanFrame {
   data?: undefined | Record<string, any>;
 }
 
+interface FetchFrame extends BaseSpanFrame {
+  data: NetworkRequestData;
+  op: 'resource.fetch'
+}
+
 interface HistoryFrame extends BaseSpanFrame {
   data: HistoryData;
   op: 'navigation.push';
@@ -161,12 +151,7 @@ interface MemoryFrame extends BaseSpanFrame {
 
 interface NavigationFrame extends BaseSpanFrame {
   data: NavigationData
-  op: 'navigation.navigate' | 'navigation.reload' | 'navigation.back';
-}
-
-interface NetworkRequestFrame extends BaseSpanFrame {
-  data: NetworkRequestData | ReplayNetworkRequestData;
-  op: 'resource.fetch'
+  op: 'navigation.navigate' | 'navigation.reload' | 'navigation.back_forward';
 }
 
 interface PaintFrame extends BaseSpanFrame {
@@ -182,19 +167,24 @@ interface ResourceFrame extends BaseSpanFrame {
     | 'resource.img'
     | 'resource.link'
     | 'resource.other'
-    | 'resource.script'
-    | 'resource.xhr';
+    | 'resource.script';
+}
+
+interface XHRFrame extends BaseSpanFrame {
+  data: NetworkRequestData;
+  op: 'resource.xhr'
 }
 
 export type SpanFrame =
   | BaseSpanFrame
+  | FetchFrame
   | HistoryFrame
   | LargestContentfulPaintFrame
   | MemoryFrame
   | NavigationFrame
-  | NetworkRequestFrame
   | PaintFrame
-  | ResourceFrame;
+  | ResourceFrame
+  | XHRFrame;
 
 export type ReplayFrame = BreadcrumbFrame | SpanFrame;