@midwayjs/prometheus 3.0.0-alpha.9 → 3.0.0-beta.12

package/CHANGELOG.md

@@ -3,6 +3,116 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28)
+
+**Note:** Version bump only for package @midwayjs/prometheus
+
+
+
+
+
+# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21)
+
+**Note:** Version bump only for package @midwayjs/prometheus
+
+
+
+
+
+# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20)
+
+**Note:** Version bump only for package @midwayjs/prometheus
+
+
+
+
+
+# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09)
+
+**Note:** Version bump only for package @midwayjs/prometheus
+
+
+
+
+
+# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08)
+
+**Note:** Version bump only for package @midwayjs/prometheus
+
+
+
+
+
+# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03)
+
+
+### Bug Fixes
+
+* add app.keys ([#1395](https://github.com/midwayjs/midway/issues/1395)) ([c44afc6](https://github.com/midwayjs/midway/commit/c44afc6cc6764a959d1fa7ae04d60099282d156a))
+
+
+
+
+
+# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26)
+
+**Note:** Version bump only for package @midwayjs/prometheus
+
+
+
+
+
+# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25)
+
+**Note:** Version bump only for package @midwayjs/prometheus
+
+
+
+
+
+# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24)
+
+**Note:** Version bump only for package @midwayjs/prometheus
+
+
+
+
+
+# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18)
+
+
+### Features
+
+* add component and framework config definition ([#1367](https://github.com/midwayjs/midway/issues/1367)) ([b2fe615](https://github.com/midwayjs/midway/commit/b2fe6157f99659471ff1333eca0b86bb889f61a3))
+
+
+
+
+
+# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16)
+
+**Note:** Version bump only for package @midwayjs/prometheus
+
+
+
+
+
+# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14)
+
+
+### Bug Fixes
+
+* node v16 typings ([#1269](https://github.com/midwayjs/midway/issues/1269)) ([e3443b5](https://github.com/midwayjs/midway/commit/e3443b58fc1faddadf1e95dd03a2f319410941bb))
+
+
+### Features
+
+* add setDiff ([#1263](https://github.com/midwayjs/midway/issues/1263)) ([9dd1a08](https://github.com/midwayjs/midway/commit/9dd1a08326540da52abf79cf31182d4e63b7f4d9))
+
+
+
+
+
 ## [2.12.3](https://github.com/midwayjs/midway/compare/v2.12.2...v2.12.3) (2021-08-09)
 
 **Note:** Version bump only for package @midwayjs/prometheus

package/dist/config/config.default.d.ts

@@ -1,3 +1,3 @@
-import { DefaultMetricsCollectorConfiguration as DefaultConfig } from 'prom-client';
-export declare const prometheus: DefaultConfig;
+import { DefaultMetricsCollectorConfiguration } from 'prom-client';
+export declare const prometheus: DefaultMetricsCollectorConfiguration;
 //# sourceMappingURL=config.default.d.ts.map

package/dist/configuration.d.ts

@@ -1,8 +1,8 @@
-export declare class AutoConfiguration {
+export declare class PrometheusConfiguration {
     prometheusConfig: any;
     app: any;
     http_server: any;
-    onReady(contanier: any): Promise<void>;
+    onReady(): Promise<void>;
     onStop(): Promise<void>;
 }
 //# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -9,9 +9,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AutoConfiguration = void 0;
+exports.PrometheusConfiguration = void 0;
 const decorator_1 = require("@midwayjs/decorator");
-const path_1 = require("path");
 const PromClient = require("prom-client");
 const utils_1 = require("./utils/utils");
 const os = require("os");
@@ -20,10 +19,11 @@ const fs = require("fs");
 const http = require("http");
 const qs = require("querystring");
 const dataService_1 = require("./service/dataService");
-let AutoConfiguration = class AutoConfiguration {
-    async onReady(contanier) {
+const DefaultConfig = require("./config/config.default");
+let PrometheusConfiguration = class PrometheusConfiguration {
+    async onReady() {
         PromClient.collectDefaultMetrics(this.prometheusConfig);
-        const modules = decorator_1.listModule('prometheus:master');
+        const modules = (0, decorator_1.listModule)('prometheus:master');
         const handlers = {};
         let sockFile = path.join(os.tmpdir(), 'midway-master.sock');
         if (process.platform === 'win32') {
@@ -31,7 +31,7 @@ let AutoConfiguration = class AutoConfiguration {
                 '\\\\.\\pipe\\' + sockFile.replace(/^\//, '').replace(/\//g, '-');
         }
         if (modules.length > 0 && process.platform !== 'win32') {
-            if (utils_1.isMaster()) {
+            if ((0, utils_1.isMaster)()) {
                 if (fs.existsSync(sockFile)) {
                     fs.unlinkSync(sockFile);
                 }
@@ -47,9 +47,9 @@ let AutoConfiguration = class AutoConfiguration {
             }
         }
         for (const module of modules) {
-            const rules = decorator_1.getClassMetadata('prometheus:master:options', module);
+            const rules = (0, decorator_1.getClassMetadata)('prometheus:master:options', module);
             for (const rule of rules) {
-                if (utils_1.isMaster()) {
+                if ((0, utils_1.isMaster)()) {
                     handlers[rule.name] = async (...args) => {
                         const service = await this.app
                             .createAnonymousContext()
@@ -85,25 +85,29 @@ let AutoConfiguration = class AutoConfiguration {
         });
     }
     async onStop() {
-        if (utils_1.isMaster()) {
-            utils_1.closeLock();
+        if ((0, utils_1.isMaster)()) {
+            (0, utils_1.closeLock)();
             this.http_server && this.http_server.close();
         }
     }
 };
 __decorate([
-    decorator_1.Config('prometheus'),
+    (0, decorator_1.Config)('prometheus'),
     __metadata("design:type", Object)
-], AutoConfiguration.prototype, "prometheusConfig", void 0);
+], PrometheusConfiguration.prototype, "prometheusConfig", void 0);
 __decorate([
-    decorator_1.App(),
+    (0, decorator_1.App)(),
     __metadata("design:type", Object)
-], AutoConfiguration.prototype, "app", void 0);
-AutoConfiguration = __decorate([
-    decorator_1.Configuration({
+], PrometheusConfiguration.prototype, "app", void 0);
+PrometheusConfiguration = __decorate([
+    (0, decorator_1.Configuration)({
         namespace: 'prometheus',
-        importConfigs: [path_1.join(__dirname, 'config')],
+        importConfigs: [
+            {
+                default: DefaultConfig,
+            },
+        ],
     })
-], AutoConfiguration);
-exports.AutoConfiguration = AutoConfiguration;
+], PrometheusConfiguration);
+exports.PrometheusConfiguration = PrometheusConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/decorator/master.js

@@ -9,9 +9,9 @@ const utils_1 = require("../utils/utils");
 const qs = require("querystring");
 function Master() {
     return function (target, propertyKey, descriptor) {
-        decorator_1.saveModule('prometheus:master', target.constructor);
+        (0, decorator_1.saveModule)('prometheus:master', target.constructor);
         const sockFile = path.join(os.tmpdir(), 'midway-master.sock');
-        if (!utils_1.isMaster()) {
+        if (!(0, utils_1.isMaster)()) {
             descriptor.value = (...args) => {
                 const params = {
                     path: `${target.constructor.name}_${propertyKey}`,
@@ -26,7 +26,7 @@ function Master() {
                 });
             };
         }
-        decorator_1.attachClassMetadata('prometheus:master:options', {
+        (0, decorator_1.attachClassMetadata)('prometheus:master:options', {
             name: `${target.constructor.name}_${propertyKey}`,
             value: descriptor.value,
         }, target.constructor);

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-export { AutoConfiguration as Configuration } from './configuration';
-export { DefaultMetricsCollectorConfiguration as DefaultConfig } from 'prom-client';
+export { PrometheusConfiguration as Configuration } from './configuration';
 export { DataService } from './service/dataService';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataService = exports.Configuration = void 0;
 var configuration_1 = require("./configuration");
-Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.AutoConfiguration; } });
+Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.PrometheusConfiguration; } });
 var dataService_1 = require("./service/dataService");
 Object.defineProperty(exports, "DataService", { enumerable: true, get: function () { return dataService_1.DataService; } });
 //# sourceMappingURL=index.js.map

package/dist/service/dataService.d.ts

@@ -8,9 +8,10 @@ export declare class DataService {
     bInit: boolean;
     init(): Promise<void>;
     getUser(method: any, status: any, path: any, time: any): Promise<void>;
-    define(name: any, type: any, options: any): Promise<void>;
+    define(name: any, type: any, options: any): void;
     inc(name: any, labels: any, value?: number): Promise<void>;
     set(name: any, value: any): Promise<void>;
+    setDiff(name: any, diff: any): Promise<void>;
     getData(): Promise<string>;
 }
 //# sourceMappingURL=dataService.d.ts.map

package/dist/service/dataService.js

@@ -54,7 +54,7 @@ let DataService = class DataService {
             .labels(method, status, path, ...Object.values(this.prometheusConfig.labels))
             .observe(time);
     }
-    async define(name, type, options) {
+    define(name, type, options) {
         options.labelNames = options.labelNames
             ? [...options.labelNames, ...Object.keys(this.prometheusConfig.labels)]
             : Object.keys(this.prometheusConfig.labels);
@@ -66,42 +66,56 @@ let DataService = class DataService {
     async set(name, value) {
         this.userDefinedMetrics[name].set({ ...this.prometheusConfig.labels }, value);
     }
+    async setDiff(name, diff) {
+        const current = await this.userDefinedMetrics[name].get();
+        let value = diff;
+        if (current.values.length !== 0) {
+            value = current.values[0].value + diff;
+        }
+        this.userDefinedMetrics[name].set({ ...this.prometheusConfig.labels }, value);
+    }
     async getData() {
         const Register = PromClient.register;
         return Register.metrics();
     }
 };
 __decorate([
-    decorator_1.Config('prometheus'),
+    (0, decorator_1.Config)('prometheus'),
     __metadata("design:type", Object)
 ], DataService.prototype, "prometheusConfig", void 0);
 __decorate([
-    master_1.Master(),
+    (0, master_1.Master)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object, Object]),
     __metadata("design:returntype", Promise)
 ], DataService.prototype, "getUser", null);
 __decorate([
-    master_1.Master(),
+    (0, master_1.Master)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", Promise)
 ], DataService.prototype, "inc", null);
 __decorate([
-    master_1.Master(),
+    (0, master_1.Master)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], DataService.prototype, "set", null);
 __decorate([
-    master_1.Master(),
+    (0, master_1.Master)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:returntype", Promise)
+], DataService.prototype, "setDiff", null);
+__decorate([
+    (0, master_1.Master)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], DataService.prototype, "getData", null);
 DataService = __decorate([
-    decorator_1.Provide(),
-    decorator_1.Scope(decorator_1.ScopeEnum.Singleton)
+    (0, decorator_1.Provide)(),
+    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)
 ], DataService);
 exports.DataService = DataService;
 //# sourceMappingURL=dataService.js.map

package/dist/utils/utils.js

@@ -11,7 +11,8 @@ const ppid = process.ppid;
 const now = new Date();
 const lockFile = path.join(os.tmpdir(), `midway-master-${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}-${ppid}.lock`);
 function isMaster() {
-    if (cluster.isMaster) {
+    // fix for node v16
+    if (cluster['isPrimary'] || cluster['isMaster']) {
         return true;
     }
     if (process.argv[1].indexOf('egg-cluster') >= 0) {

package/index.d.ts

@@ -0,0 +1,9 @@
+import { DefaultMetricsCollectorConfiguration } from 'prom-client';
+
+export * from './dist/index';
+
+declare module '@midwayjs/core/dist/interface' {
+  interface MidwayConfig {
+    prometheus?: DefaultMetricsCollectorConfiguration;
+  }
+}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@midwayjs/prometheus",
-  "version": "3.0.0-alpha.9+d5acc750",
+  "version": "3.0.0-beta.12",
   "description": "midway component for prometheus",
   "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "index.d.ts",
   "scripts": {
     "build": "tsc",
     "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
@@ -18,14 +18,15 @@
   ],
   "files": [
     "dist/**/*.js",
-    "dist/**/*.d.ts"
+    "dist/**/*.d.ts",
+    "index.d.ts"
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.0.0-alpha.9+d5acc750",
-    "@midwayjs/decorator": "^3.0.0-alpha.2",
-    "@midwayjs/koa": "^3.0.0-alpha.9+d5acc750",
-    "@midwayjs/mock": "^3.0.0-alpha.9+d5acc750",
+    "@midwayjs/core": "^3.0.0-beta.12",
+    "@midwayjs/decorator": "^3.0.0-beta.12",
+    "@midwayjs/koa": "^3.0.0-beta.12",
+    "@midwayjs/mock": "^3.0.0-beta.12",
     "@types/request": "^2.48.5"
   },
   "dependencies": {
@@ -33,7 +34,7 @@
     "request": "^2.88.2"
   },
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">=12"
   },
-  "gitHead": "d5acc7505275ea9d566edd38e5e0377141e0abc1"
+  "gitHead": "1c46e53eb934248007eeb7fe3920f5ac24e272c6"
 }