ref: Navigation Integrations with new function style (#4003)

CHANGELOG.md

@@ -39,6 +39,44 @@
   });
   ```
 
+- New React Navigation Integration interface ([#4003](https://github.com/getsentry/sentry-react-native/pull/4003))
+
+  ```js
+  import Sentry from '@sentry/react-native';
+  import { NavigationContainer } from '@react-navigation/native';
+
+  const reactNavigationIntegration = Sentry.reactNavigationIntegration();
+
+  Sentry.init({
+    tracesSampleRate: 1.0,
+    integrations: [reactNavigationIntegration],
+  });
+
+  function RootComponent() {
+    const navigation = React.useRef(null);
+
+    return <NavigationContainer ref={navigation}
+      onReady={() => {
+        reactNavigationIntegration.registerNavigationContainer(navigation);
+      }}>
+    </NavigationContainer>;
+  }
+  ```
+
+- New React Native Navigation Integration interface ([#4003](https://github.com/getsentry/sentry-react-native/pull/4003))
+
+  ```js
+  import Sentry from '@sentry/react-native';
+  import { Navigation } from 'react-native-navigation';
+
+  Sentry.init({
+    tracesSampleRate: 1.0,
+    integrations: [
+      Sentry.reactNativeNavigationIntegration({ navigation: Navigation })
+    ],
+  });
+  ```
+
 ### Features
 
 - `TimeToInitialDisplay` and `TimeToFullDisplay` start the time to display spans on mount ([#4020](https://github.com/getsentry/sentry-react-native/pull/4020))

samples/expo/app/_layout.tsx

@@ -21,7 +21,7 @@ LogBox.ignoreAllLogs();
 // Prevent the splash screen from auto-hiding before asset loading is complete.
 SplashScreen.preventAutoHideAsync();
 
-const routingInstrumentation = new Sentry.ReactNavigationInstrumentation({
+const navigationIntegration = Sentry.reactNavigationIntegration({
   enableTimeToInitialDisplay: !isExpoGo(), // This is not supported in Expo Go.
 });
 
@@ -54,9 +54,8 @@ process.env.EXPO_SKIP_DURING_EXPORT !== 'true' && Sentry.init({
         // default: [/.*/]
         failedRequestTargets: [/.*/],
       }),
-      Sentry.reactNativeTracingIntegration({
-        routingInstrumentation,
-      }),
+      navigationIntegration,
+      Sentry.reactNativeTracingIntegration(),
     );
     return integrations.filter(i => i.name !== 'Dedupe');
   },
@@ -91,7 +90,7 @@ function RootLayout() {
 
   useEffect(() => {
     if (ref) {
-      routingInstrumentation.registerNavigationContainer(ref);
+      navigationIntegration.registerNavigationContainer(ref);
     }
   }, [ref]);
 

samples/react-native/src/App.tsx

@@ -38,11 +38,11 @@ LogBox.ignoreAllLogs();
 
 const isMobileOs = Platform.OS === 'android' || Platform.OS === 'ios';
 
-const reactNavigationInstrumentation =
-  new Sentry.ReactNavigationInstrumentation({
-    routeChangeTimeoutMs: 500, // How long it will wait for the route change to complete. Default is 1000ms
-    enableTimeToInitialDisplay: isMobileOs,
-  });
+const reactNavigationIntegration = Sentry.reactNavigationIntegration({
+  routeChangeTimeoutMs: 500, // How long it will wait for the route change to complete. Default is 1000ms
+  enableTimeToInitialDisplay: isMobileOs,
+  ignoreEmptyBackNavigationTransactions: true,
+});
 
 Sentry.init({
   // Replace the example DSN below with your own DSN:
@@ -66,11 +66,10 @@ Sentry.init({
   },
   integrations(integrations) {
     integrations.push(
+      reactNavigationIntegration,
       Sentry.reactNativeTracingIntegration({
         // The time to wait in ms until the transaction will be finished, For testing, default is 1000 ms
         idleTimeoutMs: 5_000,
-        routingInstrumentation: reactNavigationInstrumentation,
-        ignoreEmptyBackNavigationTransactions: true,
       }),
       Sentry.httpClientIntegration({
         // These options are effective only in JS.
@@ -183,7 +182,7 @@ function BottomTabs() {
     <NavigationContainer
       ref={navigation}
       onReady={() => {
-        reactNavigationInstrumentation.registerNavigationContainer(navigation);
+        reactNavigationIntegration.registerNavigationContainer(navigation);
       }}>
       <Tab.Navigator
         screenOptions={{

src/js/client.ts

@@ -14,12 +14,10 @@ import type {
 import { dateTimestampInSeconds, logger, SentryError } from '@sentry/utils';
 import { Alert } from 'react-native';
 
-import { createIntegration } from './integrations/factory';
 import { defaultSdkInfo } from './integrations/sdkinfo';
 import type { ReactNativeClientOptions } from './options';
 import type { mobileReplayIntegration } from './replay/mobilereplay';
 import { MOBILE_REPLAY_INTEGRATION_NAME } from './replay/mobilereplay';
-import { getReactNativeTracingIntegration } from './tracing/reactnativetracing';
 import { createUserFeedbackEnvelope, items } from './utils/envelope';
 import { ignoreRequireCycleLogs } from './utils/ignorerequirecyclelogs';
 import { mergeOutcomes } from './utils/outcome';
@@ -136,18 +134,6 @@ export class ReactNativeClient extends BaseClient<ReactNativeClientOptions> {
     this._initNativeSdk();
   }
 
-  /**
-   * @inheritdoc
-   */
-  protected _setupIntegrations(): void {
-    super._setupIntegrations();
-    const tracing = getReactNativeTracingIntegration(this);
-    const routingName = tracing?.options?.routingInstrumentation?.name;
-    if (routingName) {
-      this.addIntegration(createIntegration(routingName));
-    }
-  }
-
   /**
    * Starts native client with dsn and options
    */

src/js/index.ts

@@ -59,15 +59,18 @@ export { TouchEventBoundary, withTouchEventBoundary } from './touchevents';
 
 export {
   reactNativeTracingIntegration,
-  ReactNavigationV5Instrumentation,
-  ReactNavigationInstrumentation,
-  ReactNativeNavigationInstrumentation,
-  RoutingInstrumentation,
+  getCurrentReactNativeTracingIntegration,
+  getReactNativeTracingIntegration,
+  reactNavigationIntegration,
+  reactNativeNavigationIntegration,
   sentryTraceGesture,
   TimeToInitialDisplay,
   TimeToFullDisplay,
   startTimeToInitialDisplaySpan,
   startTimeToFullDisplaySpan,
+  startIdleNavigationSpan,
+  startIdleSpan,
+  getDefaultIdleNavigationSpanOptions,
 } from './tracing';
 
 export type { TimeToDisplayProps } from './tracing';

src/js/tracing/index.ts

@@ -1,18 +1,15 @@
 export {
   reactNativeTracingIntegration,
   INTEGRATION_NAME as REACT_NATIVE_TRACING_INTEGRATION_NAME,
+  getCurrentReactNativeTracingIntegration,
+  getReactNativeTracingIntegration,
 } from './reactnativetracing';
 export type { ReactNativeTracingIntegration } from './reactnativetracing';
 
-export type { RoutingInstrumentationInstance } from './routingInstrumentation';
-export { RoutingInstrumentation } from './routingInstrumentation';
+export { reactNavigationIntegration } from './reactnavigation';
+export { reactNativeNavigationIntegration } from './reactnativenavigation';
 
-export {
-  ReactNavigationInstrumentation,
-  // eslint-disable-next-line deprecation/deprecation
-  ReactNavigationV5Instrumentation,
-} from './reactnavigation';
-export { ReactNativeNavigationInstrumentation } from './reactnativenavigation';
+export { startIdleNavigationSpan, startIdleSpan, getDefaultIdleNavigationSpanOptions } from './span';
 
 export type { ReactNavigationCurrentRoute, ReactNavigationRoute } from './types';
 

src/js/tracing/integrations/appStart.ts

@@ -22,7 +22,6 @@ import {
   APP_START_WARM as APP_START_WARM_OP,
   UI_LOAD as UI_LOAD_OP,
 } from '../ops';
-import { getReactNativeTracingIntegration } from '../reactnativetracing';
 import { SEMANTIC_ATTRIBUTE_SENTRY_OP } from '../semanticAttributes';
 import { createChildSpanJSON, createSpanJSON, getBundleStartTimestampMs } from '../utils';
 
@@ -97,7 +96,7 @@ export function _clearRootComponentCreationTimestampMs(): void {
  * Adds AppStart spans from the native layer to the transaction event.
  */
 export const appStartIntegration = ({
-  standalone: standaloneUserOption,
+  standalone = false,
 }: {
   /**
    * Should the integration send App Start as a standalone root span (transaction)?
@@ -108,7 +107,6 @@ export const appStartIntegration = ({
   standalone?: boolean;
 } = {}): AppStartIntegration => {
   let _client: Client | undefined = undefined;
-  let standalone = standaloneUserOption;
   let isEnabled = true;
   let appStartDataFlushed = false;
 
@@ -123,11 +121,8 @@ export const appStartIntegration = ({
     }
   };
 
-  const afterAllSetup = (client: Client): void => {
-    if (standaloneUserOption === undefined) {
-      // If not user defined, set based on the routing instrumentation presence
-      standalone = !getReactNativeTracingIntegration(client)?.options.routingInstrumentation;
-    }
+  const afterAllSetup = (_client: Client): void => {
+    // TODO: automatically set standalone based on the presence of the native layer navigation integration
   };
 
   const processEvent = async (event: Event): Promise<Event> => {

src/js/tracing/onSpanEndUtils.ts

@@ -7,7 +7,7 @@ import { AppState } from 'react-native';
 import { isRootSpan, isSentrySpan } from '../utils/span';
 
 /**
- *
+ * Hooks on span end event to execute a callback when the span ends.
  */
 export function onThisSpanEnd(client: Client, span: Span, callback: (span: Span) => void): void {
   client.on('spanEnd', (endedSpan: Span) => {
@@ -44,7 +44,18 @@ export const adjustTransactionDuration = (client: Client, span: Span, maxDuratio
     }
   });
 };
-export const ignoreEmptyBackNavigation = (client: Client, span: Span): void => {
+
+export const ignoreEmptyBackNavigation = (client: Client | undefined, span: Span): void => {
+  if (!client) {
+    logger.warn('Could not hook on spanEnd event because client is not defined.');
+    return;
+  }
+
+  if (!span) {
+    logger.warn('Could not hook on spanEnd event because span is not defined.');
+    return;
+  }
+
   if (!isRootSpan(span) || !isSentrySpan(span)) {
     logger.warn('Not sampling empty back spans only works for Sentry Transactions (Root Spans).');
     return;
@@ -70,7 +81,7 @@ export const ignoreEmptyBackNavigation = (client: Client, span: Span): void => {
     if (filtered.length <= 0) {
       // filter children must include at least one span not created by the navigation automatic instrumentation
       logger.log(
-        '[ReactNativeTracing] Not sampling transaction as route has been seen before. Pass ignoreEmptyBackNavigationTransactions = false to disable this feature.',
+        'Not sampling transaction as route has been seen before. Pass ignoreEmptyBackNavigationTransactions = false to disable this feature.',
       );
       // Route has been seen before and has no child spans.
       span['_sampled'] = false;