From 0662f62db82026e44cfff7ec42776eb6c2c06cfa Mon Sep 17 00:00:00 2001
From: Elizabeth <me@liz.coffee>
Date: Mon, 2 Jun 2025 22:54:40 -0700
Subject: Significant logging improvements

---
 u/server/filter/json.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'u/server/filter/json.ts')

diff --git a/u/server/filter/json.ts b/u/server/filter/json.ts
index 79eabac..06cf1bf 100644
--- a/u/server/filter/json.ts
+++ b/u/server/filter/json.ts
@@ -22,12 +22,13 @@ export const jsonModel =
   ): RequestFilter<MessageT> =>
   (r: ITraceable<PenguenoRequest, ServerTrace>) =>
     r
-      .bimap(TraceUtil.withMetricTrace(ParseJsonMetric))
+        .bimap(TraceUtil.withFunctionTrace(jsonModel))
+        .bimap(TraceUtil.withMetricTrace(ParseJsonMetric))
       .map((j) =>
-        Either.fromFailableAsync<Error, MessageT>(j.get().json()).then(
+        Either.fromFailableAsync<Error, MessageT>(() => j.get().json()).then(
           (either) =>
             either.mapLeft((errReason) => {
-              j.trace.addTrace(LogLevel.WARN).trace(`${errReason}`);
+              j.trace.addTrace(LogLevel.WARN).trace(errReason);
               return new PenguenoError(
                 "seems to be invalid JSON (>//<) can you fix?",
                 400,
@@ -37,9 +38,8 @@ export const jsonModel =
       )
       .peek(
         TraceUtil.promiseify((traceableEither) =>
-          traceableEither.get().mapBoth(
-            () => traceableEither.trace.trace(ParseJsonMetric.failure),
-            () => traceableEither.trace.trace(ParseJsonMetric.success),
+          traceableEither.get().fold(({ isLeft }) =>
+              traceableEither.trace.trace(ParseJsonMetric[isLeft ? "failure" : "success"])
           ),
         ),
       )
-- 
cgit v1.2.3-70-g09d2