feat(node): Support hapi v21 & fix E2E test

.github/workflows/build.yml

@@ -1017,7 +1017,7 @@ jobs:
             'generic-ts3.8',
             'node-fastify-app',
             # TODO(v8): Re-enable hapi tests
-            # 'node-hapi-app',
+            'node-hapi',
             'node-nestjs-app',
             'node-exports-test-app',
             'node-koa-app',

dev-packages/e2e-tests/test-applications/node-hapi-app/package.json → dev-packages/e2e-tests/test-applications/node-hapi/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "node-hapi-app",
+  "name": "node-hapi",
   "version": "1.0.0",
   "private": true,
   "scripts": {

dev-packages/e2e-tests/test-applications/node-hapi-app/src/app.js → dev-packages/e2e-tests/test-applications/node-hapi/src/app.js

@@ -1,10 +1,4 @@
 const Sentry = require('@sentry/node');
-const Hapi = require('@hapi/hapi');
-
-const server = Hapi.server({
-  port: 3030,
-  host: 'localhost',
-});
 
 Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
@@ -15,6 +9,13 @@ Sentry.init({
   tracesSampleRate: 1,
 });
 
+const Hapi = require('@hapi/hapi');
+
+const server = Hapi.server({
+  port: 3030,
+  host: 'localhost',
+});
+
 const init = async () => {
   server.route({
     method: 'GET',
@@ -28,6 +29,8 @@ const init = async () => {
     method: 'GET',
     path: '/test-param/{param}',
     handler: function (request, h) {
+      Sentry.setTag(`param-${request.params.param}`, 'yes');
+
       return { paramWas: request.params.param };
     },
   });

dev-packages/e2e-tests/test-applications/node-hapi-app/start-event-proxy.ts → dev-packages/e2e-tests/test-applications/node-hapi/start-event-proxy.ts

@@ -2,5 +2,5 @@ import { startEventProxyServer } from '@sentry-internal/event-proxy-server';
 
 startEventProxyServer({
   port: 3031,
-  proxyServerName: 'node-hapi-app',
+  proxyServerName: 'node-hapi',
 });

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

@@ -0,0 +1,95 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/event-proxy-server';
+import axios, { AxiosError } from 'axios';
+
+const authToken = process.env.E2E_TEST_AUTH_TOKEN;
+const sentryTestOrgSlug = process.env.E2E_TEST_SENTRY_ORG_SLUG;
+const sentryTestProject = process.env.E2E_TEST_SENTRY_TEST_PROJECT;
+const EVENT_POLLING_TIMEOUT = 90_000;
+
+test('Sends captured exception to Sentry', async ({ baseURL }) => {
+  const { data } = await axios.get(`${baseURL}/test-error`);
+  const { exceptionId } = data;
+
+  const url = `https://sentry.io/api/0/projects/${sentryTestOrgSlug}/${sentryTestProject}/events/${exceptionId}/`;
+
+  console.log(`Polling for error eventId: ${exceptionId}`);
+
+  await expect
+    .poll(
+      async () => {
+        try {
+          const response = await axios.get(url, { headers: { Authorization: `Bearer ${authToken}` } });
+
+          return response.status;
+        } catch (e) {
+          if (e instanceof AxiosError && e.response) {
+            if (e.response.status !== 404) {
+              throw e;
+            } else {
+              return e.response.status;
+            }
+          } else {
+            throw e;
+          }
+        }
+      },
+      { timeout: EVENT_POLLING_TIMEOUT },
+    )
+    .toBe(200);
+});
+
+test('Sends thrown error to Sentry', async ({ baseURL }) => {
+  const errorEventPromise = waitForError('node-hapi', errorEvent => {
+    return errorEvent?.exception?.values?.[0]?.value === 'This is an error';
+  });
+
+  try {
+    await axios.get(`${baseURL}/test-failure`);
+  } catch (e) {}
+
+  const errorEvent = await errorEventPromise;
+  const errorEventId = errorEvent.event_id;
+
+  await expect
+    .poll(
+      async () => {
+        try {
+          const response = await axios.get(
+            `https://sentry.io/api/0/projects/${sentryTestOrgSlug}/${sentryTestProject}/events/${errorEventId}/`,
+            { headers: { Authorization: `Bearer ${authToken}` } },
+          );
+
+          return response.status;
+        } catch (e) {
+          if (e instanceof AxiosError && e.response) {
+            if (e.response.status !== 404) {
+              throw e;
+            } else {
+              return e.response.status;
+            }
+          } else {
+            throw e;
+          }
+        }
+      },
+      {
+        timeout: EVENT_POLLING_TIMEOUT,
+      },
+    )
+    .toBe(200);
+});
+
+test('sends error with parameterized transaction name', async ({ baseURL }) => {
+  const errorEventPromise = waitForError('node-hapi', errorEvent => {
+    return errorEvent?.exception?.values?.[0]?.value === 'This is an error with id 123';
+  });
+
+  try {
+    await axios.get(`${baseURL}/test-error/123`);
+  } catch {}
+
+  const errorEvent = await errorEventPromise;
+
+  expect(errorEvent?.transaction).toBe('GET /test-error/{id}');
+});