expo-observe 56.0.7 → 56.0.8

package/android/src/main/java/expo/modules/observe/OpenTelemetry.kt

@@ -191,7 +191,8 @@ private val metricNameMap = mapOf(
   (MetricCategory.Updates.categoryName to "updateDownloadTime") to "expo.updates.download_time",
 
   // Navigation
-  (MetricCategory.Navigation.categoryName to "ttr") to "expo.navigation.ttr",
+  (MetricCategory.Navigation.categoryName to "cold_ttr") to "expo.navigation.cold_ttr",
+  (MetricCategory.Navigation.categoryName to "warm_ttr") to "expo.navigation.warm_ttr",
   (MetricCategory.Navigation.categoryName to "tti") to "expo.navigation.tti"
 )
 

package/build/integrations/expo-router/ObserveRouterIntegrationProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObserveRouterIntegrationProvider.d.ts","sourceRoot":"","sources":["../../../src/integrations/expo-router/ObserveRouterIntegrationProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,iBAAiB,EAA+B,MAAM,OAAO,CAAC;AAI3F,OAAO,EAAkC,KAAK,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE1F,eAAO,MAAM,+BAA+B,0DAAuD,CAAC;AAEpG,wBAAgB,gCAAgC,CAAC,EAAE,QAAQ,EAAE,EAAE,iBAAiB,2CAsB/E"}
+{"version":3,"file":"ObserveRouterIntegrationProvider.d.ts","sourceRoot":"","sources":["../../../src/integrations/expo-router/ObserveRouterIntegrationProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,iBAAiB,EAA+B,MAAM,OAAO,CAAC;AAI3F,OAAO,EAAkC,KAAK,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE1F,eAAO,MAAM,+BAA+B,0DAAuD,CAAC;AAEpG,wBAAgB,gCAAgC,CAAC,EAAE,QAAQ,EAAE,EAAE,iBAAiB,2CAuB/E"}

package/build/integrations/expo-router/ObserveRouterIntegrationProvider.js

@@ -6,15 +6,16 @@ import { createRouterIntegrationStorage } from './storage';
 export const ObserveRouterIntegrationContext = createContext(null);
 export function ObserveRouterIntegrationProvider({ children }) {
     const [storage] = useState(() => isInitialized() ? createRouterIntegrationStorage() : null);
+    const [listenersCleanup] = useState(() => {
+        if (!storage || !optionalRouter)
+            return;
+        return initListeners(storage, optionalRouter.unstable_navigationEvents);
+    });
     const prevInitialized = useRef(isInitialized());
     if (prevInitialized.current !== isInitialized()) {
         throw new Error(`[expo-observe] Router integration was ${isInitialized() ? 'enabled' : 'disabled'} after application mounted. Call ExpoObserve.configure() before mounting AppMetricsRoot.`);
     }
-    useEffect(() => {
-        if (!storage || !optionalRouter)
-            return;
-        return initListeners(storage, optionalRouter.unstable_navigationEvents);
-    }, [storage]);
+    useEffect(() => listenersCleanup, [listenersCleanup]);
     return (_jsx(ObserveRouterIntegrationContext.Provider, { value: storage, children: children }));
 }
 //# sourceMappingURL=ObserveRouterIntegrationProvider.js.map

package/build/integrations/expo-router/ObserveRouterIntegrationProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ObserveRouterIntegrationProvider.js","sourceRoot":"","sources":["../../../src/integrations/expo-router/ObserveRouterIntegrationProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAA0B,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE3F,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,8BAA8B,EAAiC,MAAM,WAAW,CAAC;AAE1F,MAAM,CAAC,MAAM,+BAA+B,GAAG,aAAa,CAAkC,IAAI,CAAC,CAAC;AAEpG,MAAM,UAAU,gCAAgC,CAAC,EAAE,QAAQ,EAAqB;IAC9E,MAAM,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAkC,GAAG,EAAE,CAC/D,aAAa,EAAE,CAAC,CAAC,CAAC,8BAA8B,EAAE,CAAC,CAAC,CAAC,IAAI,CAC1D,CAAC;IAEF,MAAM,eAAe,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;IAChD,IAAI,eAAe,CAAC,OAAO,KAAK,aAAa,EAAE,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CACb,yCAAyC,aAAa,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,0FAA0F,CAC5K,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,OAAO,IAAI,CAAC,cAAc;YAAE,OAAO;QACxC,OAAO,aAAa,CAAC,OAAO,EAAE,cAAc,CAAC,yBAAyB,CAAC,CAAC;IAC1E,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,OAAO,CACL,KAAC,+BAA+B,CAAC,QAAQ,IAAC,KAAK,EAAE,OAAO,YACrD,QAAQ,GACgC,CAC5C,CAAC;AACJ,CAAC","sourcesContent":["import { createContext, type PropsWithChildren, useEffect, useRef, useState } from 'react';\n\nimport { initListeners, isInitialized } from './init';\nimport { optionalRouter } from './router';\nimport { createRouterIntegrationStorage, type RouterIntegrationStorage } from './storage';\n\nexport const ObserveRouterIntegrationContext = createContext<RouterIntegrationStorage | null>(null);\n\nexport function ObserveRouterIntegrationProvider({ children }: PropsWithChildren) {\n  const [storage] = useState<RouterIntegrationStorage | null>(() =>\n    isInitialized() ? createRouterIntegrationStorage() : null\n  );\n\n  const prevInitialized = useRef(isInitialized());\n  if (prevInitialized.current !== isInitialized()) {\n    throw new Error(\n      `[expo-observe] Router integration was ${isInitialized() ? 'enabled' : 'disabled'} after application mounted. Call ExpoObserve.configure() before mounting AppMetricsRoot.`\n    );\n  }\n\n  useEffect(() => {\n    if (!storage || !optionalRouter) return;\n    return initListeners(storage, optionalRouter.unstable_navigationEvents);\n  }, [storage]);\n\n  return (\n    <ObserveRouterIntegrationContext.Provider value={storage}>\n      {children}\n    </ObserveRouterIntegrationContext.Provider>\n  );\n}\n"]}
+{"version":3,"file":"ObserveRouterIntegrationProvider.js","sourceRoot":"","sources":["../../../src/integrations/expo-router/ObserveRouterIntegrationProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAA0B,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE3F,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,8BAA8B,EAAiC,MAAM,WAAW,CAAC;AAE1F,MAAM,CAAC,MAAM,+BAA+B,GAAG,aAAa,CAAkC,IAAI,CAAC,CAAC;AAEpG,MAAM,UAAU,gCAAgC,CAAC,EAAE,QAAQ,EAAqB;IAC9E,MAAM,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAkC,GAAG,EAAE,CAC/D,aAAa,EAAE,CAAC,CAAC,CAAC,8BAA8B,EAAE,CAAC,CAAC,CAAC,IAAI,CAC1D,CAAC;IACF,MAAM,CAAC,gBAAgB,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE;QACvC,IAAI,CAAC,OAAO,IAAI,CAAC,cAAc;YAAE,OAAO;QACxC,OAAO,aAAa,CAAC,OAAO,EAAE,cAAc,CAAC,yBAAyB,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;IAChD,IAAI,eAAe,CAAC,OAAO,KAAK,aAAa,EAAE,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CACb,yCAAyC,aAAa,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,0FAA0F,CAC5K,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAEtD,OAAO,CACL,KAAC,+BAA+B,CAAC,QAAQ,IAAC,KAAK,EAAE,OAAO,YACrD,QAAQ,GACgC,CAC5C,CAAC;AACJ,CAAC","sourcesContent":["import { createContext, type PropsWithChildren, useEffect, useRef, useState } from 'react';\n\nimport { initListeners, isInitialized } from './init';\nimport { optionalRouter } from './router';\nimport { createRouterIntegrationStorage, type RouterIntegrationStorage } from './storage';\n\nexport const ObserveRouterIntegrationContext = createContext<RouterIntegrationStorage | null>(null);\n\nexport function ObserveRouterIntegrationProvider({ children }: PropsWithChildren) {\n  const [storage] = useState<RouterIntegrationStorage | null>(() =>\n    isInitialized() ? createRouterIntegrationStorage() : null\n  );\n  const [listenersCleanup] = useState(() => {\n    if (!storage || !optionalRouter) return;\n    return initListeners(storage, optionalRouter.unstable_navigationEvents);\n  });\n\n  const prevInitialized = useRef(isInitialized());\n  if (prevInitialized.current !== isInitialized()) {\n    throw new Error(\n      `[expo-observe] Router integration was ${isInitialized() ? 'enabled' : 'disabled'} after application mounted. Call ExpoObserve.configure() before mounting AppMetricsRoot.`\n    );\n  }\n\n  useEffect(() => listenersCleanup, [listenersCleanup]);\n\n  return (\n    <ObserveRouterIntegrationContext.Provider value={storage}>\n      {children}\n    </ObserveRouterIntegrationContext.Provider>\n  );\n}\n"]}

package/build/integrations/expo-router/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/integrations/expo-router/init.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAS1D,eAAO,MAAM,aAAa,eAAoB,CAAC;AAE/C,wBAAgB,qBAAqB,SAGpC;AAED,KAAK,gBAAgB,GAAG,WAAW,CAAC,OAAO,cAAc,CAAC,CAAC,2BAA2B,CAAC,CAAC;AAExF,wBAAgB,aAAa,CAC3B,OAAO,EAAE,wBAAwB,EACjC,gBAAgB,EAAE,gBAAgB,GACjC,MAAM,IAAI,CAyEZ"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/integrations/expo-router/init.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAS1D,eAAO,MAAM,aAAa,eAAoB,CAAC;AAE/C,wBAAgB,qBAAqB,SAGpC;AAED,KAAK,gBAAgB,GAAG,WAAW,CAAC,OAAO,cAAc,CAAC,CAAC,2BAA2B,CAAC,CAAC;AAExF,wBAAgB,aAAa,CAC3B,OAAO,EAAE,wBAAwB,EACjC,gBAAgB,EAAE,gBAAgB,GACjC,MAAM,IAAI,CAgFZ"}

package/build/integrations/expo-router/init.js

@@ -15,7 +15,6 @@ export function initListeners(storage, navigationEvents) {
     const appLaunchTime = performance.now();
     const cleanup = new Set();
     const unsubscribeAction = navigationEvents.addListener('actionDispatched', (event) => {
-        // TODO(@ubax): Handle screen preloading
         // PRELOAD comes from router.prefetch() — a route warm-up, not a user
         // navigation — so it must not seed dispatchTime.
         if (event.actionType === 'PRELOAD')
@@ -26,6 +25,12 @@ export function initListeners(storage, navigationEvents) {
         });
     });
     cleanup.add(unsubscribeAction);
+    const unsubscribePreload = navigationEvents.addListener('pagePreloaded', (e) => {
+        // The screen rendered as part of a preload. Mark it as already rendered so
+        // the eventual `pageFocused` resolves to `warm_ttr` rather than `cold_ttr`.
+        storage.renderedScreensIds.add(e.screenId);
+    });
+    cleanup.add(unsubscribePreload);
     const unsubscribeFocus = navigationEvents.addListener('pageFocused', async (e) => {
         // Snapshot both clocks once so every metric written below is stamped with
         // the moment the focus event fired, not the moment `addCustomMetricToSession`
@@ -34,6 +39,7 @@ export function initListeners(storage, navigationEvents) {
         const timestamp = new Date().toISOString();
         const isInitial = !storage.renderedScreensIds.has(e.screenId);
         storage.renderedScreensIds.add(e.screenId);
+        const name = isInitial ? 'cold_ttr' : 'warm_ttr';
         const mainSessionId = (await AppMetrics.getMainSession())?.id;
         if (!mainSessionId) {
             return;
@@ -46,10 +52,10 @@ export function initListeners(storage, navigationEvents) {
                 sessionId: mainSessionId,
                 timestamp,
                 category: 'navigation',
-                name: 'ttr',
+                name,
                 routeName: e.pathname,
                 value: appLaunchTtrSeconds,
-                params: { isInitial, isAppLaunch: true, routeParams: e.params },
+                params: { isAppLaunch: true, routeParams: e.params },
             });
             return;
         }
@@ -66,10 +72,10 @@ export function initListeners(storage, navigationEvents) {
                 sessionId: mainSessionId,
                 timestamp,
                 category: 'navigation',
-                name: 'ttr',
+                name,
                 routeName: e.pathname,
                 value: (now - dispatchTime) / 1000,
-                params: { isInitial, isAppLaunch: false, routeParams: e.params },
+                params: { isAppLaunch: false, routeParams: e.params },
             });
         }
         storage.pendingActions.length = 0;

package/build/integrations/expo-router/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/integrations/expo-router/init.ts"],"names":[],"mappings":"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","sourcesContent":["import AppMetrics from 'expo-app-metrics';\n\nimport { optionalRouter } from './router';\nimport { type RouterIntegrationStorage } from './storage';\n\n// TODO(@ubax): split this module into `.native.ts` / `.web.ts` variants so the\n// web bundle doesn't pull in `expo-app-metrics`' native bridge calls. The web\n// version should be an explicit no-op (return a noop cleanup) rather than\n// relying on the web stubs in `expo-app-metrics/module.web.ts`.\n\nlet initialized = false;\n\nexport const isInitialized = () => initialized;\n\nexport function initRouterIntegration() {\n  initialized = true;\n  optionalRouter?.unstable_navigationEvents.enable();\n}\n\ntype NavigationEvents = NonNullable<typeof optionalRouter>['unstable_navigationEvents'];\n\nexport function initListeners(\n  storage: RouterIntegrationStorage,\n  navigationEvents: NavigationEvents\n): () => void {\n  const appLaunchTime = performance.now();\n  const cleanup = new Set<() => void>();\n\n  const unsubscribeAction = navigationEvents.addListener('actionDispatched', (event) => {\n    // TODO(@ubax): Handle screen preloading\n    // PRELOAD comes from router.prefetch() — a route warm-up, not a user\n    // navigation — so it must not seed dispatchTime.\n    if (event.actionType === 'PRELOAD') return;\n    storage.pendingActions.push({\n      actionType: event.actionType,\n      dispatchTime: performance.now(),\n    });\n  });\n  cleanup.add(unsubscribeAction);\n\n  const unsubscribeFocus = navigationEvents.addListener('pageFocused', async (e) => {\n    // Snapshot both clocks once so every metric written below is stamped with\n    // the moment the focus event fired, not the moment `addCustomMetricToSession`\n    // happens to run after the awaited `getMainSession()` round-trip.\n    const now = performance.now();\n    const timestamp = new Date().toISOString();\n    const isInitial = !storage.renderedScreensIds.has(e.screenId);\n    storage.renderedScreensIds.add(e.screenId);\n    const mainSessionId = (await AppMetrics.getMainSession())?.id;\n    if (!mainSessionId) {\n      return;\n    }\n\n    if (!storage.hasRecordedInitialTtr) {\n      // Stored in seconds to match the OTel `unit = \"s\"` convention\n      const appLaunchTtrSeconds = (now - appLaunchTime) / 1000;\n      storage.hasRecordedInitialTtr = true;\n      AppMetrics.addCustomMetricToSession({\n        sessionId: mainSessionId,\n        timestamp,\n        category: 'navigation',\n        name: 'ttr',\n        routeName: e.pathname,\n        value: appLaunchTtrSeconds,\n        params: { isInitial, isAppLaunch: true, routeParams: e.params },\n      });\n      return;\n    }\n\n    if (storage.pendingActions.length === 0) return;\n\n    const last = storage.pendingActions[storage.pendingActions.length - 1];\n    if (last) {\n      const dispatchTime = last.dispatchTime;\n      storage.screenTimes[e.screenId] = {\n        ...storage.screenTimes[e.screenId],\n        dispatchTime,\n      };\n\n      AppMetrics.addCustomMetricToSession({\n        sessionId: mainSessionId,\n        timestamp,\n        category: 'navigation',\n        name: 'ttr',\n        routeName: e.pathname,\n        value: (now - dispatchTime) / 1000,\n        params: { isInitial, isAppLaunch: false, routeParams: e.params },\n      });\n    }\n    storage.pendingActions.length = 0;\n  });\n  cleanup.add(unsubscribeFocus);\n\n  return () => {\n    cleanup.forEach((c) => c());\n    cleanup.clear();\n  };\n}\n"]}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/integrations/expo-router/init.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAiC,MAAM,WAAW,CAAC;AAE1D,+EAA+E;AAC/E,8EAA8E;AAC9E,0EAA0E;AAC1E,gEAAgE;AAEhE,IAAI,WAAW,GAAG,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC;AAE/C,MAAM,UAAU,qBAAqB;IACnC,WAAW,GAAG,IAAI,CAAC;IACnB,cAAc,EAAE,yBAAyB,CAAC,MAAM,EAAE,CAAC;AACrD,CAAC;AAID,MAAM,UAAU,aAAa,CAC3B,OAAiC,EACjC,gBAAkC;IAElC,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IACxC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAc,CAAC;IAEtC,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,WAAW,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE;QACnF,qEAAqE;QACrE,iDAAiD;QACjD,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS;YAAE,OAAO;QAC3C,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC;YAC1B,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,YAAY,EAAE,WAAW,CAAC,GAAG,EAAE;SAChC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAE/B,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE;QAC7E,2EAA2E;QAC3E,4EAA4E;QAC5E,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAEhC,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC/E,0EAA0E;QAC1E,8EAA8E;QAC9E,kEAAkE;QAClE,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC9D,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;QACjD,MAAM,aAAa,GAAG,CAAC,MAAM,UAAU,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9D,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;YACnC,8DAA8D;YAC9D,MAAM,mBAAmB,GAAG,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,IAAI,CAAC;YACzD,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC;YACrC,UAAU,CAAC,wBAAwB,CAAC;gBAClC,SAAS,EAAE,aAAa;gBACxB,SAAS;gBACT,QAAQ,EAAE,YAAY;gBACtB,IAAI;gBACJ,SAAS,EAAE,CAAC,CAAC,QAAQ;gBACrB,KAAK,EAAE,mBAAmB;gBAC1B,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;aACrD,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEhD,MAAM,IAAI,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvE,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;YACvC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG;gBAChC,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;gBAClC,YAAY;aACb,CAAC;YAEF,UAAU,CAAC,wBAAwB,CAAC;gBAClC,SAAS,EAAE,aAAa;gBACxB,SAAS;gBACT,QAAQ,EAAE,YAAY;gBACtB,IAAI;gBACJ,SAAS,EAAE,CAAC,CAAC,QAAQ;gBACrB,KAAK,EAAE,CAAC,GAAG,GAAG,YAAY,CAAC,GAAG,IAAI;gBAClC,MAAM,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;aACtD,CAAC,CAAC;QACL,CAAC;QACD,OAAO,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAE9B,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5B,OAAO,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import AppMetrics from 'expo-app-metrics';\n\nimport { optionalRouter } from './router';\nimport { type RouterIntegrationStorage } from './storage';\n\n// TODO(@ubax): split this module into `.native.ts` / `.web.ts` variants so the\n// web bundle doesn't pull in `expo-app-metrics`' native bridge calls. The web\n// version should be an explicit no-op (return a noop cleanup) rather than\n// relying on the web stubs in `expo-app-metrics/module.web.ts`.\n\nlet initialized = false;\n\nexport const isInitialized = () => initialized;\n\nexport function initRouterIntegration() {\n  initialized = true;\n  optionalRouter?.unstable_navigationEvents.enable();\n}\n\ntype NavigationEvents = NonNullable<typeof optionalRouter>['unstable_navigationEvents'];\n\nexport function initListeners(\n  storage: RouterIntegrationStorage,\n  navigationEvents: NavigationEvents\n): () => void {\n  const appLaunchTime = performance.now();\n  const cleanup = new Set<() => void>();\n\n  const unsubscribeAction = navigationEvents.addListener('actionDispatched', (event) => {\n    // PRELOAD comes from router.prefetch() — a route warm-up, not a user\n    // navigation — so it must not seed dispatchTime.\n    if (event.actionType === 'PRELOAD') return;\n    storage.pendingActions.push({\n      actionType: event.actionType,\n      dispatchTime: performance.now(),\n    });\n  });\n  cleanup.add(unsubscribeAction);\n\n  const unsubscribePreload = navigationEvents.addListener('pagePreloaded', (e) => {\n    // The screen rendered as part of a preload. Mark it as already rendered so\n    // the eventual `pageFocused` resolves to `warm_ttr` rather than `cold_ttr`.\n    storage.renderedScreensIds.add(e.screenId);\n  });\n  cleanup.add(unsubscribePreload);\n\n  const unsubscribeFocus = navigationEvents.addListener('pageFocused', async (e) => {\n    // Snapshot both clocks once so every metric written below is stamped with\n    // the moment the focus event fired, not the moment `addCustomMetricToSession`\n    // happens to run after the awaited `getMainSession()` round-trip.\n    const now = performance.now();\n    const timestamp = new Date().toISOString();\n    const isInitial = !storage.renderedScreensIds.has(e.screenId);\n    storage.renderedScreensIds.add(e.screenId);\n    const name = isInitial ? 'cold_ttr' : 'warm_ttr';\n    const mainSessionId = (await AppMetrics.getMainSession())?.id;\n    if (!mainSessionId) {\n      return;\n    }\n\n    if (!storage.hasRecordedInitialTtr) {\n      // Stored in seconds to match the OTel `unit = \"s\"` convention\n      const appLaunchTtrSeconds = (now - appLaunchTime) / 1000;\n      storage.hasRecordedInitialTtr = true;\n      AppMetrics.addCustomMetricToSession({\n        sessionId: mainSessionId,\n        timestamp,\n        category: 'navigation',\n        name,\n        routeName: e.pathname,\n        value: appLaunchTtrSeconds,\n        params: { isAppLaunch: true, routeParams: e.params },\n      });\n      return;\n    }\n\n    if (storage.pendingActions.length === 0) return;\n\n    const last = storage.pendingActions[storage.pendingActions.length - 1];\n    if (last) {\n      const dispatchTime = last.dispatchTime;\n      storage.screenTimes[e.screenId] = {\n        ...storage.screenTimes[e.screenId],\n        dispatchTime,\n      };\n\n      AppMetrics.addCustomMetricToSession({\n        sessionId: mainSessionId,\n        timestamp,\n        category: 'navigation',\n        name,\n        routeName: e.pathname,\n        value: (now - dispatchTime) / 1000,\n        params: { isAppLaunch: false, routeParams: e.params },\n      });\n    }\n    storage.pendingActions.length = 0;\n  });\n  cleanup.add(unsubscribeFocus);\n\n  return () => {\n    cleanup.forEach((c) => c());\n    cleanup.clear();\n  };\n}\n"]}

package/expo-module.config.json

@@ -9,7 +9,7 @@
     "publication": {
       "groupId": "expo.modules.observe",
       "artifactId": "expo.modules.observe",
-      "version": "56.0.7",
+      "version": "56.0.8",
       "repository": "local-maven-repo"
     }
   }

package/ios/CursorRepair.swift

@@ -0,0 +1,55 @@
+// Copyright 2025-present 650 Industries. All rights reserved.
+
+import ExpoAppMetrics
+
+/**
+ Resets a dispatch cursor to `-1` if it has fallen past the largest id currently in its source
+ table. The cursors live in UserDefaults; their source tables can be wiped from underneath them
+ (notably on a schema-version mismatch in `expo-app-metrics`). Without this check the cursor would
+ skip every new row until enough accumulated to pass the stale value.
+
+ - `signalName`: short human-readable label ("metric" / "log") for log messages.
+ - `readCursor`: returns the persisted cursor value.
+ - `writeCursor`: persists a new cursor value.
+ - `readMaxId`: returns the largest id in the source table, or nil when empty.
+ */
+@AppMetricsActor
+internal func repairCursorIfStale(
+  signalName: String,
+  readCursor: () -> Int64,
+  writeCursor: (Int64) -> Void,
+  readMaxId: () throws -> Int64?
+) {
+  let cursor = readCursor()
+  let maxId: Int64?
+  do {
+    maxId = try readMaxId()
+  } catch {
+    observeLogger.warn("[Observe] Failed to read max \(signalName) id while repairing cursor: \(error.localizedDescription)")
+    return
+  }
+  if cursor > (maxId ?? -1) {
+    observeLogger.info("[Observe] Resetting stale \(signalName) dispatch cursor (was \(cursor), max id is \(maxId.map(String.init) ?? "<empty>"))")
+    writeCursor(-1)
+  }
+}
+
+@AppMetricsActor
+internal func repairMetricCursorIfStale() {
+  repairCursorIfStale(
+    signalName: "metric",
+    readCursor: { ObserveUserDefaults.lastDispatchedMetricId },
+    writeCursor: { ObserveUserDefaults.lastDispatchedMetricId = $0 },
+    readMaxId: { try AppMetrics.getMaxMetricId() }
+  )
+}
+
+@AppMetricsActor
+internal func repairLogCursorIfStale() {
+  repairCursorIfStale(
+    signalName: "log",
+    readCursor: { ObserveUserDefaults.lastDispatchedLogId },
+    writeCursor: { ObserveUserDefaults.lastDispatchedLogId = $0 },
+    readMaxId: { try AppMetrics.getMaxLogId() }
+  )
+}

package/ios/Event.swift

@@ -1,4 +1,6 @@
 import ExpoAppMetrics
+import ExpoModulesCore
+import Foundation
 
 /**
  An object representing an event providing some app metrics and the information about the app and the device.
@@ -64,58 +66,72 @@ struct Event: Codable, Sendable {
   }
 
   /**
-   Creates a new event for EAS, based on the objects from `expo-app-metrics` package.
+   Builds an `Event` from a session row plus its metric/log batch. The session row carries all the
+   metadata that used to live on `Entry`/`AppInfo`/`DeviceInfo`; metrics and logs are passed
+   separately so a partial dispatch (only the rows past a cursor) can still produce a valid event.
    */
-  static func create(app: AppInfo, device: DeviceInfo, sessions: [Session], environment: String? = nil) -> Event {
+  static func from(session: SessionRow, metrics: [MetricRow], logs: [LogRow]) -> Event {
+    let updatesInfo = AppInfo.UpdatesInfo(
+      updateId: session.appUpdateId,
+      runtimeVersion: session.appUpdateRuntimeVersion,
+      requestHeaders: decodeRequestHeaders(session.appUpdateRequestHeaders)
+    )
     return Event(
       metadata: Metadata(
-        appName: app.appName,
-        appIdentifier: app.appId,
-        appVersion: app.appVersion,
-        appBuildNumber: app.buildNumber,
-        appEasBuildId: app.easBuildId,
-        appUpdatesInfo: app.updatesInfo,
-
-        deviceName: device.modelName,
-        deviceModel: device.modelIdentifier,
-        deviceOs: device.systemName,
-        deviceOsVersion: device.systemVersion,
-
-        reactNativeVersion: app.reactNativeVersion,
-        expoSdkVersion: app.expoSdkVersion,
+        appName: session.appName,
+        appIdentifier: session.appIdentifier,
+        appVersion: session.appVersion,
+        appBuildNumber: session.appBuildNumber,
+        appEasBuildId: session.appEasBuildId,
+        appUpdatesInfo: updatesInfo.isEmpty ? nil : updatesInfo,
+        deviceName: session.deviceName ?? "",
+        deviceModel: session.deviceModel ?? "",
+        deviceOs: session.deviceOs ?? "",
+        deviceOsVersion: session.deviceOsVersion ?? "",
+        reactNativeVersion: session.reactNativeVersion ?? "",
+        expoSdkVersion: session.expoSdkVersion ?? "",
         clientVersion: ObserveVersions.clientVersion,
-
-        languageTag: Locale.preferredLanguages.first ?? "en-US",
-        environment: environment
+        languageTag: session.languageTag ?? Locale.preferredLanguages.first ?? "en-US",
+        environment: session.environment
       ),
-      metrics: sessions.flatMap { session in
-        return session.metrics.map { metric in
-          return Metric(
-            category: metric.category?.rawValue,
-            name: metric.name,
-            value: metric.value,
-            timestamp: metric.timestamp,
-            sessionId: session.id,
-            parentSessionId: nil,
-            routeName: metric.routeName,
-            updateId: metric.updateId,
-            customParams: metric.params
-          )
-        }
+      metrics: metrics.map { metric in
+        return Metric(
+          category: metric.category,
+          name: metric.name,
+          value: metric.value,
+          timestamp: metric.timestamp,
+          sessionId: metric.sessionId,
+          parentSessionId: nil,
+          routeName: metric.routeName,
+          updateId: metric.updateId,
+          customParams: decodeCustomParams(metric.params)
+        )
       },
-      logs: sessions.flatMap { session in
-        return session.logs.map { log in
-          return Log(
-            name: log.name,
-            body: log.body,
-            timestamp: log.timestamp,
-            severity: log.severity,
-            attributes: log.attributes,
-            droppedAttributesCount: log.droppedAttributesCount,
-            sessionId: session.id
-          )
-        }
+      logs: logs.map { log in
+        return Log(
+          name: log.name,
+          body: log.body,
+          timestamp: log.timestamp,
+          severity: Severity(rawValue: log.severity) ?? .info,
+          attributes: decodeCustomParams(log.attributes),
+          droppedAttributesCount: log.droppedAttributesCount,
+          sessionId: log.sessionId
+        )
       }
     )
   }
 }
+
+private func decodeRequestHeaders(_ json: String?) -> [String: String]? {
+  guard let json, let data = json.data(using: .utf8) else {
+    return nil
+  }
+  return try? JSONSerialization.jsonObject(with: data) as? [String: String]
+}
+
+private func decodeCustomParams(_ json: String?) -> AnyCodable? {
+  guard let json, let data = json.data(using: .utf8) else {
+    return nil
+  }
+  return try? JSONDecoder().decode(AnyCodable.self, from: data)
+}

package/ios/Observability.swift

@@ -10,155 +10,156 @@ internal struct ObservabilityManager {
   private static var projectId: String? = nil
   private static var useOpenTelemetry = false
 
-  /**
-   Returns entries from AppMetrics storage whose id is newer than the supplied
-   cursor.
-
-   The first (current) entry may have a lower id than the cursor when storage
-   was wiped, empty, or failed to decode — ids restart from 0 in that case.
-   We return all entries so the cursor can be repaired on the next dispatch.
-   */
-  private static func entriesNewerThan(cursor: Int) -> [MetricsStorage.Entry] {
-    let entries = AppMetrics.storage.getAllEntries()
-    if let firstEntry = entries.first, firstEntry.id < cursor {
-      return entries
-    }
-    return entries.filter { $0.id > cursor }
-  }
-
-  /**
-   Entries whose metrics have not been dispatched yet.
-   */
-  internal static func getEntriesToDispatch() -> [MetricsStorage.Entry] {
-    return entriesNewerThan(cursor: ObserveUserDefaults.lastDispatchedEntryId)
-  }
-
-  /**
-   Entries whose logs have not been dispatched yet. Tracked independently from
-   metrics so the two signals can advance in isolation.
-   */
-  internal static func getLogEntriesToDispatch() -> [MetricsStorage.Entry] {
-    return entriesNewerThan(cursor: ObserveUserDefaults.lastDispatchedLogEntryId)
-  }
-
   internal static func dispatch() async {
-    // Compute once and reuse for both signals — `shouldDispatch()` reads the
-    // persisted config, the bundle defaults, and computes a sample-rate hash.
-    // Both halves of dispatch want the same answer.
+    // Compute once and reuse for both signals — `shouldDispatch()` reads the persisted config, the
+    // bundle defaults, and computes a sample-rate hash. Both halves of dispatch want the same answer.
     let shouldDispatch = Self.shouldDispatch()
 
-    // Snapshot every entry as an `Event` once. Both metrics and logs project
-    // out of the same snapshot, so building it twice would duplicate the
-    // `Event.create` work for sessions that have both signals pending.
-    let allEntries = AppMetrics.storage.getAllEntries()
-    let eventsByEntryId: [Int: Event] = Dictionary(
-      uniqueKeysWithValues: allEntries.map { entry in
-        (
-          entry.id,
-          Event.create(
-            app: entry.app, device: entry.device, sessions: entry.sessions,
-            environment: entry.environment
-          )
-        )
-      }
-    )
-
-    await dispatchMetrics(eventsByEntryId: eventsByEntryId, shouldDispatch: shouldDispatch)
-    await dispatchLogs(eventsByEntryId: eventsByEntryId, shouldDispatch: shouldDispatch)
+    await dispatchMetrics(shouldDispatch: shouldDispatch)
+    await dispatchLogs(shouldDispatch: shouldDispatch)
   }
 
-  private static func dispatchMetrics(
-    eventsByEntryId: [Int: Event],
-    shouldDispatch: Bool
-  ) async {
-    let entries = getEntriesToDispatch()
+  private static func dispatchMetrics(shouldDispatch: Bool) async {
+    repairMetricCursorIfStale()
 
-    guard !entries.isEmpty, let endpointUrl = metricsEndpointUrl else {
-      // Nothing to dispatch
-      observeLogger.debug("[EAS Observe] No new entries to dispatch")
+    let cursor = ObserveUserDefaults.lastDispatchedMetricId
+    let pendingMetrics: [MetricRow]
+    do {
+      pendingMetrics = try AppMetrics.getMetrics(afterId: cursor)
+    } catch {
+      observeLogger.warn("[EAS Observe] Failed to read pending metrics: \(error.localizedDescription)")
+      return
+    }
+    guard !pendingMetrics.isEmpty, let endpointUrl = metricsEndpointUrl else {
+      observeLogger.debug("[EAS Observe] No new metrics to dispatch")
       return
     }
+    let highestId = pendingMetrics.last?.id ?? cursor
     if !shouldDispatch {
-      ObserveUserDefaults.lastDispatchedEntryId = entries.first?.id ?? -1
+      ObserveUserDefaults.lastDispatchedMetricId = highestId
+      return
+    }
+    let events: [Event]
+    do {
+      events = try buildEvents(forMetrics: pendingMetrics)
+    } catch {
+      observeLogger.warn("[EAS Observe] Failed to assemble metric events: \(error.localizedDescription)")
+      return
+    }
+    if events.isEmpty {
+      ObserveUserDefaults.lastDispatchedMetricId = highestId
       return
     }
     do {
-      let events = entries.compactMap { eventsByEntryId[$0.id] }
-
-      if events.isEmpty {
-        ObserveUserDefaults.lastDispatchedEntryId = entries.first?.id ?? -1
-        return
-      }
-
       let body: any Encodable
       if useOpenTelemetry {
-        body = OTRequestBody(resourceMetrics: events.map { $0.toOTEvent(easClientId)})
+        body = OTRequestBody(resourceMetrics: events.map { $0.toOTEvent(easClientId) })
       } else {
         body = RequestBody(easClientId: easClientId, events: events)
       }
-
       let success = try await sendRequest(to: endpointUrl, body: body)
       if success {
         ObserveUserDefaults.lastDispatchDate = Date.now
-        ObserveUserDefaults.lastDispatchedEntryId = entries.first?.id ?? -1
+        ObserveUserDefaults.lastDispatchedMetricId = highestId
       }
     } catch {
       observeLogger.warn("[EAS Observe] Dispatching the metrics has thrown an error: \(error)")
     }
   }
 
-  private static func dispatchLogs(
-    eventsByEntryId: [Int: Event],
-    shouldDispatch: Bool
-  ) async {
+  private static func dispatchLogs(shouldDispatch: Bool) async {
     // Logs are only sent in OpenTelemetry mode — there is no legacy logs endpoint.
     guard useOpenTelemetry else {
       return
     }
+    repairLogCursorIfStale()
 
-    let entries = getLogEntriesToDispatch()
-
-    guard !entries.isEmpty, let endpointUrl = logsEndpointUrl else {
-      observeLogger.debug("[EAS Observe] No new log entries to dispatch")
+    let cursor = ObserveUserDefaults.lastDispatchedLogId
+    let pendingLogs: [LogRow]
+    do {
+      pendingLogs = try AppMetrics.getLogs(afterId: cursor)
+    } catch {
+      observeLogger.warn("[EAS Observe] Failed to read pending logs: \(error.localizedDescription)")
+      return
+    }
+    guard !pendingLogs.isEmpty, let endpointUrl = logsEndpointUrl else {
+      observeLogger.debug("[EAS Observe] No new logs to dispatch")
       return
     }
+    let highestId = pendingLogs.last?.id ?? cursor
     if !shouldDispatch {
-      ObserveUserDefaults.lastDispatchedLogEntryId = entries.first?.id ?? -1
+      ObserveUserDefaults.lastDispatchedLogId = highestId
       return
     }
+    let events: [Event]
     do {
-      // Skip the request when there's nothing to send, but still advance the cursor so we
-      // don't keep re-checking the same entries.
-      let resourceLogs = entries.compactMap { entry -> OTResourceLogs? in
-        guard let event = eventsByEntryId[entry.id], !event.logs.isEmpty else {
-          return nil
-        }
-        return event.toOTResourceLogs(easClientId)
-      }
-      if resourceLogs.isEmpty {
-        ObserveUserDefaults.lastDispatchedLogEntryId = entries.first?.id ?? -1
-        return
+      events = try buildEvents(forLogs: pendingLogs)
+    } catch {
+      observeLogger.warn("[EAS Observe] Failed to assemble log events: \(error.localizedDescription)")
+      return
+    }
+    let resourceLogs = events.compactMap { event -> OTResourceLogs? in
+      guard !event.logs.isEmpty else {
+        return nil
       }
-
+      return event.toOTResourceLogs(easClientId)
+    }
+    if resourceLogs.isEmpty {
+      ObserveUserDefaults.lastDispatchedLogId = highestId
+      return
+    }
+    do {
       let body = OTLogsRequestBody(resourceLogs: resourceLogs)
       let success = try await sendRequest(to: endpointUrl, body: body)
       if success {
-        ObserveUserDefaults.lastDispatchedLogEntryId = entries.first?.id ?? -1
+        ObserveUserDefaults.lastDispatchedLogId = highestId
       }
     } catch {
       observeLogger.warn("[EAS Observe] Dispatching the logs has thrown an error: \(error)")
     }
   }
 
+  /**
+   Groups `metrics` by `sessionId`, hydrates the matching session rows, and emits one `Event` per
+   session in the same shape Android dispatches: each event carries the session's metadata and only
+   the metrics that belong to it.
+   */
+  private static func buildEvents(forMetrics metrics: [MetricRow]) throws -> [Event] {
+    let metricsBySession = Dictionary(grouping: metrics, by: \.sessionId)
+    let sessionIds = Array(metricsBySession.keys)
+    let sessions = try AppMetrics.getSessions(ids: sessionIds)
+    return sessions.compactMap { session in
+      guard let sessionMetrics = metricsBySession[session.id] else {
+        return nil
+      }
+      return Event.from(session: session, metrics: sessionMetrics, logs: [])
+    }
+  }
+
+  private static func buildEvents(forLogs logs: [LogRow]) throws -> [Event] {
+    let logsBySession = Dictionary(grouping: logs, by: \.sessionId)
+    let sessionIds = Array(logsBySession.keys)
+    let sessions = try AppMetrics.getSessions(ids: sessionIds)
+    return sessions.compactMap { session in
+      guard let sessionLogs = logsBySession[session.id] else {
+        return nil
+      }
+      return Event.from(session: session, metrics: [], logs: sessionLogs)
+    }
+  }
+
   private static func sendRequest(to endpointUrl: URL, body: any Encodable) async throws -> Bool {
     var request = URLRequest(url: endpointUrl)
     request.httpMethod = "POST"
     request.allHTTPHeaderFields = ["Content-Type": "application/json"]
     request.httpBody = try body.toJSONData([])
 
+    #if DEBUG
     observeLogger.debug("[EAS Observe] Sending the request to \(endpointUrl) with body:")
-    // Use `print` so the JSON can be copied without including the log level emojis.
+    // Use `print` so the JSON can be copied without including the log level emojis. Wrapped in
+    // `#if DEBUG` so release builds don't pay for a second pretty-printed encode of the payload.
     print(try body.toJSONString(.prettyPrinted))
+    #endif
 
     let (responseData, urlResponse) = try await URLSession.shared.data(for: request)
 
@@ -224,3 +225,4 @@ internal struct ObservabilityManager {
     return EASClientID.deterministicUniformValue(EASClientID.uuid()) < clamped
   }
 }
+

package/ios/ObserveUserDefaults.swift

@@ -35,8 +35,8 @@ internal final class ObserveUserDefaults: UserDefaults {
    Enum with keys used within this user defaults database.
    */
   private enum Keys: String {
-    case lastDispatchedEntryId
-    case lastDispatchedLogEntryId
+    case lastDispatchedMetricId
+    case lastDispatchedLogId
     case lastDispatchDate
     case config
     case bundleDefaults
@@ -65,29 +65,29 @@ internal final class ObserveUserDefaults: UserDefaults {
   }
 
   /**
-   Id of the last dispatched entry. It is used to prevent dispatching entries multiple times. The ids reflect the order of creation.
-   Using the creation date is not the best idea as the device's date can be changed by the user or shift along with the timezone.
+   Id of the last metric row dispatched. Each successful dispatch advances this past the largest id
+   in the batch so the next dispatch reads only newer rows. Auto-increment ids are monotonic in
+   SQLite, so a date-independent cursor avoids drift when the device clock changes.
    */
-  static var lastDispatchedEntryId: Int {
+  static var lastDispatchedMetricId: Int64 {
     get {
-      return defaults.object(forKey: Keys.lastDispatchedEntryId.rawValue) as? Int ?? -1
+      return (defaults.object(forKey: Keys.lastDispatchedMetricId.rawValue) as? Int64) ?? -1
     }
     set {
-      defaults.set(newValue, forKey: Keys.lastDispatchedEntryId.rawValue)
+      defaults.set(newValue, forKey: Keys.lastDispatchedMetricId.rawValue)
     }
   }
 
   /**
-   Id of the last entry whose logs were dispatched. Tracked separately from `lastDispatchedEntryId`
-   so that a logs request failure does not block metrics dispatch (and vice versa) — both signals
-   move forward independently.
+   Id of the last log row dispatched. Tracked separately from the metric cursor so a logs request
+   failure does not block metrics dispatch (and vice versa) — both signals move forward independently.
    */
-  static var lastDispatchedLogEntryId: Int {
+  static var lastDispatchedLogId: Int64 {
     get {
-      return defaults.object(forKey: Keys.lastDispatchedLogEntryId.rawValue) as? Int ?? -1
+      return (defaults.object(forKey: Keys.lastDispatchedLogId.rawValue) as? Int64) ?? -1
     }
     set {
-      defaults.set(newValue, forKey: Keys.lastDispatchedLogEntryId.rawValue)
+      defaults.set(newValue, forKey: Keys.lastDispatchedLogId.rawValue)
     }
   }