feedback: move 'massage' to the default body

wrn14897 · wrn14897 · commit 1a4be4aa7d5a · 2025-10-15T09:31:26.000-07:00
diff --git a/packages/api/src/fixtures.ts b/packages/api/src/fixtures.ts
@@ -63,10 +63,7 @@ const healthCheck = async () => {
   const client = await getClickhouseClient();
   const result = await client.ping();
   if (!result.success) {
-    logger.error({
-      message: 'ClickHouse health check failed',
-      error: result.error,
-    });
+    logger.error({ error: result.error }, 'ClickHouse health check failed');
     throw result.error;
   }
 };
diff --git a/packages/api/src/middleware/auth.ts b/packages/api/src/middleware/auth.ts
@@ -44,7 +44,7 @@ export function handleAuthError(
   res: Response,
   next: NextFunction,
 ) {
-  logger.debug({ message: 'Auth error', authErr: serializeError(err) });
+  logger.debug({ authErr: serializeError(err) }, 'Auth error');
   if (res.headersSent) {
     return next(err);
   }
diff --git a/packages/api/src/routers/api/ai.ts b/packages/api/src/routers/api/ai.ts
@@ -188,7 +188,7 @@ router.post(
       const source = await getSource(teamId.toString(), sourceId);
 
       if (source == null) {
-        logger.error({ message: 'invalid source id', sourceId, teamId });
+        logger.error({ sourceId, teamId }, 'invalid source id');
         return res.status(400).json({
           error: 'Invalid source',
         });
diff --git a/packages/api/src/tasks/checkAlerts.ts b/packages/api/src/tasks/checkAlerts.ts
@@ -92,11 +92,13 @@ const fireChannelEvent = async ({
   }
 
   if ((alert.silenced?.until?.getTime() ?? 0) > Date.now()) {
-    logger.info({
-      message: 'Skipped firing alert due to silence',
-      alertId: alert.id,
-      silenced: alert.silenced,
-    });
+    logger.info(
+      {
+        alertId: alert.id,
+        silenced: alert.silenced,
+      },
+      'Skipped firing alert due to silence',
+    );
     return;
   }
 
@@ -157,14 +159,16 @@ export const processAlert = async (
       previous &&
       fns.getTime(previous.createdAt) === fns.getTime(nowInMinsRoundDown)
     ) {
-      logger.info({
-        message: `Skipped to check alert since the time diff is still less than 1 window size`,
-        windowSizeInMins,
-        nowInMinsRoundDown,
-        previous,
-        now,
-        alertId: alert.id,
-      });
+      logger.info(
+        {
+          windowSizeInMins,
+          nowInMinsRoundDown,
+          previous,
+          now,
+          alertId: alert.id,
+        },
+        `Skipped to check alert since the time diff is still less than 1 window size`,
+      );
       return;
     }
     const checkStartTime = previous
@@ -218,20 +222,24 @@ export const processAlert = async (
         };
       }
     } else {
-      logger.error({
-        message: `Unsupported alert source: ${alert.source}`,
-        alertId: alert.id,
-      });
+      logger.error(
+        {
+          alertId: alert.id,
+        },
+        `Unsupported alert source: ${alert.source}`,
+      );
       return;
     }
 
     // Fetch data
     if (chartConfig == null) {
-      logger.error({
-        message: 'Failed to build chart config',
-        chartConfig,
-        alertId: alert.id,
-      });
+      logger.error(
+        {
+          chartConfig,
+          alertId: alert.id,
+        },
+        'Failed to build chart config',
+      );
       return;
     }
 
@@ -241,13 +249,15 @@ export const processAlert = async (
       metadata,
     });
 
-    logger.info({
-      message: `Received alert metric [${alert.source} source]`,
-      alertId: alert.id,
-      checksData,
-      checkStartTime,
-      checkEndTime,
-    });
+    logger.info(
+      {
+        alertId: alert.id,
+        checksData,
+        checkStartTime,
+        checkEndTime,
+      },
+      `Received alert metric [${alert.source} source]`,
+    );
 
     // TODO: support INSUFFICIENT_DATA state
     const history: IAlertHistory = {
@@ -276,19 +286,23 @@ export const processAlert = async (
       );
 
       if (timestampColumnName == null) {
-        logger.error({
-          message: 'Failed to find timestamp column',
-          meta,
-          alertId: alert.id,
-        });
+        logger.error(
+          {
+            meta,
+            alertId: alert.id,
+          },
+          'Failed to find timestamp column',
+        );
         return;
       }
       if (valueColumnNames.size === 0) {
-        logger.error({
-          message: 'Failed to find value column',
-          meta,
-          alertId: alert.id,
-        });
+        logger.error(
+          {
+            meta,
+            alertId: alert.id,
+          },
+          'Failed to find value column',
+        );
         return;
       }
 
diff --git a/packages/api/src/tasks/index.ts b/packages/api/src/tasks/index.ts
@@ -34,11 +34,13 @@ const main = async (argv: TaskArgs) => {
         `Task [${task.name()}] finished in ${(performance.now() - t0).toFixed(2)} ms`,
       );
     } catch (e: unknown) {
-      logger.error({
-        message: `Task [${task.name()}] failed: ${serializeError(e)}`,
-        cause: e,
-        task,
-      });
+      logger.error(
+        {
+          cause: e,
+          task,
+        },
+        `Task [${task.name()}] failed: ${serializeError(e)}`,
+      );
     } finally {
       await task.asyncDispose();
       span.end();
diff --git a/packages/api/src/tasks/providers/index.ts b/packages/api/src/tasks/providers/index.ts
@@ -102,11 +102,13 @@ export async function loadProvider(
       try {
         return providerFn();
       } catch (err) {
-        logger.error({
-          message: `error creating instance of ${providerName} provider; using default`,
-          cause: err,
-          providerName,
-        });
+        logger.error(
+          {
+            cause: err,
+            providerName,
+          },
+          `error creating instance of ${providerName} provider; using default`,
+        );
       }
     }
   }
diff --git a/packages/api/src/tasks/template.ts b/packages/api/src/tasks/template.ts
@@ -106,15 +106,17 @@ function validateWebhookUrl(
     // check that hostname ends in "slack.com"
     if (!isValidSlackUrl(webhook.url)) {
       const message = `Slack Webhook URL ${webhook.url} does not have hostname that ends in 'slack.com'`;
-      logger.warn({
-        webhook: {
-          id: webhook._id.toString(),
-          name: webhook.name,
-          url: webhook.url,
-          body: webhook.body,
+      logger.warn(
+        {
+          webhook: {
+            id: webhook._id.toString(),
+            name: webhook.name,
+            url: webhook.url,
+            body: webhook.body,
+          },
         },
         message,
-      });
+      );
       throw new Error(`SSRF AllowedDomainError: ${message}`);
     }
   } else {
@@ -124,15 +126,17 @@ function validateWebhookUrl(
       const message = `Webhook attempting to query blacklisted route ${blacklistedWebhookHosts.get(
         url.host,
       )}`;
-      logger.warn({
-        webhook: {
-          id: webhook._id.toString(),
-          name: webhook.name,
-          url: webhook.url,
-          body: webhook.body,
+      logger.warn(
+        {
+          webhook: {
+            id: webhook._id.toString(),
+            name: webhook.name,
+            url: webhook.url,
+            body: webhook.body,
+          },
         },
         message,
-      });
+      );
       throw new Error(`SSRF AllowedDomainError: ${message}`);
     }
   }
@@ -200,10 +204,12 @@ export const handleSendGenericWebhook = async (
       title: escapeJsonString(message.title),
     });
   } catch (e) {
-    logger.error({
-      message: 'Failed to compile generic webhook body',
-      error: serializeError(e),
-    });
+    logger.error(
+      {
+        error: serializeError(e),
+      },
+      'Failed to compile generic webhook body',
+    );
     return;
   }
 
@@ -220,10 +226,12 @@ export const handleSendGenericWebhook = async (
       throw new Error(errorText);
     }
   } catch (e) {
-    logger.error({
-      message: 'Failed to send generic webhook message',
-      error: serializeError(e),
-    });
+    logger.error(
+      {
+        error: serializeError(e),
+      },
+      'Failed to send generic webhook message',
+    );
   }
 };
 
@@ -508,12 +516,14 @@ export const renderAlertTemplate = async ({
         2500,
       );
     } catch (e) {
-      logger.error({
-        message: 'Failed to fetch sample logs',
-        savedSearchId: savedSearch.id,
-        chartConfig,
-        error: serializeError(e),
-      });
+      logger.error(
+        {
+          savedSearchId: savedSearch.id,
+          chartConfig,
+          error: serializeError(e),
+        },
+        'Failed to fetch sample logs',
+      );
     }
 
     rawTemplateBody = `${group ? `Group: "${group}"` : ''}
diff --git a/packages/api/src/tasks/usageStats.ts b/packages/api/src/tasks/usageStats.ts
@@ -128,37 +128,39 @@ async function getUsageStats() {
       getClickhouseTableSize(),
     ]);
     const clusterId = team[0]?._id.toString();
-    logger.info({
-      message: 'track-hyperdx-oss-usage-stats',
-      clusterId,
-      version: config.CODE_VERSION,
-      userCounts,
-      os: {
-        arch: os.arch(),
-        freemem: os.freemem(),
-        uptime: os.uptime(),
-      },
-      chStats: {
-        tables: chTables.reduce(
-          (acc, curr) => ({
-            ...acc,
-            [curr.table]: {
-              avgDaySize: parseInt(curr.avgDaySize),
-              days: parseInt(curr.days),
-              lastModified: new Date(curr.latestModification).getTime(),
-              maxTime: new Date(curr.max_time).getTime(),
-              minTime: new Date(curr.min_time).getTime(),
-              rows: parseInt(curr.rows),
-              size: parseInt(curr.size),
-            },
-          }),
-          {},
-        ),
-        rows: chTables.reduce((acc, curr) => acc + parseInt(curr.rows), 0),
-        size: chTables.reduce((acc, curr) => acc + parseInt(curr.size), 0),
+    logger.info(
+      {
+        clusterId,
+        version: config.CODE_VERSION,
+        userCounts,
+        os: {
+          arch: os.arch(),
+          freemem: os.freemem(),
+          uptime: os.uptime(),
+        },
+        chStats: {
+          tables: chTables.reduce(
+            (acc, curr) => ({
+              ...acc,
+              [curr.table]: {
+                avgDaySize: parseInt(curr.avgDaySize),
+                days: parseInt(curr.days),
+                lastModified: new Date(curr.latestModification).getTime(),
+                maxTime: new Date(curr.max_time).getTime(),
+                minTime: new Date(curr.min_time).getTime(),
+                rows: parseInt(curr.rows),
+                size: parseInt(curr.size),
+              },
+            }),
+            {},
+          ),
+          rows: chTables.reduce((acc, curr) => acc + parseInt(curr.rows), 0),
+          size: chTables.reduce((acc, curr) => acc + parseInt(curr.size), 0),
+        },
+        timestamp: nowInMs,
       },
-      timestamp: nowInMs,
-    });
+      'track-hyperdx-oss-usage-stats',
+    );
   } catch (err) {
     // ignore
   }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export function handleAuthError(`
`44`	`44`	`res: Response,`
`45`	`45`	`next: NextFunction,`
`46`	`46`	`) {`
`47`		`- logger.debug({ message: 'Auth error', authErr: serializeError(err) });`
	`47`	`+ logger.debug({ authErr: serializeError(err) }, 'Auth error');`
`48`	`48`	`if (res.headersSent) {`
`49`	`49`	`return next(err);`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,11 +102,13 @@ export async function loadProvider(`
`102`	`102`	`try {`
`103`	`103`	`return providerFn();`
`104`	`104`	`} catch (err) {`
`105`		`- logger.error({`
`106`		- message: `error creating instance of ${providerName} provider; using default`,
`107`		`- cause: err,`
`108`		`- providerName,`
`109`		`- });`
	`105`	`+ logger.error(`
	`106`	`+ {`
	`107`	`+ cause: err,`
	`108`	`+ providerName,`
	`109`	`+ },`
	`110`	+ `error creating instance of ${providerName} provider; using default`,
	`111`	`+ );`
`110`	`112`	`}`
`111`	`113`	`}`
`112`	`114`	`}`