add prom client metrics

sarike · sarike · commit 7804bd2daa81 · 2023-03-20T11:08:41.000+08:00
diff --git a/server/node-service/package.json b/server/node-service/package.json
@@ -62,6 +62,7 @@
     "openblocks-core": "^0.0.7",
     "openblocks-sdk": "0.0.38",
     "pino": "^8.11.0",
+    "prom-client": "^14.2.0",
     "proxy-agent": "^5.0.0",
     "stylis": "^4.1.3",
     "swagger-client": "^3.18.5",
diff --git a/server/node-service/src/controllers/system.ts b/server/node-service/src/controllers/system.ts
@@ -0,0 +1,14 @@
+import { Request, Response } from "express";
+import { register } from "prom-client";
+import _ from "lodash";
+
+export async function prometheus(req: Request, res: Response) {
+  const metrics = await register.metrics();
+  res.send(metrics);
+}
+
+export async function status(req: Request, res: Response) {
+  res.json({
+    ok: true,
+  });
+}
diff --git a/server/node-service/src/routes/apiRouter.ts b/server/node-service/src/routes/apiRouter.ts
@@ -0,0 +1,15 @@
+import express from "express";
+import * as pluginControllers from "../controllers/plugins";
+import jsControllers from "../controllers/runJavascript";
+
+const apiRouter = express.Router();
+
+apiRouter.post("/runJs", jsControllers.runJavascript);
+apiRouter.post("/batchRunJs", jsControllers.batchRunJavascript);
+
+apiRouter.get("/plugins", pluginControllers.listPlugins);
+apiRouter.post("/runPluginQuery", pluginControllers.runPluginQuery);
+apiRouter.post("/getPluginDynamicConfig", pluginControllers.getDynamicDef);
+apiRouter.post("/validatePluginDataSourceConfig", pluginControllers.validatePluginDataSourceConfig);
+
+export default apiRouter;
diff --git a/server/node-service/src/routes/index.ts b/server/node-service/src/routes/index.ts
diff --git a/server/node-service/src/routes/systemRouter.ts b/server/node-service/src/routes/systemRouter.ts
@@ -0,0 +1,8 @@
+import express from "express";
+import * as systemControllers from "../controllers/system";
+
+const systemRouter = express.Router();
+
+systemRouter.get("/prometheus", systemControllers.prometheus);
+
+export default systemRouter;
diff --git a/server/node-service/src/server.ts b/server/node-service/src/server.ts
@@ -2,10 +2,13 @@ import http from "http";
 import "./common/logger";
 import "express-async-errors";
 import express, { Response, Request, NextFunction } from "express";
-import routes from "./routes";
 import { ServiceError } from "./common/error";
 import path from "node:path";
 import morgan from "morgan";
+import { collectDefaultMetrics } from "prom-client";
+import apiRouter from "./routes/apiRouter";
+import systemRouter from "./routes/systemRouter";
+collectDefaultMetrics();
 
 const prefix = "/node-service";
 
@@ -45,7 +48,8 @@ router.use((req, res, next) => {
 });
 
 /** Routes */
-router.use(`${prefix}/api`, routes);
+router.use(`${prefix}/api`, apiRouter);
+router.use(`${prefix}/system`, systemRouter);
 
 // service err
 router.use((err: Error, _req: Request, res: Response, _next: NextFunction) => {
diff --git a/server/node-service/yarn.lock b/server/node-service/yarn.lock
@@ -5508,6 +5508,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bintrees@npm:1.0.2":
+  version: 1.0.2
+  resolution: "bintrees@npm:1.0.2"
+  checksum: 56a52b7d3634e30002b1eda740d2517a22fa8e9e2eb088e919f37c030a0ed86e364ab59e472fc770fc8751308054bb1c892979d150e11d9e11ac33bcc1b5d16e
+  languageName: node
+  linkType: hard
+
 "bluebird@npm:^3.7.2":
   version: 3.7.2
   resolution: "bluebird@npm:3.7.2::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fbluebird%2F-%2Fbluebird-3.7.2.tgz"
@@ -9484,6 +9491,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"prom-client@npm:^14.2.0":
+  version: 14.2.0
+  resolution: "prom-client@npm:14.2.0"
+  dependencies:
+    tdigest: ^0.1.1
+  checksum: d4c04e57616c72643dd02862d0d4bde09cf8869a19d0aef5e7b785e6e27d02439b66cdc165e3492f62d579fa91579183820870cc757a09b99399d2d02f46b9f1
+  languageName: node
+  linkType: hard
+
 "promise-inflight@npm:^1.0.1":
   version: 1.0.1
   resolution: "promise-inflight@npm:1.0.1::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fpromise-inflight%2F-%2Fpromise-inflight-1.0.1.tgz"
@@ -10420,6 +10436,7 @@ __metadata:
     openblocks-sdk: 0.0.38
     pino: ^8.11.0
     postman-to-openapi: ^3.0.1
+    prom-client: ^14.2.0
     proxy-agent: ^5.0.0
     stylis: ^4.1.3
     svgo: ^3.0.2
@@ -10445,6 +10462,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tdigest@npm:^0.1.1":
+  version: 0.1.2
+  resolution: "tdigest@npm:0.1.2"
+  dependencies:
+    bintrees: 1.0.2
+  checksum: 44de8246752b6f8c2924685f969fd3d94c36949f22b0907e99bef2b2220726dd8467f4730ea96b06040b9aa2587c0866049640039d1b956952dfa962bc2075a3
+  languageName: node
+  linkType: hard
+
 "teeny-request@npm:^8.0.0":
   version: 8.0.2
   resolution: "teeny-request@npm:8.0.2::__archiveUrl=https%3A%2F%2Fregistry.npmjs.org%2Fteeny-request%2F-%2Fteeny-request-8.0.2.tgz"
