@aztec/telemetry-client 0.0.0-test.1 → 0.0.1-commit.1142ef1
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.
- package/dest/attributes.d.ts +33 -9
- package/dest/attributes.d.ts.map +1 -1
- package/dest/attributes.js +22 -8
- package/dest/bench.d.ts +6 -1
- package/dest/bench.d.ts.map +1 -1
- package/dest/bench.js +31 -14
- package/dest/config.d.ts +7 -2
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +29 -1
- package/dest/index.d.ts +2 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -0
- package/dest/l1_metrics.d.ts +17 -0
- package/dest/l1_metrics.d.ts.map +1 -0
- package/dest/l1_metrics.js +54 -0
- package/dest/lmdb_metrics.d.ts +5 -3
- package/dest/lmdb_metrics.d.ts.map +1 -1
- package/dest/lmdb_metrics.js +7 -15
- package/dest/metric-utils.d.ts +5 -0
- package/dest/metric-utils.d.ts.map +1 -0
- package/dest/metric-utils.js +7 -0
- package/dest/metrics.d.ts +247 -122
- package/dest/metrics.d.ts.map +1 -1
- package/dest/metrics.js +1239 -120
- package/dest/nodejs_metrics_monitor.d.ts +19 -0
- package/dest/nodejs_metrics_monitor.d.ts.map +1 -0
- package/dest/nodejs_metrics_monitor.js +109 -0
- package/dest/noop.d.ts +9 -4
- package/dest/noop.d.ts.map +1 -1
- package/dest/noop.js +34 -1
- package/dest/otel.d.ts +13 -7
- package/dest/otel.d.ts.map +1 -1
- package/dest/otel.js +142 -21
- package/dest/otel_filter_metric_exporter.d.ts +12 -4
- package/dest/otel_filter_metric_exporter.d.ts.map +1 -1
- package/dest/otel_filter_metric_exporter.js +38 -4
- package/dest/otel_logger_provider.d.ts +1 -1
- package/dest/otel_propagation.d.ts +1 -1
- package/dest/otel_resource.d.ts +1 -1
- package/dest/otel_resource.d.ts.map +1 -1
- package/dest/otel_resource.js +31 -2
- package/dest/prom_otel_adapter.d.ts +58 -9
- package/dest/prom_otel_adapter.d.ts.map +1 -1
- package/dest/prom_otel_adapter.js +153 -45
- package/dest/start.d.ts +2 -2
- package/dest/start.d.ts.map +1 -1
- package/dest/start.js +7 -6
- package/dest/telemetry.d.ts +62 -34
- package/dest/telemetry.d.ts.map +1 -1
- package/dest/telemetry.js +47 -24
- package/dest/vendor/attributes.d.ts +1 -1
- package/dest/vendor/otel-pino-stream.d.ts +1 -2
- package/dest/vendor/otel-pino-stream.d.ts.map +1 -1
- package/dest/vendor/otel-pino-stream.js +2 -2
- package/dest/with_tracer.d.ts +1 -1
- package/dest/with_tracer.d.ts.map +1 -1
- package/dest/wrappers/fetch.d.ts +2 -2
- package/dest/wrappers/fetch.d.ts.map +1 -1
- package/dest/wrappers/fetch.js +7 -5
- package/dest/wrappers/index.d.ts +1 -1
- package/dest/wrappers/json_rpc_server.d.ts +2 -2
- package/dest/wrappers/json_rpc_server.d.ts.map +1 -1
- package/dest/wrappers/l2_block_stream.d.ts +4 -3
- package/dest/wrappers/l2_block_stream.d.ts.map +1 -1
- package/dest/wrappers/l2_block_stream.js +385 -11
- package/package.json +21 -15
- package/src/attributes.ts +42 -11
- package/src/bench.ts +37 -15
- package/src/config.ts +54 -2
- package/src/index.ts +1 -0
- package/src/l1_metrics.ts +65 -0
- package/src/lmdb_metrics.ts +24 -24
- package/src/metric-utils.ts +12 -0
- package/src/metrics.ts +1313 -145
- package/src/nodejs_metrics_monitor.ts +132 -0
- package/src/noop.ts +65 -4
- package/src/otel.ts +155 -26
- package/src/otel_filter_metric_exporter.ts +47 -5
- package/src/otel_resource.ts +40 -2
- package/src/prom_otel_adapter.ts +191 -65
- package/src/start.ts +7 -6
- package/src/telemetry.ts +151 -76
- package/src/vendor/otel-pino-stream.ts +1 -4
- package/src/wrappers/fetch.ts +24 -31
- package/src/wrappers/json_rpc_server.ts +1 -1
- package/src/wrappers/l2_block_stream.ts +6 -2
- package/dest/event_loop_monitor.d.ts +0 -18
- package/dest/event_loop_monitor.d.ts.map +0 -1
- package/dest/event_loop_monitor.js +0 -93
- package/src/event_loop_monitor.ts +0 -119
package/dest/otel_resource.js
CHANGED
|
@@ -1,12 +1,41 @@
|
|
|
1
|
-
import { detectResourcesSync, envDetectorSync, osDetectorSync,
|
|
1
|
+
import { Resource, detectResourcesSync, envDetectorSync, osDetectorSync, serviceInstanceIdDetectorSync } from '@opentelemetry/resources';
|
|
2
|
+
import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
|
|
3
|
+
import { AZTEC_NODE_ROLE, AZTEC_REGISTRY_ADDRESS, AZTEC_ROLLUP_ADDRESS, AZTEC_ROLLUP_VERSION } from './attributes.js';
|
|
2
4
|
export function getOtelResource() {
|
|
3
5
|
const resource = detectResourcesSync({
|
|
4
6
|
detectors: [
|
|
7
|
+
aztecNetworkDetectorSync,
|
|
5
8
|
osDetectorSync,
|
|
6
9
|
envDetectorSync,
|
|
7
|
-
|
|
10
|
+
// this detector is disabled because:
|
|
11
|
+
// 1. our software runs in a docker container, a lot of the attributes detected would be identical across different machines (e.g. all run node v22, executing the same script, running PID 1, etc)
|
|
12
|
+
// 2. it catures process.argv which could contain sensitive values in plain text (e.g. validator private keys)
|
|
13
|
+
// processDetectorSync,
|
|
8
14
|
serviceInstanceIdDetectorSync
|
|
9
15
|
]
|
|
10
16
|
});
|
|
11
17
|
return resource;
|
|
12
18
|
}
|
|
19
|
+
const aztecNetworkDetectorSync = {
|
|
20
|
+
detect () {
|
|
21
|
+
let role;
|
|
22
|
+
if (process.argv.includes('--sequencer')) {
|
|
23
|
+
role = 'sequencer';
|
|
24
|
+
} else if (process.argv.includes('--prover-node')) {
|
|
25
|
+
role = 'prover-node';
|
|
26
|
+
} else if (process.argv.includes('--node')) {
|
|
27
|
+
role = 'node';
|
|
28
|
+
} else if (process.argv.includes('--p2p-bootstrap')) {
|
|
29
|
+
role = 'bootnode';
|
|
30
|
+
}
|
|
31
|
+
const aztecAttributes = {
|
|
32
|
+
// this gets overwritten by OTEL_RESOURCE_ATTRIBUTES (if set)
|
|
33
|
+
[SEMRESATTRS_SERVICE_NAME]: role ? `aztec-${role}` : undefined,
|
|
34
|
+
[AZTEC_NODE_ROLE]: role,
|
|
35
|
+
[AZTEC_ROLLUP_VERSION]: process.env.ROLLUP_VERSION ?? 'canonical',
|
|
36
|
+
[AZTEC_ROLLUP_ADDRESS]: process.env.ROLLUP_CONTRACT_ADDRESS,
|
|
37
|
+
[AZTEC_REGISTRY_ADDRESS]: process.env.REGISTRY_CONTRACT_ADDRESS
|
|
38
|
+
};
|
|
39
|
+
return new Resource(aztecAttributes);
|
|
40
|
+
}
|
|
41
|
+
};
|
|
@@ -97,18 +97,67 @@ export declare class OtelGauge<Labels extends LabelsGeneric = NoLabels> implemen
|
|
|
97
97
|
* Resets the gauge to initial state
|
|
98
98
|
*/
|
|
99
99
|
reset(): void;
|
|
100
|
+
}
|
|
101
|
+
/**
|
|
102
|
+
* Implementation of a Histogram collector
|
|
103
|
+
*/
|
|
104
|
+
export declare class OtelHistogram<Labels extends LabelsGeneric = NoLabels> implements IHistogram<Labels> {
|
|
105
|
+
private logger;
|
|
106
|
+
private labelNames;
|
|
107
|
+
private histogram;
|
|
108
|
+
constructor(logger: Logger, meter: Meter, name: string, help: string, buckets?: number[], labelNames?: Array<keyof Labels>);
|
|
109
|
+
/**
|
|
110
|
+
* Starts a timer and returns a function that when called will record the time elapsed
|
|
111
|
+
* @param labels - Optional labels for the observation
|
|
112
|
+
*/
|
|
113
|
+
startTimer(labels?: Labels): () => void;
|
|
114
|
+
/**
|
|
115
|
+
* Observes a value
|
|
116
|
+
* @param value - Value to observe
|
|
117
|
+
*/
|
|
118
|
+
observe(value: number): void;
|
|
119
|
+
/**
|
|
120
|
+
* Observes a value with labels
|
|
121
|
+
* @param labels - Labels object
|
|
122
|
+
* @param value - Value to observe
|
|
123
|
+
*/
|
|
124
|
+
observe(labels: Labels, value: number): void;
|
|
125
|
+
reset(): void;
|
|
126
|
+
}
|
|
127
|
+
/**
|
|
128
|
+
* Implementation of an AvgMinMax collector
|
|
129
|
+
*/
|
|
130
|
+
export declare class OtelAvgMinMax<Labels extends LabelsGeneric = NoLabels> implements IAvgMinMax<Labels> {
|
|
131
|
+
private logger;
|
|
132
|
+
private labelNames;
|
|
133
|
+
private gauges;
|
|
134
|
+
private currentValues;
|
|
135
|
+
private labeledValues;
|
|
136
|
+
constructor(logger: Logger, meter: Meter, name: string, help: string, labelNames?: Array<keyof Labels>);
|
|
137
|
+
/**
|
|
138
|
+
* Sets the values for calculating avg, min, max
|
|
139
|
+
* @param values - Array of values
|
|
140
|
+
*/
|
|
141
|
+
set(values: number[]): void;
|
|
100
142
|
/**
|
|
101
|
-
*
|
|
102
|
-
* @param labels - Labels object
|
|
103
|
-
* @
|
|
143
|
+
* Sets the values for calculating avg, min, max with labels
|
|
144
|
+
* @param labels - Labels object
|
|
145
|
+
* @param values - Array of values
|
|
104
146
|
*/
|
|
105
|
-
|
|
147
|
+
set(labels: Labels, values: number[]): void;
|
|
148
|
+
/**
|
|
149
|
+
* Resets all stored values
|
|
150
|
+
*/
|
|
151
|
+
reset(): void;
|
|
106
152
|
/**
|
|
107
|
-
*
|
|
108
|
-
* @param
|
|
109
|
-
* @
|
|
153
|
+
* General function to observe an aggregation
|
|
154
|
+
* @param result - Observer result
|
|
155
|
+
* @param aggregateFn - Function that calculates the aggregation
|
|
110
156
|
*/
|
|
111
|
-
private
|
|
157
|
+
private observeAggregation;
|
|
158
|
+
private observeAvg;
|
|
159
|
+
private observeMin;
|
|
160
|
+
private observeMax;
|
|
112
161
|
}
|
|
113
162
|
/**
|
|
114
163
|
* Otel metrics Adapter
|
|
@@ -124,4 +173,4 @@ export declare class OtelMetricsAdapter extends Registry implements MetricsRegis
|
|
|
124
173
|
avgMinMax<Labels extends LabelsGeneric = NoLabels>(configuration: AvgMinMaxConfig<Labels>): IAvgMinMax<Labels>;
|
|
125
174
|
}
|
|
126
175
|
export {};
|
|
127
|
-
//# sourceMappingURL=
|
|
176
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvbV9vdGVsX2FkYXB0ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wcm9tX290ZWxfYWRhcHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFHbEUsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUd2QyxPQUFPLEtBQUssRUFBYSxLQUFLLEVBQW1CLGVBQWUsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRXpGOztHQUVHO0FBQ0gsS0FBSyxRQUFRLEdBQUcsTUFBTSxDQUFDO0FBQ3ZCLE1BQU0sTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDO0FBQ2hDLE1BQU0sTUFBTSxlQUFlLEdBQUcsR0FBRyxDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsQ0FBQztBQUV4RCxvQkFBWSxhQUFhO0lBQ3ZCLE9BQU8sWUFBWTtJQUNuQixPQUFPLFlBQVk7Q0FDcEI7QUFFRCxLQUFLLFFBQVEsR0FBRyxNQUFNLENBQUMsTUFBTSxFQUFFLEtBQUssQ0FBQyxDQUFDO0FBQ3RDLEtBQUssYUFBYSxHQUFHLE1BQU0sQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FBQyxDQUFDO0FBQ3JELEtBQUssU0FBUyxDQUFDLE1BQU0sU0FBUyxhQUFhLElBQUksT0FBTyxDQUFDLE1BQU0sTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0FBQzdFLFVBQVUsU0FBUyxDQUFDLE1BQU0sU0FBUyxhQUFhO0lBQzlDLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBRyxJQUFJLENBQUM7Q0FDaEM7QUFFRCxVQUFVLE1BQU0sQ0FBQyxNQUFNLFNBQVMsYUFBYSxHQUFHLFFBQVE7SUFDdEQsR0FBRyxFQUFFLFFBQVEsU0FBUyxNQUFNLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxNQUFNLEtBQUssSUFBSSxHQUFHLENBQUMsTUFBTSxF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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prom_otel_adapter.d.ts","sourceRoot":"","sources":["../src/prom_otel_adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"prom_otel_adapter.d.ts","sourceRoot":"","sources":["../src/prom_otel_adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { createLogger } from '@aztec/foundation/log';
|
|
2
|
+
import { Timer } from '@aztec/foundation/timer';
|
|
2
3
|
import { Registry } from 'prom-client';
|
|
3
4
|
export var MessageSource = /*#__PURE__*/ function(MessageSource) {
|
|
4
5
|
MessageSource["forward"] = "forward";
|
|
@@ -34,9 +35,11 @@ export var MessageSource = /*#__PURE__*/ function(MessageSource) {
|
|
|
34
35
|
this.labeledValues = new Map();
|
|
35
36
|
this.collectFns = [];
|
|
36
37
|
this._collect = ()=>{};
|
|
37
|
-
|
|
38
|
+
const metricDef = {
|
|
39
|
+
name,
|
|
38
40
|
description: help
|
|
39
|
-
}
|
|
41
|
+
};
|
|
42
|
+
this.gauge = meter.createObservableGauge(metricDef);
|
|
40
43
|
// Only observe in the callback when collect() is called
|
|
41
44
|
this.gauge.addCallback(this.handleObservation.bind(this));
|
|
42
45
|
}
|
|
@@ -59,7 +62,7 @@ export var MessageSource = /*#__PURE__*/ function(MessageSource) {
|
|
|
59
62
|
return;
|
|
60
63
|
}
|
|
61
64
|
for (const [labelStr, value] of this.labeledValues.entries()){
|
|
62
|
-
const labels =
|
|
65
|
+
const labels = parseLabelsSafely(labelStr, this.logger);
|
|
63
66
|
if (labels) {
|
|
64
67
|
result.observe(value, labels);
|
|
65
68
|
}
|
|
@@ -71,7 +74,7 @@ export var MessageSource = /*#__PURE__*/ function(MessageSource) {
|
|
|
71
74
|
return;
|
|
72
75
|
}
|
|
73
76
|
if (labelsOrValue) {
|
|
74
|
-
|
|
77
|
+
validateLabels(labelsOrValue, this.labelNames, 'Gauge');
|
|
75
78
|
const labelKey = JSON.stringify(labelsOrValue);
|
|
76
79
|
const currentValue = this.labeledValues.get(labelKey) ?? 0;
|
|
77
80
|
this.labeledValues.set(labelKey, currentValue + (value ?? 1));
|
|
@@ -84,7 +87,7 @@ export var MessageSource = /*#__PURE__*/ function(MessageSource) {
|
|
|
84
87
|
this.currentValue = labelsOrValue;
|
|
85
88
|
return;
|
|
86
89
|
}
|
|
87
|
-
|
|
90
|
+
validateLabels(labelsOrValue, this.labelNames, 'Gauge');
|
|
88
91
|
const labelKey = JSON.stringify(labelsOrValue);
|
|
89
92
|
this.labeledValues.set(labelKey, value);
|
|
90
93
|
}
|
|
@@ -93,7 +96,7 @@ export var MessageSource = /*#__PURE__*/ function(MessageSource) {
|
|
|
93
96
|
* @param labels - Optional labels object
|
|
94
97
|
*/ dec(labels) {
|
|
95
98
|
if (labels) {
|
|
96
|
-
|
|
99
|
+
validateLabels(labels, this.labelNames, 'Gauge');
|
|
97
100
|
const labelKey = JSON.stringify(labels);
|
|
98
101
|
const currentValue = this.labeledValues.get(labelKey) ?? 0;
|
|
99
102
|
this.labeledValues.set(labelKey, currentValue - 1);
|
|
@@ -107,58 +110,163 @@ export var MessageSource = /*#__PURE__*/ function(MessageSource) {
|
|
|
107
110
|
this.currentValue = 0;
|
|
108
111
|
this.labeledValues.clear();
|
|
109
112
|
}
|
|
113
|
+
}
|
|
114
|
+
/**
|
|
115
|
+
* Implementation of a Histogram collector
|
|
116
|
+
*/ export class OtelHistogram {
|
|
117
|
+
logger;
|
|
118
|
+
labelNames;
|
|
119
|
+
histogram;
|
|
120
|
+
constructor(logger, meter, name, help, buckets = [], labelNames = []){
|
|
121
|
+
this.logger = logger;
|
|
122
|
+
this.labelNames = labelNames;
|
|
123
|
+
const metricDef = {
|
|
124
|
+
name,
|
|
125
|
+
description: help
|
|
126
|
+
};
|
|
127
|
+
this.histogram = meter.createHistogram(metricDef, {
|
|
128
|
+
advice: buckets.length ? {
|
|
129
|
+
explicitBucketBoundaries: buckets
|
|
130
|
+
} : undefined
|
|
131
|
+
});
|
|
132
|
+
}
|
|
110
133
|
/**
|
|
111
|
-
*
|
|
112
|
-
* @param labels -
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
throw new Error('Gauge was initialized without labels support');
|
|
134
|
+
* Starts a timer and returns a function that when called will record the time elapsed
|
|
135
|
+
* @param labels - Optional labels for the observation
|
|
136
|
+
*/ startTimer(labels) {
|
|
137
|
+
if (labels) {
|
|
138
|
+
validateLabels(labels, this.labelNames, 'Histogram');
|
|
117
139
|
}
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
140
|
+
const timer = new Timer();
|
|
141
|
+
return ()=>{
|
|
142
|
+
// Use timer.s() here to get the duration in seconds since this is only currently used by gossipsub_heartbeat_duration_seconds
|
|
143
|
+
const duration = timer.s();
|
|
144
|
+
if (labels) {
|
|
145
|
+
this.observe(labels, duration);
|
|
146
|
+
} else {
|
|
147
|
+
this.observe(duration);
|
|
121
148
|
}
|
|
122
|
-
}
|
|
149
|
+
};
|
|
123
150
|
}
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
return JSON.parse(labelStr);
|
|
131
|
-
} catch {
|
|
132
|
-
this.logger.error(`Failed to parse label string: ${labelStr}`);
|
|
133
|
-
return null;
|
|
151
|
+
observe(labelsOrValue, value) {
|
|
152
|
+
if (typeof labelsOrValue === 'number') {
|
|
153
|
+
this.histogram.record(labelsOrValue);
|
|
154
|
+
} else {
|
|
155
|
+
validateLabels(labelsOrValue, this.labelNames, 'Histogram');
|
|
156
|
+
this.histogram.record(value, labelsOrValue);
|
|
134
157
|
}
|
|
135
158
|
}
|
|
159
|
+
reset() {
|
|
160
|
+
// OpenTelemetry histograms cannot be reset, but we implement the interface
|
|
161
|
+
this.logger.silent('OpenTelemetry histograms cannot be fully reset');
|
|
162
|
+
}
|
|
136
163
|
}
|
|
137
164
|
/**
|
|
138
|
-
*
|
|
139
|
-
*/ class
|
|
165
|
+
* Implementation of an AvgMinMax collector
|
|
166
|
+
*/ export class OtelAvgMinMax {
|
|
140
167
|
logger;
|
|
141
|
-
|
|
168
|
+
labelNames;
|
|
169
|
+
gauges;
|
|
170
|
+
currentValues;
|
|
171
|
+
labeledValues;
|
|
172
|
+
constructor(logger, meter, name, help, labelNames = []){
|
|
142
173
|
this.logger = logger;
|
|
174
|
+
this.labelNames = labelNames;
|
|
175
|
+
this.currentValues = [];
|
|
176
|
+
this.labeledValues = new Map();
|
|
177
|
+
// Create three separate gauges for avg, min, and max
|
|
178
|
+
this.gauges = {
|
|
179
|
+
avg: meter.createObservableGauge({
|
|
180
|
+
name: `${name}_avg`,
|
|
181
|
+
description: `${help} (average)`
|
|
182
|
+
}),
|
|
183
|
+
min: meter.createObservableGauge({
|
|
184
|
+
name: `${name}_min`,
|
|
185
|
+
description: `${help} (minimum)`
|
|
186
|
+
}),
|
|
187
|
+
max: meter.createObservableGauge({
|
|
188
|
+
name: `${name}_max`,
|
|
189
|
+
description: `${help} (maximum)`
|
|
190
|
+
})
|
|
191
|
+
};
|
|
192
|
+
// Register callbacks for each gauge
|
|
193
|
+
this.gauges.avg.addCallback(this.observeAvg.bind(this));
|
|
194
|
+
this.gauges.min.addCallback(this.observeMin.bind(this));
|
|
195
|
+
this.gauges.max.addCallback(this.observeMax.bind(this));
|
|
143
196
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
197
|
+
set(labelsOrValues, values) {
|
|
198
|
+
if (Array.isArray(labelsOrValues)) {
|
|
199
|
+
this.currentValues = labelsOrValues;
|
|
200
|
+
return;
|
|
201
|
+
} else {
|
|
202
|
+
validateLabels(labelsOrValues, this.labelNames, 'AvgMinMax');
|
|
203
|
+
const labelKey = JSON.stringify(labelsOrValues);
|
|
204
|
+
this.labeledValues.set(labelKey, values || []);
|
|
205
|
+
}
|
|
147
206
|
}
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
207
|
+
/**
|
|
208
|
+
* Resets all stored values
|
|
209
|
+
*/ reset() {
|
|
210
|
+
this.currentValues = [];
|
|
211
|
+
this.labeledValues.clear();
|
|
212
|
+
}
|
|
213
|
+
/**
|
|
214
|
+
* General function to observe an aggregation
|
|
215
|
+
* @param result - Observer result
|
|
216
|
+
* @param aggregateFn - Function that calculates the aggregation
|
|
217
|
+
*/ observeAggregation(result, aggregateFn) {
|
|
218
|
+
// Observe unlabeled values
|
|
219
|
+
if (this.currentValues.length > 0) {
|
|
220
|
+
result.observe(aggregateFn(this.currentValues));
|
|
221
|
+
}
|
|
222
|
+
// Observe labeled values
|
|
223
|
+
for (const [labelStr, values] of this.labeledValues.entries()){
|
|
224
|
+
if (values.length > 0) {
|
|
225
|
+
const labels = parseLabelsSafely(labelStr, this.logger);
|
|
226
|
+
if (labels) {
|
|
227
|
+
result.observe(aggregateFn(values), labels);
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
observeAvg(result) {
|
|
233
|
+
this.observeAggregation(result, (arr)=>arr.reduce((sum, val)=>sum + val, 0) / arr.length);
|
|
234
|
+
}
|
|
235
|
+
observeMin(result) {
|
|
236
|
+
this.observeAggregation(result, (arr)=>Math.min.apply(null, arr));
|
|
237
|
+
}
|
|
238
|
+
observeMax(result) {
|
|
239
|
+
this.observeAggregation(result, (arr)=>Math.max.apply(null, arr));
|
|
151
240
|
}
|
|
152
241
|
}
|
|
153
242
|
/**
|
|
154
|
-
*
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
243
|
+
* Validates that provided labels match the expected schema
|
|
244
|
+
* @param labels - Labels object to validate
|
|
245
|
+
* @param labelNames - Array of allowed label names
|
|
246
|
+
* @param metricType - Type of metric for error message ('Gauge', 'Histogram', 'AvgMinMax')
|
|
247
|
+
* @throws Error if invalid labels are provided
|
|
248
|
+
*/ function validateLabels(labels, labelNames, metricType) {
|
|
249
|
+
if (labelNames.length === 0) {
|
|
250
|
+
throw new Error(`${metricType} was initialized without labels support`);
|
|
251
|
+
}
|
|
252
|
+
for (const key of Object.keys(labels)){
|
|
253
|
+
if (!labelNames.includes(key)) {
|
|
254
|
+
throw new Error(`Invalid label key: ${key}`);
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
/**
|
|
259
|
+
* Safely parses label string back to object
|
|
260
|
+
* @param labelStr - Stringified labels object
|
|
261
|
+
* @param logger - Logger instance for error reporting
|
|
262
|
+
* @returns Labels object or null if parsing fails
|
|
263
|
+
*/ function parseLabelsSafely(labelStr, logger) {
|
|
264
|
+
try {
|
|
265
|
+
return JSON.parse(labelStr);
|
|
266
|
+
} catch {
|
|
267
|
+
logger.error(`Failed to parse label string: ${labelStr}`);
|
|
268
|
+
return null;
|
|
269
|
+
}
|
|
162
270
|
}
|
|
163
271
|
/**
|
|
164
272
|
* Otel metrics Adapter
|
|
@@ -175,9 +283,9 @@ export var MessageSource = /*#__PURE__*/ function(MessageSource) {
|
|
|
175
283
|
return new OtelGauge(this.logger, this.meter, configuration.name, configuration.help, configuration.labelNames);
|
|
176
284
|
}
|
|
177
285
|
histogram(configuration) {
|
|
178
|
-
return new
|
|
286
|
+
return new OtelHistogram(this.logger, this.meter, configuration.name, configuration.help, configuration.buckets, configuration.labelNames);
|
|
179
287
|
}
|
|
180
288
|
avgMinMax(configuration) {
|
|
181
|
-
return new
|
|
289
|
+
return new OtelAvgMinMax(this.logger, this.meter, configuration.name, configuration.help, configuration.labelNames);
|
|
182
290
|
}
|
|
183
291
|
}
|
package/dest/start.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { TelemetryClientConfig } from './config.js';
|
|
2
2
|
import type { TelemetryClient } from './telemetry.js';
|
|
3
3
|
export * from './config.js';
|
|
4
|
-
export declare function initTelemetryClient(config: TelemetryClientConfig): TelemetryClient
|
|
4
|
+
export declare function initTelemetryClient(config: TelemetryClientConfig): Promise<TelemetryClient>;
|
|
5
5
|
export declare function getTelemetryClient(): TelemetryClient;
|
|
6
|
-
//# sourceMappingURL=
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9zdGFydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUV0RCxjQUFjLGFBQWEsQ0FBQztBQUs1Qix3QkFBc0IsbUJBQW1CLENBQUMsTUFBTSxFQUFFLHFCQUFxQixHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FrQmpHO0FBRUQsd0JBQWdCLGtCQUFrQixJQUFJLGVBQWUsQ0FFcEQifQ==
|
package/dest/start.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD,cAAc,aAAa,CAAC;AAK5B,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC,CAkBjG;AAED,wBAAgB,kBAAkB,IAAI,eAAe,CAEpD"}
|
package/dest/start.js
CHANGED
|
@@ -1,22 +1,23 @@
|
|
|
1
1
|
import { createLogger } from '@aztec/foundation/log';
|
|
2
2
|
import { NoopTelemetryClient } from './noop.js';
|
|
3
|
-
import { OpenTelemetryClient } from './otel.js';
|
|
4
3
|
export * from './config.js';
|
|
5
|
-
let
|
|
4
|
+
let initialized = false;
|
|
6
5
|
let telemetry = new NoopTelemetryClient();
|
|
7
|
-
export function initTelemetryClient(config) {
|
|
6
|
+
export async function initTelemetryClient(config) {
|
|
8
7
|
const log = createLogger('telemetry:client');
|
|
9
|
-
if (
|
|
8
|
+
if (initialized) {
|
|
10
9
|
log.warn('Telemetry client has already been initialized once');
|
|
11
10
|
return telemetry;
|
|
12
11
|
}
|
|
13
|
-
if (config.metricsCollectorUrl) {
|
|
12
|
+
if (config.metricsCollectorUrl || config.publicMetricsCollectorUrl) {
|
|
14
13
|
log.info(`Using OpenTelemetry client with custom collector`);
|
|
14
|
+
// Lazy load OpenTelemetry to avoid loading heavy deps at startup
|
|
15
|
+
const { OpenTelemetryClient } = await import('./otel.js');
|
|
15
16
|
telemetry = OpenTelemetryClient.createAndStart(config, log);
|
|
16
17
|
} else {
|
|
17
18
|
log.info('Using NoopTelemetryClient');
|
|
18
19
|
}
|
|
19
|
-
|
|
20
|
+
initialized = true;
|
|
20
21
|
return telemetry;
|
|
21
22
|
}
|
|
22
23
|
export function getTelemetryClient() {
|
package/dest/telemetry.d.ts
CHANGED
|
@@ -1,21 +1,31 @@
|
|
|
1
|
-
import { type AttributeValue, type BatchObservableCallback, type MetricOptions, type Observable, type BatchObservableResult as OtelBatchObservableResult, type Gauge as OtelGauge, type Histogram as OtelHistogram, type ObservableGauge as OtelObservableGauge, type ObservableResult as OtelObservableResult, type ObservableUpDownCounter as OtelObservableUpDownCounter, type UpDownCounter as OtelUpDownCounter, type Span, type Tracer } from '@opentelemetry/api';
|
|
1
|
+
import { type AttributeValue, type BatchObservableCallback, type Context, type MetricOptions, type Observable, type BatchObservableResult as OtelBatchObservableResult, type Gauge as OtelGauge, type Histogram as OtelHistogram, type ObservableGauge as OtelObservableGauge, type ObservableResult as OtelObservableResult, type ObservableUpDownCounter as OtelObservableUpDownCounter, type UpDownCounter as OtelUpDownCounter, type Span, type Tracer } from '@opentelemetry/api';
|
|
2
2
|
import type * as Attributes from './attributes.js';
|
|
3
|
-
import type
|
|
4
|
-
export {
|
|
3
|
+
import type { MetricDefinition } from './metrics.js';
|
|
4
|
+
export { toMetricOptions } from './metric-utils.js';
|
|
5
|
+
export { type Span, SpanStatusCode, ValueType, type Context } from '@opentelemetry/api';
|
|
5
6
|
type ValuesOf<T> = T extends Record<string, infer U> ? U : never;
|
|
7
|
+
type AttributeNames = ValuesOf<typeof Attributes>;
|
|
8
|
+
/**
|
|
9
|
+
* This is a set of attributes that could lead to high cardinality in the metrics.
|
|
10
|
+
* If you find yourself wanting to capture this data in a metric consider if it makes sense to capture
|
|
11
|
+
* as the metric value instead of an attribute or consider logging instead.
|
|
12
|
+
*
|
|
13
|
+
* Think twice before removing an attribute from this list.
|
|
14
|
+
*/
|
|
15
|
+
type BannedMetricAttributeNames = (typeof Attributes)['BLOCK_NUMBER' | 'BLOCK_ARCHIVE' | 'SLOT_NUMBER' | 'BLOCK_PARENT' | 'BLOCK_CANDIDATE_TXS_COUNT' | 'BLOCK_TXS_COUNT' | 'BLOCK_SIZE' | 'EPOCH_SIZE' | 'EPOCH_NUMBER' | 'TX_HASH' | 'PROVING_JOB_ID' | 'P2P_ID' | 'P2P_REQ_RESP_BATCH_REQUESTS_COUNT' | 'TARGET_ADDRESS' | 'MANA_USED' | 'TOTAL_INSTRUCTIONS'];
|
|
6
16
|
/** Global registry of attributes */
|
|
7
|
-
type AttributesType = Partial<Record<
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
export type {
|
|
12
|
-
export type Gauge = OtelGauge<
|
|
13
|
-
export type Histogram = OtelHistogram<
|
|
14
|
-
export type UpDownCounter = OtelUpDownCounter<
|
|
15
|
-
export type ObservableGauge = OtelObservableGauge<
|
|
16
|
-
export type ObservableUpDownCounter = OtelObservableUpDownCounter<
|
|
17
|
-
export type ObservableResult = OtelObservableResult<
|
|
18
|
-
export type BatchObservableResult = OtelBatchObservableResult<
|
|
17
|
+
export type AttributesType = Partial<Record<AttributeNames, AttributeValue>>;
|
|
18
|
+
/** Subset of attributes allowed to be added to metrics */
|
|
19
|
+
export type MetricAttributesType = Partial<Record<Exclude<AttributeNames, BannedMetricAttributeNames>, AttributeValue>>;
|
|
20
|
+
/** Re-export MetricDefinition for convenience */
|
|
21
|
+
export type { MetricDefinition } from './metrics.js';
|
|
22
|
+
export type Gauge = OtelGauge<MetricAttributesType>;
|
|
23
|
+
export type Histogram = OtelHistogram<MetricAttributesType>;
|
|
24
|
+
export type UpDownCounter = OtelUpDownCounter<MetricAttributesType>;
|
|
25
|
+
export type ObservableGauge = OtelObservableGauge<MetricAttributesType>;
|
|
26
|
+
export type ObservableUpDownCounter = OtelObservableUpDownCounter<MetricAttributesType>;
|
|
27
|
+
export type ObservableResult = OtelObservableResult<MetricAttributesType>;
|
|
28
|
+
export type BatchObservableResult = OtelBatchObservableResult<MetricAttributesType>;
|
|
19
29
|
export type { Tracer };
|
|
20
30
|
/**
|
|
21
31
|
* A meter that provides instruments for recording metrics.
|
|
@@ -23,36 +33,32 @@ export type { Tracer };
|
|
|
23
33
|
export interface Meter {
|
|
24
34
|
/**
|
|
25
35
|
* Creates a new gauge instrument. A gauge is a metric that represents a single numerical value that can arbitrarily go up and down.
|
|
26
|
-
* @param
|
|
27
|
-
* @param options - The options for the gauge
|
|
36
|
+
* @param metric - The metric definition
|
|
28
37
|
*/
|
|
29
|
-
createGauge(
|
|
38
|
+
createGauge(metric: MetricDefinition): Gauge;
|
|
30
39
|
/**
|
|
31
|
-
* Creates a new gauge instrument. A gauge is a metric that represents a single numerical value that can arbitrarily go up and down.
|
|
32
|
-
* @param
|
|
33
|
-
* @param options - The options for the gauge
|
|
40
|
+
* Creates a new observable gauge instrument. A gauge is a metric that represents a single numerical value that can arbitrarily go up and down.
|
|
41
|
+
* @param metric - The metric definition
|
|
34
42
|
*/
|
|
35
|
-
createObservableGauge(
|
|
43
|
+
createObservableGauge(metric: MetricDefinition): ObservableGauge;
|
|
36
44
|
addBatchObservableCallback(callback: BatchObservableCallback<AttributesType>, observables: Observable<AttributesType>[]): void;
|
|
37
45
|
removeBatchObservableCallback(callback: BatchObservableCallback<AttributesType>, observables: Observable<AttributesType>[]): void;
|
|
38
46
|
/**
|
|
39
47
|
* Creates a new histogram instrument. A histogram is a metric that samples observations (usually things like request durations or response sizes) and counts them in configurable buckets.
|
|
40
|
-
* @param
|
|
41
|
-
* @param
|
|
48
|
+
* @param metric - The metric definition
|
|
49
|
+
* @param extraOptions - Optional extra options (e.g., advice for bucket boundaries)
|
|
42
50
|
*/
|
|
43
|
-
createHistogram(
|
|
51
|
+
createHistogram(metric: MetricDefinition, extraOptions?: Partial<MetricOptions>): Histogram;
|
|
44
52
|
/**
|
|
45
53
|
* Creates a new counter instrument. A counter can go up or down with a delta from the previous value.
|
|
46
|
-
* @param
|
|
47
|
-
* @param options - The options for the counter
|
|
54
|
+
* @param metric - The metric definition
|
|
48
55
|
*/
|
|
49
|
-
createUpDownCounter(
|
|
56
|
+
createUpDownCounter(metric: MetricDefinition): UpDownCounter;
|
|
50
57
|
/**
|
|
51
|
-
* Creates a new
|
|
52
|
-
* @param
|
|
53
|
-
* @param options - The options for the gauge
|
|
58
|
+
* Creates a new observable up/down counter instrument.
|
|
59
|
+
* @param metric - The metric definition
|
|
54
60
|
*/
|
|
55
|
-
createObservableUpDownCounter(
|
|
61
|
+
createObservableUpDownCounter(metric: MetricDefinition): ObservableUpDownCounter;
|
|
56
62
|
}
|
|
57
63
|
/**
|
|
58
64
|
* A telemetry client that provides meters for recording metrics.
|
|
@@ -80,6 +86,23 @@ export interface TelemetryClient {
|
|
|
80
86
|
* Flushes the telemetry client.
|
|
81
87
|
*/
|
|
82
88
|
flush(): Promise<void>;
|
|
89
|
+
/**
|
|
90
|
+
* Updates what telemetry is exported to the public collector
|
|
91
|
+
*/
|
|
92
|
+
setExportedPublicTelemetry(prefixes: string[]): void;
|
|
93
|
+
/**
|
|
94
|
+
* Updates the roles that would share telemetry (if enabled)
|
|
95
|
+
*/
|
|
96
|
+
setPublicTelemetryCollectFrom(roles: string[]): void;
|
|
97
|
+
/**
|
|
98
|
+
* Get current trace context as an opaque string for propagation.
|
|
99
|
+
* Returns the W3C traceparent header value if a trace is active, undefined otherwise.
|
|
100
|
+
*/
|
|
101
|
+
getTraceContext(): string | undefined;
|
|
102
|
+
/**
|
|
103
|
+
* Recreates a context propagated by a remote system
|
|
104
|
+
*/
|
|
105
|
+
extractPropagatedContext(traceContext: string): Context | undefined;
|
|
83
106
|
}
|
|
84
107
|
/** Objects that adhere to this interface can use @trackSpan */
|
|
85
108
|
export interface Traceable {
|
|
@@ -114,5 +137,10 @@ export declare function trackSpan<T extends Traceable, F extends (...args: any[]
|
|
|
114
137
|
* @returns - A new function that wraps the callback in a span
|
|
115
138
|
*/
|
|
116
139
|
export declare function wrapCallbackInSpan<F extends (...args: any[]) => any>(tracer: Tracer, spanName: string, attributes: AttributesType, callback: F): F;
|
|
117
|
-
export declare function runInSpan<A extends any[], R>(tracer: Tracer | string, spanName: string, callback: (span: Span, ...args: A) => R): (...args: A) => R
|
|
118
|
-
|
|
140
|
+
export declare function runInSpan<A extends any[], R>(tracer: Tracer | string, spanName: string, callback: (span: Span, ...args: A) => Promise<R>): (...args: A) => Promise<R>;
|
|
141
|
+
/**
|
|
142
|
+
* Execute a callback within a span immediately (for one-off traced calls).
|
|
143
|
+
* Unlike runInSpan which returns a reusable function, this executes right away.
|
|
144
|
+
*/
|
|
145
|
+
export declare function execInSpan<R>(tracer: Tracer | string, spanName: string, callback: (span: Span) => Promise<R>): Promise<R>;
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVsZW1ldHJ5LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdGVsZW1ldHJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGNBQWMsRUFDbkIsS0FBSyx1QkFBdUIsRUFDNUIsS0FBSyxPQUFPLEVBQ1osS0FBSyxhQUFhLEVBQ2xCLEtBQUssVUFBVSxFQUNmLEtBQUsscUJBQXFCLElBQUkseUJBQXlCLEVBQ3ZELEtBQUssS0FBSyxJQUFJLFNBQVMsRUFDdkIsS0FBSyxTQUFTLElBQUksYUFBYSxFQUMvQixLQUFLLGVBQWUsSUFBSSxtQkFBbUIsRUFDM0MsS0FBSyxnQkFBZ0IsSUFBSSxvQkFBb0IsRUFDN0MsS0FBSyx1QkFBdUIsSUFBSSwyQkFBMkIsRUFDM0QsS0FBSyxhQUFhLElBQUksaUJBQWlCLEVBQ3ZDLEtBQUssSUFBSSxFQUVULEtBQUssTUFBTSxFQUNaLE1BQU0sb0JBQW9CLENBQUM7QUFFNUIsT0FBTyxLQUFLLEtBQUssVUFBVSxNQUFNLGlCQUFpQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBR3JELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVwRCxPQUFPLEVBQUUsS0FBSyxJQUFJLEVBQUUsY0FBYyxFQUFFLFNBQVMsRUFBRSxLQUFLLE9BQU8sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXhGLEtBQUssUUFBUSxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsTUFBTSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQyxHQUFHLENBQUMsR0FBRyxLQUFLLENBQUM7QUFFakUsS0FBSyxjQUFjLEdBQUcsUUFBUSxDQUFDLE9BQU8sVUFBVSxDQUFDLENBQUM7QUFFbEQ7Ozs7OztHQU1HO0FBQ0gsS0FBSywwQkFBMEIsR0FBRyxDQUFDLE9BQU8sVUFBVSxDQUFDLENBQ2pELGNBQWMsR0FDZCxlQUFlLEdB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
|