@libp2p/prometheus-metrics 4.3.21 → 4.3.22

package/dist/src/metric.js

@@ -2,21 +2,15 @@ import { Gauge } from 'prom-client';
 import { normalizeString } from './utils.js';
 export class PrometheusMetric {
     gauge;
-    calculators;
     constructor(name, opts) {
         name = normalizeString(name);
         const help = normalizeString(opts.help ?? name);
         const labels = opts.label != null ? [normalizeString(opts.label)] : [];
         let collect;
-        this.calculators = [];
         // calculated metric
         if (opts?.calculate != null) {
-            this.calculators.push(opts.calculate);
-            const self = this;
             collect = async function () {
-                const values = await Promise.all(self.calculators.map(async (calculate) => calculate()));
-                const sum = values.reduce((acc, curr) => acc + curr, 0);
-                this.set(sum);
+                this.set(await opts.calculate());
             };
         }
         this.gauge = new Gauge({
@@ -27,9 +21,6 @@ export class PrometheusMetric {
             collect
         });
     }
-    addCalculator(calculator) {
-        this.calculators.push(calculator);
-    }
     update(value) {
         this.gauge.set(value);
     }

package/dist/src/metric.js.map

@@ -1 +1 @@
-{"version":3,"file":"metric.js","sourceRoot":"","sources":["../../src/metric.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAK5C,MAAM,OAAO,gBAAgB;IACV,KAAK,CAAO;IACZ,WAAW,CAAmB;IAE/C,YAAa,IAAY,EAAE,IAAuC;QAChE,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;QAC5B,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACtE,IAAI,OAAgD,CAAA;QACpD,IAAI,CAAC,WAAW,GAAG,EAAE,CAAA;QAErB,oBAAoB;QACpB,IAAI,IAAI,EAAE,SAAS,IAAI,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACrC,MAAM,IAAI,GAAG,IAAI,CAAA;YAEjB,OAAO,GAAG,KAAK;gBACb,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAC,SAAS,EAAC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAA;gBACtF,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,EAAE,CAAC,CAAC,CAAA;gBAEvD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YACf,CAAC,CAAA;QACH,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC;YACrB,IAAI;YACJ,IAAI;YACJ,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;YACpE,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,aAAa,CAAE,UAA2B;QACxC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACnC,CAAC;IAED,MAAM,CAAE,KAAa;QACnB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACvB,CAAC;IAED,SAAS,CAAE,QAAgB,CAAC;QAC1B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACvB,CAAC;IAED,SAAS,CAAE,QAAgB,CAAC;QAC1B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACvB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAA;IAChC,CAAC;CACF"}
+{"version":3,"file":"metric.js","sourceRoot":"","sources":["../../src/metric.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAK5C,MAAM,OAAO,gBAAgB;IACV,KAAK,CAAO;IAE7B,YAAa,IAAY,EAAE,IAAuC;QAChE,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;QAC5B,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACtE,IAAI,OAAgD,CAAA;QAEpD,oBAAoB;QACpB,IAAI,IAAI,EAAE,SAAS,IAAI,IAAI,EAAE,CAAC;YAC5B,OAAO,GAAG,KAAK;gBACb,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;YAClC,CAAC,CAAA;QACH,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC;YACrB,IAAI;YACJ,IAAI;YACJ,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;YACpE,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,CAAE,KAAa;QACnB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACvB,CAAC;IAED,SAAS,CAAE,QAAgB,CAAC;QAC1B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACvB,CAAC;IAED,SAAS,CAAE,QAAgB,CAAC;QAC1B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACvB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAA;IAChC,CAAC;CACF"}

package/dist/src/summary-group.d.ts

@@ -1,12 +1,9 @@
 import type { PrometheusCalculatedSummaryOptions } from './index.js';
-import type { CalculatedMetric } from './utils.js';
-import type { CalculateMetric, SummaryGroup, StopTimer } from '@libp2p/interface';
-export declare class PrometheusSummaryGroup implements SummaryGroup, CalculatedMetric<Record<string, number>> {
+import type { SummaryGroup, StopTimer } from '@libp2p/interface';
+export declare class PrometheusSummaryGroup implements SummaryGroup {
     private readonly summary;
     private readonly label;
-    private readonly calculators;
     constructor(name: string, opts: PrometheusCalculatedSummaryOptions<Record<string, number>>);
-    addCalculator(calculator: CalculateMetric<Record<string, number>>): void;
     observe(values: Record<string, number>): void;
     reset(): void;
     timer(key: string): StopTimer;

package/dist/src/summary-group.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"summary-group.d.ts","sourceRoot":"","sources":["../../src/summary-group.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,YAAY,CAAA;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAGjF,qBAAa,sBAAuB,YAAW,YAAY,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;IACrC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;IAC9B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgD;gBAE/D,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,kCAAkC,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAqC3F,aAAa,CAAE,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,IAAI;IAIzE,OAAO,CAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAM9C,KAAK,IAAK,IAAI;IAId,KAAK,CAAE,GAAG,EAAE,MAAM,GAAG,SAAS;CAK/B"}
+{"version":3,"file":"summary-group.d.ts","sourceRoot":"","sources":["../../src/summary-group.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,YAAY,CAAA;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAGhE,qBAAa,sBAAuB,YAAW,YAAY;IACzD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;IACrC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;gBAEjB,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,kCAAkC,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IA+B3F,OAAO,CAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAM9C,KAAK,IAAK,IAAI;IAId,KAAK,CAAE,GAAG,EAAE,MAAM,GAAG,SAAS;CAK/B"}

package/dist/src/summary-group.js

@@ -3,24 +3,18 @@ import { normalizeString } from './utils.js';
 export class PrometheusSummaryGroup {
     summary;
     label;
-    calculators;
     constructor(name, opts) {
         name = normalizeString(name);
         const help = normalizeString(opts.help ?? name);
         const label = this.label = normalizeString(opts.label ?? name);
         let collect;
-        this.calculators = [];
         // calculated metric
         if (opts?.calculate != null) {
-            this.calculators.push(opts.calculate);
-            const self = this;
             collect = async function () {
-                await Promise.all(self.calculators.map(async (calculate) => {
-                    const values = await calculate();
-                    Object.entries(values).forEach(([key, value]) => {
-                        this.observe({ [label]: key }, value);
-                    });
-                }));
+                const values = await opts.calculate();
+                Object.entries(values).forEach(([key, value]) => {
+                    this.observe({ [label]: key }, value);
+                });
             };
         }
         this.summary = new PromSummary({
@@ -36,9 +30,6 @@ export class PrometheusSummaryGroup {
             collect
         });
     }
-    addCalculator(calculator) {
-        this.calculators.push(calculator);
-    }
     observe(values) {
         Object.entries(values).forEach(([key, value]) => {
             this.summary.observe({ [this.label]: key }, value);

package/dist/src/summary-group.js.map

@@ -1 +1 @@
-{"version":3,"file":"summary-group.js","sourceRoot":"","sources":["../../src/summary-group.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAM5C,MAAM,OAAO,sBAAsB;IAChB,OAAO,CAAa;IACpB,KAAK,CAAQ;IACb,WAAW,CAAgD;IAE5E,YAAa,IAAY,EAAE,IAAgE;QACzF,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;QAC5B,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;QAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAA;QAC9D,IAAI,OAAsD,CAAA;QAC1D,IAAI,CAAC,WAAW,GAAG,EAAE,CAAA;QAErB,oBAAoB;QACpB,IAAI,IAAI,EAAE,SAAS,IAAI,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACrC,MAAM,IAAI,GAAG,IAAI,CAAA;YAEjB,OAAO,GAAG,KAAK;gBACb,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAC,SAAS,EAAC,EAAE;oBACvD,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAA;oBAEhC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;wBAC9C,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,CAAC,CAAA;oBACvC,CAAC,CAAC,CAAA;gBACJ,CAAC,CAAC,CAAC,CAAA;YACL,CAAC,CAAA;QACH,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,WAAW,CAAC;YAC7B,IAAI;YACJ,IAAI;YACJ,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC;YAC1E,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI;YACzC,UAAU,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;YACxB,SAAS,EAAE,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;YACpE,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,aAAa,CAAE,UAAmD;QAChE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACnC,CAAC;IAED,OAAO,CAAE,MAA8B;QACrC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC9C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK;QACH,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;IACtB,CAAC;IAED,KAAK,CAAE,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YAC7B,CAAC,GAAG,CAAC,EAAE,CAAC;SACT,CAAC,CAAA;IACJ,CAAC;CACF"}
+{"version":3,"file":"summary-group.js","sourceRoot":"","sources":["../../src/summary-group.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAK5C,MAAM,OAAO,sBAAsB;IAChB,OAAO,CAAa;IACpB,KAAK,CAAQ;IAE9B,YAAa,IAAY,EAAE,IAAgE;QACzF,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;QAC5B,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;QAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAA;QAC9D,IAAI,OAAsD,CAAA;QAE1D,oBAAoB;QACpB,IAAI,IAAI,EAAE,SAAS,IAAI,IAAI,EAAE,CAAC;YAC5B,OAAO,GAAG,KAAK;gBACb,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;gBAErC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBAC9C,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,CAAC,CAAA;gBACvC,CAAC,CAAC,CAAA;YACJ,CAAC,CAAA;QACH,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,WAAW,CAAC;YAC7B,IAAI;YACJ,IAAI;YACJ,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC;YAC1E,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI;YACzC,UAAU,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;YACxB,SAAS,EAAE,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;YACpE,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,CAAE,MAA8B;QACrC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC9C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK;QACH,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;IACtB,CAAC;IAED,KAAK,CAAE,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YAC7B,CAAC,GAAG,CAAC,EAAE,CAAC;SACT,CAAC,CAAA;IACJ,CAAC;CACF"}

package/dist/src/summary.d.ts

@@ -1,10 +1,8 @@
 import type { PrometheusCalculatedSummaryOptions } from './index.js';
-import type { StopTimer, CalculateMetric, Summary } from '@libp2p/interface';
+import type { StopTimer, Summary } from '@libp2p/interface';
 export declare class PrometheusSummary implements Summary {
     private readonly summary;
-    private readonly calculators;
     constructor(name: string, opts: PrometheusCalculatedSummaryOptions);
-    addCalculator(calculator: CalculateMetric): void;
     observe(value: number): void;
     reset(): void;
     timer(): StopTimer;

package/dist/src/summary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"summary.d.ts","sourceRoot":"","sources":["../../src/summary.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,YAAY,CAAA;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAG5E,qBAAa,iBAAkB,YAAW,OAAO;IAC/C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmB;gBAElC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,kCAAkC;IAkCnE,aAAa,CAAE,UAAU,EAAE,eAAe,GAAG,IAAI;IAIjD,OAAO,CAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAI7B,KAAK,IAAK,IAAI;IAId,KAAK,IAAK,SAAS;CAGpB"}
+{"version":3,"file":"summary.d.ts","sourceRoot":"","sources":["../../src/summary.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,YAAY,CAAA;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAG3D,qBAAa,iBAAkB,YAAW,OAAO;IAC/C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;gBAExB,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,kCAAkC;IA2BnE,OAAO,CAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAI7B,KAAK,IAAK,IAAI;IAId,KAAK,IAAK,SAAS;CAGpB"}

package/dist/src/summary.js

@@ -2,22 +2,15 @@ import { Summary as PromSummary } from 'prom-client';
 import { normalizeString } from './utils.js';
 export class PrometheusSummary {
     summary;
-    calculators;
     constructor(name, opts) {
         name = normalizeString(name);
         const help = normalizeString(opts.help ?? name);
         const labels = opts.label != null ? [normalizeString(opts.label)] : [];
         let collect;
-        this.calculators = [];
         // calculated metric
         if (opts?.calculate != null) {
-            this.calculators.push(opts.calculate);
-            const self = this;
             collect = async function () {
-                const values = await Promise.all(self.calculators.map(async (calculate) => calculate()));
-                for (const value of values) {
-                    this.observe(value);
-                }
+                this.observe(await opts.calculate());
             };
         }
         this.summary = new PromSummary({
@@ -33,9 +26,6 @@ export class PrometheusSummary {
             collect
         });
     }
-    addCalculator(calculator) {
-        this.calculators.push(calculator);
-    }
     observe(value) {
         this.summary.observe(value);
     }

package/dist/src/summary.js.map

@@ -1 +1 @@
-{"version":3,"file":"summary.js","sourceRoot":"","sources":["../../src/summary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAK5C,MAAM,OAAO,iBAAiB;IACX,OAAO,CAAa;IACpB,WAAW,CAAmB;IAE/C,YAAa,IAAY,EAAE,IAAwC;QACjE,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;QAC5B,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACtE,IAAI,OAAsD,CAAA;QAC1D,IAAI,CAAC,WAAW,GAAG,EAAE,CAAA;QAErB,oBAAoB;QACpB,IAAI,IAAI,EAAE,SAAS,IAAI,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACrC,MAAM,IAAI,GAAG,IAAI,CAAA;YAEjB,OAAO,GAAG,KAAK;gBACb,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAC,SAAS,EAAC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAA;gBACtF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;oBAC3B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;gBACrB,CAAC;YACH,CAAC,CAAA;QACH,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,WAAW,CAAC;YAC7B,IAAI;YACJ,IAAI;YACJ,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC;YAC1E,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI;YACzC,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;YACpE,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,aAAa,CAAE,UAA2B;QACxC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IACnC,CAAC;IAED,OAAO,CAAE,KAAa;QACpB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC7B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;IACtB,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAA;IAClC,CAAC;CACF"}
+{"version":3,"file":"summary.js","sourceRoot":"","sources":["../../src/summary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAK5C,MAAM,OAAO,iBAAiB;IACX,OAAO,CAAa;IAErC,YAAa,IAAY,EAAE,IAAwC;QACjE,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,CAAA;QAC5B,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAA;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACtE,IAAI,OAAsD,CAAA;QAE1D,oBAAoB;QACpB,IAAI,IAAI,EAAE,SAAS,IAAI,IAAI,EAAE,CAAC;YAC5B,OAAO,GAAG,KAAK;gBACb,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;YACtC,CAAC,CAAA;QACH,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,WAAW,CAAC;YAC7B,IAAI;YACJ,IAAI;YACJ,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC;YAC1E,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI;YACzC,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;YACpE,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,CAAE,KAAa;QACpB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC7B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;IACtB,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAA;IAClC,CAAC;CACF"}

package/dist/src/utils.d.ts

@@ -1,7 +1,3 @@
-import type { CalculateMetric } from '@libp2p/interface';
-export interface CalculatedMetric<T = number> {
-    addCalculator(calculator: CalculateMetric<T>): void;
-}
 export declare const ONE_SECOND = 1000;
 export declare const ONE_MINUTE: number;
 /**

package/dist/src/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAExD,MAAM,WAAW,gBAAgB,CAAE,CAAC,GAAG,MAAM;IAC3C,aAAa,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;CACpD;AAED,eAAO,MAAM,UAAU,OAAO,CAAA;AAC9B,eAAO,MAAM,UAAU,QAAkB,CAAA;AAEzC;;;GAGG;AACH,wBAAgB,eAAe,CAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAIpD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,OAAO,CAAA;AAC9B,eAAO,MAAM,UAAU,QAAkB,CAAA;AAEzC;;;GAGG;AACH,wBAAgB,eAAe,CAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAIpD"}

package/dist/src/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAAA;AAC9B,MAAM,CAAC,MAAM,UAAU,GAAG,EAAE,GAAG,UAAU,CAAA;AAEzC;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAE,GAAW;IAC1C,OAAO,GAAG;SACP,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC;SAC9B,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AACxB,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAAA;AAC9B,MAAM,CAAC,MAAM,UAAU,GAAG,EAAE,GAAG,UAAU,CAAA;AAEzC;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAE,GAAW;IAC1C,OAAO,GAAG;SACP,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC;SAC9B,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AACxB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/prometheus-metrics",
-  "version": "4.3.21",
+  "version": "4.3.22",
   "description": "Collect libp2p metrics for scraping by Prometheus or Graphana",
   "author": "",
   "license": "Apache-2.0 OR MIT",
@@ -41,19 +41,19 @@
     "test:electron-main": "aegir test -t electron-main --cov"
   },
   "dependencies": {
-    "@libp2p/interface": "^2.10.2",
+    "@libp2p/interface": "^2.10.3",
     "it-foreach": "^2.1.3",
     "it-stream-types": "^2.0.2",
     "prom-client": "^15.1.3",
     "uint8arraylist": "^2.4.8"
   },
   "devDependencies": {
-    "@libp2p/crypto": "^5.1.4",
-    "@libp2p/interface-compliance-tests": "^6.4.8",
-    "@libp2p/logger": "^5.1.18",
-    "@libp2p/peer-id": "^5.1.5",
+    "@libp2p/crypto": "^5.1.5",
+    "@libp2p/interface-compliance-tests": "^6.4.9",
+    "@libp2p/logger": "^5.1.19",
+    "@libp2p/peer-id": "^5.1.6",
     "@multiformats/multiaddr": "^12.4.0",
-    "aegir": "^47.0.6",
+    "aegir": "^47.0.14",
     "it-drain": "^3.0.9",
     "it-pipe": "^3.0.1",
     "p-defer": "^4.0.1"

package/src/counter-group.ts

@@ -1,35 +1,27 @@
 import { Counter as PromCounter } from 'prom-client'
 import { normalizeString } from './utils.js'
 import type { PrometheusCalculatedMetricOptions } from './index.js'
-import type { CalculatedMetric } from './utils.js'
-import type { CounterGroup, CalculateMetric } from '@libp2p/interface'
+import type { CounterGroup } from '@libp2p/interface'
 import type { CollectFunction } from 'prom-client'
 
-export class PrometheusCounterGroup implements CounterGroup, CalculatedMetric<Record<string, number>> {
+export class PrometheusCounterGroup implements CounterGroup {
   private readonly counter: PromCounter
   private readonly label: string
-  private readonly calculators: Array<CalculateMetric<Record<string, number>>>
 
   constructor (name: string, opts: PrometheusCalculatedMetricOptions<Record<string, number>>) {
     name = normalizeString(name)
     const help = normalizeString(opts.help ?? name)
     const label = this.label = normalizeString(opts.label ?? name)
     let collect: CollectFunction<PromCounter<any>> | undefined
-    this.calculators = []
 
     // calculated metric
     if (opts?.calculate != null) {
-      this.calculators.push(opts.calculate)
-      const self = this
-
       collect = async function () {
-        await Promise.all(self.calculators.map(async calculate => {
-          const values = await calculate()
+        const values = await opts.calculate()
 
-          Object.entries(values).forEach(([key, value]) => {
-            this.inc({ [label]: key }, value)
-          })
-        }))
+        Object.entries(values).forEach(([key, value]) => {
+          this.inc({ [label]: key }, value)
+        })
       }
     }
 
@@ -42,10 +34,6 @@ export class PrometheusCounterGroup implements CounterGroup, CalculatedMetric<Re
     })
   }
 
-  addCalculator (calculator: CalculateMetric<Record<string, number>>): void {
-    this.calculators.push(calculator)
-  }
-
   increment (values: Record<string, number | unknown>): void {
     Object.entries(values).forEach(([key, value]) => {
       const inc = typeof value === 'number' ? value : 1

package/src/counter.ts

@@ -1,31 +1,22 @@
 import { Counter as PromCounter } from 'prom-client'
 import { normalizeString } from './utils.js'
 import type { PrometheusCalculatedMetricOptions } from './index.js'
-import type { CalculatedMetric } from './utils.js'
-import type { CalculateMetric, Counter } from '@libp2p/interface'
+import type { Counter } from '@libp2p/interface'
 import type { CollectFunction } from 'prom-client'
 
-export class PrometheusCounter implements Counter, CalculatedMetric {
+export class PrometheusCounter implements Counter {
   private readonly counter: PromCounter
-  private readonly calculators: CalculateMetric[]
 
   constructor (name: string, opts: PrometheusCalculatedMetricOptions) {
     name = normalizeString(name)
     const help = normalizeString(opts.help ?? name)
     const labels = opts.label != null ? [normalizeString(opts.label)] : []
     let collect: CollectFunction<PromCounter<any>> | undefined
-    this.calculators = []
 
     // calculated metric
     if (opts?.calculate != null) {
-      this.calculators.push(opts.calculate)
-      const self = this
-
       collect = async function () {
-        const values = await Promise.all(self.calculators.map(async calculate => calculate()))
-        const sum = values.reduce((acc, curr) => acc + curr, 0)
-
-        this.inc(sum)
+        this.inc(await opts.calculate())
       }
     }
 
@@ -38,10 +29,6 @@ export class PrometheusCounter implements Counter, CalculatedMetric {
     })
   }
 
-  addCalculator (calculator: CalculateMetric): void {
-    this.calculators.push(calculator)
-  }
-
   increment (value: number = 1): void {
     this.counter.inc(value)
   }

package/src/histogram-group.ts

@@ -1,35 +1,27 @@
 import { Histogram as PromHistogram } from 'prom-client'
 import { normalizeString } from './utils.js'
 import type { PrometheusCalculatedHistogramOptions } from './index.js'
-import type { CalculatedMetric } from './utils.js'
-import type { CalculateMetric, HistogramGroup, StopTimer } from '@libp2p/interface'
+import type { HistogramGroup, StopTimer } from '@libp2p/interface'
 import type { CollectFunction } from 'prom-client'
 
-export class PrometheusHistogramGroup implements HistogramGroup, CalculatedMetric<Record<string, number>> {
+export class PrometheusHistogramGroup implements HistogramGroup {
   private readonly histogram: PromHistogram
   private readonly label: string
-  private readonly calculators: Array<CalculateMetric<Record<string, number>>>
 
   constructor (name: string, opts: PrometheusCalculatedHistogramOptions<Record<string, number>>) {
     name = normalizeString(name)
     const help = normalizeString(opts.help ?? name)
     const label = this.label = normalizeString(opts.label ?? name)
     let collect: CollectFunction<PromHistogram<any>> | undefined
-    this.calculators = []
 
     // calculated metric
     if (opts?.calculate != null) {
-      this.calculators.push(opts.calculate)
-      const self = this
-
       collect = async function () {
-        await Promise.all(self.calculators.map(async calculate => {
-          const values = await calculate()
+        const values = await opts.calculate()
 
-          Object.entries(values).forEach(([key, value]) => {
-            this.observe({ [label]: key }, value)
-          })
-        }))
+        Object.entries(values).forEach(([key, value]) => {
+          this.observe({ [label]: key }, value)
+        })
       }
     }
 
@@ -43,10 +35,6 @@ export class PrometheusHistogramGroup implements HistogramGroup, CalculatedMetri
     })
   }
 
-  addCalculator (calculator: CalculateMetric<Record<string, number>>): void {
-    this.calculators.push(calculator)
-  }
-
   observe (values: Record<string, number>): void {
     Object.entries(values).forEach(([key, value]) => {
       this.histogram.observe({ [this.label]: key }, value)

package/src/histogram.ts

@@ -1,30 +1,22 @@
 import { Histogram as PromHistogram } from 'prom-client'
 import { normalizeString } from './utils.js'
 import type { PrometheusCalculatedHistogramOptions } from './index.js'
-import type { StopTimer, CalculateMetric, Histogram } from '@libp2p/interface'
+import type { StopTimer, Histogram } from '@libp2p/interface'
 import type { CollectFunction } from 'prom-client'
 
 export class PrometheusHistogram implements Histogram {
   private readonly histogram: PromHistogram
-  private readonly calculators: CalculateMetric[]
 
   constructor (name: string, opts: PrometheusCalculatedHistogramOptions) {
     name = normalizeString(name)
     const help = normalizeString(opts.help ?? name)
     const labels = opts.label != null ? [normalizeString(opts.label)] : []
     let collect: CollectFunction<PromHistogram<any>> | undefined
-    this.calculators = []
 
     // calculated metric
     if (opts?.calculate != null) {
-      this.calculators.push(opts.calculate)
-      const self = this
-
       collect = async function () {
-        const values = await Promise.all(self.calculators.map(async calculate => calculate()))
-        for (const value of values) {
-          this.observe(value)
-        }
+        this.observe(await opts.calculate())
       }
     }
 
@@ -38,10 +30,6 @@ export class PrometheusHistogram implements Histogram {
     })
   }
 
-  addCalculator (calculator: CalculateMetric): void {
-    this.calculators.push(calculator)
-  }
-
   observe (value: number): void {
     this.histogram.observe(value)
   }

package/src/index.ts

@@ -152,7 +152,7 @@ class PrometheusMetrics implements Metrics {
     if (init?.preserveExistingMetrics !== true) {
       this.log('Clearing existing metrics')
       metrics.clear()
-      ;(this.registry ?? register).clear()
+      register?.clear()
     }
 
     if (init?.collectDefaultMetrics !== false) {
@@ -174,7 +174,7 @@ class PrometheusMetrics implements Metrics {
         }
 
         // reset counts for next time
-        this.transferStats = new Map()
+        this.transferStats.clear()
 
         return output
       }
@@ -216,6 +216,14 @@ class PrometheusMetrics implements Metrics {
     '@libp2p/metrics'
   ]
 
+  start (): void {
+
+  }
+
+  stop (): void {
+    this.transferStats.clear()
+  }
+
   /**
    * Increment the transfer stat for the passed key, making sure
    * it exists first
@@ -269,17 +277,12 @@ class PrometheusMetrics implements Metrics {
 
     let metric = metrics.get(name)
 
-    if (metrics.has(name)) {
-      this.log('Reuse existing metric', name)
-
-      if (opts.calculate != null) {
-        metric.addCalculator(opts.calculate)
-      }
-
-      return metrics.get(name)
+    if (metric != null) {
+      this.log('reuse existing metric', name)
+      return metric
     }
 
-    this.log('Register metric', name)
+    this.log('register metric', name)
     metric = new PrometheusMetric(name, { registry: this.registry, ...opts })
 
     metrics.set(name, metric)
@@ -299,16 +302,11 @@ class PrometheusMetrics implements Metrics {
     let metricGroup = metrics.get(name)
 
     if (metricGroup != null) {
-      this.log('Reuse existing metric group', name)
-
-      if (opts.calculate != null) {
-        metricGroup.addCalculator(opts.calculate)
-      }
-
+      this.log('reuse existing metric', name)
       return metricGroup
     }
 
-    this.log('Register metric group', name)
+    this.log('register metric group', name)
     metricGroup = new PrometheusMetricGroup(name, { registry: this.registry, ...opts })
 
     metrics.set(name, metricGroup)
@@ -328,16 +326,11 @@ class PrometheusMetrics implements Metrics {
     let counter = metrics.get(name)
 
     if (counter != null) {
-      this.log('Reuse existing counter', name)
-
-      if (opts.calculate != null) {
-        counter.addCalculator(opts.calculate)
-      }
-
-      return metrics.get(name)
+      this.log('reuse existing counter', name)
+      return counter
     }
 
-    this.log('Register counter', name)
+    this.log('register counter', name)
     counter = new PrometheusCounter(name, { registry: this.registry, ...opts })
 
     metrics.set(name, counter)
@@ -357,16 +350,11 @@ class PrometheusMetrics implements Metrics {
     let counterGroup = metrics.get(name)
 
     if (counterGroup != null) {
-      this.log('Reuse existing counter group', name)
-
-      if (opts.calculate != null) {
-        counterGroup.addCalculator(opts.calculate)
-      }
-
+      this.log('reuse existing counter group', name)
       return counterGroup
     }
 
-    this.log('Register counter group', name)
+    this.log('register counter group', name)
     counterGroup = new PrometheusCounterGroup(name, { registry: this.registry, ...opts })
 
     metrics.set(name, counterGroup)
@@ -385,17 +373,12 @@ class PrometheusMetrics implements Metrics {
 
     let metric = metrics.get(name)
 
-    if (metrics.has(name)) {
-      this.log('Reuse existing histogram', name)
-
-      if (opts.calculate != null) {
-        metric.addCalculator(opts.calculate)
-      }
-
-      return metrics.get(name)
+    if (metric != null) {
+      this.log('reuse existing histogram', name)
+      return metric
     }
 
-    this.log('Register histogram', name)
+    this.log('register histogram', name)
     metric = new PrometheusHistogram(name, { registry: this.registry, ...opts })
 
     metrics.set(name, metric)
@@ -415,16 +398,11 @@ class PrometheusMetrics implements Metrics {
     let metricGroup = metrics.get(name)
 
     if (metricGroup != null) {
-      this.log('Reuse existing histogram group', name)
-
-      if (opts.calculate != null) {
-        metricGroup.addCalculator(opts.calculate)
-      }
-
+      this.log('reuse existing histogram group', name)
       return metricGroup
     }
 
-    this.log('Register histogram group', name)
+    this.log('register histogram group', name)
     metricGroup = new PrometheusHistogramGroup(name, { registry: this.registry, ...opts })
 
     metrics.set(name, metricGroup)
@@ -443,17 +421,12 @@ class PrometheusMetrics implements Metrics {
 
     let metric = metrics.get(name)
 
-    if (metrics.has(name)) {
-      this.log('Reuse existing summary', name)
-
-      if (opts.calculate != null) {
-        metric.addCalculator(opts.calculate)
-      }
-
-      return metrics.get(name)
+    if (metric != null) {
+      this.log('reuse existing summary', name)
+      return metric
     }
 
-    this.log('Register summary', name)
+    this.log('register summary', name)
     metric = new PrometheusSummary(name, { registry: this.registry, ...opts })
 
     metrics.set(name, metric)
@@ -473,16 +446,11 @@ class PrometheusMetrics implements Metrics {
     let metricGroup = metrics.get(name)
 
     if (metricGroup != null) {
-      this.log('Reuse existing summary group', name)
-
-      if (opts.calculate != null) {
-        metricGroup.addCalculator(opts.calculate)
-      }
-
+      this.log('reuse existing summary group', name)
       return metricGroup
     }
 
-    this.log('Register summary group', name)
+    this.log('register summary group', name)
     metricGroup = new PrometheusSummaryGroup(name, { registry: this.registry, ...opts })
 
     metrics.set(name, metricGroup)