refactor(metrics): move SQLite metrics into metrics.ts. PE-4401

ar-io · Aug 29, 2023 · 6107f02 · 6107f02
1 parent 257f3f8
commit 6107f02
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/src/database/standalone-sqlite.ts b/src/database/standalone-sqlite.ts
@@ -25,7 +25,6 @@ import {
   parentPort,
   workerData,
 } from 'node:worker_threads';
-import * as promClient from 'prom-client';
 import * as R from 'ramda';
 import sql from 'sql-bricks';
 import * as winston from 'winston';
@@ -45,6 +44,7 @@ import {
 import { MANIFEST_CONTENT_TYPE } from '../lib/encoding.js';
 import { currentUnixTimestamp } from '../lib/time.js';
 import log from '../log.js';
+import * as metrics from '../metrics.js';
 import {
   BlockListValidator,
   BundleIndex,
@@ -2152,7 +2152,6 @@ export class StandaloneSqliteDatabase
     NestedDataIndexWriter
 {
   log: winston.Logger;
-  methodDurationSummary: promClient.Summary<string>;
   private workers: {
     core: { read: any[]; write: any[] };
     data: { read: any[]; write: any[] };
@@ -2185,29 +2184,19 @@ export class StandaloneSqliteDatabase
   };
   constructor({
     log,
-    metricsRegistry,
     coreDbPath,
     dataDbPath,
     moderationDbPath,
     bundlesDbPath,
   }: {
     log: winston.Logger;
-    metricsRegistry: promClient.Registry;
     coreDbPath: string;
     dataDbPath: string;
     moderationDbPath: string;
     bundlesDbPath: string;
   }) {
     this.log = log.child({ class: 'StandaloneSqliteDatabase' });
 
-    // Metrics
-    this.methodDurationSummary = new promClient.Summary({
-      name: 'standalone_sqlite_method_duration_seconds',
-      help: 'Count of failed Arweave peer info requests',
-      labelNames: ['worker', 'role', 'method'],
-    });
-    metricsRegistry.registerMetric(this.methodDurationSummary);
-
     const self = this;
 
     function spawn(pool: WorkerPoolName, role: WorkerRoleName) {
@@ -2314,7 +2303,7 @@ export class StandaloneSqliteDatabase
     method: string,
     args: any,
   ): Promise<any> {
-    const end = this.methodDurationSummary.startTimer({
+    const end = metrics.methodDurationSummary.startTimer({
       worker: workerName,
       role,
       method,

diff --git a/src/metrics.ts b/src/metrics.ts
@@ -44,3 +44,12 @@ export const arweavePeerRefreshErrorCounter = new promClient.Counter({
   name: 'arweave_peer_referesh_errors_total',
   help: 'Count of errors refreshing the Arweave peers list',
 });
+
+//
+// SQLite metrics
+//
+export const methodDurationSummary = new promClient.Summary({
+  name: 'standalone_sqlite_method_duration_seconds',
+  help: 'Count of failed Arweave peer info requests',
+  labelNames: ['worker', 'role', 'method'],
+});
diff --git a/src/system.ts b/src/system.ts
@@ -89,7 +89,6 @@ export const arweaveClient = new ArweaveCompositeClient({
 
 export const db = new StandaloneSqliteDatabase({
   log,
-  metricsRegistry: promClient.register,
   coreDbPath: 'data/sqlite/core.db',
   dataDbPath: 'data/sqlite/data.db',
   moderationDbPath: 'data/sqlite/moderation.db',