- {{ t('native-observe-version-health-help') }} + {{ versionHealthHelp }}
| {{ t('native-observe-version') }} | ++ {{ t('native-observe-platform') }} + | ++ {{ t('native-observe-channel') }} + | {{ t('events') }} | @@ -464,10 +505,16 @@ watch([packageId, days], async () => {||
|---|---|---|---|---|---|
| {{ version.version_name }} | ++ {{ version.platform || '-' }} + | ++ {{ version.channel_name || '-' }} + | {{ formatCount(version.events) }} | {{ formatCount(version.devices) }} | {{ formatPercent(version.issue_free_rate) }} | diff --git a/supabase/functions/_backend/private/native_observe_stats.ts b/supabase/functions/_backend/private/native_observe_stats.ts index 5605c621ec..53aad1106e 100644 --- a/supabase/functions/_backend/private/native_observe_stats.ts +++ b/supabase/functions/_backend/private/native_observe_stats.ts @@ -1,11 +1,11 @@ -import type { Context } from 'hono' import type { Dayjs } from 'dayjs' +import type { Context } from 'hono' import type { UpdateDeliveryTimingEventCF } from '../utils/cloudflare.ts' import type { MiddlewareKeyVariables } from '../utils/hono.ts' import dayjs from 'dayjs' import utc from 'dayjs/plugin/utc.js' import { Hono } from 'hono/tiny' -import { parseStatsDurationMs, readNativeObservePluginVersionsCF, readUpdateDeliveryTimingEventsCF, resolveUpdateDeliveryTimingDurationMs } from '../utils/cloudflare.ts' +import { parseStatsDurationMs, readDevicePlatformChannelByIdsCF, readNativeObservePluginVersionsCF, readUpdateDeliveryTimingEventsCF, resolveUpdateDeliveryTimingDurationMs } from '../utils/cloudflare.ts' import { parseBody, simpleError, useCors } from '../utils/hono.ts' import { middlewareAuth } from '../utils/hono_jwt.ts' import { cloudlog } from '../utils/logging.ts' @@ -17,11 +17,13 @@ dayjs.extend(utc) const supportedPeriodDays = [1, 3, 7, 30] as const type NativeObservePeriodDays = typeof supportedPeriodDays[number] type NativeObserveView = 'global' | 'plugins' +type NativeObserveVersionGroup = 'version' | 'version_platform' | 'version_platform_channel' interface NativeObserveStatsRequest { app_id: string days?: number view?: NativeObserveView + version_group?: NativeObserveVersionGroup } interface NativeObserveMetricRow { @@ -36,6 +38,8 @@ interface NativeObserveMetricRow { interface NativeObserveVersionRow { version_name: string + platform?: string | null + channel_name?: string | null events: number | string devices: number | string issue_count: number | string @@ -74,6 +78,8 @@ interface NativeObserveEventSample { version_name: string device_id: string duration_ms: number | null + platform?: string + channel_name?: string } type NativeObserveNumericValue = number | string | null | undefined @@ -83,6 +89,7 @@ interface BuildNativeObserveResponseInput { days: NativeObservePeriodDays start: string end: string + versionGroup: NativeObserveVersionGroup dailyRows: NativeObserveMetricRow[] actionRows: NativeObserveMetricRow[] versionRows: NativeObserveVersionRow[] @@ -197,6 +204,8 @@ FROM filtered` const versionStatsQuery = `${filteredStatsCte} SELECT version_name, + NULL::text AS platform, + NULL::text AS channel_name, count(*)::integer AS events, count(DISTINCT device_id)::integer AS devices, count(*) FILTER (WHERE action = ANY($5::public.stats_action[]))::integer AS issue_count, @@ -208,6 +217,56 @@ GROUP BY version_name ORDER BY events DESC, version_name ASC LIMIT 12` +const filteredStatsWithDevicesCte = `WITH filtered AS ( + SELECT + to_char(date_trunc('day', stats.created_at AT TIME ZONE 'UTC'), 'YYYY-MM-DD') AS day, + stats.action, + COALESCE(NULLIF(stats.version_name, ''), 'unknown') AS version_name, + COALESCE(NULLIF(devices.platform::text, ''), 'unknown') AS platform, + COALESCE(NULLIF(devices.default_channel, ''), 'unknown') AS channel_name, + stats.device_id, + ${durationExpression.replaceAll('metadata', 'stats.metadata')} AS duration_ms + FROM public.stats + LEFT JOIN public.devices + ON devices.app_id = stats.app_id + AND devices.device_id = stats.device_id + WHERE stats.app_id = $1 + AND stats.created_at >= $2::timestamptz + AND stats.created_at < $3::timestamptz + AND stats.action = ANY($4::public.stats_action[]) +)` + +function buildVersionStatsQuery(versionGroup: NativeObserveVersionGroup): string { + if (versionGroup === 'version') + return versionStatsQuery + + const groupColumns = versionGroup === 'version_platform' + ? 'version_name, platform' + : 'version_name, platform, channel_name' + const channelSelect = versionGroup === 'version_platform' + ? 'NULL::text AS channel_name,' + : 'channel_name,' + const orderColumns = versionGroup === 'version_platform' + ? 'events DESC, version_name ASC, platform ASC' + : 'events DESC, version_name ASC, platform ASC, channel_name ASC' + + return `${filteredStatsWithDevicesCte} +SELECT + version_name, + platform, + ${channelSelect} + count(*)::integer AS events, + count(DISTINCT device_id)::integer AS devices, + count(*) FILTER (WHERE action = ANY($5::public.stats_action[]))::integer AS issue_count, + count(DISTINCT device_id) FILTER (WHERE action = ANY($5::public.stats_action[]))::integer AS affected_devices, + percentile_cont(0.9) WITHIN GROUP (ORDER BY duration_ms) FILTER (WHERE action = 'app_launch_ready'::public.stats_action AND duration_ms IS NOT NULL) AS launch_p90_ms, + percentile_cont(0.9) WITHIN GROUP (ORDER BY duration_ms) FILTER (WHERE action = 'webview_page_loaded'::public.stats_action AND duration_ms IS NOT NULL) AS webview_load_p90_ms +FROM filtered +GROUP BY ${groupColumns} +ORDER BY ${orderColumns} +LIMIT 36` +} + const pluginVersionStatsQuery = `SELECT COALESCE(NULLIF(plugin_version, ''), 'unknown') AS plugin_version, count(*)::integer AS devices, @@ -247,6 +306,31 @@ function normalizeNativeObserveView(value: unknown): NativeObserveView | null { return 'plugins' return null } + +function normalizeNativeObserveVersionGroup(value: unknown): NativeObserveVersionGroup | null { + if (value === undefined || value === 'version') + return 'version' + if (value === 'version_platform' || value === 'version_platform_channel') + return value + return null +} + +function needsVersionDeviceDimensions(versionGroup: NativeObserveVersionGroup) { + return versionGroup !== 'version' +} + +function versionGroupBucketKey( + versionGroup: NativeObserveVersionGroup, + versionName: string, + platform = 'unknown', + channelName = 'unknown', +) { + if (versionGroup === 'version') + return versionName + if (versionGroup === 'version_platform') + return `${versionName}\0${platform}` + return `${versionName}\0${platform}\0${channelName}` +} function generateDateLabels(from: Date, to: Date) { const start = dayjs(from).utc().startOf('day') const end = dayjs(to).utc().startOf('day') @@ -340,17 +424,23 @@ function toNativeObserveEventSamples(events: UpdateDeliveryTimingEventCF[]): Nat return samples } +interface NativeObserveVersionBucket { + version_name: string + platform: string | null + channel_name: string | null + devices: Set