fixup! test(fastify): Verify if upstream error is fixed and won't regress

Author: JPeer264

dev-packages/e2e-tests/test-applications/node-fastify-5/src/app.ts

@@ -25,6 +25,11 @@ Sentry.init({
           return false;
         }
 
+        // @ts-ignore // Fastify V5 is not typed correctly
+        if (_request.routeOptions?.url?.includes('/test-error-ignored') && _reply.statusCode === 500) {
+          return false;
+        }
+
         return true;
       },
     }),
@@ -90,6 +95,21 @@ app.get('/test-error', async function (req, res) {
   res.send({ exceptionId });
 });
 
+// Regression test for https://github.com/fastify/fastify/issues/6409
+// The error diagnostic channel was always sending 200 unless explicitly changed.
+// This was fixed in Fastify 5.7.0
+app.register((childApp: F.FastifyInstance, _options: F.FastifyPluginOptions, next: (err?: Error) => void) => {
+  childApp.setErrorHandler((error: Error, _request: F.FastifyRequest, reply: F.FastifyReply) => {
+    reply.send({ ok: false });
+  });
+
+  childApp.get('/test-error-ignored', async function () {
+    throw new Error('This is an error that will not be captured');
+  });
+
+  next();
+});
+
 app.get('/test-error-not-captured', async function () {
   // This error will not be captured by Sentry
   throw new Error('This is an error that will not be captured');
@@ -127,6 +147,11 @@ app.post('/test-post', function (req, res) {
   res.send({ status: 'ok', body: req.body });
 });
 
+app.get('/flush', async function (_req, res) {
+  await Sentry.flush();
+  res.send({ ok: true });
+});
+
 app.listen({ port: port });
 
 // A second app so we can test header propagation between external URLs

dev-packages/e2e-tests/test-applications/node-fastify-5/tests/errors.test.ts

@@ -35,34 +35,51 @@ test('Sends correct error event', async ({ baseURL }) => {
 });
 
 test('Does not send error when shouldHandleError returns false', async ({ baseURL }) => {
-  const errorEventPromise = waitForError('node-fastify-5', event => {
-    return !event.type && event.exception?.values?.[0]?.value === 'This is an error that will not be captured';
+  let errorEventOccurred = false;
+
+  waitForError('node-fastify-5', event => {
+    if (!event.type && event.exception?.values?.[0]?.value === 'This is an error that will not be captured') {
+      errorEventOccurred = true;
+    }
+    return event?.transaction === 'GET /test-error-not-captured';
   });
 
-  errorEventPromise.then(() => {
-    throw new Error('This error should not be captured');
+  const transactionEventPromise = waitForTransaction('node-fastify-5', transactionEvent => {
+    return transactionEvent?.transaction === 'GET /test-error-not-captured';
   });
 
   await fetch(`${baseURL}/test-error-not-captured`);
 
-  // wait for a short time to ensure the error is not captured
-  await new Promise(resolve => setTimeout(resolve, 1000));
+  await transactionEventPromise;
+
+  await fetch(`${baseURL}/flush`);
+
+  expect(errorEventOccurred).toBe(false);
 });
 
 // Regression test for https://github.com/fastify/fastify/issues/6409
 // The error diagnostic channel was always sending 200 unless explicitly changed.
 // This was fixed in Fastify 5.7.0
 test('Error in child plugin with rethrown error handler reports correct 500 status', async ({ baseURL }) => {
-  const errorEventPromise = waitForError('node-fastify-5', event => {
-    return !event.type && event.exception?.values?.[0]?.value === 'This is an error that will not be captured';
+  let errorEventOccurred = false;
+
+  waitForError('node-fastify-5', event => {
+    if (!event.type && event.exception?.values?.[0]?.value === 'This is an error that will not be captured') {
+      errorEventOccurred = true;
+    }
+    return event?.transaction === 'GET /test-error-ignored';
   });
 
-  errorEventPromise.then(() => {
-    throw new Error('This error should not be captured');
+  const transactionEventPromise = waitForTransaction('node-fastify-5', transactionEvent => {
+    return transactionEvent?.transaction === 'GET /test-error-ignored';
   });
 
+
   await fetch(`${baseURL}/test-error-ignored`);
 
-  // wait for a short time to ensure the error is not captured
-  await new Promise(resolve => setTimeout(resolve, 1000));
+  await transactionEventPromise;
+
+  await fetch(`${baseURL}/flush`);
+
+  expect(errorEventOccurred).toBe(false);
 });