fix tests

Author: AbhiPrasad

dev-packages/browser-integration-tests/suites/integrations/ContextLines/init.js

@@ -1,9 +1,9 @@
 import * as Sentry from '@sentry/browser';
-import { ContextLines } from '@sentry/integrations';
+import { contextLinesIntegration } from '@sentry/integrations';
 
 window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
-  integrations: [new ContextLines()],
+  integrations: [contextLinesIntegration()],
 });

dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/init.js

@@ -1,11 +1,11 @@
 import * as Sentry from '@sentry/browser';
-import { HttpClient } from '@sentry/integrations';
+import { httpClientIntegration } from '@sentry/integrations';
 
 window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
-  integrations: [new HttpClient()],
+  integrations: [httpClientIntegration()],
   tracesSampleRate: 1,
   sendDefaultPii: true,
 });

dev-packages/browser-integration-tests/suites/integrations/httpclient/init.js

@@ -1,11 +1,11 @@
 import * as Sentry from '@sentry/browser';
-import { HttpClient } from '@sentry/integrations';
+import { httpClientIntegration } from '@sentry/integrations';
 
 window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://[email protected]/1337',
-  integrations: [new HttpClient()],
+  integrations: [httpClientIntegration()],
   tracesSampleRate: 1,
   sendDefaultPii: true,
 });

dev-packages/e2e-tests/test-applications/node-express-app/src/app.ts

@@ -1,4 +1,4 @@
-import * as Integrations from '@sentry/integrations';
+import { httpClientIntegration } from '@sentry/integrations';
 import * as Sentry from '@sentry/node';
 import '@sentry/tracing';
 import express from 'express';
@@ -13,7 +13,7 @@ Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.E2E_TEST_DSN,
   includeLocalVariables: true,
-  integrations: [new Integrations.HttpClient()],
+  integrations: [httpClientIntegration()],
   debug: true,
   tunnel: `http://localhost:3031/`, // proxy server
   tracesSampleRate: 1,

packages/nextjs/src/edge/rewriteFramesIntegration.ts

@@ -0,0 +1,49 @@
+import { defineIntegration } from '@sentry/core';
+import { rewriteFramesIntegration as originalRewriteFramesIntegration } from '@sentry/integrations';
+import type { IntegrationFn, StackFrame } from '@sentry/types';
+import { GLOBAL_OBJ, escapeStringForRegex } from '@sentry/utils';
+
+const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
+  __rewriteFramesDistDir__?: string;
+};
+
+type StackFrameIteratee = (frame: StackFrame) => StackFrame;
+interface RewriteFramesOptions {
+  root?: string;
+  prefix?: string;
+  iteratee?: StackFrameIteratee;
+}
+
+export const customRewriteFramesIntegration = ((options?: RewriteFramesOptions) => {
+  // This value is injected at build time, based on the output directory specified in the build config. Though a default
+  // is set there, we set it here as well, just in case something has gone wrong with the injection.
+  const distDirName = globalWithInjectedValues.__rewriteFramesDistDir__;
+
+  if (distDirName) {
+    const distDirAbsPath = distDirName.replace(/(\/|\\)$/, ''); // We strip trailing slashes because "app:///_next" also doesn't have one
+
+    // Normally we would use `path.resolve` to obtain the absolute path we will strip from the stack frame to align with
+    // the uploaded artifacts, however we don't have access to that API in edge so we need to be a bit more lax.
+    // eslint-disable-next-line @sentry-internal/sdk/no-regexp-constructor -- user input is escaped
+    const SOURCEMAP_FILENAME_REGEX = new RegExp(`.*${escapeStringForRegex(distDirAbsPath)}`);
+
+    return originalRewriteFramesIntegration({
+      iteratee: frame => {
+        frame.filename = frame.filename?.replace(SOURCEMAP_FILENAME_REGEX, 'app:///_next');
+        return frame;
+      },
+      ...options,
+    });
+  }
+
+  // Do nothing if we can't find a distDirName
+  return {
+    // eslint-disable-next-line deprecation/deprecation
+    name: 'RewriteFrames',
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    setupOnce: () => {},
+    processEvent: event => event,
+  };
+}) satisfies IntegrationFn;
+
+export const rewriteFramesIntegration = defineIntegration(customRewriteFramesIntegration);

packages/nextjs/src/server/rewriteFramesIntegration.ts

@@ -0,0 +1,49 @@
+import * as path from 'path';
+import { defineIntegration } from '@sentry/core';
+import { rewriteFramesIntegration as originalRewriteFramesIntegration } from '@sentry/integrations';
+import type { IntegrationFn, StackFrame } from '@sentry/types';
+import { escapeStringForRegex } from '@sentry/utils';
+
+const globalWithInjectedValues = global as typeof global & {
+  __rewriteFramesDistDir__?: string;
+};
+
+type StackFrameIteratee = (frame: StackFrame) => StackFrame;
+interface RewriteFramesOptions {
+  root?: string;
+  prefix?: string;
+  iteratee?: StackFrameIteratee;
+}
+
+export const customRewriteFramesIntegration = ((options?: RewriteFramesOptions) => {
+  // This value is injected at build time, based on the output directory specified in the build config. Though a default
+  // is set there, we set it here as well, just in case something has gone wrong with the injection.
+  const distDirName = globalWithInjectedValues.__rewriteFramesDistDir__;
+
+  if (distDirName) {
+    // nextjs always puts the build directory at the project root level, which is also where you run `next start` from, so
+    // we can read in the project directory from the currently running process
+    const distDirAbsPath = path.resolve(distDirName).replace(/(\/|\\)$/, ''); // We strip trailing slashes because "app:///_next" also doesn't have one
+    // eslint-disable-next-line @sentry-internal/sdk/no-regexp-constructor -- user input is escaped
+    const SOURCEMAP_FILENAME_REGEX = new RegExp(escapeStringForRegex(distDirAbsPath));
+
+    return originalRewriteFramesIntegration({
+      iteratee: frame => {
+        frame.filename = frame.filename?.replace(SOURCEMAP_FILENAME_REGEX, 'app:///_next');
+        return frame;
+      },
+      ...options,
+    });
+  }
+
+  // Do nothing if we can't find a distDirName
+  return {
+    // eslint-disable-next-line deprecation/deprecation
+    name: 'RewriteFrames',
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    setupOnce: () => {},
+    processEvent: event => event,
+  };
+}) satisfies IntegrationFn;
+
+export const rewriteFramesIntegration = defineIntegration(customRewriteFramesIntegration);

packages/sveltekit/test/server/rewriteFramesIntegration.ts

@@ -1,4 +1,4 @@
-import { RewriteFrames } from '@sentry/integrations';
+import { rewriteFramesIntegration } from '@sentry/integrations';
 import type { Event, StackFrame } from '@sentry/types';
 import { basename } from '@sentry/utils';
 
@@ -25,10 +25,8 @@ describe('rewriteFramesIteratee', () => {
       module: '3-ab34d22f.js',
     };
 
-    // eslint-disable-next-line deprecation/deprecation
-    const originalRewriteFrames = new RewriteFrames();
-    // eslint-disable-next-line deprecation/deprecation
-    const rewriteFrames = new RewriteFrames({ iteratee: rewriteFramesIteratee });
+    const originalRewriteFrames = rewriteFramesIntegration();
+    const rewriteFrames = rewriteFramesIntegration({ iteratee: rewriteFramesIteratee });
 
     const event: Event = {
       exception: {
@@ -42,8 +40,8 @@ describe('rewriteFramesIteratee', () => {
       },
     };
 
-    const originalResult = originalRewriteFrames.processEvent(event);
-    const result = rewriteFrames.processEvent(event);
+    const originalResult = originalRewriteFrames.processEvent?.(event, {}, {} as any);
+    const result = rewriteFrames.processEvent?.(event, {}, {} as any) as Event;
 
     expect(result.exception?.values?.[0]?.stacktrace?.frames?.[0]).toEqual({
       filename: 'app:///3-ab34d22f.js',