pass entire options object when reformatting include option

Author: lobsterkatie

packages/node/src/integrations/requestdata.ts

@@ -104,7 +104,7 @@ export class RequestData implements Integration {
     // the moment it lives here, though, until https://github.com/getsentry/sentry-javascript/issues/5718 is addressed.
     // (TL;DR: Those functions touch many parts of the repo in many different ways, and need to be clened up. Once
     // that's happened, it will be easier to add this logic in without worrying about unexpected side effects.)
-    const { include, addRequestData, transactionNamingScheme } = this._options;
+    const { addRequestData, transactionNamingScheme } = this._options;
 
     addGlobalEventProcessor(event => {
       const hub = getCurrentHub();
@@ -117,7 +117,9 @@ export class RequestData implements Integration {
         return event;
       }
 
-      const processedEvent = addRequestData(event, req, { include: formatIncludeOption(include) });
+      const addRequestDataOptions = convertReqDataIntegrationOptsToAddReqDataOpts(this._options);
+
+      const processedEvent = addRequestData(event, req, addRequestDataOptions);
 
       // Transaction events already have the right `transaction` value
       if (event.type === 'transaction' || transactionNamingScheme === 'handler') {
@@ -151,12 +153,12 @@ export class RequestData implements Integration {
   }
 }
 
-/** Convert `include` option to match what `addRequestDataToEvent` expects */
+/** Convert this integration's options to match what `addRequestDataToEvent` expects */
 /** TODO: Can possibly be deleted once https://github.com/getsentry/sentry-javascript/issues/5718 is fixed */
-function formatIncludeOption(
-  integrationInclude: RequestDataIntegrationOptions['include'] = {},
-): AddRequestDataToEventOptions['include'] {
-  const { ip, user, ...requestOptions } = integrationInclude;
+function convertReqDataIntegrationOptsToAddReqDataOpts(
+  integrationOptions: RequestDataIntegrationOptions,
+): AddRequestDataToEventOptions {
+  const { ip, user, ...requestOptions } = integrationOptions.include;
 
   const requestIncludeKeys: string[] = [];
   for (const [key, value] of Object.entries(requestOptions)) {
@@ -181,9 +183,11 @@ function formatIncludeOption(
   }
 
   return {
-    ip,
-    user: addReqDataUserOpt,
-    request: requestIncludeKeys.length !== 0 ? requestIncludeKeys : undefined,
+    include: {
+      ip,
+      user: addReqDataUserOpt,
+      request: requestIncludeKeys.length !== 0 ? requestIncludeKeys : undefined,
+    },
   };
 }