Merge branch 'develop' into fix/fetch-not-release

Author: Lei-k

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

@@ -30,12 +30,10 @@ const useLoader = bundleKey.startsWith('loader');
 const IMPORTED_INTEGRATION_CDN_BUNDLE_PATHS: Record<string, string> = {
   httpClientIntegration: 'httpclient',
   captureConsoleIntegration: 'captureconsole',
-  debugIntegration: 'debug',
   rewriteFramesIntegration: 'rewriteframes',
   contextLinesIntegration: 'contextlines',
   extraErrorDataIntegration: 'extraerrordata',
   reportingObserverIntegration: 'reportingobserver',
-  sessionTimingIntegration: 'sessiontiming',
   feedbackIntegration: 'feedback',
   moduleMetadataIntegration: 'modulemetadata',
 };

dev-packages/e2e-tests/test-applications/react-create-hash-router/src/index.tsx

@@ -41,7 +41,7 @@ Sentry.init({
   debug: !!process.env.DEBUG,
 });
 
-const sentryCreateHashRouter = Sentry.wrapCreateBrowserRouter(createHashRouter);
+const sentryCreateHashRouter = Sentry.wrapCreateBrowserRouterV6(createHashRouter);
 
 const router = sentryCreateHashRouter([
   {

dev-packages/e2e-tests/test-applications/react-router-6-use-routes/src/index.tsx

@@ -39,7 +39,7 @@ Sentry.init({
   tunnel: 'http://localhost:3031', // proxy server
 });
 
-const useSentryRoutes = Sentry.wrapUseRoutes(useRoutes);
+const useSentryRoutes = Sentry.wrapUseRoutesV6(useRoutes);
 
 function App() {
   return useSentryRoutes([

docs/migration/v8-to-v9.md

@@ -92,7 +92,19 @@ It will be removed in a future major version.
 
 ## 4. Removal of Deprecated APIs (TODO)
 
-TODO
+### `@sentry/core` / All SDKs
+
+- The `debugIntegration` has been removed. To log outgoing events, use [Hook Options](https://docs.sentry.io/platforms/javascript/configuration/options/#hooks) (`beforeSend`, `beforeSendTransaction`, ...).
+- The `sessionTimingIntegration` has been removed. To capture session durations alongside events, use [Context](https://docs.sentry.io/platforms/javascript/enriching-events/context/) (`Sentry.setContext()`).
+
+### `@sentry/react`
+
+- The `wrapUseRoutes` method has been removed. Use `wrapUseRoutesV6` or `wrapUseRoutesV7` instead depending on what version of react router you are using.
+- The `wrapCreateBrowserRouter` method has been removed. Use `wrapCreateBrowserRouterV6` or `wrapCreateBrowserRouterV7` depending on what version of react router you are using.
+
+### `@sentry/core`
+
+- The `getNumberOfUrlSegments` method has been removed. There are no replacements.
 
 ## 5. Build Changes
 

packages/astro/src/index.server.ts

@@ -34,8 +34,6 @@ export {
   createTransport,
   cron,
   dataloaderIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  debugIntegration,
   dedupeIntegration,
   DEFAULT_USER_INCLUDES,
   defaultStackParser,
@@ -105,8 +103,6 @@ export {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  // eslint-disable-next-line deprecation/deprecation
-  sessionTimingIntegration,
   setContext,
   setCurrentClient,
   setExtra,

packages/aws-serverless/src/index.ts

@@ -125,13 +125,9 @@ export {
 
 export {
   captureConsoleIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  debugIntegration,
   dedupeIntegration,
   extraErrorDataIntegration,
   rewriteFramesIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  sessionTimingIntegration,
 } from '@sentry/core';
 
 export { awsIntegration } from './integration/aws';

packages/browser/rollup.bundle.config.mjs

@@ -10,7 +10,6 @@ const reexportedPluggableIntegrationFiles = [
   'dedupe',
   'extraerrordata',
   'rewriteframes',
-  'sessiontiming',
   'feedback',
   'modulemetadata',
 ];

packages/browser/src/index.ts

@@ -6,12 +6,8 @@ export { contextLinesIntegration } from './integrations/contextlines';
 
 export {
   captureConsoleIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  debugIntegration,
   extraErrorDataIntegration,
   rewriteFramesIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  sessionTimingIntegration,
   captureFeedback,
 } from '@sentry/core';
 

packages/browser/src/integrations-bundle/index.debug.ts

@@ -1,3 +1 @@
-// eslint-disable-next-line deprecation/deprecation
-export { debugIntegration } from '@sentry/core';
 export { spotlightBrowserIntegration } from '../integrations/spotlight';

packages/browser/src/integrations-bundle/index.sessiontiming.ts

@@ -13,13 +13,11 @@ const LazyLoadableIntegrations = {
   captureConsoleIntegration: 'captureconsole',
   contextLinesIntegration: 'contextlines',
   linkedErrorsIntegration: 'linkederrors',
-  debugIntegration: 'debug',
   dedupeIntegration: 'dedupe',
   extraErrorDataIntegration: 'extraerrordata',
   httpClientIntegration: 'httpclient',
   reportingObserverIntegration: 'reportingobserver',
   rewriteFramesIntegration: 'rewriteframes',
-  sessionTimingIntegration: 'sessiontiming',
   browserProfilingIntegration: 'browserprofiling',
   moduleMetadataIntegration: 'modulemetadata',
 } as const;

packages/browser/src/utils/lazyLoadIntegration.ts

@@ -147,13 +147,9 @@ export {
 
 export {
   captureConsoleIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  debugIntegration,
   dedupeIntegration,
   extraErrorDataIntegration,
   rewriteFramesIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  sessionTimingIntegration,
 } from '@sentry/core';
 
 export type { BunOptions } from './types';

packages/bun/src/index.ts

@@ -74,8 +74,6 @@ export {
   linkedErrorsIntegration,
   requestDataIntegration,
   extraErrorDataIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  debugIntegration,
   dedupeIntegration,
   rewriteFramesIntegration,
   captureConsoleIntegration,

packages/cloudflare/src/index.ts

@@ -96,13 +96,9 @@ export { linkedErrorsIntegration } from './integrations/linkederrors';
 export { moduleMetadataIntegration } from './integrations/metadata';
 export { requestDataIntegration } from './integrations/requestdata';
 export { captureConsoleIntegration } from './integrations/captureconsole';
-// eslint-disable-next-line deprecation/deprecation
-export { debugIntegration } from './integrations/debug';
 export { dedupeIntegration } from './integrations/dedupe';
 export { extraErrorDataIntegration } from './integrations/extraerrordata';
 export { rewriteFramesIntegration } from './integrations/rewriteframes';
-// eslint-disable-next-line deprecation/deprecation
-export { sessionTimingIntegration } from './integrations/sessiontiming';
 export { zodErrorsIntegration } from './integrations/zoderrors';
 export { thirdPartyErrorFilterIntegration } from './integrations/third-party-errors-filter';
 // eslint-disable-next-line deprecation/deprecation

packages/core/src/index.ts

@@ -162,8 +162,7 @@ export {
   parseBaggageHeader,
 } from './baggage';
 
-// eslint-disable-next-line deprecation/deprecation
-export { getNumberOfUrlSegments, getSanitizedUrlString, parseUrl, stripUrlQueryAndFragment } from './url';
+export { getSanitizedUrlString, parseUrl, stripUrlQueryAndFragment } from './url';
 // eslint-disable-next-line deprecation/deprecation
 export { makeFifoCache } from './cache';
 export { eventFromMessage, eventFromUnknownInput, exceptionFromError, parseStackFrames } from './eventbuilder';

packages/core/src/integrations/debug.ts

@@ -48,17 +48,6 @@ export function stripUrlQueryAndFragment(urlPath: string): string {
   return (urlPath.split(/[?#]/, 1) as [string, ...string[]])[0];
 }
 
-/**
- * Returns number of URL segments of a passed string URL.
- *
- * @deprecated This function will be removed in the next major version.
- */
-// TODO(v9): Hoist this function into the places where we use it. (as it stands only react router v6 instrumentation)
-export function getNumberOfUrlSegments(url: string): number {
-  // split at '/' or at '\/' to split regex urls correctly
-  return url.split(/\\?\//).filter(s => s.length > 0 && s !== ',').length;
-}
-
 /**
  * Takes a URL object and returns a sanitized string which is safe to use as span name
  * see: https://develop.sentry.dev/sdk/data-handling/#structuring-data