ref: Remove old requestBodySize and responseBodySize fields

mydea · mydea · commit e10641b4a58e · 2023-03-27T09:28:10.000+02:00
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodies/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodies/test.ts
@@ -80,8 +80,6 @@ sentryTest('captures requestBody & responseBody when experiment is configured',
       data: {
         method: 'POST',
         statusCode: 200,
-        requestBodySize: 13,
-        responseBodySize: 14,
         request: {
           size: 13,
           body: '{"foo":"bar"}',
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureNonTextBodies/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureNonTextBodies/test.ts
@@ -85,8 +85,6 @@ sentryTest(
         data: {
           method: 'POST',
           statusCode: 200,
-          requestBodySize: 16,
-          responseBodySize: 24,
           request: {
             size: 16,
             body: 'name=Anne&age=32',
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/contentLengthHeader/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/contentLengthHeader/test.ts
@@ -80,7 +80,6 @@ sentryTest('parses response_body_size from Content-Length header if available',
       data: {
         method: 'GET',
         statusCode: 200,
-        responseBodySize: 789,
         response: {
           size: 789,
         },
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/noContentLengthHeader/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/noContentLengthHeader/test.ts
@@ -79,7 +79,6 @@ sentryTest('does not capture response_body_size without Content-Length header',
       data: {
         method: 'GET',
         statusCode: 200,
-        responseBodySize: 29,
         response: {
           size: 29,
         },
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/nonTextBodySizes/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/nonTextBodySizes/test.ts
@@ -82,8 +82,6 @@ sentryTest('calculates body sizes for non-string bodies', async ({ getLocalTestP
       data: {
         method: 'POST',
         statusCode: 200,
-        requestBodySize: 26,
-        responseBodySize: 24,
         request: {
           size: 26,
         },
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/requestBodySize/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/requestBodySize/test.ts
@@ -8,7 +8,7 @@ import {
   waitForReplayRequest,
 } from '../../../../../utils/replayHelpers';
 
-sentryTest('captures requestBodySize when body is sent', async ({ getLocalTestPath, page }) => {
+sentryTest('captures request body size when body is sent', async ({ getLocalTestPath, page }) => {
   if (shouldSkipReplayTest()) {
     sentryTest.skip();
   }
@@ -78,7 +78,6 @@ sentryTest('captures requestBodySize when body is sent', async ({ getLocalTestPa
       data: {
         method: 'POST',
         statusCode: 200,
-        requestBodySize: 13,
         request: {
           size: 13,
         },
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodies/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodies/test.ts
@@ -86,8 +86,6 @@ sentryTest(
         data: {
           method: 'POST',
           statusCode: 200,
-          requestBodySize: 13,
-          responseBodySize: 14,
           request: { size: 13, body: '{"foo":"bar"}' },
           response: { size: 14, body: '{"res":"this"}' },
         },
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureNonTextBodies/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureNonTextBodies/test.ts
@@ -89,8 +89,6 @@ sentryTest(
         data: {
           method: 'POST',
           statusCode: 200,
-          requestBodySize: 16,
-          responseBodySize: 24,
           request: { size: 16, body: 'name=Anne&age=32' },
           response: { size: 24, body: '<html>Hello world</html>' },
         },
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/contentLengthHeader/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/contentLengthHeader/test.ts
@@ -87,7 +87,6 @@ sentryTest(
         data: {
           method: 'GET',
           statusCode: 200,
-          responseBodySize: 789,
           response: { size: 789 },
         },
         description: 'http://localhost:7654/foo',
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/noContentLengthHeader/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/noContentLengthHeader/test.ts
@@ -87,7 +87,6 @@ sentryTest(
         data: {
           method: 'GET',
           statusCode: 200,
-          responseBodySize: 29,
           response: { size: 29 },
         },
         description: 'http://localhost:7654/foo',
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/nonTextBodySizes/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/nonTextBodySizes/test.ts
@@ -85,8 +85,6 @@ sentryTest('calculates body sizes for non-string bodies', async ({ getLocalTestP
       data: {
         method: 'POST',
         statusCode: 200,
-        requestBodySize: 26,
-        responseBodySize: 24,
         request: { size: 26 },
         response: { size: 24 },
       },
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/requestBodySize/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/requestBodySize/test.ts
@@ -8,7 +8,7 @@ import {
   waitForReplayRequest,
 } from '../../../../../utils/replayHelpers';
 
-sentryTest('captures requestBodySize when body is sent', async ({ getLocalTestPath, page, browserName }) => {
+sentryTest('captures request body size when body is sent', async ({ getLocalTestPath, page, browserName }) => {
   // These are a bit flaky on non-chromium browsers
   if (shouldSkipReplayTest() || browserName !== 'chromium') {
     sentryTest.skip();
@@ -82,7 +82,6 @@ sentryTest('captures requestBodySize when body is sent', async ({ getLocalTestPa
       data: {
         method: 'POST',
         statusCode: 200,
-        requestBodySize: 13,
         request: { size: 13 },
       },
       description: 'http://localhost:7654/foo',
diff --git a/packages/browser-integration-tests/utils/replayEventTemplates.ts b/packages/browser-integration-tests/utils/replayEventTemplates.ts
@@ -138,8 +138,6 @@ export const expectedFetchPerformanceSpan = {
   data: {
     method: 'POST',
     statusCode: 200,
-    responseBodySize: 11,
-    requestBodySize: 3,
     request: { size: 3 },
     response: { size: 11 },
   },
@@ -153,7 +151,6 @@ export const expectedXHRPerformanceSpan = {
   data: {
     method: 'GET',
     statusCode: 200,
-    responseBodySize: 11,
     response: { size: 11 },
   },
 };
diff --git a/packages/replay/src/coreHandlers/handleFetch.ts b/packages/replay/src/coreHandlers/handleFetch.ts
@@ -11,18 +11,17 @@ export function handleFetch(handlerData: HandlerDataFetch): null | ReplayPerform
     return null;
   }
 
-  const { method, request_body_size: requestBodySize, response_body_size: responseBodySize } = fetchData;
+  // This is only used as a fallback, so we know the body sizes are never set here
+  const { method, url } = fetchData;
 
   return {
     type: 'resource.fetch',
     start: startTimestamp / 1000,
     end: endTimestamp / 1000,
-    name: fetchData.url,
+    name: url,
     data: {
       method,
       statusCode: response && (response as Response).status,
-      requestBodySize,
-      responseBodySize,
     },
   };
 }
diff --git a/packages/replay/src/coreHandlers/handleXhr.ts b/packages/replay/src/coreHandlers/handleXhr.ts
@@ -11,13 +11,8 @@ export function handleXhr(handlerData: HandlerDataXhr): ReplayPerformanceEntry |
     return null;
   }
 
-  const {
-    method,
-    url,
-    status_code: statusCode,
-    request_body_size: requestBodySize,
-    response_body_size: responseBodySize,
-  } = xhr.__sentry_xhr__;
+  // This is only used as a fallback, so we know the body sizes are never set here
+  const { method, url, status_code: statusCode } = xhr.__sentry_xhr__;
 
   if (url === undefined) {
     return null;
@@ -31,8 +26,6 @@ export function handleXhr(handlerData: HandlerDataXhr): ReplayPerformanceEntry |
     data: {
       method,
       statusCode,
-      requestBodySize,
-      responseBodySize,
     },
   };
 }
diff --git a/packages/replay/src/coreHandlers/util/fetchUtils.ts b/packages/replay/src/coreHandlers/util/fetchUtils.ts
@@ -103,8 +103,6 @@ async function _prepareFetchData(
     url,
     method,
     statusCode: statusCode || 0,
-    requestBodySize,
-    responseBodySize,
     request,
     response,
   };
diff --git a/packages/replay/src/coreHandlers/util/networkUtils.ts b/packages/replay/src/coreHandlers/util/networkUtils.ts
@@ -88,17 +88,7 @@ export function makeNetworkReplayBreadcrumb(
     return null;
   }
 
-  const {
-    startTimestamp,
-    endTimestamp,
-    url,
-    method,
-    statusCode,
-    requestBodySize,
-    responseBodySize,
-    request,
-    response,
-  } = data;
+  const { startTimestamp, endTimestamp, url, method, statusCode, request, response } = data;
 
   const result: ReplayPerformanceEntry & { data: object } = {
     type,
@@ -108,8 +98,6 @@ export function makeNetworkReplayBreadcrumb(
     data: dropUndefinedKeys({
       method,
       statusCode,
-      requestBodySize,
-      responseBodySize,
       request,
       response,
     }),
diff --git a/packages/replay/src/coreHandlers/util/xhrUtils.ts b/packages/replay/src/coreHandlers/util/xhrUtils.ts
@@ -85,8 +85,6 @@ function _prepareXhrData(
     url,
     method,
     statusCode: statusCode || 0,
-    requestBodySize,
-    responseBodySize,
     request,
     response,
   };
diff --git a/packages/replay/src/types.ts b/packages/replay/src/types.ts
@@ -371,8 +371,6 @@ export type ReplayNetworkRequestData = {
   url: string;
   method?: string;
   statusCode: number;
-  requestBodySize?: number;
-  responseBodySize?: number;
 
   request?: {
     size?: number;
diff --git a/packages/replay/test/unit/coreHandlers/handleFetch.test.ts b/packages/replay/test/unit/coreHandlers/handleFetch.test.ts
@@ -45,7 +45,8 @@ describe('Unit | coreHandlers | handleFetch', () => {
     expect(handleFetch(data)).toEqual(null);
   });
 
-  it('passes request/response size through if available', function () {
+  // This cannot happen as of now, this test just shows the expected behavior
+  it('ignores request/response sizes', function () {
     const data = {
       ...DEFAULT_DATA,
       fetchData: {
@@ -58,8 +59,6 @@ describe('Unit | coreHandlers | handleFetch', () => {
     expect(handleFetch(data)?.data).toEqual({
       method: 'GET',
       statusCode: 200,
-      requestBodySize: 123,
-      responseBodySize: 456,
     });
   });
 });
diff --git a/packages/replay/test/unit/coreHandlers/handleNetworkBreadcrumbs.test.ts b/packages/replay/test/unit/coreHandlers/handleNetworkBreadcrumbs.test.ts
@@ -114,8 +114,6 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
             payload: {
               data: {
                 method: 'GET',
-                requestBodySize: 10,
-                responseBodySize: 13,
                 statusCode: 200,
                 request: {
                   size: 10,
@@ -228,8 +226,6 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
             payload: {
               data: {
                 method: 'GET',
-                requestBodySize: 10,
-                responseBodySize: 13,
                 request: {
                   size: 10,
                 },
@@ -345,7 +341,6 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
             payload: {
               data: {
                 statusCode: 200,
-                responseBodySize: 13,
                 response: {
                   size: 13,
                 },
@@ -410,8 +405,6 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
             payload: {
               data: {
                 method: 'GET',
-                requestBodySize: 10,
-                responseBodySize: 13,
                 statusCode: 200,
                 request: {
                   size: 10,
@@ -540,8 +533,6 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
             payload: {
               data: {
                 method: 'GET',
-                requestBodySize: 10,
-                responseBodySize: 13,
                 statusCode: 200,
                 request: {
                   size: 10,
diff --git a/packages/replay/test/unit/coreHandlers/handleXhr.test.ts b/packages/replay/test/unit/coreHandlers/handleXhr.test.ts
@@ -38,7 +38,8 @@ describe('Unit | coreHandlers | handleXhr', () => {
     expect(handleXhr(data)).toEqual(null);
   });
 
-  it('passes request/response size through if available', function () {
+  // This cannot happen as of now, this test just shows the expected behavior
+  it('ignores request/response sizes', function () {
     const data: HandlerDataXhr = {
       ...DEFAULT_DATA,
       xhr: {
@@ -54,8 +55,6 @@ describe('Unit | coreHandlers | handleXhr', () => {
     expect(handleXhr(data)?.data).toEqual({
       method: 'GET',
       statusCode: 200,
-      requestBodySize: 123,
-      responseBodySize: 456,
     });
   });
 });
