Add thrown 500 redirects.

Author: onurtemizkan

packages/remix/test/integration/app/routes/action-json-response/$id.tsx

@@ -1,19 +1,31 @@
-import { ActionFunction, json } from '@remix-run/node';
+import { ActionFunction, json, redirect, LoaderFunction } from '@remix-run/node';
 import { useActionData } from '@remix-run/react';
 
+export const loader: LoaderFunction = async ({ params: { id } }) => {
+  if (id === '-1') {
+    throw new Error('Unexpected Server Error from Loader');
+  }
+};
+
 export const action: ActionFunction = async ({ params: { id } }) => {
   if (id === '-1') {
-    throw new Error('Error');
+    throw new Error('Unexpected Server Error');
+  }
+
+  if (id === '-2') {
+    // Note: This GET request triggers to the `Loader` of the URL, not the `Action`.
+    throw redirect('/action-json-response/-1');
   }
 
   return json({ test: 'test' });
 };
 
 export default function ActionJSONResponse() {
-  const { test } = useActionData();
+  const data = useActionData();
+
   return (
     <div>
-      <h1>{test}</h1>
+      <h1>{data && data.test ? data.test : 'Not Found'}</h1>
     </div>
   );
 }

packages/remix/test/integration/app/routes/loader-json-response/$id.tsx

@@ -1,11 +1,15 @@
-import { json, LoaderFunction } from '@remix-run/node';
+import { json, LoaderFunction, redirect } from '@remix-run/node';
 import { useLoaderData } from '@remix-run/react';
 
 type LoaderData = { id: string };
 
 export const loader: LoaderFunction = async ({ params: { id } }) => {
+  if (id === '-2') {
+    throw new Error('Unexpected Server Error from Loader');
+  }
+
   if (id === '-1') {
-    throw new Error('Error');
+    throw redirect('/loader-json-response/-2');
   }
 
   return json({
@@ -18,7 +22,7 @@ export default function LoaderJSONResponse() {
 
   return (
     <div>
-      <h1>{data.id}</h1>
+      <h1>{data && data.id ? data.id : 'Not Found'}</h1>
     </div>
   );
 }

packages/remix/test/integration/test/server/action.test.ts

@@ -22,6 +22,10 @@ describe('Remix API Actions', () => {
           description: 'routes/action-json-response/$id',
           op: 'remix.server.action',
         },
+        {
+          description: 'routes/action-json-response/$id',
+          op: 'remix.server.loader',
+        },
         {
           description: 'routes/action-json-response/$id',
           op: 'remix.server.documentRequest',
@@ -52,15 +56,57 @@ describe('Remix API Actions', () => {
         values: [
           {
             type: 'Error',
-            value: 'Error',
-            stacktrace: expect.any(Object),
-            mechanism: {
-              data: {
-                function: 'action',
-              },
-              handled: true,
-              type: 'instrument',
-            },
+            value: 'Unexpected Server Error',
+          },
+        ],
+      },
+    });
+  });
+
+  it('handles a thrown 500 response', async () => {
+    const baseURL = await runServer();
+    const url = `${baseURL}/action-json-response/-2`;
+
+    const [transaction_1, event, transaction_2] = await getMultipleEnvelopeRequest(url, 3, 'post');
+
+    assertSentryTransaction(transaction_1[2], {
+      contexts: {
+        trace: {
+          op: 'http.server',
+          status: 'ok',
+          tags: {
+            method: 'POST',
+            'http.status_code': '302',
+          },
+        },
+      },
+      tags: {
+        transaction: 'routes/action-json-response/$id',
+      },
+    });
+
+    assertSentryTransaction(transaction_2[2], {
+      contexts: {
+        trace: {
+          op: 'http.server',
+          status: 'internal_error',
+          tags: {
+            method: 'GET',
+            'http.status_code': '500',
+          },
+        },
+      },
+      tags: {
+        transaction: 'routes/action-json-response/$id',
+      },
+    });
+
+    assertSentryEvent(event[2], {
+      exception: {
+        values: [
+          {
+            type: 'Error',
+            value: 'Unexpected Server Error from Loader',
           },
         ],
       },

packages/remix/test/integration/test/server/loader.test.ts

@@ -28,7 +28,7 @@ describe('Remix API Loaders', () => {
 
   it('reports an error thrown from the loader', async () => {
     const baseURL = await runServer();
-    const url = `${baseURL}/loader-json-response/-1`;
+    const url = `${baseURL}/loader-json-response/-2`;
 
     const [transaction, event] = await getMultipleEnvelopeRequest(url, 2);
 
@@ -48,15 +48,7 @@ describe('Remix API Loaders', () => {
         values: [
           {
             type: 'Error',
-            value: 'Error',
-            stacktrace: expect.any(Object),
-            mechanism: {
-              data: {
-                function: 'loader',
-              },
-              handled: true,
-              type: 'instrument',
-            },
+            value: 'Unexpected Server Error from Loader',
           },
         ],
       },
@@ -86,4 +78,54 @@ describe('Remix API Loaders', () => {
       ],
     });
   });
+
+  it('handles a thrown 500 response', async () => {
+    const baseURL = await runServer();
+    const url = `${baseURL}/loader-json-response/-1`;
+
+    const [transaction_1, event, transaction_2] = await getMultipleEnvelopeRequest(url, 3);
+
+    assertSentryTransaction(transaction_1[2], {
+      contexts: {
+        trace: {
+          op: 'http.server',
+          status: 'ok',
+          tags: {
+            method: 'GET',
+            'http.status_code': '302',
+          },
+        },
+      },
+      tags: {
+        transaction: 'routes/loader-json-response/$id',
+      },
+    });
+
+    assertSentryTransaction(transaction_2[2], {
+      contexts: {
+        trace: {
+          op: 'http.server',
+          status: 'internal_error',
+          tags: {
+            method: 'GET',
+            'http.status_code': '500',
+          },
+        },
+      },
+      tags: {
+        transaction: 'routes/loader-json-response/$id',
+      },
+    });
+
+    assertSentryEvent(event[2], {
+      exception: {
+        values: [
+          {
+            type: 'Error',
+            value: 'Unexpected Server Error from Loader',
+          },
+        ],
+      },
+    });
+  });
 });