fixup! feat(firebase): update e2e tests to use functions

Author: JPeer264

dev-packages/e2e-tests/test-applications/node-firebase/firestore-app/package.json

@@ -9,17 +9,12 @@
   "dependencies": {
     "@firebase/app": "^0.13.1",
     "@sentry/node": "latest || *",
-    "@sentry/core": "latest || *",
-    "@sentry/opentelemetry": "latest || *",
-    "@types/node": "^22.13.14",
-    "dotenv": "^16.4.5",
     "express": "^4.18.2",
-    "firebase": "^12.0.0",
-    "firebase-admin": "^13.5.0",
-    "tsconfig-paths": "^4.2.0"
+    "firebase": "^12.0.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
+    "@types/node": "^22.13.14",
     "typescript": "5.9.3"
   }
 }

dev-packages/e2e-tests/test-applications/node-firebase/functions/package.json

@@ -11,9 +11,7 @@
   "dependencies": {
     "firebase-admin": "^12.6.0",
     "firebase-functions": "^6.0.1",
-    "@sentry/node": "latest || *",
-    "@sentry/core": "latest || *",
-    "@sentry/opentelemetry": "latest || *"
+    "@sentry/node": "latest || *"
   },
   "devDependencies": {
     "typescript": "5.9.3"

dev-packages/e2e-tests/test-applications/node-firebase/functions/src/index.ts

@@ -1,7 +1,7 @@
 import './init';
 
 import { onDocumentCreated, onDocumentCreatedWithAuthContext } from 'firebase-functions/firestore';
-import { onCall, onRequest } from 'firebase-functions/https';
+import { onRequest } from 'firebase-functions/https';
 import * as logger from 'firebase-functions/logger';
 import { setGlobalOptions } from 'firebase-functions/options';
 import * as admin from 'firebase-admin';

packages/node/src/integrations/tracing/firebase/otel/patches/functions.ts

@@ -66,42 +66,24 @@ export function patchFunctions(
   }
 
   const moduleFunctionsCJS = new InstrumentationNodeModuleDefinition('firebase-functions', functionsSupportedVersions);
-
-  moduleFunctionsCJS.files.push(
-    new InstrumentationNodeModuleFile(
-      'firebase-functions/lib/v2/providers/https.js',
-      functionsSupportedVersions,
-      moduleExports => wrapCommonFunctions(moduleExports, wrap, unwrap, tracer, functionsSpanCreationHook, 'function'),
-      moduleExports => unwrapCommonFunctions(moduleExports, unwrap),
-    ),
-  );
-
-  moduleFunctionsCJS.files.push(
-    new InstrumentationNodeModuleFile(
-      'firebase-functions/lib/v2/providers/firestore.js',
-      functionsSupportedVersions,
-      moduleExports => wrapCommonFunctions(moduleExports, wrap, unwrap, tracer, functionsSpanCreationHook, 'firestore'),
-      moduleExports => unwrapCommonFunctions(moduleExports, unwrap),
-    ),
-  );
-
-  moduleFunctionsCJS.files.push(
-    new InstrumentationNodeModuleFile(
-      'firebase-functions/lib/v2/providers/scheduler.js',
-      functionsSupportedVersions,
-      moduleExports => wrapCommonFunctions(moduleExports, wrap, unwrap, tracer, functionsSpanCreationHook, 'scheduler'),
-      moduleExports => unwrapCommonFunctions(moduleExports, unwrap),
-    ),
-  );
-
-  moduleFunctionsCJS.files.push(
-    new InstrumentationNodeModuleFile(
-      'firebase-functions/lib/v2/storage.js',
-      functionsSupportedVersions,
-      moduleExports => wrapCommonFunctions(moduleExports, wrap, unwrap, tracer, functionsSpanCreationHook, 'storage'),
-      moduleExports => unwrapCommonFunctions(moduleExports, unwrap),
-    ),
-  );
+  const modulesToInstrument = [
+    { name: 'firebase-functions/lib/v2/providers/https.js', triggerType: 'function' },
+    { name: 'firebase-functions/lib/v2/providers/firestore.js', triggerType: 'firestore' },
+    { name: 'firebase-functions/lib/v2/providers/scheduler.js', triggerType: 'scheduler' },
+    { name: 'firebase-functions/lib/v2/storage.js', triggerType: 'storage' },
+  ] as const;
+
+  modulesToInstrument.forEach(({ name, triggerType }) => {
+    moduleFunctionsCJS.files.push(
+      new InstrumentationNodeModuleFile(
+        name,
+        functionsSupportedVersions,
+        moduleExports =>
+          wrapCommonFunctions(moduleExports, wrap, unwrap, tracer, functionsSpanCreationHook, triggerType),
+        moduleExports => unwrapCommonFunctions(moduleExports, unwrap),
+      ),
+    );
+  });
 
   return moduleFunctionsCJS;
 }
@@ -190,7 +172,7 @@ export function patchV2Functions<T extends FirebaseFunctions = FirebaseFunctions
           safeExecuteInTheMiddleAsync(
             () => handler.apply(this, handlerArgs),
             err => {
-              if (err instanceof Error) {
+              if (err) {
                 span.recordException(err);
               }