Move data inside mechanism object

Author: onurtemizkan

packages/react-router/src/common/utils.ts

@@ -50,15 +50,15 @@ export function captureInstrumentationError(
   result: InstrumentationResult,
   captureErrors: boolean,
   mechanismType: string,
-  data: Record<string, unknown>,
+  data: Record<string, string | boolean>,
 ): void {
   if (result.status === 'error' && captureErrors && isError(result.error)) {
     captureException(result.error, {
       mechanism: {
         type: mechanismType,
         handled: false,
+        data,
       },
-      data,
     });
   }
 }

packages/react-router/test/client/createClientInstrumentation.test.ts

@@ -214,10 +214,7 @@ describe('createSentryClientInstrumentation', () => {
     });
 
     expect(core.captureException).toHaveBeenCalledWith(mockError, {
-      mechanism: { type: 'react_router.client_loader', handled: false },
-      data: {
-        'http.url': '/test-path',
-      },
+      mechanism: { type: 'react_router.client_loader', handled: false, data: { 'http.url': '/test-path' } },
     });
   });
 
@@ -268,10 +265,7 @@ describe('createSentryClientInstrumentation', () => {
     });
 
     expect(core.captureException).toHaveBeenCalledWith(mockError, {
-      mechanism: { type: 'react_router.navigate', handled: false },
-      data: {
-        'http.url': '/about',
-      },
+      mechanism: { type: 'react_router.navigate', handled: false, data: { 'http.url': '/about' } },
     });
   });
 

packages/react-router/test/common/utils.test.ts

@@ -94,8 +94,7 @@ describe('captureInstrumentationError', () => {
     captureInstrumentationError(result, true, 'react_router.loader', data);
 
     expect(core.captureException).toHaveBeenCalledWith(error, {
-      mechanism: { type: 'react_router.loader', handled: false },
-      data,
+      mechanism: { type: 'react_router.loader', handled: false, data },
     });
   });
 

packages/react-router/test/server/createServerInstrumentation.test.ts

@@ -132,10 +132,10 @@ describe('createSentryServerInstrumentation', () => {
     await hooks.request(mockHandleRequest, { request: mockRequest, context: undefined });
 
     expect(core.captureException).toHaveBeenCalledWith(mockError, {
-      mechanism: { type: 'react_router.request_handler', handled: false },
-      data: {
-        'http.method': 'GET',
-        'http.url': '/api/users',
+      mechanism: {
+        type: 'react_router.request_handler',
+        handled: false,
+        data: { 'http.method': 'GET', 'http.url': '/api/users' },
       },
     });
   });
@@ -367,10 +367,10 @@ describe('createSentryServerInstrumentation', () => {
     });
 
     expect(core.captureException).toHaveBeenCalledWith(mockError, {
-      mechanism: { type: 'react_router.loader', handled: false },
-      data: {
-        'http.method': 'GET',
-        'http.url': '/test',
+      mechanism: {
+        type: 'react_router.loader',
+        handled: false,
+        data: { 'http.method': 'GET', 'http.url': '/test' },
       },
     });
   });