@arcblock/pm2-prom-module 2.6.3 → 2.6.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/metrics/index.js +2 -1
  2. package/package.json +1 -1
  3. package/utils/docker.js +5 -2
package/metrics/index.js CHANGED
@@ -48,11 +48,12 @@ const initMetrics = (prefix) => {
48
48
  collect() {
49
49
  return __awaiter(this, void 0, void 0, function* () {
50
50
  const info = yield (0, docker_1.getBlockletServerInfo)();
51
+ this.reset();
51
52
  this.set(info, 1);
52
53
  });
53
54
  },
54
55
  registers: [exports.registry],
55
- labelNames: ['name', 'version', 'mode', 'internalIP'],
56
+ labelNames: ['type', 'name', 'version', 'mode', 'internalIP'],
56
57
  });
57
58
  new prom_client_1.default.Gauge({
58
59
  name: `${prefix}_${METRIC_FREE_MEMORY}`,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@arcblock/pm2-prom-module",
3
- "version": "2.6.3",
3
+ "version": "2.6.4",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
package/utils/docker.js CHANGED
@@ -59,13 +59,15 @@ const getBlockletServerInfo = () => __awaiter(void 0, void 0, void 0, function*
59
59
  if (!internalIP) {
60
60
  throw new Error('Failed to get internal IP address');
61
61
  }
62
- const response = yield fetch(`https://${internalIP.replace(/\./g, '-')}.ip.abtnet.io/.well-known/did.json`);
62
+ const url = `https://${internalIP.replace(/\./g, '-')}.ip.abtnet.io/.well-known/did.json`;
63
+ const response = yield fetch(url);
63
64
  if (response.status !== 200) {
64
- throw new Error(`Failed to get blocklet server info, ip: ${internalIP}, status: ${response.status}, statusText: ${response.statusText}`);
65
+ throw new Error(`Failed to get blocklet server info, url: ${url}, status: ${response.status}, statusText: ${response.statusText}`);
65
66
  }
66
67
  const data = yield response.json();
67
68
  const metadata = data.services.find((service) => service.type === 'server').metadata;
68
69
  return {
70
+ type: 'server',
69
71
  name: metadata.name,
70
72
  version: metadata.version,
71
73
  mode: metadata.mode,
@@ -75,6 +77,7 @@ const getBlockletServerInfo = () => __awaiter(void 0, void 0, void 0, function*
75
77
  catch (error) {
76
78
  console.error(error);
77
79
  return {
80
+ type: 'server',
78
81
  name: 'unknown',
79
82
  version: 'unknown',
80
83
  mode: 'unknown',