Refactor current route handling

src/Navigation.tsx

@@ -28,7 +28,6 @@ import {
   storePayloadForAccountSwitch,
 } from '#/lib/hooks/useNotificationHandler'
 import {useWebScrollRestoration} from '#/lib/hooks/useWebScrollRestoration'
-import {logger as notyLogger} from '#/lib/notifications/util'
 import {buildStateObject} from '#/lib/routes/helpers'
 import {
   type AllNavigatorParams,
@@ -38,12 +37,12 @@ import {
   type MessagesTabNavigatorParams,
   type MyProfileTabNavigatorParams,
   type NotificationsTabNavigatorParams,
+  type RouteParams,
   type SearchTabNavigatorParams,
+  type State,
 } from '#/lib/routes/types'
-import {type RouteParams, type State} from '#/lib/routes/types'
+import {logEvent} from '#/lib/statsig/statsig'
-import {attachRouteToLogEvents, logEvent} from '#/lib/statsig/statsig'
 import {bskyTitle} from '#/lib/strings/headings'
-import {logger} from '#/logger'
 import {useUnreadNotifications} from '#/state/queries/notifications/unread'
 import {useSession} from '#/state/session'
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
@@ -137,6 +136,7 @@ import {
   EmailDialogScreenID,
   useEmailDialogControl,
 } from '#/components/dialogs/EmailDialog'
+import {AnalyticsContext, useAnalytics, utils} from '#/analytics'
 import {IS_NATIVE, IS_WEB} from '#/env'
 import {router} from '#/routes'
 import {Referrer} from '../modules/expo-bluesky-swiss-army'
@@ -879,6 +879,8 @@ const LINKING = {
 let lastHandledNotificationDateDedupe: number | undefined
 
 function RoutesContainer({children}: React.PropsWithChildren<{}>) {
+  const ax = useAnalytics()
+  const notyLogger = ax.logger.useContext(ax.logger.Context.Notifications)
   const theme = useColorSchemeStyle(DefaultTheme, DarkTheme)
   const {currentAccount, accounts} = useSession()
   const {onPressSwitchAccount} = useAccountSwitcher()
@@ -945,10 +947,15 @@ function RoutesContainer({children}: React.PropsWithChildren<{}>) {
       const payload = getNotificationPayload(response.notification)
 
       if (payload) {
-        notyLogger.metric(
+        ax.metric(
           'notifications:openApp',
           {reason: payload.reason, causedBoot: true},
-          {statsig: false},
+          {
+            navigation: {
+              previousScreen: prevLoggedRouteName.current,
+              currentScreen: getCurrentRouteName(),
+            },
+          },
         )
 
         if (payload.reason === 'chat-message') {
@@ -984,36 +991,55 @@ function RoutesContainer({children}: React.PropsWithChildren<{}>) {
   }
 
   return (
-    <>
+    <NavigationContainer
-      <NavigationContainer
+      ref={navigationRef}
-        ref={navigationRef}
+      linking={LINKING}
-        linking={LINKING}
+      theme={theme}
-        theme={theme}
+      onStateChange={() => {
-        onStateChange={() => {
+        ax.metric(
-          logger.metric(
+          'router:navigate',
-            'router:navigate',
+          {from: prevLoggedRouteName.current},
-            {from: prevLoggedRouteName.current},
+          {
-            {statsig: false},
+            navigation: {
-          )
+              previousScreen: prevLoggedRouteName.current,
-          prevLoggedRouteName.current = getCurrentRouteName()
+              currentScreen: getCurrentRouteName(),
-        }}
+            },
-        onReady={() => {
+          },
-          attachRouteToLogEvents(getCurrentRouteName)
+        )
-          logModuleInitTime()
+        prevLoggedRouteName.current = getCurrentRouteName()
-          onReady()
+      }}
-          logger.metric('router:navigate', {}, {statsig: false})
+      onReady={() => {
-          handlePushNotificationEntry()
+        logModuleInitTime()
-        }}
+        onReady()
-        // WARNING: Implicit navigation to nested navigators is depreciated in React Navigation 7.x
+        ax.metric(
-        // However, there's a fair amount of places we do that, especially in when popping to the top of stacks.
+          'router:navigate',
-        // See BottomBar.tsx for an example of how to handle nested navigators in the tabs correctly.
+          {},
-        // I'm scared of missing a spot (esp. with push notifications etc) so let's enable this legacy behaviour for now.
+          {
-        // We will need to confirm we handle nested navigators correctly by the time we migrate to React Navigation 8.x
+            navigation: {
-        // -sfn
+              previousScreen: prevLoggedRouteName.current,
-        navigationInChildEnabled>
+              currentScreen: getCurrentRouteName(),
+            },
+          },
+        )
+        handlePushNotificationEntry()
+      }}
+      // WARNING: Implicit navigation to nested navigators is depreciated in React Navigation 7.x
+      // However, there's a fair amount of places we do that, especially in when popping to the top of stacks.
+      // See BottomBar.tsx for an example of how to handle nested navigators in the tabs correctly.
+      // I'm scared of missing a spot (esp. with push notifications etc) so let's enable this legacy behaviour for now.
+      // We will need to confirm we handle nested navigators correctly by the time we migrate to React Navigation 8.x
+      // -sfn
+      navigationInChildEnabled>
+      <AnalyticsContext
+        metadata={utils.useMeta({
+          navigation: {
+            previousScreen: prevLoggedRouteName.current,
+            currentScreen: getCurrentRouteName(),
+          },
+        })}>
         {children}
-      </NavigationContainer>
+      </AnalyticsContext>
-    </>
+    </NavigationContainer>
   )
 }
 

src/analytics/types.ts

@@ -13,6 +13,11 @@ export type BaseMetadata = {
 
 export type GeolocationMetadata = Geolocation
 
+export type NavigationMetadata = {
+  previousScreen?: string
+  currentScreen?: string
+}
+
 export type SessionMetadata = {
   did: string
   isBskyPds: boolean
@@ -24,6 +29,7 @@ export type PreferencesMetadata = {
 }
 
 export type MergeableMetadata = {
+  navigation?: NavigationMetadata
   session?: SessionMetadata
   preferences?: PreferencesMetadata
 }

src/lib/statsig/statsig.tsx

@@ -76,12 +76,6 @@ type FlatJSONRecord = Record<
 
 let getCurrentRouteName: () => string | null | undefined = () => null
 
-export function attachRouteToLogEvents(
-  getRouteName: () => string | null | undefined,
-) {
-  getCurrentRouteName = getRouteName
-}
-
 export function toClout(n: number | null | undefined): number | undefined {
   if (n == null) {
     return undefined