Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions services/o11y/src/alerting/gastown-health-query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,17 @@ type QueryEnv = {

type FetchFn = (url: string, init?: RequestInit) => Promise<Response>;

const AnalyticsEngineNumberSchema = z.preprocess(
value => (typeof value === 'string' && value.trim() !== '' ? Number(value) : value),
z.number().finite().nonnegative().nullable()
);

const GastownHealthResponseSchema = z.object({
data: z.array(
z.object({
town_id: z.string(),
weighted_failed_checks: z.number().nonnegative().nullable(),
weighted_successful_checks: z.number().nonnegative().nullable(),
weighted_failed_checks: AnalyticsEngineNumberSchema,
weighted_successful_checks: AnalyticsEngineNumberSchema,
latest_event_timestamp: z.string().nullable(),
})
),
Expand Down
31 changes: 25 additions & 6 deletions services/o11y/test/gastown-health-query.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,20 @@ describe('queryGastownHealth', () => {
data: [
{
town_id: 'town-1',
weighted_failed_checks: 20,
weighted_successful_checks: 100,
weighted_failed_checks: '20',
weighted_successful_checks: '100',
latest_event_timestamp: '2026-06-24 15:09:00.000',
},
{
town_id: 'town-2',
weighted_failed_checks: 4,
weighted_successful_checks: 50,
weighted_failed_checks: '4',
weighted_successful_checks: '50',
latest_event_timestamp: '2026-06-24 15:10:00.000',
},
{
town_id: '',
weighted_failed_checks: 3,
weighted_successful_checks: 2,
weighted_failed_checks: '3',
weighted_successful_checks: '2',
latest_event_timestamp: '2026-06-24 15:08:00.000',
},
],
Expand Down Expand Up @@ -107,6 +107,25 @@ describe('queryGastownHealth', () => {
});
});

it.each(['', 'not-a-number', '-1', 'Infinity'])(
'rejects invalid Analytics Engine aggregate %j',
async aggregate => {
const fetchFn: FetchFn = async () =>
Response.json({
data: [
{
town_id: '',
weighted_failed_checks: aggregate,
weighted_successful_checks: '0',
latest_event_timestamp: null,
},
],
});

await expect(queryGastownHealth(makeEnv(), fetchFn)).rejects.toThrow();
}
);

it('rejects malformed Analytics Engine responses', async () => {
const fetchFn: FetchFn = async () =>
Response.json({ data: [{ weighted_failed_checks: '20' }] });
Expand Down