fix: allow valid API rate limit metrics bucket sizes

Author: StackedByAdit

apps/webapp/app/env.server.ts

@@ -779,7 +779,6 @@ const EnvironmentSchema = z
       .number()
       .int()
       .positive()
-      .multipleOf(10)
       .refine((seconds) => 60 % seconds === 0 || seconds % 60 === 0, {
         message: "must divide or be a multiple of 60 so buckets align to minute boundaries",
       })

apps/webapp/test/env.server.test.ts

@@ -116,3 +116,41 @@ describe("webapp environment secrets", () => {
     expect(env.GITHUB_APP_CLIENT_SECRET).toBe("client-secret");
   });
 });
+
+describe("API_RATE_LIMIT_METRICS_BUCKET_SECONDS", () => {
+  afterEach(() => {
+    process.env = originalEnv;
+    vi.resetModules();
+  });
+
+  it("defaults to 10 when unset", async () => {
+    process.env = { ...requiredEnv };
+    delete process.env.API_RATE_LIMIT_METRICS_BUCKET_SECONDS;
+
+    const { env } = await import("../app/env.server");
+
+    expect(env.API_RATE_LIMIT_METRICS_BUCKET_SECONDS).toBe(10);
+  });
+
+  it.each(["10", "15", "20", "30", "60", "120"])(
+    "accepts valid divisor or multiple of 60: %s",
+    async (value) => {
+      process.env = { ...requiredEnv, API_RATE_LIMIT_METRICS_BUCKET_SECONDS: value };
+
+      const { env } = await import("../app/env.server");
+
+      expect(env.API_RATE_LIMIT_METRICS_BUCKET_SECONDS).toBe(Number(value));
+    }
+  );
+
+  it.each(["7", "0", "-10", "15.5", "not-a-number"])(
+    "rejects invalid bucket seconds: %s",
+    async (value) => {
+      process.env = { ...requiredEnv, API_RATE_LIMIT_METRICS_BUCKET_SECONDS: value };
+
+      await expect(import("../app/env.server")).rejects.toThrow(
+        "API_RATE_LIMIT_METRICS_BUCKET_SECONDS"
+      );
+    }
+  );
+});

docs/self-hosting/env/webapp.mdx

@@ -79,7 +79,7 @@ mode: "wide"
 | `API_RATE_LIMIT_JWT_WINDOW`                      | No       | 1m                    | API rate limit JWT window.                                                                                         |
 | `API_RATE_LIMIT_JWT_TOKENS`                      | No       | 60                    | API rate limit JWT tokens.                                                                                         |
 | `API_RATE_LIMIT_METRICS_ENABLED`                 | No       | 0                     | Record API rate limit usage into the `metrics` table: `1` for everyone, `allowlist` for flagged organizations.     |
-| `API_RATE_LIMIT_METRICS_BUCKET_SECONDS`          | No       | 10                    | Aggregation bucket width for API rate limit metrics: 10, 20, 30 or a multiple of 60.                               |
+| `API_RATE_LIMIT_METRICS_BUCKET_SECONDS`          | No       | 10                    | Aggregation bucket width for API rate limit metrics: any divisor of 60 (e.g. 10, 15, 20, 30) or a multiple of 60.  |
 | `API_RATE_LIMIT_METRICS_FLUSH_INTERVAL_MS`       | No       | 10000                 | How often aggregated API rate limit metrics are flushed to ClickHouse.                                             |
 | `API_RATE_LIMIT_METRICS_MAX_ENTRIES`             | No       | 10000                 | Cap on distinct (environment, bucket) entries held between flushes.                                                |
 | `API_RATE_LIMIT_METRICS_WAIT_FOR_ASYNC_INSERT`   | No       | 0                     | Wait for ClickHouse to write each async insert of API rate limit metrics, surfacing write failures.                |