Merge branch 'develop' into metrics-summary

Author: cleptric

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,9 +27,26 @@ 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
 
-## Other changes
+## 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.
+
+## Removal of `Sentry.configureScope` (#10565)
+
+The top level `Sentry.configureScope` function has been removed. Instead, you should use the `Sentry.getCurrentScope()`
+to access and mutate the current scope.
+
+## Deletion of `@sentry/hub` package (#10530)
+
+`@sentry/hub` has been removed. All exports from `@sentry.hub` should be available in `@sentry/core`.
+
+## General API Changes
 
 - Remove `spanStatusfromHttpCode` in favour of `getSpanStatusFromHttpCode` (#10361)
+- Remove deprecated `deepReadDirSync` export from `@sentry/node` (#10564)
+- Remove `_eventFromIncompleteOnError` usage (#10553)
 
 # Deprecations in 7.x
 

dev-packages/browser-integration-tests/suites/public-api/configureScope/clear_scope/subject.js

@@ -7,5 +7,5 @@ document.getElementById('go-background').addEventListener('click', () => {
 
 document.getElementById('start-transaction').addEventListener('click', () => {
   window.transaction = Sentry.startTransaction({ name: 'test-transaction' });
-  Sentry.getCurrentHub().configureScope(scope => scope.setSpan(window.transaction));
+  Sentry.getCurrentScope().setSpan(window.transaction);
 });

dev-packages/browser-integration-tests/suites/public-api/configureScope/clear_scope/test.ts

@@ -7,5 +7,5 @@ document.getElementById('go-background').addEventListener('click', () => {
 
 document.getElementById('start-transaction').addEventListener('click', () => {
   window.transaction = Sentry.startTransaction({ name: 'test-transaction' });
-  Sentry.getCurrentHub().configureScope(scope => scope.setSpan(window.transaction));
+  Sentry.getCurrentScope().setSpan(window.transaction);
 });

dev-packages/browser-integration-tests/suites/public-api/configureScope/init.js

@@ -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/browser-integration-tests/suites/public-api/configureScope/set_properties/subject.js

@@ -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/browser-integration-tests/suites/public-api/configureScope/set_properties/test.ts

@@ -11,7 +11,7 @@ Sentry.init({
   dsn: 'https://[email protected]/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/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-custom/subject.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/browser-integration-tests/suites/tracing/browsertracing/backgroundtab-custom/subject.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/e2e-tests/test-applications/create-next-app/pages/api/success.ts

@@ -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/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts

@@ -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/basic-session.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/basic.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/basic.mjs

@@ -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;

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

@@ -118,7 +118,7 @@ class SentryErrorHandler implements AngularErrorHandler {
     if (this._options.showDialog) {
       const client = Sentry.getClient();
 
-      if (client && client.on && !this._registeredAfterSendEventHandler) {
+      if (client && !this._registeredAfterSendEventHandler) {
         client.on('afterSendEvent', (event: Event) => {
           if (!event.type) {
             // eslint-disable-next-line deprecation/deprecation
@@ -128,7 +128,7 @@ class SentryErrorHandler implements AngularErrorHandler {
 
         // We only want to register this hook once in the lifetime of the error handler
         this._registeredAfterSendEventHandler = true;
-      } else if (!client || !client.on) {
+      } else if (!client) {
         Sentry.showReportDialog({ ...this._options.dialogOptions, eventId });
       }
     }

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

@@ -17,8 +17,6 @@ export {
   captureMessage,
   captureCheckIn,
   withMonitor,
-  // eslint-disable-next-line deprecation/deprecation
-  configureScope,
   createTransport,
   // eslint-disable-next-line deprecation/deprecation
   extractTraceparentData,
@@ -58,8 +56,6 @@ export {
   defaultIntegrations,
   getDefaultIntegrations,
   defaultStackParser,
-  // eslint-disable-next-line deprecation/deprecation
-  lastEventId,
   flush,
   close,
   getSentryRelease,

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

@@ -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;

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

@@ -1,10 +1,11 @@
 import type { BrowserClient } from '@sentry/browser';
 import { getActiveSpan } from '@sentry/browser';
-import { browserTracingIntegration, getCurrentScope } from '@sentry/browser';
+import { browserTracingIntegration } from '@sentry/browser';
 import * as SentryBrowser from '@sentry/browser';
 import { BrowserTracing, SDK_VERSION, WINDOW, getClient } from '@sentry/browser';
 import { vi } from 'vitest';
 
+import { getIsolationScope } from '@sentry/core';
 import { init } from '../../../astro/src/client/sdk';
 
 const browserInit = vi.spyOn(SentryBrowser, 'init');
@@ -38,16 +39,16 @@ describe('Sentry client SDK', () => {
       );
     });
 
-    it('sets the runtime tag on the scope', () => {
-      const currentScope = getCurrentScope();
+    it('sets the runtime tag on the isolation scope', () => {
+      const isolationScope = getIsolationScope();
 
       // @ts-expect-error need access to protected _tags attribute
-      expect(currentScope._tags).toEqual({});
+      expect(isolationScope._tags).toEqual({});
 
       init({ dsn: 'https://[email protected]/1337' });
 
       // @ts-expect-error need access to protected _tags attribute
-      expect(currentScope._tags).toEqual({ runtime: 'browser' });
+      expect(isolationScope._tags).toEqual({ runtime: 'browser' });
     });
 
     describe('automatically adds integrations', () => {

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

@@ -36,16 +36,16 @@ describe('Sentry server SDK', () => {
       );
     });
 
-    it('sets the runtime tag on the scope', () => {
-      const currentScope = SentryNode.getCurrentScope();
+    it('sets the runtime tag on the isolation scope', () => {
+      const isolationScope = SentryNode.getIsolationScope();
 
       // @ts-expect-error need access to protected _tags attribute
-      expect(currentScope._tags).toEqual({});
+      expect(isolationScope._tags).toEqual({});
 
       init({ dsn: 'https://[email protected]/1337' });
 
       // @ts-expect-error need access to protected _tags attribute
-      expect(currentScope._tags).toEqual({ runtime: 'node' });
+      expect(isolationScope._tags).toEqual({ runtime: 'node' });
     });
   });
 });

packages/angular-ivy/scripts/prepack.ts

@@ -37,12 +37,9 @@ functions will not perform any action before you have called `Sentry.init()`:
 import * as Sentry from '@sentry/browser';
 
 // Set user information, as well as tags and further extras
-Sentry.configureScope(scope => {
-  scope.setExtra('battery', 0.7);
-  scope.setTag('user_mode', 'admin');
-  scope.setUser({ id: '4711' });
-  // scope.clear();
-});
+Sentry.setExtra('battery', 0.7);
+Sentry.setTag('user_mode', 'admin');
+Sentry.setUser({ id: '4711' });
 
 // Add a breadcrumb for future events
 Sentry.addBreadcrumb({