Merge branch 'develop' into onur/fix-flaky-remix-e2e-tests

Author: AbhiPrasad

MIGRATION.md

@@ -1,5 +1,21 @@
 # Upgrading from 7.x to 8.x
 
+## Removal of deprecated API in `@sentry/nextjs`
+
+The following previously deprecated API has been removed from the `@sentry/nextjs` package:
+
+- `withSentryApi` (Replacement: `wrapApiHandlerWithSentry`)
+- `withSentryAPI` (Replacement: `wrapApiHandlerWithSentry`)
+- `withSentryGetServerSideProps` (Replacement: `wrapGetServerSidePropsWithSentry`)
+- `withSentryGetStaticProps` (Replacement: `wrapGetStaticPropsWithSentry`)
+- `withSentryServerSideGetInitialProps` (Replacement: `wrapGetInitialPropsWithSentry`)
+- `withSentryServerSideAppGetInitialProps` (Replacement: `wrapAppGetInitialPropsWithSentry`)
+- `withSentryServerSideDocumentGetInitialProps` (Replacement: `wrapDocumentGetInitialPropsWithSentry`)
+- `withSentryServerSideErrorGetInitialProps` was renamed to `wrapErrorGetInitialPropsWithSentry`
+- `nextRouterInstrumentation` (Replaced by using `browserTracingIntegration`)
+- `IS_BUILD`
+- `isBuild`
+
 ## Removal of Severity Enum
 
 In v7 we deprecated the `Severity` enum in favor of using the `SeverityLevel` type. In v8 we removed the `Severity`
@@ -11,6 +27,12 @@ enum. If you were using the `Severity` enum, you should replace it with the `Sev
 The `Offline` integration has been removed in favor of the offline transport wrapper:
 http://docs.sentry.io/platforms/javascript/configuration/transports/#offline-caching
 
+## Removal of `enableAnrDetection` and `Anr` class (##10562)
+
+The `enableAnrDetection` and `Anr` class have been removed. See the
+[docs](https://docs.sentry.io/platforms/node/configuration/application-not-responding/) for more details how to migrate
+to `anrIntegration`, the new integration for ANR detection.
+
 ## Other changes
 
 - Remove `spanStatusfromHttpCode` in favour of `getSpanStatusFromHttpCode` (#10361)
@@ -289,6 +311,45 @@ If you are using the `Hub` right now, see the following table on how to migrate
 | endSession()           | `Sentry.endSession()`                                                                |
 | shouldSendDefaultPii() | REMOVED - The closest equivalent is `Sentry.getClient().getOptions().sendDefaultPii` |
 
+The `Hub` constructor is also deprecated and will be removed in the next major version. If you are creating Hubs for
+multi-client use like so:
+
+```ts
+// OLD
+const hub = new Hub();
+hub.bindClient(client);
+makeMain(hub);
+```
+
+instead initialize the client as follows:
+
+```ts
+// NEW
+Sentry.withIsolationScope(() => {
+  Sentry.setCurrentClient(client);
+  client.init();
+});
+```
+
+If you are using the Hub to capture events like so:
+
+```ts
+// OLD
+const client = new Client();
+const hub = new Hub(client);
+hub.captureException();
+```
+
+instead capture isolated events as follows:
+
+```ts
+// NEW
+const client = new Client();
+const scope = new Scope();
+scope.setClient(client);
+scope.captureException();
+```
+
 ## Deprecate `client.setupIntegrations()`
 
 Instead, use the new `client.init()` method. You should probably not use this directly and instead use `Sentry.init()`,

dev-packages/browser-integration-tests/suites/replay/dsc/test.ts

@@ -36,7 +36,7 @@ sentryTest(
 
     await page.evaluate(() => {
       const scope = (window as unknown as TestWindow).Sentry.getCurrentScope();
-      scope.setUser({ id: 'user123', segment: 'segmentB' });
+      scope.setUser({ id: 'user123' });
       scope.addEventProcessor(event => {
         event.transaction = 'testTransactionDSC';
         return event;
@@ -53,7 +53,6 @@ sentryTest(
     expect(envHeader.trace).toBeDefined();
     expect(envHeader.trace).toEqual({
       environment: 'production',
-      user_segment: 'segmentB',
       sample_rate: '1',
       trace_id: expect.any(String),
       public_key: 'public',
@@ -84,7 +83,7 @@ sentryTest(
 
     await page.evaluate(() => {
       const scope = (window as unknown as TestWindow).Sentry.getCurrentScope();
-      scope.setUser({ id: 'user123', segment: 'segmentB' });
+      scope.setUser({ id: 'user123' });
       scope.addEventProcessor(event => {
         event.transaction = 'testTransactionDSC';
         return event;
@@ -101,7 +100,6 @@ sentryTest(
     expect(envHeader.trace).toBeDefined();
     expect(envHeader.trace).toEqual({
       environment: 'production',
-      user_segment: 'segmentB',
       sample_rate: '1',
       trace_id: expect.any(String),
       public_key: 'public',
@@ -144,7 +142,7 @@ sentryTest(
 
     await page.evaluate(() => {
       const scope = (window as unknown as TestWindow).Sentry.getCurrentScope();
-      scope.setUser({ id: 'user123', segment: 'segmentB' });
+      scope.setUser({ id: 'user123' });
       scope.addEventProcessor(event => {
         event.transaction = 'testTransactionDSC';
         return event;
@@ -162,7 +160,6 @@ sentryTest(
     expect(envHeader.trace).toBeDefined();
     expect(envHeader.trace).toEqual({
       environment: 'production',
-      user_segment: 'segmentB',
       sample_rate: '1',
       trace_id: expect.any(String),
       public_key: 'public',
@@ -195,7 +192,7 @@ sentryTest(
 
     await page.evaluate(async () => {
       const scope = (window as unknown as TestWindow).Sentry.getCurrentScope();
-      scope.setUser({ id: 'user123', segment: 'segmentB' });
+      scope.setUser({ id: 'user123' });
       scope.addEventProcessor(event => {
         event.transaction = 'testTransactionDSC';
         return event;
@@ -213,7 +210,6 @@ sentryTest(
     expect(envHeader.trace).toBeDefined();
     expect(envHeader.trace).toEqual({
       environment: 'production',
-      user_segment: 'segmentB',
       sample_rate: '1',
       trace_id: expect.any(String),
       public_key: 'public',

dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/init.js

@@ -12,7 +12,7 @@ Sentry.init({
 });
 
 const scope = Sentry.getCurrentScope();
-scope.setUser({ id: 'user123', segment: 'segmentB' });
+scope.setUser({ id: 'user123' });
 scope.addEventProcessor(event => {
   event.transaction = 'testTransactionDSC';
   return event;

dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts

@@ -22,7 +22,6 @@ sentryTest(
     expect(envHeader.trace).toBeDefined();
     expect(envHeader.trace).toEqual({
       environment: 'production',
-      user_segment: 'segmentB',
       sample_rate: '1',
       transaction: expect.stringContaining('/index.html'),
       trace_id: expect.any(String),

dev-packages/browser-integration-tests/suites/tracing/envelope-header/init.js

@@ -12,7 +12,7 @@ Sentry.init({
 });
 
 const scope = Sentry.getCurrentScope();
-scope.setUser({ id: 'user123', segment: 'segmentB' });
+scope.setUser({ id: 'user123' });
 scope.addEventProcessor(event => {
   event.transaction = 'testTransactionDSC';
   return event;

dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts

@@ -26,7 +26,6 @@ sentryTest(
     expect(envHeader.trace).toBeDefined();
     expect(envHeader.trace).toEqual({
       environment: 'production',
-      user_segment: 'segmentB',
       sample_rate: '1',
       trace_id: expect.any(String),
       public_key: 'public',

dev-packages/e2e-tests/test-applications/create-next-app/pages/api/success.ts

@@ -3,16 +3,7 @@ import * as Sentry from '@sentry/nextjs';
 import type { NextApiRequest, NextApiResponse } from 'next';
 
 export default function handler(req: NextApiRequest, res: NextApiResponse) {
-  // eslint-disable-next-line deprecation/deprecation
-  const transaction = Sentry.startTransaction({ name: 'test-transaction', op: 'e2e-test' });
-  // eslint-disable-next-line deprecation/deprecation
-  Sentry.getCurrentScope().setSpan(transaction);
-
-  // eslint-disable-next-line deprecation/deprecation
-  const span = transaction.startChild();
-
-  span.end();
-  transaction.end();
+  Sentry.startSpan({ name: 'test-span' }, span => undefined);
 
   Sentry.flush().then(() => {
     res.status(200).json({

dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

@@ -60,7 +60,7 @@ const DEPENDENTS: Dependent[] = [
   {
     package: '@sentry/serverless',
     exports: Object.keys(SentryServerless),
-    ignoreExports: ['cron', 'hapiErrorPlugin', 'enableAnrDetection'],
+    ignoreExports: ['cron', 'hapiErrorPlugin'],
   },
   {
     package: '@sentry/sveltekit',

dev-packages/node-integration-tests/suites/anr/basic-session.js

@@ -11,7 +11,7 @@ Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
   debug: true,
-  integrations: [new Sentry.Integrations.Anr({ captureStackTrace: true, anrThreshold: 100 })],
+  integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100 })],
 });
 
 function longWork() {

dev-packages/node-integration-tests/suites/anr/basic.js

@@ -12,7 +12,7 @@ Sentry.init({
   release: '1.0',
   debug: true,
   autoSessionTracking: false,
-  integrations: [new Sentry.Integrations.Anr({ captureStackTrace: true, anrThreshold: 100 })],
+  integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100 })],
 });
 
 function longWork() {

dev-packages/node-integration-tests/suites/anr/basic.mjs

@@ -12,7 +12,7 @@ Sentry.init({
   release: '1.0',
   debug: true,
   autoSessionTracking: false,
-  integrations: [new Sentry.Integrations.Anr({ captureStackTrace: true, anrThreshold: 100 })],
+  integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100 })],
 });
 
 function longWork() {

dev-packages/node-integration-tests/suites/anr/forked.js

@@ -12,7 +12,7 @@ Sentry.init({
   release: '1.0',
   debug: true,
   autoSessionTracking: false,
-  integrations: [new Sentry.Integrations.Anr({ captureStackTrace: true, anrThreshold: 100 })],
+  integrations: [Sentry.anrIntegration({ captureStackTrace: true, anrThreshold: 100 })],
 });
 
 function longWork() {

dev-packages/node-integration-tests/suites/anr/legacy.js

@@ -6,7 +6,7 @@ function configureSentry() {
     release: '1.0',
     debug: true,
     autoSessionTracking: false,
-    integrations: [new Sentry.Integrations.Anr({ captureStackTrace: true })],
+    integrations: [Sentry.anrIntegration({ captureStackTrace: true })],
   });
 }
 

dev-packages/node-integration-tests/suites/anr/should-exit-forced.js

@@ -6,7 +6,7 @@ function configureSentry() {
     release: '1.0',
     debug: true,
     autoSessionTracking: false,
-    integrations: [new Sentry.Integrations.Anr({ captureStackTrace: true })],
+    integrations: [Sentry.anrIntegration({ captureStackTrace: true })],
   });
 }
 

dev-packages/node-integration-tests/suites/anr/should-exit.js

@@ -56,11 +56,6 @@ conditionalTest({ min: 16 })('should report ANR when event loop blocked', () =>
     cleanupChildProcesses();
   });
 
-  // TODO (v8): Remove this old API and this test
-  test('Legacy API', done => {
-    createRunner(__dirname, 'legacy.js').expect({ event: EXPECTED_ANR_EVENT }).start(done);
-  });
-
   test('CJS', done => {
     createRunner(__dirname, 'basic.js').expect({ event: EXPECTED_ANR_EVENT }).start(done);
   });

dev-packages/node-integration-tests/suites/anr/test.ts

@@ -20,7 +20,7 @@ Sentry.init({
   transport: loggingTransport,
 });
 
-Sentry.setUser({ id: 'user123', segment: 'SegmentA' });
+Sentry.setUser({ id: 'user123' });
 
 app.use(Sentry.Handlers.requestHandler());
 app.use(Sentry.Handlers.tracingHandler());

dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts

@@ -15,7 +15,7 @@ test('should attach a baggage header to an outgoing request.', async () => {
     test_data: {
       host: 'somewhere.not.sentry',
       baggage:
-        'sentry-environment=prod,sentry-release=1.0,sentry-user_segment=SegmentA,sentry-public_key=public' +
+        'sentry-environment=prod,sentry-release=1.0,sentry-public_key=public' +
         ',sentry-trace_id=86f39e84263a4de99c326acab3bfe3bd,sentry-sample_rate=1,sentry-transaction=GET%20%2Ftest%2Fexpress' +
         ',sentry-sampled=true',
     },

dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/test.ts

@@ -24,7 +24,7 @@ Sentry.init({
   transport: loggingTransport,
 });
 
-Sentry.setUser({ id: 'user123', segment: 'SegmentA' });
+Sentry.setUser({ id: 'user123' });
 
 app.use(Sentry.Handlers.requestHandler());
 app.use(Sentry.Handlers.tracingHandler());

dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts

@@ -6,6 +6,7 @@ type PackageJson = {
   type?: string;
   nx?: string;
   volta?: any;
+  exports?: Record<string, string | Record<string, string>>;
 };
 
 const buildDir = path.join(process.cwd(), 'build');
@@ -18,6 +19,18 @@ const pkgJson: PackageJson = JSON.parse(fs.readFileSync(pkjJsonPath).toString())
 delete pkgJson.main;
 pkgJson.type = 'module';
 
+pkgJson.exports = {
+  '.': {
+    es2015: './fesm2015/sentry-angular-ivy.js',
+    esm2015: './esm2015/sentry-angular-ivy.js',
+    fesm2015: './fesm2015/sentry-angular-ivy.js',
+    import: './fesm2015/sentry-angular-ivy.js',
+    require: './bundles/sentry-angular-ivy.umd.js',
+    types: './sentry-angular-ivy.d.ts',
+  },
+  './*': './*',
+};
+
 // no need to keep around other properties that are only relevant for our reop:
 delete pkgJson.nx;
 delete pkgJson.volta;

packages/angular-ivy/scripts/prepack.ts

@@ -58,8 +58,6 @@ export {
   defaultIntegrations,
   getDefaultIntegrations,
   defaultStackParser,
-  // eslint-disable-next-line deprecation/deprecation
-  lastEventId,
   flush,
   close,
   getSentryRelease,

packages/astro/src/index.server.ts

@@ -26,9 +26,4 @@ export declare const defaultStackParser: StackParser;
 export declare function close(timeout?: number | undefined): PromiseLike<boolean>;
 export declare function flush(timeout?: number | undefined): PromiseLike<boolean>;
 
-/**
- * @deprecated This function will be removed in the next major version of the Sentry SDK.
- */
-export declare function lastEventId(): string | undefined;
-
 export default sentryAstro;

packages/astro/src/index.types.ts

@@ -42,7 +42,7 @@ export function getTracingMetaTags(
     : dsc
       ? dsc
       : client
-        ? getDynamicSamplingContextFromClient(traceId, client, scope)
+        ? getDynamicSamplingContextFromClient(traceId, client)
         : undefined;
 
   const baggage = dynamicSamplingContextToSentryBaggageHeader(dynamicSamplingContext);

packages/astro/src/server/meta.ts

@@ -42,8 +42,6 @@ export {
   getCurrentScope,
   Hub,
   // eslint-disable-next-line deprecation/deprecation
-  lastEventId,
-  // eslint-disable-next-line deprecation/deprecation
   // eslint-disable-next-line deprecation/deprecation
   makeMain,
   setCurrentClient,