Merge remote-tracking branch 'origin/kw-export-ip-address-helpers' into kw-export-ip-address-helpers

Author: krystofwoldrich

dev-packages/e2e-tests/test-applications/create-remix-app-express-legacy/app/entry.server.tsx

@@ -13,7 +13,7 @@ installGlobals();
 
 const ABORT_DELAY = 5_000;
 
-export const handleError = Sentry.wrapRemixHandleError;
+export const handleError = Sentry.sentryHandleError;
 
 export default function handleRequest(
   request: Request,

dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/entry.server.tsx

@@ -13,7 +13,7 @@ installGlobals();
 
 const ABORT_DELAY = 5_000;
 
-export const handleError = Sentry.wrapRemixHandleError;
+export const handleError = Sentry.sentryHandleError;
 
 export default function handleRequest(
   request: Request,

dev-packages/e2e-tests/test-applications/create-remix-app-express/app/entry.server.tsx

@@ -13,7 +13,7 @@ installGlobals();
 
 const ABORT_DELAY = 5_000;
 
-export const handleError = Sentry.wrapRemixHandleError;
+export const handleError = Sentry.sentryHandleError;
 
 export default function handleRequest(
   request: Request,

docs/migration/v8-to-v9.md

@@ -326,7 +326,7 @@ The following outlines deprecations that were introduced in version 8 of the SDK
 
 - **Passing `undefined` to `tracesSampleRate` / `tracesSampler` / `enableTracing` will be handled differently in v9**
 
-In v8, explicitly setting `tracesSampleRate` (even if it is set to `undefined`) will result in tracing being _enabled_, although no spans will be generated.
+In v8, explicitly setting `tracesSampleRate` (even if it is set to `undefined`) resulted in tracing being _enabled_, although no spans were generated.
 
 ```ts
 Sentry.init({
@@ -338,6 +338,8 @@ In v9, we will streamline this behavior so that passing `undefined` will result
 
 If you are relying on `undefined` being passed in and having tracing enabled because of this, you should update your config to set e.g. `tracesSampleRate: 0` instead, which will also enable tracing in v9.
 
+The `enableTracing` option was removed. In v9, to emulate `enableTracing: true`, set `tracesSampleRate: 1`. To emulate `enableTracing: false`, remove the `tracesSampleRate` and `tracesSampler` options (if configured).
+
 - **The `autoSessionTracking` option is deprecated.**
 
 To enable session tracking, it is recommended to unset `autoSessionTracking` and ensure that either, in browser environments the `browserSessionIntegration` is added, or in server environments the `httpIntegration` is added.

packages/astro/test/client/sdk.test.ts

@@ -52,7 +52,6 @@ describe('Sentry client SDK', () => {
       it.each([
         ['tracesSampleRate', { tracesSampleRate: 0 }],
         ['tracesSampler', { tracesSampler: () => 1.0 }],
-        ['enableTracing', { enableTracing: true }],
         ['no tracing option set', {}],
       ])('adds browserTracingIntegration if tracing is enabled via %s', (_, tracingOptions) => {
         init({
@@ -72,7 +71,7 @@ describe('Sentry client SDK', () => {
 
         init({
           dsn: 'https://[email protected]/1337',
-          enableTracing: true,
+          tracesSampleRate: 1,
         });
 
         const integrationsToInit = browserInit.mock.calls[0]![0]?.defaultIntegrations || [];
@@ -90,7 +89,7 @@ describe('Sentry client SDK', () => {
           integrations: [
             browserTracingIntegration({ finalTimeout: 10, instrumentNavigation: false, instrumentPageLoad: false }),
           ],
-          enableTracing: true,
+          tracesSampleRate: 1,
         });
 
         const browserTracing = getClient<BrowserClient>()?.getIntegrationByName('BrowserTracing');

packages/browser-utils/src/metrics/web-vitals/types/base.ts

@@ -104,15 +104,6 @@ export type MetricWithAttribution =
  */
 export type MetricRatingThresholds = [number, number];
 
-/**
- * @deprecated Use metric-specific function types instead, such as:
- * `(metric: LCPMetric) => void`. If a single callback type is needed for
- * multiple metrics, use `(metric: MetricType) => void`.
- */
-export interface ReportCallback {
-  (metric: MetricType): void;
-}
-
 export interface ReportOpts {
   reportAllChanges?: boolean;
   durationThreshold?: number;

packages/browser/src/index.ts

@@ -39,8 +39,6 @@ export {
 } from './tracing/browserTracingIntegration';
 export type { RequestInstrumentationOptions } from './tracing/request';
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  addTracingExtensions,
   registerSpanErrorInstrumentation,
   getActiveSpan,
   getRootSpan,

packages/cloudflare/test/integrations/fetch.test.ts

@@ -26,7 +26,6 @@ describe('WinterCGFetch instrumentation', () => {
 
     client = new FakeClient({
       dsn: 'https://[email protected]/1337',
-      enableTracing: true,
       tracesSampleRate: 1,
       integrations: [],
       transport: () => ({

packages/core/src/client.ts

@@ -1111,11 +1111,13 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
 /**
  * @deprecated Use `Client` instead. This alias may be removed in a future major version.
  */
+// TODO(v10): Remove
 export type BaseClient = Client;
 
 /**
  * @deprecated Use `Client` instead. This alias may be removed in a future major version.
  */
+// TODO(v10): Remove
 export const BaseClient = Client;
 
 /**

packages/core/src/fetch.ts

@@ -1,5 +1,3 @@
-import type { Client } from './client';
-import type { Scope } from './scope';
 import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from './semanticAttributes';
 import { SPAN_STATUS_ERROR, setHttpStatus, startInactiveSpan } from './tracing';
 import { SentryNonRecordingSpan } from './tracing/sentryNonRecordingSpan';
@@ -201,27 +199,6 @@ function _addTracingHeadersToFetchRequest(
   }
 }
 
-/**
- * Adds sentry-trace and baggage headers to the various forms of fetch headers.
- *
- * @deprecated This function will not be exported anymore in v9.
- */
-export function addTracingHeadersToFetchRequest(
-  request: string | unknown,
-  _client: Client | undefined,
-  _scope: Scope | undefined,
-  fetchOptionsObj: {
-    headers?:
-      | {
-          [key: string]: string[] | string | undefined;
-        }
-      | PolymorphicRequestHeaders;
-  },
-  span?: Span,
-): PolymorphicRequestHeaders | undefined {
-  return _addTracingHeadersToFetchRequest(request as Request, fetchOptionsObj, span);
-}
-
 function getFullURL(url: string): string | undefined {
   try {
     const parsed = new URL(url);