Fix Analytics Engine telemetry fields

Keep WebUI Analytics Engine double fields within Cloudflare's 20-column limit and add a Pages check guard.

Record APK filename and package name in bot worker usage analytics.

Author: zhaobozhen

AGENTS.md

@@ -102,6 +102,7 @@
 - Keep runtime log export/share/download code lazy-loaded; it is not first-screen behavior and can tip the tight initial JS gzip budget.
 - For slow Web UI link analysis, inspect runtime log split timings (`client_duration_ms`, `server_duration_ms`, `fetch_headers_ms`, `response_text_ms`, `json_parse_ms`, `render_ms`) before blaming rendering, history writes, or remote parsing. Large reports can justify moving noncritical work off the visible-result path, but they are not evidence of multi-second stalls by themselves.
 - Static Web UI text should stay non-selectable for drag/long-press copy. Only application/report data values should opt into selection, using the existing `app-data-text` whitelist class or an equivalent narrowly scoped report-data selector.
+- Cloudflare Analytics Engine exposes only `blob1`-`blob20` and `double1`-`double20`. Keep Web UI `functions/analytics.js` blob/double key arrays at 20 entries or fewer, and let `npm run pages:check` catch budget overflows before deploy.
 
 ## Worker Notes
 

packages/apk-webui/functions/analytics.js

@@ -46,8 +46,6 @@ const ANALYTICS_DOUBLE_KEYS = [
   "client_time_offset_ms",
   "downloaded_bytes",
   "range_request_count",
-  "reserved_1",
-  "reserved_2",
 ];
 
 const PRIVATE_EVENT_KEYS = new Set([

packages/apk-webui/scripts/check.mjs

@@ -1,5 +1,5 @@
 import { spawn } from "node:child_process";
-import { readdir } from "node:fs/promises";
+import { readFile, readdir } from "node:fs/promises";
 import { dirname, extname, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -16,6 +16,7 @@ const extraSyntaxFiles = [
 ];
 
 await runNpm(["run", "i18n:check", "--workspace", "@tgbot/shared"], repoDir);
+await validateAnalyticsEngineKeyBudgets();
 
 const syntaxFiles = (await collectSyntaxFiles(sourceRoots))
   .concat(extraSyntaxFiles)
@@ -78,6 +79,25 @@ function runNpm(args, cwd) {
   return run("cmd.exe", ["/d", "/s", "/c", ["npm", ...args].join(" ")], cwd);
 }
 
+async function validateAnalyticsEngineKeyBudgets() {
+  const analyticsPath = resolve(projectDir, "functions/analytics.js");
+  const source = await readFile(analyticsPath, "utf8");
+  for (const name of ["ANALYTICS_BLOB_KEYS", "ANALYTICS_DOUBLE_KEYS"]) {
+    const values = readStringArray(source, name);
+    if (values.length > 20) {
+      throw new Error(`${name} has ${values.length} entries; Analytics Engine supports at most 20`);
+    }
+  }
+}
+
+function readStringArray(source, name) {
+  const match = source.match(new RegExp(`const ${name} = \\[([\\s\\S]*?)\\];`));
+  if (!match) {
+    throw new Error(`Missing ${name}`);
+  }
+  return [...match[1].matchAll(/"([^"]+)"/gu)].map((item) => item[1]);
+}
+
 function formatCommand(command, args) {
   return [command, ...args].join(" ");
 }

packages/bot-worker/src/observability.js

@@ -21,8 +21,8 @@ const ANALYTICS_BLOB_KEYS = [
   "worker_version_tag",
   "error_name",
   "ui_mode",
-  "operation",
-  "input_source",
+  "file_name",
+  "package_name",
 ];
 
 const ANALYTICS_DOUBLE_KEYS = [
@@ -63,8 +63,6 @@ const ANALYTICS_PRIVATE_TELEMETRY_KEYS = new Set([
   ...CONSOLE_PRIVATE_TELEMETRY_KEYS,
   "app_icon_path",
   "error_message",
-  "file_name",
-  "package_name",
   "report_path",
   "url_host",
   "url_path",

packages/bot-worker/test/observability.test.mjs

@@ -0,0 +1,37 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { logInfoEvent } from "../src/observability.js";
+
+test("analytics datapoints include APK file and package identifiers", () => {
+  const datapoints = [];
+  const env = {
+    USAGE_ANALYTICS: {
+      writeDataPoint(point) {
+        datapoints.push(point);
+      },
+    },
+  };
+  const originalLog = console.log;
+  console.log = () => {};
+
+  try {
+    logInfoEvent(
+      env,
+      { request_id: "request-1", surface: "worker", route: "telegram_webhook" },
+      "apk.analysis.succeeded",
+      {
+        result: "success",
+        file_name: "sample.apk",
+        package_name: "com.example.app",
+      },
+    );
+  } finally {
+    console.log = originalLog;
+  }
+
+  assert.equal(datapoints.length, 1);
+  assert.equal(datapoints[0].blobs.length, 20);
+  assert.ok(datapoints[0].blobs.includes("sample.apk"));
+  assert.ok(datapoints[0].blobs.includes("com.example.app"));
+});