@midwayjs/prometheus 3.5.3 → 3.6.1-beta.0

package/dist/configuration.js

@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrometheusConfiguration = void 0;
-const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 const PromClient = require("prom-client");
 const utils_1 = require("./utils/utils");
 const os = require("os");
@@ -23,7 +23,7 @@ const DefaultConfig = require("./config/config.default");
 let PrometheusConfiguration = class PrometheusConfiguration {
     async onReady() {
         PromClient.collectDefaultMetrics(this.prometheusConfig);
-        const modules = (0, decorator_1.listModule)('prometheus:master');
+        const modules = (0, core_1.listModule)('prometheus:master');
         const handlers = {};
         let sockFile = path.join(os.tmpdir(), 'midway-master.sock');
         if (process.platform === 'win32') {
@@ -47,7 +47,7 @@ let PrometheusConfiguration = class PrometheusConfiguration {
             }
         }
         for (const module of modules) {
-            const rules = (0, decorator_1.getClassMetadata)('prometheus:master:options', module);
+            const rules = (0, core_1.getClassMetadata)('prometheus:master:options', module);
             for (const rule of rules) {
                 if ((0, utils_1.isMaster)()) {
                     handlers[rule.name] = async (...args) => {
@@ -92,15 +92,15 @@ let PrometheusConfiguration = class PrometheusConfiguration {
     }
 };
 __decorate([
-    (0, decorator_1.Config)('prometheus'),
+    (0, core_1.Config)('prometheus'),
     __metadata("design:type", Object)
 ], PrometheusConfiguration.prototype, "prometheusConfig", void 0);
 __decorate([
-    (0, decorator_1.App)(),
+    (0, core_1.App)(),
     __metadata("design:type", Object)
 ], PrometheusConfiguration.prototype, "app", void 0);
 PrometheusConfiguration = __decorate([
-    (0, decorator_1.Configuration)({
+    (0, core_1.Configuration)({
         namespace: 'prometheus',
         importConfigs: [
             {

package/dist/decorator/master.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Master = void 0;
-const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 const request = require("request");
 const path = require("path");
 const os = require("os");
@@ -9,7 +9,7 @@ const utils_1 = require("../utils/utils");
 const qs = require("querystring");
 function Master() {
     return function (target, propertyKey, descriptor) {
-        (0, decorator_1.saveModule)('prometheus:master', target.constructor);
+        (0, core_1.saveModule)('prometheus:master', target.constructor);
         const sockFile = path.join(os.tmpdir(), 'midway-master.sock');
         if (!(0, utils_1.isMaster)()) {
             descriptor.value = (...args) => {
@@ -26,7 +26,7 @@ function Master() {
                 });
             };
         }
-        (0, decorator_1.attachClassMetadata)('prometheus:master:options', {
+        (0, core_1.attachClassMetadata)('prometheus:master:options', {
             name: `${target.constructor.name}_${propertyKey}`,
             value: descriptor.value,
         }, target.constructor);

package/dist/index.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/service/dataService.d.ts

@@ -10,6 +10,7 @@ export declare class DataService {
     getUser(method: any, status: any, path: any, time: any): Promise<void>;
     define(name: any, type: any, options: any): void;
     inc(name: any, labels: any, value?: number): Promise<void>;
+    observe(name: any, labels: any, value: any): Promise<void>;
     set(name: any, value: any): Promise<void>;
     setDiff(name: any, diff: any): Promise<void>;
     getData(): Promise<string>;

package/dist/service/dataService.js

@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataService = void 0;
-const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 const Client = require("prom-client");
 const master_1 = require("../decorator/master");
 const PromClient = require("prom-client");
@@ -63,6 +63,9 @@ let DataService = class DataService {
     async inc(name, labels, value = 1) {
         this.userDefinedMetrics[name].inc({ ...labels, ...this.prometheusConfig.labels }, value);
     }
+    async observe(name, labels, value) {
+        this.userDefinedMetrics[name].labels(...labels, ...Object.values(this.prometheusConfig.labels)).observe(value);
+    }
     async set(name, value) {
         this.userDefinedMetrics[name].set({ ...this.prometheusConfig.labels }, value);
     }
@@ -80,7 +83,7 @@ let DataService = class DataService {
     }
 };
 __decorate([
-    (0, decorator_1.Config)('prometheus'),
+    (0, core_1.Config)('prometheus'),
     __metadata("design:type", Object)
 ], DataService.prototype, "prometheusConfig", void 0);
 __decorate([
@@ -95,6 +98,12 @@ __decorate([
     __metadata("design:paramtypes", [Object, Object, Object]),
     __metadata("design:returntype", Promise)
 ], DataService.prototype, "inc", null);
+__decorate([
+    (0, master_1.Master)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:returntype", Promise)
+], DataService.prototype, "observe", null);
 __decorate([
     (0, master_1.Master)(),
     __metadata("design:type", Function),
@@ -114,8 +123,8 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], DataService.prototype, "getData", null);
 DataService = __decorate([
-    (0, decorator_1.Provide)(),
-    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)
+    (0, core_1.Provide)(),
+    (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], DataService);
 exports.DataService = DataService;
 //# sourceMappingURL=dataService.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/prometheus",
-  "version": "3.5.3",
+  "version": "3.6.1-beta.0",
   "description": "midway component for prometheus",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -23,11 +23,11 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.5.3",
-    "@midwayjs/decorator": "^3.4.11",
-    "@midwayjs/koa": "^3.5.3",
-    "@midwayjs/mock": "^3.5.3",
-    "@types/request": "2.48.8"
+    "@midwayjs/core": "^3.6.0",
+    "@midwayjs/koa": "^3.6.0",
+    "@midwayjs/mock": "^3.6.0",
+    "@types/request": "2.48.8",
+    "typescript": "4.5.4"
   },
   "dependencies": {
     "prom-client": "^14.0.0",
@@ -35,6 +35,5 @@
   },
   "engines": {
     "node": ">=12"
-  },
-  "gitHead": "32356484664846984f6d3d65a3a75dea015e8dcc"
+  }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.