fix: newest unconfirmed block propsal metric

hirosystems · Jan 27, 2025 · e0f3550 · e0f3550
1 parent 03e256e
commit e0f3550
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/src/pg/pg-store.ts b/src/pg/pg-store.ts
@@ -1077,7 +1077,7 @@ export class PgStore extends BasePgStore {
     return result;
   }
 
-  async getLastPendingProposalDate(args: { sql: PgSqlClient }) {
+  async getPendingProposalDate(args: { sql: PgSqlClient; kind: 'oldest' | 'newest' }) {
     const result = await args.sql<
       {
         received_at: Date | null;
@@ -1090,15 +1090,15 @@ export class PgStore extends BasePgStore {
             (SELECT COALESCE(MAX(block_height), 0) FROM block_pushes)
           ) AS height
       ),
-      oldest_pending_proposal AS (
+      pending_proposal AS (
         SELECT received_at
         FROM block_proposals bp
         WHERE bp.block_height > (SELECT height FROM max_heights)
-        ORDER BY received_at ASC
+        ORDER BY received_at ${args.kind == 'newest' ? args.sql`DESC` : args.sql`ASC`}
         LIMIT 1
       )
       SELECT received_at
-      FROM oldest_pending_proposal
+      FROM pending_proposal
     `;
 
     // Return the computed value or null if no pending proposals exist

diff --git a/src/prom-metrics.ts b/src/prom-metrics.ts
@@ -9,11 +9,23 @@ export function configureSignerMetrics(db: PgStore) {
   const metricsPrefix = 'signer_api_';
 
   new Gauge({
-    name: metricsPrefix + 'time_since_last_pending_block_proposal_ms',
+    name: metricsPrefix + 'time_since_oldest_pending_block_proposal_ms',
     help: 'Time in milliseconds since the oldest pending block proposal',
     async collect() {
       const dbResult = await db.sqlTransaction(async sql => {
-        return await db.getLastPendingProposalDate({ sql });
+        return await db.getPendingProposalDate({ sql, kind: 'oldest' });
+      });
+      this.reset();
+      this.set(dbResult ? Date.now() - dbResult.getTime() : 0);
+    },
+  });
+
+  new Gauge({
+    name: metricsPrefix + 'time_since_newest_pending_block_proposal_ms',
+    help: 'Time in milliseconds since the most recent pending block proposal',
+    async collect() {
+      const dbResult = await db.sqlTransaction(async sql => {
+        return await db.getPendingProposalDate({ sql, kind: 'newest' });
       });
       this.reset();
       this.set(dbResult ? Date.now() - dbResult.getTime() : 0);

diff --git a/tests/db/db-notifications.test.ts b/tests/db/db-notifications.test.ts
@@ -254,8 +254,9 @@ describe("Db notifications tests", () => {
     await db.sql`DELETE FROM blocks WHERE block_height >= ${block_height}`;
     await db.sql`DELETE FROM block_pushes WHERE block_height >= ${block_height}`;
 
-    const pendingProposalDate = await db.getLastPendingProposalDate({
+    const pendingProposalDate = await db.getPendingProposalDate({
       sql: db.sql,
+      kind: 'oldest',
     });
     expect(pendingProposalDate).toBeInstanceOf(Date);
     expect(
@@ -318,7 +319,7 @@ describe("Db notifications tests", () => {
     const receivedLines = responseTest.text.split("\n");
 
     const expectedPendingProposalLineRegex = new RegExp(
-      `# TYPE ${metricPrefix}time_since_last_pending_block_proposal_ms gauge\n${metricPrefix}time_since_last_pending_block_proposal_ms [1-9]\d*`,
+      `# TYPE ${metricPrefix}time_since_oldest_pending_block_proposal_ms gauge\n${metricPrefix}time_since_oldest_pending_block_proposal_ms [1-9]\d*`,
       "g",
     );
     expect(responseTest.text).toMatch(expectedPendingProposalLineRegex);