@libp2p/prometheus-metrics 1.1.5 → 2.0.0-e66f4891

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. package/README.md +21 -9
  2. package/dist/src/counter-group.d.ts +1 -1
  3. package/dist/src/counter.d.ts +1 -1
  4. package/dist/src/index.d.ts +1 -1
  5. package/dist/src/index.js +2 -2
  6. package/dist/src/index.js.map +1 -1
  7. package/dist/src/metric-group.d.ts +1 -1
  8. package/dist/src/metric.d.ts +1 -1
  9. package/dist/src/utils.d.ts +1 -1
  10. package/package.json +10 -102
  11. package/src/counter-group.ts +1 -1
  12. package/src/counter.ts +1 -1
  13. package/src/index.ts +4 -4
  14. package/src/metric-group.ts +1 -1
  15. package/src/metric.ts +1 -1
  16. package/src/utils.ts +1 -1
  17. package/dist/typedoc-urls.json +0 -5
package/README.md CHANGED
@@ -2,8 +2,8 @@
2
2
 
3
3
  [![libp2p.io](https://img.shields.io/badge/project-libp2p-yellow.svg?style=flat-square)](http://libp2p.io/)
4
4
  [![Discuss](https://img.shields.io/discourse/https/discuss.libp2p.io/posts.svg?style=flat-square)](https://discuss.libp2p.io)
5
- [![codecov](https://img.shields.io/codecov/c/github/libp2p/js-libp2p-prometheus-metrics.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-prometheus-metrics)
6
- [![CI](https://img.shields.io/github/actions/workflow/status/libp2p/js-libp2p-prometheus-metrics/js-test-and-release.yml?branch=main\&style=flat-square)](https://github.com/libp2p/js-libp2p-prometheus-metrics/actions/workflows/js-test-and-release.yml?query=branch%3Amain)
5
+ [![codecov](https://img.shields.io/codecov/c/github/libp2p/js-libp2p.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p)
6
+ [![CI](https://img.shields.io/github/actions/workflow/status/libp2p/js-libp2p/main.yml?branch=master\&style=flat-square)](https://github.com/libp2p/js-libp2p/actions/workflows/main.yml?query=branch%3Amaster)
7
7
 
8
8
  > Collect libp2p metrics for scraping by Prometheus or Graphana
9
9
 
@@ -59,31 +59,43 @@ Some useful queries are:
59
59
 
60
60
  #### Data sent/received
61
61
 
62
- rate(libp2p_data_transfer_bytes_total[30s])
62
+ ```
63
+ rate(libp2p_data_transfer_bytes_total[30s])
64
+ ```
63
65
 
64
66
  #### CPU usage
65
67
 
66
- rate(process_cpu_user_seconds_total[30s]) * 100
68
+ ```
69
+ rate(process_cpu_user_seconds_total[30s]) * 100
70
+ ```
67
71
 
68
72
  #### Memory usage
69
73
 
70
- nodejs_memory_usage_bytes
74
+ ```
75
+ nodejs_memory_usage_bytes
76
+ ```
71
77
 
72
78
  #### DHT query time
73
79
 
74
- libp2p_kad_dht_wan_query_time_seconds
80
+ ```
81
+ libp2p_kad_dht_wan_query_time_seconds
82
+ ```
75
83
 
76
84
  or
77
85
 
78
- libp2p_kad_dht_lan_query_time_seconds
86
+ ```
87
+ libp2p_kad_dht_lan_query_time_seconds
88
+ ```
79
89
 
80
90
  #### TCP transport dialer errors
81
91
 
82
- rate(libp2p_tcp_dialer_errors_total[30s])
92
+ ```
93
+ rate(libp2p_tcp_dialer_errors_total[30s])
94
+ ```
83
95
 
84
96
  ## API Docs
85
97
 
86
- - <https://libp2p.github.io/js-libp2p-prometheus-metrics>
98
+ - <https://libp2p.github.io/js-libp2p/modules/_libp2p_prometheus_metrics.html>
87
99
 
88
100
  ## License
89
101
 
package/dist/src/counter-group.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { type CalculatedMetric } from './utils.js';
2
2
  import type { PrometheusCalculatedMetricOptions } from './index.js';
3
- import type { CounterGroup, CalculateMetric } from '@libp2p/interface-metrics';
3
+ import type { CounterGroup, CalculateMetric } from '@libp2p/interface/metrics';
4
4
  export declare class PrometheusCounterGroup implements CounterGroup, CalculatedMetric<Record<string, number>> {
5
5
  private readonly counter;
6
6
  private readonly label;
package/dist/src/counter.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { type CalculatedMetric } from './utils.js';
2
2
  import type { PrometheusCalculatedMetricOptions } from './index.js';
3
- import type { CalculateMetric, Counter } from '@libp2p/interface-metrics';
3
+ import type { CalculateMetric, Counter } from '@libp2p/interface/metrics';
4
4
  export declare class PrometheusCounter implements Counter, CalculatedMetric {
5
5
  private readonly counter;
6
6
  private readonly calculators;
package/dist/src/index.d.ts CHANGED
@@ -94,7 +94,7 @@
94
94
  * ```
95
95
  */
96
96
  import { type DefaultMetricsCollectorConfiguration, type Registry } from 'prom-client';
97
- import type { CalculatedMetricOptions, Metrics } from '@libp2p/interface-metrics';
97
+ import type { CalculatedMetricOptions, Metrics } from '@libp2p/interface/metrics';
98
98
  export interface PrometheusMetricsInit {
99
99
  /**
100
100
  * Use a custom registry to register metrics.
package/dist/src/index.js CHANGED
@@ -171,12 +171,12 @@ class PrometheusMetrics {
171
171
  this._track(maConn, 'global');
172
172
  }
173
173
  trackProtocolStream(stream, connection) {
174
- if (stream.stat.protocol == null) {
174
+ if (stream.protocol == null) {
175
175
  // protocol not negotiated yet, should not happen as the upgrader
176
176
  // calls this handler after protocol negotiation
177
177
  return;
178
178
  }
179
- this._track(stream, stream.stat.protocol);
179
+ this._track(stream, stream.protocol);
180
180
  }
181
181
  registerMetric(name, opts = {}) {
182
182
  if (name == null ?? name.trim() === '') {
package/dist/src/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
package/dist/src/metric-group.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { type CalculatedMetric } from './utils.js';
2
2
  import type { PrometheusCalculatedMetricOptions } from './index.js';
3
- import type { CalculateMetric, MetricGroup, StopTimer } from '@libp2p/interface-metrics';
3
+ import type { CalculateMetric, MetricGroup, StopTimer } from '@libp2p/interface/metrics';
4
4
  export declare class PrometheusMetricGroup implements MetricGroup, CalculatedMetric<Record<string, number>> {
5
5
  private readonly gauge;
6
6
  private readonly label;
package/dist/src/metric.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type { PrometheusCalculatedMetricOptions } from './index.js';
2
- import type { Metric, StopTimer, CalculateMetric } from '@libp2p/interface-metrics';
2
+ import type { Metric, StopTimer, CalculateMetric } from '@libp2p/interface/metrics';
3
3
  export declare class PrometheusMetric implements Metric {
4
4
  private readonly gauge;
5
5
  private readonly calculators;
package/dist/src/utils.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { CalculateMetric } from '@libp2p/interface-metrics';
1
+ import type { CalculateMetric } from '@libp2p/interface/metrics';
2
2
  export interface CalculatedMetric<T = number> {
3
3
  addCalculator: (calculator: CalculateMetric<T>) => void;
4
4
  }
package/package.json CHANGED
@@ -1,20 +1,16 @@
1
1
  {
2
2
  "name": "@libp2p/prometheus-metrics",
3
- "version": "1.1.5",
3
+ "version": "2.0.0-e66f4891",
4
4
  "description": "Collect libp2p metrics for scraping by Prometheus or Graphana",
5
5
  "author": "",
6
6
  "license": "Apache-2.0 OR MIT",
7
- "homepage": "https://github.com/libp2p/js-libp2p-prometheus-metrics#readme",
7
+ "homepage": "https://github.com/libp2p/js-libp2p/tree/master/packages/metrics-prometheus#readme",
8
8
  "repository": {
9
9
  "type": "git",
10
- "url": "git+https://github.com/libp2p/js-libp2p-prometheus-metrics.git"
10
+ "url": "git+https://github.com/libp2p/js-libp2p.git"
11
11
  },
12
12
  "bugs": {
13
- "url": "https://github.com/libp2p/js-libp2p-prometheus-metrics/issues"
14
- },
15
- "engines": {
16
- "node": ">=18.0.0",
17
- "npm": ">=8.6.0"
13
+ "url": "https://github.com/libp2p/js-libp2p/issues"
18
14
  },
19
15
  "type": "module",
20
16
  "types": "./dist/src/index.d.ts",
@@ -36,91 +32,6 @@
36
32
  "sourceType": "module"
37
33
  }
38
34
  },
39
- "release": {
40
- "branches": [
41
- "main"
42
- ],
43
- "plugins": [
44
- [
45
- "@semantic-release/commit-analyzer",
46
- {
47
- "preset": "conventionalcommits",
48
- "releaseRules": [
49
- {
50
- "breaking": true,
51
- "release": "major"
52
- },
53
- {
54
- "revert": true,
55
- "release": "patch"
56
- },
57
- {
58
- "type": "feat",
59
- "release": "minor"
60
- },
61
- {
62
- "type": "fix",
63
- "release": "patch"
64
- },
65
- {
66
- "type": "docs",
67
- "release": "patch"
68
- },
69
- {
70
- "type": "test",
71
- "release": "patch"
72
- },
73
- {
74
- "type": "deps",
75
- "release": "patch"
76
- },
77
- {
78
- "scope": "no-release",
79
- "release": false
80
- }
81
- ]
82
- }
83
- ],
84
- [
85
- "@semantic-release/release-notes-generator",
86
- {
87
- "preset": "conventionalcommits",
88
- "presetConfig": {
89
- "types": [
90
- {
91
- "type": "feat",
92
- "section": "Features"
93
- },
94
- {
95
- "type": "fix",
96
- "section": "Bug Fixes"
97
- },
98
- {
99
- "type": "chore",
100
- "section": "Trivial Changes"
101
- },
102
- {
103
- "type": "docs",
104
- "section": "Documentation"
105
- },
106
- {
107
- "type": "deps",
108
- "section": "Dependencies"
109
- },
110
- {
111
- "type": "test",
112
- "section": "Tests"
113
- }
114
- ]
115
- }
116
- }
117
- ],
118
- "@semantic-release/changelog",
119
- "@semantic-release/npm",
120
- "@semantic-release/github",
121
- "@semantic-release/git"
122
- ]
123
- },
124
35
  "scripts": {
125
36
  "clean": "aegir clean",
126
37
  "lint": "aegir lint",
@@ -128,23 +39,20 @@
128
39
  "build": "aegir build",
129
40
  "test": "aegir test -t node",
130
41
  "test:node": "aegir test -t node --cov",
131
- "test:electron-main": "aegir test -t electron-main --cov",
132
- "release": "aegir release",
133
- "docs": "aegir docs"
42
+ "test:electron-main": "aegir test -t electron-main --cov"
134
43
  },
135
44
  "dependencies": {
136
- "@libp2p/interface-connection": "^5.0.2",
137
- "@libp2p/interface-metrics": "^4.0.2",
138
- "@libp2p/logger": "^2.0.2",
45
+ "@libp2p/interface": "0.1.0-e66f4891",
46
+ "@libp2p/logger": "3.0.0-e66f4891",
139
47
  "it-foreach": "^2.0.3",
140
48
  "it-stream-types": "^2.0.1",
141
49
  "prom-client": "^14.1.0"
142
50
  },
143
51
  "devDependencies": {
144
- "@libp2p/interface-mocks": "^12.0.1",
145
- "@libp2p/peer-id-factory": "^2.0.3",
52
+ "@libp2p/interface-compliance-tests": "4.0.0-e66f4891",
53
+ "@libp2p/peer-id-factory": "3.0.0-e66f4891",
146
54
  "@multiformats/multiaddr": "^12.1.3",
147
- "aegir": "^39.0.6",
55
+ "aegir": "^40.0.1",
148
56
  "it-drain": "^3.0.2",
149
57
  "it-pipe": "^3.0.1",
150
58
  "p-defer": "^4.0.0"
package/src/counter-group.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { Counter as PromCounter, type CollectFunction } from 'prom-client'
2
2
  import { normaliseString, type CalculatedMetric } from './utils.js'
3
3
  import type { PrometheusCalculatedMetricOptions } from './index.js'
4
- import type { CounterGroup, CalculateMetric } from '@libp2p/interface-metrics'
4
+ import type { CounterGroup, CalculateMetric } from '@libp2p/interface/metrics'
5
5
 
6
6
  export class PrometheusCounterGroup implements CounterGroup, CalculatedMetric<Record<string, number>> {
7
7
  private readonly counter: PromCounter
package/src/counter.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { type CollectFunction, Counter as PromCounter } from 'prom-client'
2
2
  import { normaliseString, type CalculatedMetric } from './utils.js'
3
3
  import type { PrometheusCalculatedMetricOptions } from './index.js'
4
- import type { CalculateMetric, Counter } from '@libp2p/interface-metrics'
4
+ import type { CalculateMetric, Counter } from '@libp2p/interface/metrics'
5
5
 
6
6
  export class PrometheusCounter implements Counter, CalculatedMetric {
7
7
  private readonly counter: PromCounter
package/src/index.ts CHANGED
@@ -101,8 +101,8 @@ import { PrometheusCounterGroup } from './counter-group.js'
101
101
  import { PrometheusCounter } from './counter.js'
102
102
  import { PrometheusMetricGroup } from './metric-group.js'
103
103
  import { PrometheusMetric } from './metric.js'
104
- import type { MultiaddrConnection, Stream, Connection } from '@libp2p/interface-connection'
105
- import type { CalculatedMetricOptions, Counter, CounterGroup, Metric, MetricGroup, MetricOptions, Metrics } from '@libp2p/interface-metrics'
104
+ import type { MultiaddrConnection, Stream, Connection } from '@libp2p/interface/connection'
105
+ import type { CalculatedMetricOptions, Counter, CounterGroup, Metric, MetricGroup, MetricOptions, Metrics } from '@libp2p/interface/metrics'
106
106
  import type { Duplex, Source } from 'it-stream-types'
107
107
 
108
108
  const log = logger('libp2p:prometheus-metrics')
@@ -224,13 +224,13 @@ class PrometheusMetrics implements Metrics {
224
224
  }
225
225
 
226
226
  trackProtocolStream (stream: Stream, connection: Connection): void {
227
- if (stream.stat.protocol == null) {
227
+ if (stream.protocol == null) {
228
228
  // protocol not negotiated yet, should not happen as the upgrader
229
229
  // calls this handler after protocol negotiation
230
230
  return
231
231
  }
232
232
 
233
- this._track(stream, stream.stat.protocol)
233
+ this._track(stream, stream.protocol)
234
234
  }
235
235
 
236
236
  registerMetric (name: string, opts: PrometheusCalculatedMetricOptions): void
package/src/metric-group.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { type CollectFunction, Gauge } from 'prom-client'
2
2
  import { normaliseString, type CalculatedMetric } from './utils.js'
3
3
  import type { PrometheusCalculatedMetricOptions } from './index.js'
4
- import type { CalculateMetric, MetricGroup, StopTimer } from '@libp2p/interface-metrics'
4
+ import type { CalculateMetric, MetricGroup, StopTimer } from '@libp2p/interface/metrics'
5
5
 
6
6
  export class PrometheusMetricGroup implements MetricGroup, CalculatedMetric<Record<string, number>> {
7
7
  private readonly gauge: Gauge
package/src/metric.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { type CollectFunction, Gauge } from 'prom-client'
2
2
  import { normaliseString } from './utils.js'
3
3
  import type { PrometheusCalculatedMetricOptions } from './index.js'
4
- import type { Metric, StopTimer, CalculateMetric } from '@libp2p/interface-metrics'
4
+ import type { Metric, StopTimer, CalculateMetric } from '@libp2p/interface/metrics'
5
5
 
6
6
  export class PrometheusMetric implements Metric {
7
7
  private readonly gauge: Gauge
package/src/utils.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { CalculateMetric } from '@libp2p/interface-metrics'
1
+ import type { CalculateMetric } from '@libp2p/interface/metrics'
2
2
 
3
3
  export interface CalculatedMetric <T = number> {
4
4
  addCalculator: (calculator: CalculateMetric<T>) => void
package/dist/typedoc-urls.json DELETED
@@ -1,5 +0,0 @@
1
- {
2
- "PrometheusCalculatedMetricOptions": "https://libp2p.github.io/js-libp2p-prometheus-metrics/interfaces/PrometheusCalculatedMetricOptions.html",
3
- "PrometheusMetricsInit": "https://libp2p.github.io/js-libp2p-prometheus-metrics/interfaces/PrometheusMetricsInit.html",
4
- "prometheusMetrics": "https://libp2p.github.io/js-libp2p-prometheus-metrics/functions/prometheusMetrics.html"
5
- }