expo-observe 56.0.6 → 56.0.8

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

@@ -189,6 +189,11 @@ private val metricNameMap = mapOf(
 
   // Updates
   (MetricCategory.Updates.categoryName to "updateDownloadTime") to "expo.updates.download_time",
+
+  // Navigation
+  (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"
 )
 
 fun EASMetric.toOTMetric(): OTMetric {

package/build/ObserveProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObserveProvider.d.ts","sourceRoot":"","sources":["../src/ObserveProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAE/C,wBAAgB,eAAe,CAAC,EAAE,QAAQ,EAAE,EAAE,iBAAiB,2CAE9D"}
+{"version":3,"file":"ObserveProvider.d.ts","sourceRoot":"","sources":["../src/ObserveProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAI/C,wBAAgB,eAAe,CAAC,EAAE,QAAQ,EAAE,EAAE,iBAAiB,2CAE9D"}

package/build/ObserveProvider.js

@@ -1,6 +1,7 @@
-import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import {} from 'react';
+import { ObserveRouterIntegrationProvider } from './integrations/expo-router/ObserveRouterIntegrationProvider';
 export function ObserveProvider({ children }) {
-    return _jsx(_Fragment, { children: children });
+    return _jsx(ObserveRouterIntegrationProvider, { children: children });
 }
 //# sourceMappingURL=ObserveProvider.js.map

package/build/ObserveProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ObserveProvider.js","sourceRoot":"","sources":["../src/ObserveProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAA0B,MAAM,OAAO,CAAC;AAE/C,MAAM,UAAU,eAAe,CAAC,EAAE,QAAQ,EAAqB;IAC7D,OAAO,4BAAG,QAAQ,GAAI,CAAC;AACzB,CAAC","sourcesContent":["import { type PropsWithChildren } from 'react';\n\nexport function ObserveProvider({ children }: PropsWithChildren) {\n  return <>{children}</>;\n}\n"]}
+{"version":3,"file":"ObserveProvider.js","sourceRoot":"","sources":["../src/ObserveProvider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAA0B,MAAM,OAAO,CAAC;AAE/C,OAAO,EAAE,gCAAgC,EAAE,MAAM,6DAA6D,CAAC;AAE/G,MAAM,UAAU,eAAe,CAAC,EAAE,QAAQ,EAAqB;IAC7D,OAAO,KAAC,gCAAgC,cAAE,QAAQ,GAAoC,CAAC;AACzF,CAAC","sourcesContent":["import { type PropsWithChildren } from 'react';\n\nimport { ObserveRouterIntegrationProvider } from './integrations/expo-router/ObserveRouterIntegrationProvider';\n\nexport function ObserveProvider({ children }: PropsWithChildren) {\n  return <ObserveRouterIntegrationProvider>{children}</ObserveRouterIntegrationProvider>;\n}\n"]}

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

@@ -0,0 +1,5 @@
+import { type PropsWithChildren } from 'react';
+import { type RouterIntegrationStorage } from './storage';
+export declare const ObserveRouterIntegrationContext: import("react").Context<RouterIntegrationStorage | null>;
+export declare function ObserveRouterIntegrationProvider({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=ObserveRouterIntegrationProvider.d.ts.map

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

@@ -0,0 +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,2CAuB/E"}

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

@@ -0,0 +1,21 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { createContext, useEffect, useRef, useState } from 'react';
+import { initListeners, isInitialized } from './init';
+import { optionalRouter } from './router';
+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(() => listenersCleanup, [listenersCleanup]);
+    return (_jsx(ObserveRouterIntegrationContext.Provider, { value: storage, children: children }));
+}
+//# sourceMappingURL=ObserveRouterIntegrationProvider.js.map

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

@@ -0,0 +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;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/index.d.ts

@@ -1,4 +1,5 @@
 export { isRouterInstalled } from './router';
 export { useObserveForRouter } from './useObserveForRouter';
 export { initRouterIntegration } from './init';
+export { ObserveRouterIntegrationProvider } from './ObserveRouterIntegrationProvider';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/integrations/expo-router/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/integrations/expo-router/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC"}

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

@@ -1,4 +1,5 @@
 export { isRouterInstalled } from './router';
 export { useObserveForRouter } from './useObserveForRouter';
 export { initRouterIntegration } from './init';
+export { ObserveRouterIntegrationProvider } from './ObserveRouterIntegrationProvider';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/integrations/expo-router/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC","sourcesContent":["export { isRouterInstalled } from './router';\nexport { useObserveForRouter } from './useObserveForRouter';\nexport { initRouterIntegration } from './init';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/integrations/expo-router/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,gCAAgC,EAAE,MAAM,oCAAoC,CAAC","sourcesContent":["export { isRouterInstalled } from './router';\nexport { useObserveForRouter } from './useObserveForRouter';\nexport { initRouterIntegration } from './init';\nexport { ObserveRouterIntegrationProvider } from './ObserveRouterIntegrationProvider';\n"]}

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

@@ -1,3 +1,8 @@
+import { optionalRouter } from './router';
+import { type RouterIntegrationStorage } from './storage';
 export declare const isInitialized: () => boolean;
 export declare function initRouterIntegration(): void;
+type NavigationEvents = NonNullable<typeof optionalRouter>['unstable_navigationEvents'];
+export declare function initListeners(storage: RouterIntegrationStorage, navigationEvents: NavigationEvents): () => void;
+export {};
 //# sourceMappingURL=init.d.ts.map

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,eAAO,MAAM,aAAa,eAAoB,CAAC;AAE/C,wBAAgB,qBAAqB,SAEpC"}
+{"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

@@ -1,6 +1,89 @@
+import AppMetrics from 'expo-app-metrics';
+import { optionalRouter } from './router';
+import {} from './storage';
+// TODO(@ubax): split this module into `.native.ts` / `.web.ts` variants so the
+// web bundle doesn't pull in `expo-app-metrics`' native bridge calls. The web
+// version should be an explicit no-op (return a noop cleanup) rather than
+// relying on the web stubs in `expo-app-metrics/module.web.ts`.
 let initialized = false;
 export const isInitialized = () => initialized;
 export function initRouterIntegration() {
     initialized = true;
+    optionalRouter?.unstable_navigationEvents.enable();
+}
+export function initListeners(storage, navigationEvents) {
+    const appLaunchTime = performance.now();
+    const cleanup = new Set();
+    const unsubscribeAction = navigationEvents.addListener('actionDispatched', (event) => {
+        // PRELOAD comes from router.prefetch() — a route warm-up, not a user
+        // navigation — so it must not seed dispatchTime.
+        if (event.actionType === 'PRELOAD')
+            return;
+        storage.pendingActions.push({
+            actionType: event.actionType,
+            dispatchTime: performance.now(),
+        });
+    });
+    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`
+        // happens to run after the awaited `getMainSession()` round-trip.
+        const now = performance.now();
+        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;
+        }
+        if (!storage.hasRecordedInitialTtr) {
+            // Stored in seconds to match the OTel `unit = "s"` convention
+            const appLaunchTtrSeconds = (now - appLaunchTime) / 1000;
+            storage.hasRecordedInitialTtr = true;
+            AppMetrics.addCustomMetricToSession({
+                sessionId: mainSessionId,
+                timestamp,
+                category: 'navigation',
+                name,
+                routeName: e.pathname,
+                value: appLaunchTtrSeconds,
+                params: { isAppLaunch: true, routeParams: e.params },
+            });
+            return;
+        }
+        if (storage.pendingActions.length === 0)
+            return;
+        const last = storage.pendingActions[storage.pendingActions.length - 1];
+        if (last) {
+            const dispatchTime = last.dispatchTime;
+            storage.screenTimes[e.screenId] = {
+                ...storage.screenTimes[e.screenId],
+                dispatchTime,
+            };
+            AppMetrics.addCustomMetricToSession({
+                sessionId: mainSessionId,
+                timestamp,
+                category: 'navigation',
+                name,
+                routeName: e.pathname,
+                value: (now - dispatchTime) / 1000,
+                params: { isAppLaunch: false, routeParams: e.params },
+            });
+        }
+        storage.pendingActions.length = 0;
+    });
+    cleanup.add(unsubscribeFocus);
+    return () => {
+        cleanup.forEach((c) => c());
+        cleanup.clear();
+    };
 }
 //# sourceMappingURL=init.js.map

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":"AAAA,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;AACrB,CAAC","sourcesContent":["let initialized = false;\n\nexport const isInitialized = () => initialized;\n\nexport function initRouterIntegration() {\n  initialized = true;\n}\n"]}
+{"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    // 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/build/integrations/expo-router/storage.d.ts

@@ -0,0 +1,27 @@
+import type { ActionDispatchedEvent } from 'expo-router';
+export interface ScreenTimes {
+    dispatchTime: number;
+    lastInteractiveCall?: number;
+}
+export interface PendingAction {
+    actionType: ActionDispatchedEvent['actionType'];
+    dispatchTime: number;
+}
+export interface RouterIntegrationStorage {
+    /**
+     * Actions dispatched, but not yet processed by the integration
+     */
+    pendingActions: PendingAction[];
+    renderedScreensIds: Set<string>;
+    /**
+     * Wether the app had already recorded the first render of the screen
+     */
+    hasRecordedInitialTtr: boolean;
+    /**
+     * Times used to calculate spans from dispatch to certain event
+     */
+    screenTimes: Record<string, ScreenTimes>;
+    interactiveScreensIds: Set<string>;
+}
+export declare function createRouterIntegrationStorage(): RouterIntegrationStorage;
+//# sourceMappingURL=storage.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../src/integrations/expo-router/storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEzD,MAAM,WAAW,WAAW;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,qBAAqB,CAAC,YAAY,CAAC,CAAC;IAChD,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC;;OAEG;IACH,qBAAqB,EAAE,OAAO,CAAC;IAC/B;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACzC,qBAAqB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACpC;AAED,wBAAgB,8BAA8B,IAAI,wBAAwB,CAQzE"}

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

@@ -0,0 +1,10 @@
+export function createRouterIntegrationStorage() {
+    return {
+        pendingActions: [],
+        renderedScreensIds: new Set(),
+        hasRecordedInitialTtr: false,
+        screenTimes: {},
+        interactiveScreensIds: new Set(),
+    };
+}
+//# sourceMappingURL=storage.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../src/integrations/expo-router/storage.ts"],"names":[],"mappings":"AA6BA,MAAM,UAAU,8BAA8B;IAC5C,OAAO;QACL,cAAc,EAAE,EAAE;QAClB,kBAAkB,EAAE,IAAI,GAAG,EAAE;QAC7B,qBAAqB,EAAE,KAAK;QAC5B,WAAW,EAAE,EAAE;QACf,qBAAqB,EAAE,IAAI,GAAG,EAAE;KACjC,CAAC;AACJ,CAAC","sourcesContent":["import type { ActionDispatchedEvent } from 'expo-router';\n\nexport interface ScreenTimes {\n  dispatchTime: number;\n  lastInteractiveCall?: number;\n}\n\nexport interface PendingAction {\n  actionType: ActionDispatchedEvent['actionType'];\n  dispatchTime: number;\n}\n\nexport interface RouterIntegrationStorage {\n  /**\n   * Actions dispatched, but not yet processed by the integration\n   */\n  pendingActions: PendingAction[];\n  renderedScreensIds: Set<string>;\n  /**\n   * Wether the app had already recorded the first render of the screen\n   */\n  hasRecordedInitialTtr: boolean;\n  /**\n   * Times used to calculate spans from dispatch to certain event\n   */\n  screenTimes: Record<string, ScreenTimes>;\n  interactiveScreensIds: Set<string>;\n}\n\nexport function createRouterIntegrationStorage(): RouterIntegrationStorage {\n  return {\n    pendingActions: [],\n    renderedScreensIds: new Set(),\n    hasRecordedInitialTtr: false,\n    screenTimes: {},\n    interactiveScreensIds: new Set(),\n  };\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"useObserveForRouter.d.ts","sourceRoot":"","sources":["../../../src/integrations/expo-router/useObserveForRouter.ts"],"names":[],"mappings":"AAAA,OAAO,UAAqC,MAAM,kBAAkB,CAAC;AAMrE,KAAK,eAAe,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,iBAAiB,CAAC,CAAC;AAE9D,wBAAgB,mBAAmB,IAAI,eAAe,GAAG,IAAI,CAwD5D"}
+{"version":3,"file":"useObserveForRouter.d.ts","sourceRoot":"","sources":["../../../src/integrations/expo-router/useObserveForRouter.ts"],"names":[],"mappings":"AAAA,OAAO,UAAqC,MAAM,kBAAkB,CAAC;AAOrE,KAAK,eAAe,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,iBAAiB,CAAC,CAAC;AAE9D,wBAAgB,mBAAmB,IAAI,eAAe,GAAG,IAAI,CA2G5D"}

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

@@ -1,12 +1,15 @@
 import AppMetrics, {} from 'expo-app-metrics';
-import { useCallback, useEffect, useRef } from 'react';
+import { use, useCallback, useEffect, useRef } from 'react';
+import { ObserveRouterIntegrationContext } from './ObserveRouterIntegrationProvider';
 import { isInitialized } from './init';
 import { optionalRouter } from './router';
 export function useObserveForRouter() {
+    const storage = use(ObserveRouterIntegrationContext);
     const isMounted = useRef(true);
     const route = optionalRouter?.useRoute();
     const navigation = optionalRouter?.useNavigation();
-    const pathname = optionalRouter?.useCurrentRouteInfo()?.pathname;
+    const routeInfo = optionalRouter?.useCurrentRouteInfo();
+    const { pathname, params: routeParams } = routeInfo ?? {};
     const initializedAtMount = useRef(isInitialized());
     if (initializedAtMount.current !== isInitialized()) {
         throw new Error("[expo-observe] Router integration was toggled during a screen's lifecycle. " +
@@ -28,6 +31,8 @@ export function useObserveForRouter() {
         };
     }, []);
     const markInteractive = useCallback(async (attributes) => {
+        const now = performance.now();
+        const timestamp = new Date().toISOString();
         if (!isMounted.current) {
             console.warn('[expo-observe] Calling markInteractive on unmounted screen');
             return;
@@ -42,7 +47,45 @@ export function useObserveForRouter() {
                 routeName: pathname,
             });
         }
-    }, [screenId, navigation, pathname]);
+        if (!storage) {
+            throw new Error('[expo-observe] markInteractive was called without an active ObserveProvider. Wrap your app in ObserveRoot from expo-observe.');
+        }
+        // Snapshot times BEFORE writing the new interactive timestamp so the
+        // duplicate-detection logic below sees the *previous* call, not this one.
+        const currentScreenData = storage.screenTimes[screenId];
+        storage.interactiveScreensIds.add(screenId);
+        if (storage.screenTimes[screenId]) {
+            storage.screenTimes[screenId] = {
+                ...storage.screenTimes[screenId],
+                lastInteractiveCall: now,
+            };
+        }
+        if (!currentScreenData?.dispatchTime)
+            return;
+        const previousInteractiveCall = currentScreenData.lastInteractiveCall;
+        const previousWasAfterDispatch = previousInteractiveCall != null && currentScreenData.dispatchTime < previousInteractiveCall;
+        if (previousWasAfterDispatch) {
+            // We only want to record interactive once per navigation
+            return;
+        }
+        // Stored in seconds to match the OTel `unit = "s"` convention
+        const interactiveTimeSeconds = (now - currentScreenData.dispatchTime) / 1000;
+        const mainSessionId = (await AppMetrics.getMainSession())?.id;
+        // TODO(@ubax): we should count the time against the action which caused the first navigation
+        // and add a param stating if during that time there was any navigation
+        if (mainSessionId) {
+            await AppMetrics.addCustomMetricToSession({
+                sessionId: mainSessionId,
+                timestamp,
+                category: 'navigation',
+                // TODO(@ubax): Use segments.join here to get full routeName and pass pathname and params via params
+                routeName: pathname,
+                name: 'tti',
+                value: interactiveTimeSeconds,
+                params: { routeParams },
+            });
+        }
+    }, [screenId, navigation, pathname, storage, routeParams]);
     return initializedAtMount.current ? markInteractive : null;
 }
 //# sourceMappingURL=useObserveForRouter.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useObserveForRouter.js","sourceRoot":"","sources":["../../../src/integrations/expo-router/useObserveForRouter.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,EAAE,EAAyB,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAI1C,MAAM,UAAU,mBAAmB;IACjC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAG,cAAc,EAAE,QAAQ,EAAE,CAAC;IACzC,MAAM,UAAU,GAAG,cAAc,EAAE,aAAa,EAAE,CAAC;IACnD,MAAM,QAAQ,GAAG,cAAc,EAAE,mBAAmB,EAAE,EAAE,QAAQ,CAAC;IAEjE,MAAM,kBAAkB,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;IACnD,IAAI,kBAAkB,CAAC,OAAO,KAAK,aAAa,EAAE,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CACb,6EAA6E;YAC3E,sGAAsG,CACzG,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAG,CAAC;IAC5B,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IACtC,IAAI,YAAY,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACtC,OAAO,CAAC,IAAI,CACV,2FAA2F,CAC5F,CAAC;QACF,YAAY,CAAC,OAAO,GAAG,QAAQ,CAAC;IAClC,CAAC;IAED,SAAS,CAAC,GAAG,EAAE;QACb,4EAA4E;QAC5E,8EAA8E;QAC9E,gEAAgE;QAChE,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;QACzB,OAAO,GAAG,EAAE;YACV,SAAS,CAAC,OAAO,GAAG,KAAK,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,eAAe,GAAG,WAAW,CACjC,KAAK,EAAE,UAA6B,EAAE,EAAE;QACtC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;YAC3E,OAAO;QACT,CAAC;QACD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,CAAC,IAAI,CACV,sHAAsH,CACvH,CAAC;YACF,OAAO;QACT,CAAC;QACD,IAAI,UAAU,EAAE,SAAS,EAAE,EAAE,CAAC;YAC5B,UAAU,CAAC,eAAe,CAAC;gBACzB,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;gBACrB,SAAS,EAAE,QAAQ;aACpB,CAAC,CAAC;QACL,CAAC;IACH,CAAC,EACD,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,CACjC,CAAC;IAEF,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7D,CAAC","sourcesContent":["import AppMetrics, { type MetricAttributes } from 'expo-app-metrics';\nimport { useCallback, useEffect, useRef } from 'react';\n\nimport { isInitialized } from './init';\nimport { optionalRouter } from './router';\n\ntype MarkInteractive = (typeof AppMetrics)['markInteractive'];\n\nexport function useObserveForRouter(): MarkInteractive | null {\n  const isMounted = useRef(true);\n  const route = optionalRouter?.useRoute();\n  const navigation = optionalRouter?.useNavigation();\n  const pathname = optionalRouter?.useCurrentRouteInfo()?.pathname;\n\n  const initializedAtMount = useRef(isInitialized());\n  if (initializedAtMount.current !== isInitialized()) {\n    throw new Error(\n      \"[expo-observe] Router integration was toggled during a screen's lifecycle. \" +\n        'Call `ExpoObserve.configure({ disableRouterIntegration })` once at startup before any screen mounts.'\n    );\n  }\n\n  const screenId = route?.key;\n  const prevScreenId = useRef(screenId);\n  if (prevScreenId.current !== screenId) {\n    console.warn(\n      '[expo-observe] Screen ID changed between renders. This is most likely an expo-router bug.'\n    );\n    prevScreenId.current = screenId;\n  }\n\n  useEffect(() => {\n    // Strict-mode mounts the effect twice (mount → cleanup → re-mount). Without\n    // restoring isMounted here, the second mount would leave it permanently false\n    // and every markInteractive call would warn \"unmounted screen\".\n    isMounted.current = true;\n    return () => {\n      isMounted.current = false;\n    };\n  }, []);\n\n  const markInteractive = useCallback(\n    async (attributes?: MetricAttributes) => {\n      if (!isMounted.current) {\n        console.warn('[expo-observe] Calling markInteractive on unmounted screen');\n        return;\n      }\n      if (!screenId) {\n        console.warn(\n          '[expo-observe] No metadata available for the current screen. Make sure to call useObserve inside a screen component.'\n        );\n        return;\n      }\n      if (navigation?.isFocused()) {\n        AppMetrics.markInteractive({\n          ...(attributes ?? {}),\n          routeName: pathname,\n        });\n      }\n    },\n    [screenId, navigation, pathname]\n  );\n\n  return initializedAtMount.current ? markInteractive : null;\n}\n"]}
+{"version":3,"file":"useObserveForRouter.js","sourceRoot":"","sources":["../../../src/integrations/expo-router/useObserveForRouter.ts"],"names":[],"mappings":"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","sourcesContent":["import AppMetrics, { type MetricAttributes } from 'expo-app-metrics';\nimport { use, useCallback, useEffect, useRef } from 'react';\n\nimport { ObserveRouterIntegrationContext } from './ObserveRouterIntegrationProvider';\nimport { isInitialized } from './init';\nimport { optionalRouter } from './router';\n\ntype MarkInteractive = (typeof AppMetrics)['markInteractive'];\n\nexport function useObserveForRouter(): MarkInteractive | null {\n  const storage = use(ObserveRouterIntegrationContext);\n  const isMounted = useRef(true);\n  const route = optionalRouter?.useRoute();\n  const navigation = optionalRouter?.useNavigation();\n  const routeInfo = optionalRouter?.useCurrentRouteInfo();\n  const { pathname, params: routeParams } = routeInfo ?? {};\n\n  const initializedAtMount = useRef(isInitialized());\n  if (initializedAtMount.current !== isInitialized()) {\n    throw new Error(\n      \"[expo-observe] Router integration was toggled during a screen's lifecycle. \" +\n        'Call `ExpoObserve.configure({ disableRouterIntegration })` once at startup before any screen mounts.'\n    );\n  }\n\n  const screenId = route?.key;\n  const prevScreenId = useRef(screenId);\n  if (prevScreenId.current !== screenId) {\n    console.warn(\n      '[expo-observe] Screen ID changed between renders. This is most likely an expo-router bug.'\n    );\n    prevScreenId.current = screenId;\n  }\n\n  useEffect(() => {\n    // Strict-mode mounts the effect twice (mount → cleanup → re-mount). Without\n    // restoring isMounted here, the second mount would leave it permanently false\n    // and every markInteractive call would warn \"unmounted screen\".\n    isMounted.current = true;\n    return () => {\n      isMounted.current = false;\n    };\n  }, []);\n\n  const markInteractive = useCallback(\n    async (attributes?: MetricAttributes) => {\n      const now = performance.now();\n      const timestamp = new Date().toISOString();\n      if (!isMounted.current) {\n        console.warn('[expo-observe] Calling markInteractive on unmounted screen');\n        return;\n      }\n      if (!screenId) {\n        console.warn(\n          '[expo-observe] No metadata available for the current screen. Make sure to call useObserve inside a screen component.'\n        );\n        return;\n      }\n      if (navigation?.isFocused()) {\n        AppMetrics.markInteractive({\n          ...(attributes ?? {}),\n          routeName: pathname,\n        });\n      }\n\n      if (!storage) {\n        throw new Error(\n          '[expo-observe] markInteractive was called without an active ObserveProvider. Wrap your app in ObserveRoot from expo-observe.'\n        );\n      }\n\n      // Snapshot times BEFORE writing the new interactive timestamp so the\n      // duplicate-detection logic below sees the *previous* call, not this one.\n      const currentScreenData = storage.screenTimes[screenId];\n\n      storage.interactiveScreensIds.add(screenId);\n      if (storage.screenTimes[screenId]) {\n        storage.screenTimes[screenId] = {\n          ...storage.screenTimes[screenId],\n          lastInteractiveCall: now,\n        };\n      }\n\n      if (!currentScreenData?.dispatchTime) return;\n\n      const previousInteractiveCall = currentScreenData.lastInteractiveCall;\n      const previousWasAfterDispatch =\n        previousInteractiveCall != null && currentScreenData.dispatchTime < previousInteractiveCall;\n\n      if (previousWasAfterDispatch) {\n        // We only want to record interactive once per navigation\n        return;\n      }\n\n      // Stored in seconds to match the OTel `unit = \"s\"` convention\n      const interactiveTimeSeconds = (now - currentScreenData.dispatchTime) / 1000;\n      const mainSessionId = (await AppMetrics.getMainSession())?.id;\n      // TODO(@ubax): we should count the time against the action which caused the first navigation\n      // and add a param stating if during that time there was any navigation\n      if (mainSessionId) {\n        await AppMetrics.addCustomMetricToSession({\n          sessionId: mainSessionId,\n          timestamp,\n          category: 'navigation',\n          // TODO(@ubax): Use segments.join here to get full routeName and pass pathname and params via params\n          routeName: pathname,\n          name: 'tti',\n          value: interactiveTimeSeconds,\n          params: { routeParams },\n        });\n      }\n    },\n    [screenId, navigation, pathname, storage, routeParams]\n  );\n\n  return initializedAtMount.current ? markInteractive : null;\n}\n"]}

package/expo-module.config.json

@@ -9,7 +9,7 @@
     "publication": {
       "groupId": "expo.modules.observe",
       "artifactId": "expo.modules.observe",
-      "version": "56.0.6",
+      "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)
+}