Move the prometheus monitoring for fill feed to the calling script

client/ts/src/fillFeed.ts

@@ -6,8 +6,6 @@ import { PROGRAM_ID } from './manifest';
 import { convertU128 } from './utils/numbers';
 import { genAccDiscriminator } from './utils/discriminator';
 import * as promClient from 'prom-client';
-import express from 'express';
-import promBundle from 'express-prom-bundle';
 import { FillLogResult } from './types';
 
 // For live monitoring of the fill feed. For a more complete look at fill
@@ -182,40 +180,6 @@ export class FillFeed {
   }
 }
 
-/**
- * Run a fill feed as a websocket server that clients can connect to and get
- * notifications of fills for all manifest markets.
- */
-export async function runFillFeed() {
-  const connection: Connection = new Connection(
-    process.env.RPC_URL || 'http://127.0.0.1:8899',
-    'confirmed',
-  );
-
-  promClient.collectDefaultMetrics({
-    labels: {
-      app: 'fillFeed',
-    },
-  });
-
-  const register = new promClient.Registry();
-  register.setDefaultLabels({
-    app: 'fillFeed',
-  });
-  const metricsApp = express();
-  metricsApp.listen(8080);
-
-  const promMetrics = promBundle({
-    includeMethod: true,
-    metricsApp,
-    autoregister: false,
-  });
-  metricsApp.use(promMetrics);
-
-  const fillFeed: FillFeed = new FillFeed(connection);
-  await fillFeed.parseLogs();
-}
-
 const fillDiscriminant = genAccDiscriminator('manifest::logs::FillLog');
 
 function toFillLogResult(

debug-ui/package.json

@@ -26,8 +26,11 @@
     "@solana/wallet-adapter-react-ui": "^0.9.35",
     "@solana/wallet-adapter-wallets": "^0.19.32",
     "@solana/web3.js": "^1.95.0",
+    "express": "^4.21.0",
+    "express-prom-bundle": "^7.0.0",
     "lightweight-charts": "^4.2.0",
     "next": "14.2.5",
+    "prom-client": "^15.1.3",
     "react": "^18.2.0",
     "react-dom": "^18",
     "react-toastify": "^10.0.5"

debug-ui/scripts/start-fill-feed.ts

@@ -3,6 +3,9 @@ import 'dotenv/config';
 import { FillFeed } from '@cks-systems/manifest-sdk/fillFeed';
 import { Connection } from '@solana/web3.js';
 import { sleep } from '@/lib/util';
+import * as promClient from 'prom-client';
+import express from 'express';
+import promBundle from 'express-prom-bundle';
 
 const { RPC_URL } = process.env;
 
@@ -28,6 +31,27 @@ const monitorFeed = async (feed: FillFeed) => {
 };
 
 const run = async () => {
+  // Prometheus monitoring for this feed on the default prometheus port.
+  promClient.collectDefaultMetrics({
+    labels: {
+      app: 'fillFeed',
+    },
+  });
+
+  const register = new promClient.Registry();
+  register.setDefaultLabels({
+    app: 'fillFeed',
+  });
+  const metricsApp = express();
+  metricsApp.listen(9090);
+
+  const promMetrics = promBundle({
+    includeMethod: true,
+    metricsApp,
+    autoregister: false,
+  });
+  metricsApp.use(promMetrics);
+
   const timeoutMs = 5_000;
 
   console.log('starting feed...');