Skip to content

Open-source status page, incident response and uptime monitoring

🐛 fix bug api (#873)

Thibault Le Ouaybeabcb7c2e00
diff --git a/apps/checker/cmd/main.go b/apps/checker/cmd/main.go
index 676872d59..2a8461abc 100644
--- a/apps/checker/cmd/main.go
+++ b/apps/checker/cmd/main.go
@@ -261,10 +261,10 @@ func main() {
return fmt.Errorf("unable to ping: %w", err)
}
r.Region = flyRegion
+ res = r
if err := tinybirdClient.SendEvent(ctx, res, dataSourceName); err != nil {
log.Ctx(ctx).Error().Err(err).Msg("failed to send event to tinybird")
}
- res = r
return nil
}
if err := backoff.Retry(op, backoff.WithMaxRetries(backoff.NewExponentialBackOff(), 3)); err != nil {
diff --git a/apps/server/src/v1/check/post.test.ts b/apps/server/src/v1/check/post.test.ts
index b7779a3bf..2f54ba144 100644
--- a/apps/server/src/v1/check/post.test.ts
+++ b/apps/server/src/v1/check/post.test.ts
@@ -65,7 +65,7 @@ test("Create a single check ", async () => {
latency: 100,
region: "ams",
status: 200,
- timestamp: 1234567890,
+ time: 1234567890,
timing: {
connectDone: 4,
connectStart: 3,
@@ -93,7 +93,7 @@ test.todo("Create a multiple check ", async () => {
mockFetch.mockReturnValue(
Promise.resolve(
new Response(
- '{"status":200,"latency":100,"body":"Hello World","headers":{"Content-Type":"application/json"},"timestamp":1234567890,"timing":{"dnsStart":1,"dnsDone":2,"connectStart":3,"connectDone":4,"tlsHandshakeStart":5,"tlsHandshakeDone":6,"firstByteStart":7,"firstByteDone":8,"transferStart":9,"transferDone":10},"region":"ams"}',
+ '{"status":200,"latency":100,"body":"Hello World","headers":{"Content-Type":"application/json"},"time":1234567890,"timing":{"dnsStart":1,"dnsDone":2,"connectStart":3,"connectDone":4,"tlsHandshakeStart":5,"tlsHandshakeDone":6,"firstByteStart":7,"firstByteDone":8,"transferStart":9,"transferDone":10},"region":"ams"}',
{ status: 200, headers: { "content-type": "application/json" } }
)
)
@@ -134,7 +134,7 @@ test.todo("Create a multiple check ", async () => {
latency: 100,
region: "ams",
status: 200,
- timestamp: 1234567890,
+ time: 1234567890,
timing: {
connectDone: 4,
connectStart: 3,
diff --git a/apps/server/src/v1/check/post.ts b/apps/server/src/v1/check/post.ts
index d76635af5..43bc45114 100644
--- a/apps/server/src/v1/check/post.ts
+++ b/apps/server/src/v1/check/post.ts
@@ -8,6 +8,7 @@ import { openApiErrorResponses } from "../../libs/errors/openapi-error-responses
import type { checkAPI } from "./index";
import {
AggregatedResponseSchema,
+ AggregatedResult,
CheckPostResponseSchema,
CheckSchema,
ResponseSchema,
@@ -93,14 +94,12 @@ export function registerPostCheck(api: typeof checkAPI) {
const allResults = await Promise.allSettled(currentFetch);
result.push(...allResults);
}
- console.log(result);
const filteredResult = result.filter((r) => r.status === "fulfilled");
const fulfilledRequest = [];
for await (const r of filteredResult) {
if (r.status !== "fulfilled") throw new Error("No value");
const json = await r.value.json();
- console.log(ResponseSchema.safeParse(json));
fulfilledRequest.push(ResponseSchema.parse(json));
}
@@ -144,14 +143,6 @@ export function registerPostCheck(api: typeof checkAPI) {
latencyArray
) as number[];
- const aggregate = z.object({
- dms: AggregatedResponseSchema,
- connect: AggregatedResponseSchema,
- tls: AggregatedResponseSchema,
- firstByte: AggregatedResponseSchema,
- transfert: AggregatedResponseSchema,
- latency: AggregatedResponseSchema,
- });
const aggregatedDNS = AggregatedResponseSchema.parse({
p50: dnsPercentile[0],
p75: dnsPercentile[1],
@@ -202,7 +193,7 @@ export function registerPostCheck(api: typeof checkAPI) {
max: Math.max(...latencyArray),
});
- aggregatedResponse = aggregate.parse({
+ aggregatedResponse = AggregatedResult.parse({
dns: aggregatedDNS,
connection: aggregatedConnect,
tls: aggregatedTls,
@@ -218,7 +209,7 @@ export function registerPostCheck(api: typeof checkAPI) {
id: newCheck.id,
raw: allTimings,
response: lastResponse,
- aggregated: aggregatedResponse,
+ aggregated: aggregatedResponse ? aggregatedResponse : undefined,
});
return c.json(responseResult);
diff --git a/apps/server/src/v1/check/schema.ts b/apps/server/src/v1/check/schema.ts
index fb18ad462..f1513ceee 100644
--- a/apps/server/src/v1/check/schema.ts
+++ b/apps/server/src/v1/check/schema.ts
@@ -120,6 +120,15 @@ export const ResponseSchema = z.object({
region: z.string().openapi({ description: "The region where the check ran" }),
});
+export const AggregatedResult = z.object({
+ dns: AggregatedResponseSchema,
+ connect: AggregatedResponseSchema,
+ tls: AggregatedResponseSchema,
+ firstByte: AggregatedResponseSchema,
+ transfer: AggregatedResponseSchema,
+ latency: AggregatedResponseSchema,
+});
+
export const CheckPostResponseSchema = z.object({
id: z.number().int().openapi({ description: "The id of the check" }),
raw: z.array(TimingSchema).openapi({
@@ -128,4 +137,7 @@ export const CheckPostResponseSchema = z.object({
response: ResponseSchema.openapi({
description: "The last response of the check",
}),
+ aggregated: AggregatedResult.optional().openapi({
+ description: "The aggregated data of the check",
+ }),
});