Merge branch 'develop' into abhi-npm-run-all2

Author: AbhiPrasad

.github/workflows/build.yml

@@ -1050,6 +1050,7 @@ jobs:
             'node-express-esm-preload',
             'node-express-esm-without-loader',
             'node-express-cjs-preload',
+            'node-otel-sdk-node',
             'nextjs-app-dir',
             'nextjs-14',
             'nextjs-15',

dev-packages/browser-integration-tests/tsconfig.json

@@ -6,7 +6,8 @@
     "moduleResolution": "node",
     "noEmit": true,
     "strict": true,
-    "allowSyntheticDefaultImports": true
+    "allowSyntheticDefaultImports": true,
+    "noUncheckedIndexedAccess": false
   },
   "include": ["**/*.ts"],
   "exclude": ["node_modules"]

dev-packages/browser-integration-tests/utils/generatePlugin.ts

@@ -128,8 +128,9 @@ function generateSentryAlias(): Record<string, string> {
 
       const modulePath = path.resolve(PACKAGES_DIR, packageName);
 
-      if (useCompiledModule && bundleKey && BUNDLE_PATHS[packageName]?.[bundleKey]) {
-        const bundlePath = path.resolve(modulePath, BUNDLE_PATHS[packageName][bundleKey]);
+      const bundleKeyPath = bundleKey && BUNDLE_PATHS[packageName]?.[bundleKey];
+      if (useCompiledModule && bundleKeyPath) {
+        const bundlePath = path.resolve(modulePath, bundleKeyPath);
 
         return [packageJSON['name'], bundlePath];
       }
@@ -175,8 +176,8 @@ class SentryScenarioGenerationPlugin {
           (statement: { specifiers: [{ imported: { name: string } }] }, source: string) => {
             const imported = statement.specifiers?.[0]?.imported?.name;
 
-            if (imported && IMPORTED_INTEGRATION_CDN_BUNDLE_PATHS[imported]) {
-              const bundleName = IMPORTED_INTEGRATION_CDN_BUNDLE_PATHS[imported];
+            const bundleName = imported && IMPORTED_INTEGRATION_CDN_BUNDLE_PATHS[imported];
+            if (bundleName) {
               this.requiredIntegrations.push(bundleName);
             } else if (source === '@sentry/wasm') {
               this.requiresWASMIntegration = true;
@@ -190,7 +191,7 @@ class SentryScenarioGenerationPlugin {
       HtmlWebpackPlugin.getHooks(compilation).alterAssetTags.tapAsync(this._name, (data, cb) => {
         if (useBundleOrLoader) {
           const bundleName = 'browser';
-          const bundlePath = BUNDLE_PATHS[bundleName][bundleKey];
+          const bundlePath = BUNDLE_PATHS[bundleName]?.[bundleKey];
 
           if (!bundlePath) {
             throw new Error(`Could not find bundle or loader for key ${bundleKey}`);
@@ -215,10 +216,10 @@ class SentryScenarioGenerationPlugin {
                   '__LOADER_OPTIONS__',
                   JSON.stringify({
                     dsn: 'https://[email protected]/1337',
-                    ...loaderConfig.options,
+                    ...loaderConfig?.options,
                   }),
                 )
-                .replace('__LOADER_LAZY__', loaderConfig.lazy ? 'true' : 'false');
+                .replace('__LOADER_LAZY__', loaderConfig?.lazy ? 'true' : 'false');
             });
           }
 
@@ -240,36 +241,41 @@ class SentryScenarioGenerationPlugin {
                 path.resolve(
                   PACKAGES_DIR,
                   'feedback',
-                  BUNDLE_PATHS['feedback'][integrationBundleKey].replace('[INTEGRATION_NAME]', integration),
+                  BUNDLE_PATHS['feedback']?.[integrationBundleKey]?.replace('[INTEGRATION_NAME]', integration) || '',
                 ),
                 fileName,
               );
             });
           }
 
-          this.requiredIntegrations.forEach(integration => {
-            const fileName = `${integration}.bundle.js`;
-            addStaticAssetSymlink(
-              this.localOutPath,
-              path.resolve(
-                PACKAGES_DIR,
-                'browser',
-                BUNDLE_PATHS['integrations'][integrationBundleKey].replace('[INTEGRATION_NAME]', integration),
-              ),
-              fileName,
-            );
+          const baseIntegrationFileName = BUNDLE_PATHS['integrations']?.[integrationBundleKey];
 
-            const integrationObject = createHtmlTagObject('script', {
-              src: fileName,
-            });
+          if (baseIntegrationFileName) {
+            this.requiredIntegrations.forEach(integration => {
+              const fileName = `${integration}.bundle.js`;
+              addStaticAssetSymlink(
+                this.localOutPath,
+                path.resolve(
+                  PACKAGES_DIR,
+                  'browser',
+                  baseIntegrationFileName.replace('[INTEGRATION_NAME]', integration),
+                ),
+                fileName,
+              );
 
-            data.assetTags.scripts.unshift(integrationObject);
-          });
+              const integrationObject = createHtmlTagObject('script', {
+                src: fileName,
+              });
+
+              data.assetTags.scripts.unshift(integrationObject);
+            });
+          }
 
-          if (this.requiresWASMIntegration && BUNDLE_PATHS['wasm'][integrationBundleKey]) {
+          const baseWasmFileName = BUNDLE_PATHS['wasm']?.[integrationBundleKey];
+          if (this.requiresWASMIntegration && baseWasmFileName) {
             addStaticAssetSymlink(
               this.localOutPath,
-              path.resolve(PACKAGES_DIR, 'wasm', BUNDLE_PATHS['wasm'][integrationBundleKey]),
+              path.resolve(PACKAGES_DIR, 'wasm', baseWasmFileName),
               'wasm.bundle.js',
             );
 

dev-packages/browser-integration-tests/utils/helpers.ts

@@ -65,13 +65,18 @@ const properFullEnvelopeParser = <T extends Envelope>(request: Request | null):
 };
 
 function getEventAndTraceHeader(envelope: EventEnvelope): EventAndTraceHeader {
-  const event = envelope[1][0][1] as Event;
-  const trace = envelope[0].trace;
+  const event = envelope[1][0]?.[1] as Event | undefined;
+  const trace = envelope[0]?.trace;
+
+  if (!event || !trace) {
+    throw new Error('Could not get event or trace from envelope');
+  }
+
   return [event, trace];
 }
 
 export const properEnvelopeRequestParser = <T = Event>(request: Request | null, envelopeIndex = 1): T => {
-  return properEnvelopeParser(request)[0][envelopeIndex] as T;
+  return properEnvelopeParser(request)[0]?.[envelopeIndex] as T;
 };
 
 export const properFullEnvelopeRequestParser = <T extends Envelope>(request: Request | null): T => {
@@ -361,7 +366,14 @@ async function getFirstSentryEnvelopeRequest<T>(
   url?: string,
   requestParser: (req: Request) => T = envelopeRequestParser as (req: Request) => T,
 ): Promise<T> {
-  return (await getMultipleSentryEnvelopeRequests<T>(page, 1, { url }, requestParser))[0];
+  const reqs = await getMultipleSentryEnvelopeRequests<T>(page, 1, { url }, requestParser);
+
+  const req = reqs[0];
+  if (!req) {
+    throw new Error('No request found');
+  }
+
+  return req;
 }
 
 export { runScriptInSandbox, getMultipleSentryEnvelopeRequests, getFirstSentryEnvelopeRequest, getSentryEvents };

dev-packages/e2e-tests/test-applications/nestjs/src/app.controller.ts

@@ -45,6 +45,11 @@ export class AppController1 {
     return this.appService.testException(id);
   }
 
+  @Get('test-expected-exception/:id')
+  async testExpectedException(@Param('id') id: string) {
+    return this.appService.testExpectedException(id);
+  }
+
   @Get('test-outgoing-fetch-external-allowed')
   async testOutgoingFetchExternalAllowed() {
     return this.appService.testOutgoingFetchExternalAllowed();

dev-packages/e2e-tests/test-applications/nestjs/src/app.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import * as Sentry from '@sentry/nestjs';
 import { makeHttpRequest } from './utils';
 
@@ -52,6 +52,10 @@ export class AppService1 {
     throw new Error(`This is an exception with id ${id}`);
   }
 
+  testExpectedException(id: string) {
+    throw new HttpException(`This is an expected exception with id ${id}`, HttpStatus.FORBIDDEN);
+  }
+
   async testOutgoingFetchExternalAllowed() {
     const fetchResponse = await fetch('http://localhost:3040/external-allowed');
 

dev-packages/e2e-tests/test-applications/nestjs/tests/errors.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from '@playwright/test';
-import { waitForError } from '@sentry-internal/test-utils';
+import { waitForError, waitForTransaction } from '@sentry-internal/test-utils';
 
 test('Sends exception to Sentry', async ({ baseURL }) => {
   const errorEventPromise = waitForError('nestjs', event => {
@@ -28,3 +28,28 @@ test('Sends exception to Sentry', async ({ baseURL }) => {
     span_id: expect.any(String),
   });
 });
+
+test('Does not send expected exception to Sentry', async ({ baseURL }) => {
+  let errorEventOccurred = false;
+
+  waitForError('nestjs', event => {
+    if (!event.type && event.exception?.values?.[0]?.value === 'This is an expected exception with id 123') {
+      errorEventOccurred = true;
+    }
+
+    return event?.transaction === 'GET /test-expected-exception/:id';
+  });
+
+  const transactionEventPromise = waitForTransaction('nestjs', transactionEvent => {
+    return transactionEvent?.transaction === 'GET /test-expected-exception/:id';
+  });
+
+  const response = await fetch(`${baseURL}/test-expected-exception/123`);
+  expect(response.status).toBe(403);
+
+  await transactionEventPromise;
+
+  await new Promise(resolve => setTimeout(resolve, 10000));
+
+  expect(errorEventOccurred).toBe(false);
+});

dev-packages/e2e-tests/test-applications/node-otel-sdk-node/.gitignore

@@ -0,0 +1 @@
+dist

dev-packages/e2e-tests/test-applications/node-otel-sdk-node/.npmrc

@@ -0,0 +1,2 @@
+@sentry:registry=http://127.0.0.1:4873
+@sentry-internal:registry=http://127.0.0.1:4873

dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json

@@ -0,0 +1,32 @@
+{
+  "name": "node-otel-sdk-trace",
+  "version": "1.0.0",
+  "private": true,
+  "scripts": {
+    "build": "tsc",
+    "start": "node dist/app.js",
+    "test": "playwright test",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml",
+    "test:build": "pnpm install && pnpm build",
+    "test:assert": "pnpm test"
+  },
+  "dependencies": {
+    "@opentelemetry/sdk-node": "0.52.1",
+    "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
+    "@sentry/core": "latest || *",
+    "@sentry/node": "latest || *",
+    "@sentry/opentelemetry": "latest || *",
+    "@sentry/types": "latest || *",
+    "@types/express": "4.17.17",
+    "@types/node": "18.15.1",
+    "express": "4.19.2",
+    "typescript": "4.9.5"
+  },
+  "devDependencies": {
+    "@playwright/test": "^1.44.1",
+    "@sentry-internal/test-utils": "link:../../../test-utils"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  }
+}