3 files changed, 18 insertions, 12 deletions
diff --git a/u/server/activity/fourohfour.ts b/u/server/activity/fourohfour.ts
index ed8c7eb..33cfe5f 100644
--- a/u/server/activity/fourohfour.ts
+++ b/u/server/activity/fourohfour.ts
@@ -7,12 +7,13 @@ import {
 } from "@emprespresso/pengueno";
 
 const messages = [
-  "D: Meow-t found! Your API call ran away!",
-  "404-bidden! But like...in a cute way >:3 !",
-  ":o Your data went on a paw-sible vacation!",
+  "D: meow-t found! your api call ran away!",
+  "404-bidden! but like...in a cute way >:3 !",
+  ":< your data went on a paw-sible vacation!",
   "uwu~ not found, but found our hearts instead!",
 ];
-const randomFourOhFour = () => messages[Math.random() * messages.length];
+const randomFourOhFour = () =>
+  messages[Math.floor(Math.random() * messages.length)];
 
 export interface IFourOhFourActivity {
   fourOhFour: IActivity;
diff --git a/u/server/request.ts b/u/server/request.ts
index c857f88..5dd9d7b 100644
--- a/u/server/request.ts
+++ b/u/server/request.ts
@@ -1,4 +1,5 @@
-import { LogMetricTraceable } from "@emprespresso/pengueno";
+import { LogMetricTraceable, LogTraceable } from "@emprespresso/pengueno";
+import { TraceUtil } from "../trace/util.ts";
 
 const greetings = [
   "hewwo :D",
@@ -39,9 +40,11 @@ export class PenguenoRequest extends Request {
     const id = crypto.randomUUID();
     const url = new URL(request.url);
     const { pathname } = url;
-    const traceSupplier = () => `[${id} <- ${request.method}'d @ ${pathname}]`;
-    return LogMetricTraceable.from(
+    const logTraceable = LogTraceable.of(
       new PenguenoRequest(url, { ...request }, id, new Date()),
-    ).bimap((_request) => [_request.get(), traceSupplier]);
+    ).bimap(
+      TraceUtil.withTrace(`Id=${id} Method=${request.method} Path=${pathname}`),
+    );
+    return LogMetricTraceable.ofLogTraceable(logTraceable);
   }
 }
diff --git a/u/server/response.ts b/u/server/response.ts
index 4531157..629dbb5 100644
--- a/u/server/response.ts
+++ b/u/server/response.ts
@@ -28,12 +28,12 @@ const getResponse = (
   };
 };
 
-const ResponseCodeMetrics = [1, 2, 3, 4, 5].map((x) =>
+const ResponseCodeMetrics = [0, 1, 2, 3, 4, 5].map((x) =>
   Metric.fromName(`response.${x}xx`),
 );
 export const getResponseMetric = (status: number) => {
-  const index = Math.floor(status / 100) + 1;
-  return ResponseCodeMetrics[index] ?? ResponseCodeMetrics[5 - 1];
+  const index = Math.floor(status / 100);
+  return ResponseCodeMetrics[index] ?? ResponseCodeMetrics[5];
 };
 
 export class PenguenoResponse extends Response {
@@ -67,7 +67,9 @@ export class JsonResponse extends PenguenoResponse {
       super(
         req,
         JSON.stringify(
-          e.fold(({ isLeft, value }) => (isLeft ? { error: value } : { ok: value })),
+          e.fold(({ isLeft, value }) =>
+            isLeft ? { error: value } : { ok: value },
+          ),
         ),
         optsWithJsonContentType,
       );