@forge/metrics 0.1.1 → 0.1.2-next.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @forge/metrics
 
+## 0.1.2-next.0
+
+### Patch Changes
+
+- 5176a36: Implement internal metrics on Node runtime
+
 ## 0.1.1
 
 ### Patch Changes

package/out/internal/data-types.d.ts

@@ -26,31 +26,32 @@ export declare class TimerDeadError extends Error {
     constructor();
 }
 export declare class ExperimentalCounter implements Counter {
-    private name;
     private readonly runtimeMetrics;
-    constructor(name: string);
+    private readonly name;
+    constructor(runtimeMetrics: RuntimeMetrics, name: string);
     incrBy(value: number): void;
     incr(): void;
     decrBy(value: number): void;
     decr(): void;
 }
 export declare class ExperimentalGauge implements Gauge {
-    private name;
     private readonly runtimeMetrics;
-    constructor(name: string);
+    private readonly name;
+    constructor(runtimeMetrics: RuntimeMetrics, name: string);
     set(value: number): void;
 }
 export declare class ExperimentalTimerStop implements TimerStop {
-    private timerName;
     private readonly runtimeMetrics;
+    private readonly timerName;
     private timerId;
     private isAlive;
-    constructor(timerName: string);
+    constructor(runtimeMetrics: RuntimeMetrics, timerName: string);
     stop(): void;
 }
 export declare class ExperimentalTimer implements Timer {
-    private name;
-    constructor(name: string);
+    private readonly runtimeMetrics;
+    private readonly name;
+    constructor(runtimeMetrics: RuntimeMetrics, name: string);
     measure(): ExperimentalTimerStop;
 }
 //# sourceMappingURL=data-types.d.ts.map

package/out/internal/data-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-types.d.ts","sourceRoot":"","sources":["../../src/internal/data-types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACjF,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpD,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IACvE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CACvE;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,IAAI,IAAI,CAAC;IACb,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,IAAI,IAAI,IAAI,CAAC;IACb,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,KAAK;IACpB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,IAAI,IAAI,CAAC;CACd;AAED,MAAM,WAAW,KAAK;IACpB,OAAO,IAAI,SAAS,CAAC;CACtB;AAMD,qBAAa,wBAAyB,SAAQ,KAAK;;CAIlD;AAED,qBAAa,cAAe,SAAQ,KAAK;;CAIxC;AAED,qBAAa,mBAAoB,YAAW,OAAO;IAGrC,OAAO,CAAC,IAAI;IAFxB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuB;gBAElC,IAAI,EAAE,MAAM;IAEhC,MAAM,CAAC,KAAK,EAAE,MAAM;IAIpB,IAAI;IAIJ,MAAM,CAAC,KAAK,EAAE,MAAM;IAIpB,IAAI;CAGL;AAED,qBAAa,iBAAkB,YAAW,KAAK;IAGjC,OAAO,CAAC,IAAI;IAFxB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuB;gBAElC,IAAI,EAAE,MAAM;IAEhC,GAAG,CAAC,KAAK,EAAE,MAAM;CAGlB;AAED,qBAAa,qBAAsB,YAAW,SAAS;IAKzC,OAAO,CAAC,SAAS;IAJ7B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuB;IACtD,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,OAAO,CAAS;gBAEJ,SAAS,EAAE,MAAM;IAKrC,IAAI;CAYL;AAED,qBAAa,iBAAkB,YAAW,KAAK;IACjC,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,MAAM;IAEhC,OAAO;CAGR"}
+{"version":3,"file":"data-types.d.ts","sourceRoot":"","sources":["../../src/internal/data-types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACjF,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpD,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IACvE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CACvE;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,IAAI,IAAI,CAAC;IACb,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,IAAI,IAAI,IAAI,CAAC;IACb,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,KAAK;IACpB,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,IAAI,IAAI,CAAC;CACd;AAED,MAAM,WAAW,KAAK;IACpB,OAAO,IAAI,SAAS,CAAC;CACtB;AAED,qBAAa,wBAAyB,SAAQ,KAAK;;CAIlD;AAED,qBAAa,cAAe,SAAQ,KAAK;;CAIxC;AAED,qBAAa,mBAAoB,YAAW,OAAO;IACrC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAAkB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAArD,cAAc,EAAE,cAAc,EAAmB,IAAI,EAAE,MAAM;IAE1F,MAAM,CAAC,KAAK,EAAE,MAAM;IAIpB,IAAI;IAIJ,MAAM,CAAC,KAAK,EAAE,MAAM;IAIpB,IAAI;CAGL;AAED,qBAAa,iBAAkB,YAAW,KAAK;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAAkB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAArD,cAAc,EAAE,cAAc,EAAmB,IAAI,EAAE,MAAM;IAE1F,GAAG,CAAC,KAAK,EAAE,MAAM;CAGlB;AAED,qBAAa,qBAAsB,YAAW,SAAS;IAIzC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAAkB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAHvF,OAAO,CAAC,OAAO,CAAuB;IACtC,OAAO,CAAC,OAAO,CAAS;gBAEK,cAAc,EAAE,cAAc,EAAmB,SAAS,EAAE,MAAM;IAK/F,IAAI;CAYL;AAED,qBAAa,iBAAkB,YAAW,KAAK;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAAkB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAArD,cAAc,EAAE,cAAc,EAAmB,IAAI,EAAE,MAAM;IAE1F,OAAO;CAGR"}

package/out/internal/data-types.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExperimentalTimer = exports.ExperimentalTimerStop = exports.ExperimentalGauge = exports.ExperimentalCounter = exports.TimerDeadError = exports.TimerNotInitialisedError = void 0;
-const getRuntimeMetrics = () => {
-    return global.api.internalMetrics;
-};
 class TimerNotInitialisedError extends Error {
     constructor() {
         super('Timer is not initialised');
@@ -17,9 +14,9 @@ class TimerDeadError extends Error {
 }
 exports.TimerDeadError = TimerDeadError;
 class ExperimentalCounter {
-    constructor(name) {
+    constructor(runtimeMetrics, name) {
+        this.runtimeMetrics = runtimeMetrics;
         this.name = name;
-        this.runtimeMetrics = getRuntimeMetrics();
     }
     incrBy(value) {
         this.runtimeMetrics.invokeCounter('incr', this.name, value);
@@ -28,7 +25,7 @@ class ExperimentalCounter {
         this.incrBy(1);
     }
     decrBy(value) {
-        global.api.internalMetrics.invokeCounter('decr', this.name, value);
+        this.runtimeMetrics.invokeCounter('decr', this.name, value);
     }
     decr() {
         this.decrBy(1);
@@ -36,9 +33,9 @@ class ExperimentalCounter {
 }
 exports.ExperimentalCounter = ExperimentalCounter;
 class ExperimentalGauge {
-    constructor(name) {
+    constructor(runtimeMetrics, name) {
+        this.runtimeMetrics = runtimeMetrics;
         this.name = name;
-        this.runtimeMetrics = getRuntimeMetrics();
     }
     set(value) {
         this.runtimeMetrics.invokeGauge(this.name, value);
@@ -46,9 +43,9 @@ class ExperimentalGauge {
 }
 exports.ExperimentalGauge = ExperimentalGauge;
 class ExperimentalTimerStop {
-    constructor(timerName) {
+    constructor(runtimeMetrics, timerName) {
+        this.runtimeMetrics = runtimeMetrics;
         this.timerName = timerName;
-        this.runtimeMetrics = getRuntimeMetrics();
         this.timerId = null;
         this.isAlive = false;
         this.timerId = this.runtimeMetrics.invokeTimer('start', null, this.timerName);
@@ -67,11 +64,12 @@ class ExperimentalTimerStop {
 }
 exports.ExperimentalTimerStop = ExperimentalTimerStop;
 class ExperimentalTimer {
-    constructor(name) {
+    constructor(runtimeMetrics, name) {
+        this.runtimeMetrics = runtimeMetrics;
         this.name = name;
     }
     measure() {
-        return new ExperimentalTimerStop(this.name);
+        return new ExperimentalTimerStop(this.runtimeMetrics, this.name);
     }
 }
 exports.ExperimentalTimer = ExperimentalTimer;

package/out/internal/index.d.ts

@@ -1,14 +1,2 @@
-import { Counter, ExperimentalCounter, ExperimentalGauge, ExperimentalTimer, Gauge, Timer } from './data-types';
-export interface Metrics {
-    counter(name: string): Counter;
-    gauge(name: string): Gauge;
-    timer(name: string): Timer;
-}
-declare class ExperimentalMetrics implements Metrics {
-    counter(name: string): ExperimentalCounter;
-    gauge(name: string): ExperimentalGauge;
-    timer(name: string): ExperimentalTimer;
-}
-export declare const internalMetrics: ExperimentalMetrics;
-export { Counter, Gauge, Timer };
+export { internalMetrics, Counter, Gauge, Timer, Metrics } from './metrics';
 //# sourceMappingURL=index.d.ts.map

package/out/internal/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/internal/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAEhH,MAAM,WAAW,OAAO;IACtB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAC/B,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAC3B,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;CAC5B;AAED,cAAM,mBAAoB,YAAW,OAAO;IAC1C,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,KAAK,CAAC,IAAI,EAAE,MAAM;IAIlB,KAAK,CAAC,IAAI,EAAE,MAAM;CAGnB;AAED,eAAO,MAAM,eAAe,qBAA4B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/internal/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC"}

package/out/internal/index.js

@@ -1,16 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.internalMetrics = void 0;
-const data_types_1 = require("./data-types");
-class ExperimentalMetrics {
-    counter(name) {
-        return new data_types_1.ExperimentalCounter(name);
-    }
-    gauge(name) {
-        return new data_types_1.ExperimentalGauge(name);
-    }
-    timer(name) {
-        return new data_types_1.ExperimentalTimer(name);
-    }
-}
-exports.internalMetrics = new ExperimentalMetrics();
+var metrics_1 = require("./metrics");
+Object.defineProperty(exports, "internalMetrics", { enumerable: true, get: function () { return metrics_1.internalMetrics; } });

package/out/internal/metrics.d.ts

@@ -0,0 +1,15 @@
+import { Counter, Gauge, Timer, ExperimentalTimer } from './data-types';
+export interface Metrics {
+    counter(name: string): Counter;
+    gauge(name: string): Gauge;
+    timer(name: string): Timer;
+}
+declare class ExperimentalMetrics implements Metrics {
+    internalMetricName(name: string): string;
+    counter(name: string): import("packages/forge-util/packages/metrics-interface/dist").Counter;
+    gauge(name: string): import("packages/forge-util/packages/metrics-interface/dist").Gauge;
+    timer(name: string): ExperimentalTimer | import("packages/forge-util/packages/metrics-interface/dist").Timing;
+}
+export declare const internalMetrics: ExperimentalMetrics;
+export { Counter, Gauge, Timer };
+//# sourceMappingURL=metrics.d.ts.map

package/out/internal/metrics.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/internal/metrics.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,OAAO,EACP,KAAK,EACL,KAAK,EAGL,iBAAiB,EAElB,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,OAAO;IACtB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAC/B,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAC3B,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;CAC5B;AAMD,cAAM,mBAAoB,YAAW,OAAO;IAC1C,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIxC,OAAO,CAAC,IAAI,EAAE,MAAM;IASpB,KAAK,CAAC,IAAI,EAAE,MAAM;IASlB,KAAK,CAAC,IAAI,EAAE,MAAM;CAQnB;AAED,eAAO,MAAM,eAAe,qBAA4B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC"}

package/out/internal/metrics.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.internalMetrics = void 0;
+const api_1 = require("@forge/api");
+const data_types_1 = require("./data-types");
+function getRuntimeMetrics() {
+    var _a;
+    return (_a = global.api) === null || _a === void 0 ? void 0 : _a.internalMetrics;
+}
+class ExperimentalMetrics {
+    internalMetricName(name) {
+        return `internalAppMetrics.${name}`;
+    }
+    counter(name) {
+        const metrics = getRuntimeMetrics();
+        if (metrics) {
+            return new data_types_1.ExperimentalCounter(metrics, name);
+        }
+        else {
+            return (0, api_1.getRuntime)().metrics.counter(this.internalMetricName(name));
+        }
+    }
+    gauge(name) {
+        const metrics = getRuntimeMetrics();
+        if (metrics) {
+            return new data_types_1.ExperimentalGauge(metrics, name);
+        }
+        else {
+            return (0, api_1.getRuntime)().metrics.gauge(this.internalMetricName(name));
+        }
+    }
+    timer(name) {
+        const metrics = getRuntimeMetrics();
+        if (metrics) {
+            return new data_types_1.ExperimentalTimer(metrics, name);
+        }
+        else {
+            return (0, api_1.getRuntime)().metrics.timing(this.internalMetricName(name));
+        }
+    }
+}
+exports.internalMetrics = new ExperimentalMetrics();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/metrics",
-  "version": "0.1.1",
+  "version": "0.1.2-next.0",
   "description": "Forge internal metrics",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -10,5 +10,9 @@
     "build": "yarn run clean && yarn run compile",
     "clean": "rm -rf ./out && rm -f tsconfig.tsbuildinfo",
     "compile": "tsc -b -v"
+  },
+  "dependencies": {
+    "@forge/api": "2.13.0",
+    "@forge/runtime": "4.3.1"
   }
 }