@libp2p/prometheus-metrics 4.3.21 → 4.3.22

package/src/metric-group.ts

@@ -1,35 +1,27 @@
 import { Gauge } from 'prom-client'
 import { normalizeString } from './utils.js'
 import type { PrometheusCalculatedMetricOptions } from './index.js'
-import type { CalculatedMetric } from './utils.js'
-import type { CalculateMetric, MetricGroup, StopTimer } from '@libp2p/interface'
+import type { MetricGroup, StopTimer } from '@libp2p/interface'
 import type { CollectFunction } from 'prom-client'
 
-export class PrometheusMetricGroup implements MetricGroup, CalculatedMetric<Record<string, number>> {
+export class PrometheusMetricGroup implements MetricGroup {
   private readonly gauge: Gauge
   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<Gauge<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.set({ [label]: key }, value)
-          })
-        }))
+        Object.entries(values).forEach(([key, value]) => {
+          this.set({ [label]: key }, value)
+        })
       }
     }
 
@@ -42,10 +34,6 @@ export class PrometheusMetricGroup implements MetricGroup, CalculatedMetric<Reco
     })
   }
 
-  addCalculator (calculator: CalculateMetric<Record<string, number>>): void {
-    this.calculators.push(calculator)
-  }
-
   update (values: Record<string, number>): void {
     Object.entries(values).forEach(([key, value]) => {
       this.gauge.set({ [this.label]: key }, value)

package/src/metric.ts

@@ -1,30 +1,22 @@
 import { Gauge } from 'prom-client'
 import { normalizeString } from './utils.js'
 import type { PrometheusCalculatedMetricOptions } from './index.js'
-import type { Metric, StopTimer, CalculateMetric } from '@libp2p/interface'
+import type { Metric, StopTimer } from '@libp2p/interface'
 import type { CollectFunction } from 'prom-client'
 
 export class PrometheusMetric implements Metric {
   private readonly gauge: Gauge
-  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<Gauge<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.set(sum)
+        this.set(await opts.calculate())
       }
     }
 
@@ -37,10 +29,6 @@ export class PrometheusMetric implements Metric {
     })
   }
 
-  addCalculator (calculator: CalculateMetric): void {
-    this.calculators.push(calculator)
-  }
-
   update (value: number): void {
     this.gauge.set(value)
   }

package/src/summary-group.ts

@@ -1,35 +1,27 @@
 import { Summary as PromSummary } from 'prom-client'
 import { normalizeString } from './utils.js'
 import type { PrometheusCalculatedSummaryOptions } from './index.js'
-import type { CalculatedMetric } from './utils.js'
-import type { CalculateMetric, SummaryGroup, StopTimer } from '@libp2p/interface'
+import type { SummaryGroup, StopTimer } from '@libp2p/interface'
 import type { CollectFunction } from 'prom-client'
 
-export class PrometheusSummaryGroup implements SummaryGroup, CalculatedMetric<Record<string, number>> {
+export class PrometheusSummaryGroup implements SummaryGroup {
   private readonly summary: PromSummary
   private readonly label: string
-  private readonly calculators: Array<CalculateMetric<Record<string, number>>>
 
   constructor (name: string, opts: PrometheusCalculatedSummaryOptions<Record<string, number>>) {
     name = normalizeString(name)
     const help = normalizeString(opts.help ?? name)
     const label = this.label = normalizeString(opts.label ?? name)
     let collect: CollectFunction<PromSummary<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)
+        })
       }
     }
 
@@ -47,10 +39,6 @@ export class PrometheusSummaryGroup implements SummaryGroup, CalculatedMetric<Re
     })
   }
 
-  addCalculator (calculator: CalculateMetric<Record<string, number>>): void {
-    this.calculators.push(calculator)
-  }
-
   observe (values: Record<string, number>): void {
     Object.entries(values).forEach(([key, value]) => {
       this.summary.observe({ [this.label]: key }, value)

package/src/summary.ts

@@ -1,30 +1,22 @@
 import { Summary as PromSummary } from 'prom-client'
 import { normalizeString } from './utils.js'
 import type { PrometheusCalculatedSummaryOptions } from './index.js'
-import type { StopTimer, CalculateMetric, Summary } from '@libp2p/interface'
+import type { StopTimer, Summary } from '@libp2p/interface'
 import type { CollectFunction } from 'prom-client'
 
 export class PrometheusSummary implements Summary {
   private readonly summary: PromSummary
-  private readonly calculators: CalculateMetric[]
 
   constructor (name: string, opts: PrometheusCalculatedSummaryOptions) {
     name = normalizeString(name)
     const help = normalizeString(opts.help ?? name)
     const labels = opts.label != null ? [normalizeString(opts.label)] : []
     let collect: CollectFunction<PromSummary<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())
       }
     }
 
@@ -42,10 +34,6 @@ export class PrometheusSummary implements Summary {
     })
   }
 
-  addCalculator (calculator: CalculateMetric): void {
-    this.calculators.push(calculator)
-  }
-
   observe (value: number): void {
     this.summary.observe(value)
   }

package/src/utils.ts

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