ref(node): Do not manually finish / update root Hapi spans.

Author: onurtemizkan

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

@@ -1,15 +1,26 @@
 import { expect, test } from '@playwright/test';
-import { waitForError } from '@sentry-internal/event-proxy-server';
+import { waitForError, waitForTransaction } from '@sentry-internal/event-proxy-server';
 
 test('Sends thrown error to Sentry', async ({ baseURL }) => {
   const errorEventPromise = waitForError('node-hapi', errorEvent => {
     return errorEvent?.exception?.values?.[0]?.value === 'This is an error';
   });
 
+  const transactionEventPromise = waitForTransaction('node-hapi', transactionEvent => {
+    return transactionEvent?.transaction === 'GET /test-failure';
+  });
+
   await fetch(`${baseURL}/test-failure`);
 
   const errorEvent = await errorEventPromise;
-  const errorEventId = errorEvent.event_id;
+  const transactionEvent = await transactionEventPromise;
+
+  expect(transactionEvent.transaction).toBe('GET /test-failure');
+  expect(transactionEvent.contexts?.trace).toMatchObject({
+    trace_id: expect.any(String),
+    span_id: expect.any(String),
+  });
+  console.debug('transactionEvent', transactionEvent);
 
   expect(errorEvent.exception?.values).toHaveLength(1);
   expect(errorEvent.exception?.values?.[0]?.value).toBe('This is an error');
@@ -27,6 +38,9 @@ test('Sends thrown error to Sentry', async ({ baseURL }) => {
     trace_id: expect.any(String),
     span_id: expect.any(String),
   });
+
+  expect(errorEvent.contexts?.trace?.trace_id).toBe(transactionEvent.contexts?.trace?.trace_id);
+  expect(errorEvent.contexts?.trace?.span_id).toBe(transactionEvent.contexts?.trace?.span_id);
 });
 
 test('sends error with parameterized transaction name', async ({ baseURL }) => {

packages/node/src/integrations/tracing/hapi/index.ts

@@ -3,14 +3,11 @@ import {
   SDK_VERSION,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  SPAN_STATUS_ERROR,
   captureException,
   defineIntegration,
-  getActiveSpan,
   getClient,
   getDefaultIsolationScope,
   getIsolationScope,
-  getRootSpan,
   spanToJSON,
 } from '@sentry/core';
 import type { IntegrationFn, Span } from '@sentry/types';
@@ -79,19 +76,11 @@ export const hapiErrorPlugin = {
           logger.warn('Isolation scope is still the default isolation scope - skipping setting transactionName');
       }
 
-      const activeSpan = getActiveSpan();
-      const rootSpan = activeSpan ? getRootSpan(activeSpan) : undefined;
-
       if (request.response && isBoomObject(request.response)) {
         sendErrorToSentry(request.response);
       } else if (isErrorEvent(event)) {
         sendErrorToSentry(event.error);
       }
-
-      if (rootSpan) {
-        rootSpan.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
-        rootSpan.end();
-      }
     });
   },
 };