fix(serverless): Capture custom tags in error events of GCP functions (…

…#7298)

Change the way we listen to errors by directly try/catching the function instead of listening to the domain's error callback. 

Co-authored-by: Luca Forstner <luca.forstner@sentry.io>

packages/serverless/src/gcpfunction/http.ts

@@ -1,9 +1,15 @@
 import type { AddRequestDataToEventOptions } from '@sentry/node';
 import { captureException, flush, getCurrentHub } from '@sentry/node';
 import { extractTraceparentData } from '@sentry/tracing';
-import { baggageHeaderToDynamicSamplingContext, isString, logger, stripUrlQueryAndFragment } from '@sentry/utils';
-
-import { domainify, getActiveDomain, proxyFunction } from './../utils';
+import {
+  baggageHeaderToDynamicSamplingContext,
+  isString,
+  isThenable,
+  logger,
+  stripUrlQueryAndFragment,
+} from '@sentry/utils';
+
+import { domainify, proxyFunction } from './../utils';
 import type { HttpFunction, WrapperOptions } from './general';
 
 // TODO (v8 / #5257): Remove this whole old/new business and just use the new stuff
@@ -105,13 +111,6 @@ function _wrapHttpFunction(fn: HttpFunction, wrapOptions: Partial<HttpFunctionWr
     // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
     (res as any).__sentry_transaction = transaction;
 
-    // functions-framework creates a domain for each incoming request so we take advantage of this fact and add an error handler.
-    // BTW this is the only way to catch any exception occured during request lifecycle.
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    getActiveDomain()!.on('error', err => {
-      captureException(err);
-    });
-
     // eslint-disable-next-line @typescript-eslint/unbound-method
     const _end = res.end;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -128,6 +127,21 @@ function _wrapHttpFunction(fn: HttpFunction, wrapOptions: Partial<HttpFunctionWr
         });
     };
 
-    return fn(req, res);
+    let fnResult;
+    try {
+      fnResult = fn(req, res);
+    } catch (err) {
+      captureException(err);
+      throw err;
+    }
+
+    if (isThenable(fnResult)) {
+      fnResult.then(null, err => {
+        captureException(err);
+        throw err;
+      });
+    }
+
+    return fnResult;
   };
 }