@forge/runtime 5.3.0-next.1 → 5.3.0-next.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @forge/runtime
 
+## 5.3.0-next.2
+
+### Patch Changes
+
+- 579c6a2: send metrics with the same name but different tags separately
+
 ## 5.3.0-next.1
 
 ### Patch Changes

package/out/metrics/in-memory-metrics.d.ts

@@ -7,12 +7,15 @@ export declare class InMemoryMetrics implements Metrics {
     private readonly _children;
     private readonly _events;
     private readonly _tags;
-    constructor(tags?: Tags);
+    private readonly _name;
+    constructor(tags?: Tags, name?: string);
+    getName(): string;
     getTimers(): TimedMetricsRecord[];
     getCounters(): Map<string, CounterMetricsRecord>;
     getEvents(): EventMetricsRecord[];
     getGauges(): Map<string, GaugeMetricsRecord>;
     getChildren(): Map<string, InMemoryMetrics>;
+    private getHashedMetricName;
     child(name: string, tags?: Tags): Metrics;
     counter(name: string, tags?: Tags): Counter;
     event(title: string, description?: string): void;

package/out/metrics/in-memory-metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"in-memory-metrics.d.ts","sourceRoot":"","sources":["../../src/metrics/in-memory-metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,gDAAgD,CAAC;AAKvG,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAM7G,qBAAa,eAAgB,YAAW,OAAO;IAC7C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAC/C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoC;IAC9D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkC;IAC1D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA+B;IACzD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAC/C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAO;gBAEjB,IAAI,GAAE,IAAS;IASpB,SAAS,IAAI,kBAAkB,EAAE;IAIjC,WAAW,IAAI,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAIhD,SAAS,IAAI,kBAAkB,EAAE;IAIjC,SAAS,IAAI,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAI5C,WAAW,IAAI,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC;IAIlD,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,OAAO;IAUzC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,OAAO;IAQ3C,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAIhD,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,KAAK;IAQvC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM;CAK1C"}
+{"version":3,"file":"in-memory-metrics.d.ts","sourceRoot":"","sources":["../../src/metrics/in-memory-metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,gDAAgD,CAAC;AAKvG,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAM7G,qBAAa,eAAgB,YAAW,OAAO;IAC7C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAC/C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoC;IAC9D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkC;IAC1D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA+B;IACzD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAC/C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAO;IAC7B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;gBAEnB,IAAI,GAAE,IAAS,EAAE,IAAI,SAAK;IAU/B,OAAO;IAIP,SAAS,IAAI,kBAAkB,EAAE;IAIjC,WAAW,IAAI,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAIhD,SAAS,IAAI,kBAAkB,EAAE;IAIjC,SAAS,IAAI,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAI5C,WAAW,IAAI,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC;IAIlD,OAAO,CAAC,mBAAmB;IAK3B,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,IAAS,GAAG,OAAO;IAW7C,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,IAAS,GAAG,OAAO;IAS/C,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAIhD,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,IAAS,GAAG,KAAK;IAS3C,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM;CAK1C"}

package/out/metrics/in-memory-metrics.js

@@ -6,13 +6,17 @@ const in_memory_event_metric_1 = require("./in-memory-event-metric");
 const in_memory_gauge_metric_1 = require("./in-memory-gauge-metric");
 const in_memory_timed_metric_1 = require("./in-memory-timed-metric");
 class InMemoryMetrics {
-    constructor(tags = {}) {
+    constructor(tags = {}, name = '') {
         this._timers = [];
         this._counters = new Map();
         this._gauges = new Map();
         this._children = new Map();
         this._events = [];
         this._tags = tags;
+        this._name = name;
+    }
+    getName() {
+        return this._name;
     }
     getTimers() {
         return this._timers;
@@ -29,31 +33,38 @@ class InMemoryMetrics {
     getChildren() {
         return this._children;
     }
-    child(name, tags) {
-        if (!this._children.has(name)) {
-            const child = new InMemoryMetrics();
+    getHashedMetricName(name, tags) {
+        const sortedTags = Object.entries(Object.assign(Object.assign({}, this._tags), tags)).sort();
+        return `${name}_${JSON.stringify(sortedTags)}`;
+    }
+    child(name, tags = {}) {
+        const hashedMetricName = this.getHashedMetricName(name, tags);
+        if (!this._children.has(hashedMetricName)) {
+            const child = new InMemoryMetrics({}, name);
             Object.assign(child._tags, this._tags);
             Object.assign(child._tags, tags);
-            this._children.set(name, child);
+            this._children.set(hashedMetricName, child);
         }
-        return this._children.get(name);
+        return this._children.get(hashedMetricName);
     }
-    counter(name, tags) {
-        if (!this._counters.has(name)) {
+    counter(name, tags = {}) {
+        const hashedMetricName = this.getHashedMetricName(name, tags);
+        if (!this._counters.has(hashedMetricName)) {
             const counter = new in_memory_counter_metric_1.InMemoryCounterMetric(name, Object.assign(Object.assign({}, this._tags), tags));
-            this._counters.set(name, counter);
+            this._counters.set(hashedMetricName, counter);
         }
-        return this._counters.get(name);
+        return this._counters.get(hashedMetricName);
     }
     event(title, description) {
         this._events.push(new in_memory_event_metric_1.InMemoryEventMetric(title, description));
     }
-    gauge(name, tags) {
-        if (!this._gauges.has(name)) {
+    gauge(name, tags = {}) {
+        const hashedMetricName = this.getHashedMetricName(name, tags);
+        if (!this._gauges.has(hashedMetricName)) {
             const gauge = new in_memory_gauge_metric_1.InMemoryGaugeMetric(name, Object.assign(Object.assign({}, this._tags), tags));
-            this._gauges.set(name, gauge);
+            this._gauges.set(hashedMetricName, gauge);
         }
-        return this._gauges.get(name);
+        return this._gauges.get(hashedMetricName);
     }
     timing(name, tags) {
         const timer = new in_memory_timed_metric_1.InMemoryTimedMetric(name, Object.assign(Object.assign({}, this._tags), tags));

package/out/metrics/metrics.js

@@ -29,8 +29,8 @@ class MetricsCollector {
         const addPrefix = (p, value) => {
             return p ? p + '.' + value : value;
         };
-        const allMetrics = Array.from(metrics.getChildren().entries())
-            .map(([k, v]) => [...MetricsCollector.collect(v, addPrefix(prefix, k))])
+        const allMetrics = Array.from(metrics.getChildren().values())
+            .map((v) => [...MetricsCollector.collect(v, addPrefix(prefix, v.getName()))])
             .reduce((accumulator, value) => accumulator.concat(value), []);
         const counters = Array.from(metrics.getCounters().values()).map((v) => ({
             name: addPrefix(prefix, v.getName()),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/runtime",
-  "version": "5.3.0-next.1",
+  "version": "5.3.0-next.2",
   "description": "A Node.js runtime for Atlassian app functions",
   "author": "Atlassian",
   "license": "UNLICENSED",