Revert back to Histogram for metrics

TheAntiCarCollective · Oct 20, 2023 · 659b45a · 659b45a
1 parent 852af53
commit 659b45a
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 80 deletions.
diff --git a/src/shared/discord.ts b/src/shared/discord.ts
@@ -12,17 +12,17 @@ import type {
 
 import { Client, Events, Routes, User } from "discord.js";
 import assert from "node:assert";
-import { Gauge, Summary } from "prom-client";
+import { Gauge, Histogram } from "prom-client";
 
 import loggerFactory from "../logger.factory";
 
 // region Logger and Metrics
 const logger = loggerFactory(module);
 
-const interactionRequestDuration = new Summary({
-  help: "Interaction request duration in milliseconds",
-  labelNames: ["status", "handler"],
-  name: "interaction_request_duration_milliseconds",
+const interactionRequestDuration = new Histogram({
+  help: "Interaction request duration in seconds",
+  labelNames: ["handler", "status"],
+  name: "interaction_request_duration_seconds",
 });
 
 const shardPing = new Gauge({
@@ -181,69 +181,32 @@ const getHandler = (interaction: BaseInteraction, uiid?: string) => {
   }
 };
 
-const onInteraction = (
-  status: "error" | "success",
-  interaction: BaseInteraction,
-  startRequestTime: number,
-  uiid?: string,
-) => {
-  const handler = getHandler(interaction, uiid);
-  const labels = { handler, status };
-
-  return (result: unknown) => {
-    const endRequestTime = performance.now();
-    const requestDuration = endRequestTime - startRequestTime;
-    interactionRequestDuration.observe(labels, requestDuration);
-
-    const childLogger = logger.child({
-      interaction,
-      labels,
-      requestDuration,
-    });
-
-    if (status === "error") {
-      childLogger.error(result, "ON_INTERACTION_ERROR");
-    } else if (requestDuration >= 2500) {
-      childLogger.warn(result, "ON_INTERACTION_SUCCESS_SLOW");
-    } else {
-      childLogger.info(result, "ON_INTERACTION_SUCCESS");
-    }
-
-    return status;
-  };
+const createContext = (status: "error" | "success", uiid?: string) => {
+  return (result: unknown) => ({ result, status, uiid });
 };
 
-const onCommand = (
-  interaction: CommandInteraction,
-  startRequestTime: number,
-) => {
+const onCommand = (interaction: CommandInteraction) => {
   for (const [name, { onCommand }] of commands) {
     if (name === interaction.commandName) {
       return onCommand(interaction)
-        .then(onInteraction("success", interaction, startRequestTime))
-        .catch(onInteraction("error", interaction, startRequestTime));
+        .then(createContext("success"))
+        .catch(createContext("error"));
     }
   }
 };
 
-const onAutocomplete = (
-  interaction: AutocompleteInteraction,
-  startRequestTime: number,
-) => {
+const onAutocomplete = (interaction: AutocompleteInteraction) => {
   for (const [name, { onAutocomplete }] of commands) {
     if (name === interaction.commandName) {
       assert(onAutocomplete !== undefined);
       return onAutocomplete(interaction)
-        .then(onInteraction("success", interaction, startRequestTime))
-        .catch(onInteraction("error", interaction, startRequestTime));
+        .then(createContext("success"))
+        .catch(createContext("error"));
     }
   }
 };
 
-const onMessageComponent = (
-  interaction: MessageComponentInteraction,
-  startRequestTime: number,
-) => {
+const onMessageComponent = (interaction: MessageComponentInteraction) => {
   let { customId } = interaction;
   for (const [uiid, onComponent] of components) {
     const legacyPrefix = `GLOBAL_${uiid}_`;
@@ -255,42 +218,58 @@ const onMessageComponent = (
     if (customId.startsWith(uiid)) {
       const id = customId.slice(uiid.length);
       return onComponent(interaction, id)
-        .then(onInteraction("success", interaction, startRequestTime, uiid))
-        .catch(onInteraction("error", interaction, startRequestTime, uiid));
+        .then(createContext("success", uiid))
+        .catch(createContext("error", uiid));
     }
   }
 };
 
-const onModalSubmit = (
-  interaction: ModalSubmitInteraction,
-  startRequestTime: number,
-) => {
+const onModalSubmit = (interaction: ModalSubmitInteraction) => {
   const { customId } = interaction;
   for (const [uiid, onModal] of modals) {
     if (customId.startsWith(uiid)) {
       const id = customId.slice(uiid.length);
       return onModal(interaction, id)
-        .then(onInteraction("success", interaction, startRequestTime, uiid))
-        .catch(onInteraction("error", interaction, startRequestTime, uiid));
+        .then(createContext("success", uiid))
+        .catch(createContext("error", uiid));
     }
   }
 };
 
 discord.on(Events.InteractionCreate, async (interaction) => {
-  const startRequestTime = performance.now();
+  const observeRequestDuration = interactionRequestDuration.startTimer();
 
-  let status;
+  let context;
   if (interaction.isCommand()) {
-    status = await onCommand(interaction, startRequestTime);
+    context = await onCommand(interaction);
   } else if (interaction.isAutocomplete()) {
-    status = await onAutocomplete(interaction, startRequestTime);
+    context = await onAutocomplete(interaction);
   } else if (interaction.isMessageComponent()) {
-    status = await onMessageComponent(interaction, startRequestTime);
+    context = await onMessageComponent(interaction);
   } else if (interaction.isModalSubmit()) {
-    status = await onModalSubmit(interaction, startRequestTime);
+    context = await onModalSubmit(interaction);
   }
 
-  assert(status !== undefined);
+  assert(context !== undefined);
+  const { result, status, uiid } = context;
+
+  const handler = getHandler(interaction, uiid);
+  const labels = { handler, status };
+  const requestDuration = observeRequestDuration(labels);
+
+  const childLogger = logger.child({
+    interaction,
+    labels,
+    requestDuration,
+  });
+
+  if (status === "error") {
+    childLogger.error(result, "ON_INTERACTION_ERROR");
+  } else if (requestDuration >= 2.5) {
+    childLogger.warn(result, "ON_INTERACTION_SUCCESS_SLOW");
+  } else {
+    childLogger.info(result, "ON_INTERACTION_SUCCESS");
+  }
 });
 // endregion
 // endregion
diff --git a/src/shared/postgresql.ts b/src/shared/postgresql.ts
@@ -1,7 +1,7 @@
 import type { PoolClient } from "pg";
 
 import { Pool } from "pg";
-import { Summary } from "prom-client";
+import { Histogram } from "prom-client";
 
 import type { Caller } from "./caller";
 
@@ -15,10 +15,10 @@ type Callback<T> = (client: PoolClient) => Promise<T>;
 // region Logger and Metrics
 const logger = loggerFactory(module);
 
-const databaseRequestDuration = new Summary({
-  help: "Database request duration in milliseconds",
-  labelNames: ["caller", "status", "connected"],
-  name: "database_request_duration_milliseconds",
+const databaseRequestDuration = new Histogram({
+  help: "Database request duration in seconds",
+  labelNames: ["caller", "connected", "status"],
+  name: "database_request_duration_seconds",
 });
 // endregion
 
@@ -31,7 +31,7 @@ const postgresql = new Pool({
 });
 
 export const useClient = async <T>(caller: Caller, callback: Callback<T>) => {
-  const startRequestTime = performance.now();
+  const observeRequestDuration = databaseRequestDuration.startTimer();
   const onDatabase =
     (status: "error" | "success", client?: PoolClient) => (result: unknown) => {
       client?.release(status === "error");
@@ -42,14 +42,8 @@ export const useClient = async <T>(caller: Caller, callback: Callback<T>) => {
         status,
       };
 
-      const endRequestTime = performance.now();
-      const requestDuration = endRequestTime - startRequestTime;
-      databaseRequestDuration.observe(labels, requestDuration);
-
-      const childLogger = logger.child({
-        labels,
-        requestDuration,
-      });
+      const requestDuration = observeRequestDuration(labels);
+      const childLogger = logger.child({ labels, requestDuration });
 
       if (status === "error") {
         childLogger.error(result, "ON_DATABASE_ERROR");