@aztec/telemetry-client 5.0.0-private.20260319 → 5.0.0-rc.2
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 +5 -2
- package/dest/attributes.d.ts.map +1 -1
- package/dest/attributes.js +2 -1
- package/dest/config.d.ts +3 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +17 -9
- package/dest/lmdb_metrics.d.ts +2 -2
- package/dest/lmdb_metrics.d.ts.map +1 -1
- package/dest/metrics.d.ts +23 -4
- package/dest/metrics.d.ts.map +1 -1
- package/dest/metrics.js +120 -15
- package/dest/monitored_batch_span_processor.d.ts +29 -0
- package/dest/monitored_batch_span_processor.d.ts.map +1 -0
- package/dest/monitored_batch_span_processor.js +75 -0
- package/dest/otel.d.ts +6 -1
- package/dest/otel.d.ts.map +1 -1
- package/dest/otel.js +73 -4
- package/dest/otel_propagation.d.ts +3 -1
- package/dest/otel_propagation.d.ts.map +1 -1
- package/dest/otel_propagation.js +49 -1
- package/dest/start.d.ts +1 -1
- package/dest/start.d.ts.map +1 -1
- package/dest/start.js +1 -1
- package/dest/telemetry.d.ts +2 -2
- package/dest/telemetry.d.ts.map +1 -1
- package/dest/wrappers/fetch.d.ts +3 -3
- package/dest/wrappers/fetch.d.ts.map +1 -1
- package/dest/wrappers/fetch.js +3 -2
- package/dest/wrappers/index.d.ts +1 -2
- package/dest/wrappers/index.d.ts.map +1 -1
- package/dest/wrappers/index.js +0 -1
- package/package.json +3 -3
- package/src/attributes.ts +4 -1
- package/src/config.ts +24 -9
- package/src/metrics.ts +125 -15
- package/src/monitored_batch_span_processor.ts +100 -0
- package/src/otel.ts +52 -3
- package/src/otel_propagation.ts +42 -1
- package/src/start.ts +6 -1
- package/src/telemetry.ts +0 -1
- package/src/wrappers/fetch.ts +9 -3
- package/src/wrappers/index.ts +0 -1
- package/dest/wrappers/l2_block_stream.d.ts +0 -16
- package/dest/wrappers/l2_block_stream.d.ts.map +0 -1
- package/dest/wrappers/l2_block_stream.js +0 -400
- package/src/wrappers/l2_block_stream.ts +0 -41
package/src/otel_propagation.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import type { DiagnosticsMiddleware } from '@aztec/foundation/json-rpc/server';
|
|
2
|
+
|
|
1
3
|
import { ROOT_CONTEXT, type Span, SpanKind, SpanStatusCode, propagation } from '@opentelemetry/api';
|
|
2
4
|
import type Koa from 'koa';
|
|
3
5
|
|
|
@@ -17,7 +19,7 @@ export function getOtelJsonRpcPropagationMiddleware(
|
|
|
17
19
|
const context = propagation.extract(ROOT_CONTEXT, ctx.request.headers);
|
|
18
20
|
const method = (ctx.request.body as any)?.method;
|
|
19
21
|
return tracer.startActiveSpan(
|
|
20
|
-
`JsonRpcServer.${method ?? '
|
|
22
|
+
`JsonRpcServer.${method ?? 'batch'}`,
|
|
21
23
|
{ kind: SpanKind.SERVER },
|
|
22
24
|
context,
|
|
23
25
|
async (span: Span): Promise<void> => {
|
|
@@ -48,3 +50,42 @@ export function getOtelJsonRpcPropagationMiddleware(
|
|
|
48
50
|
);
|
|
49
51
|
};
|
|
50
52
|
}
|
|
53
|
+
|
|
54
|
+
export function getOtelJsonRpcDiagnosticsMiddleware(): DiagnosticsMiddleware {
|
|
55
|
+
return function otelJsonRpcDiagnostics(ctx, next) {
|
|
56
|
+
const [namespace, method] = splitNamespace(ctx.method);
|
|
57
|
+
const scope = namespace ?? 'UnknownHandler';
|
|
58
|
+
const tracer = getTelemetryClient().getTracer(scope);
|
|
59
|
+
return tracer.startActiveSpan(
|
|
60
|
+
`${scope}.${method}`,
|
|
61
|
+
{ kind: SpanKind.INTERNAL, attributes: { [ATTR_JSONRPC_METHOD]: ctx.method } },
|
|
62
|
+
async span => {
|
|
63
|
+
if (ctx.id !== null) {
|
|
64
|
+
span.setAttribute(ATTR_JSONRPC_REQUEST_ID, ctx.id);
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
try {
|
|
68
|
+
await next();
|
|
69
|
+
span.setStatus({ code: SpanStatusCode.OK });
|
|
70
|
+
} catch (err) {
|
|
71
|
+
span.setStatus({ code: SpanStatusCode.ERROR, message: err instanceof Error ? err.message : String(err) });
|
|
72
|
+
if (typeof err === 'string' || err instanceof Error) {
|
|
73
|
+
span.recordException(err);
|
|
74
|
+
}
|
|
75
|
+
throw err;
|
|
76
|
+
} finally {
|
|
77
|
+
span.end();
|
|
78
|
+
}
|
|
79
|
+
},
|
|
80
|
+
);
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
function splitNamespace(fullMethod: string): [namespace: string | undefined, method: string] {
|
|
85
|
+
const idx = fullMethod.indexOf('_');
|
|
86
|
+
if (idx > -1) {
|
|
87
|
+
return [fullMethod.slice(0, idx), fullMethod.slice(idx + 1)];
|
|
88
|
+
} else {
|
|
89
|
+
return [undefined, fullMethod];
|
|
90
|
+
}
|
|
91
|
+
}
|
package/src/start.ts
CHANGED
|
@@ -19,7 +19,12 @@ export async function initTelemetryClient(
|
|
|
19
19
|
return telemetry;
|
|
20
20
|
}
|
|
21
21
|
|
|
22
|
-
if (
|
|
22
|
+
if (
|
|
23
|
+
config.metricsCollectorUrl ||
|
|
24
|
+
config.publicMetricsCollectorUrl ||
|
|
25
|
+
config.tracesCollectorUrl ||
|
|
26
|
+
config.logsCollectorUrl
|
|
27
|
+
) {
|
|
23
28
|
log.info(`Using OpenTelemetry client with custom collector`);
|
|
24
29
|
// Lazy load OpenTelemetry to avoid loading heavy deps at startup
|
|
25
30
|
const { OpenTelemetryClient } = await import('./otel.js');
|
package/src/telemetry.ts
CHANGED
package/src/wrappers/fetch.ts
CHANGED
|
@@ -9,12 +9,17 @@ import { ATTR_JSONRPC_METHOD, ATTR_JSONRPC_REQUEST_ID } from '../vendor/attribut
|
|
|
9
9
|
|
|
10
10
|
/**
|
|
11
11
|
* Makes a fetch function that retries based on the given attempts and propagates trace information.
|
|
12
|
-
* @param retries - Sequence of intervals (in seconds) to retry.
|
|
12
|
+
* @param retries - Sequence of intervals (in seconds) to retry, or a factory function returning an iterator for custom/indefinite backoff.
|
|
13
13
|
* @param noRetry - Whether to stop retries on server errors.
|
|
14
14
|
* @param log - Optional logger for logging attempts.
|
|
15
15
|
* @returns A fetch function.
|
|
16
16
|
*/
|
|
17
|
-
export function makeTracedFetch(
|
|
17
|
+
export function makeTracedFetch(
|
|
18
|
+
retries: number[] | (() => Generator<number>),
|
|
19
|
+
defaultNoRetry: boolean,
|
|
20
|
+
fetch = defaultFetch,
|
|
21
|
+
log?: Logger,
|
|
22
|
+
) {
|
|
18
23
|
return (host: string, body: unknown, extraHeaders: Record<string, string> = {}, noRetry?: boolean) => {
|
|
19
24
|
const telemetry = getTelemetryClient();
|
|
20
25
|
return telemetry.getTracer('fetch').startActiveSpan(`JsonRpcClient`, { kind: SpanKind.CLIENT }, async span => {
|
|
@@ -27,10 +32,11 @@ export function makeTracedFetch(retries: number[], defaultNoRetry: boolean, fetc
|
|
|
27
32
|
}
|
|
28
33
|
const headers = { ...extraHeaders };
|
|
29
34
|
propagation.inject(context.active(), headers);
|
|
35
|
+
const backoff = typeof retries === 'function' ? retries() : makeBackoff(retries);
|
|
30
36
|
return await retry(
|
|
31
37
|
() => fetch(host, body, headers, noRetry ?? defaultNoRetry),
|
|
32
38
|
`JsonRpcClient request to ${host}`,
|
|
33
|
-
|
|
39
|
+
backoff,
|
|
34
40
|
log,
|
|
35
41
|
false,
|
|
36
42
|
);
|
package/src/wrappers/index.ts
CHANGED
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
2
|
-
import { type L2BlockSource, L2BlockStream, type L2BlockStreamEventHandler, type L2BlockStreamLocalDataProvider } from '@aztec/stdlib/block';
|
|
3
|
-
import { type Traceable, type Tracer } from '@aztec/telemetry-client';
|
|
4
|
-
/** Extends an L2BlockStream with a tracer to create a new trace per iteration. */
|
|
5
|
-
export declare class TraceableL2BlockStream extends L2BlockStream implements Traceable {
|
|
6
|
-
readonly tracer: Tracer;
|
|
7
|
-
private readonly name;
|
|
8
|
-
constructor(l2BlockSource: Pick<L2BlockSource, 'getBlocks' | 'getBlockHeader' | 'getL2Tips' | 'getCheckpoints' | 'getCheckpointedBlocks'>, localData: L2BlockStreamLocalDataProvider, handler: L2BlockStreamEventHandler, tracer: Tracer, name?: string, log?: import("@aztec/foundation/log").Logger, opts?: {
|
|
9
|
-
proven?: boolean;
|
|
10
|
-
pollIntervalMS?: number;
|
|
11
|
-
batchSize?: number;
|
|
12
|
-
startingBlock?: BlockNumber;
|
|
13
|
-
});
|
|
14
|
-
work(): Promise<void>;
|
|
15
|
-
}
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfc3RyZWFtLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd3JhcHBlcnMvbDJfYmxvY2tfc3RyZWFtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU5RCxPQUFPLEVBQ0wsS0FBSyxhQUFhLEVBQ2xCLGFBQWEsRUFDYixLQUFLLHlCQUF5QixFQUM5QixLQUFLLDhCQUE4QixFQUNwQyxNQUFNLHFCQUFxQixDQUFDO0FBQzdCLE9BQU8sRUFBRSxLQUFLLFNBQVMsRUFBRSxLQUFLLE1BQU0sRUFBYSxNQUFNLHlCQUF5QixDQUFDO0FBRWpGLGtGQUFrRjtBQUNsRixxQkFBYSxzQkFBdUIsU0FBUSxhQUFjLFlBQVcsU0FBUzthQVExRCxNQUFNLEVBQUUsTUFBTTtJQUM5QixPQUFPLENBQUMsUUFBUSxDQUFDLElBQUk7SUFSdkIsWUFDRSxhQUFhLEVBQUUsSUFBSSxDQUNqQixhQUFhLEVBQ2IsV0FBVyxHQUFHLGdCQUFnQixHQUFHLFdBQVcsR0FBRyxnQkFBZ0IsR0FBRyx1QkFBdUIsQ0FDMUYsRUFDRCxTQUFTLEVBQUUsOEJBQThCLEVBQ3pDLE9BQU8sRUFBRSx5QkFBeUIsRUFDbEIsTUFBTSxFQUFFLE1BQU0sRUFDYixJQUFJLEdBQUUsTUFBd0IsRUFDL0MsR0FBRyx5Q0FBcUMsRUFDeEMsSUFBSSxHQUFFO1FBQ0osTUFBTSxDQUFDLEVBQUUsT0FBTyxDQUFDO1FBQ2pCLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUN4QixTQUFTLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDbkIsYUFBYSxDQUFDLEVBQUUsV0FBVyxDQUFDO0tBQ3hCLEVBR1A7SUFPUSxJQUFJLGtCQUVaO0NBQ0YifQ==
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"l2_block_stream.d.ts","sourceRoot":"","sources":["../../src/wrappers/l2_block_stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,EACL,KAAK,aAAa,EAClB,aAAa,EACb,KAAK,yBAAyB,EAC9B,KAAK,8BAA8B,EACpC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,MAAM,EAAa,MAAM,yBAAyB,CAAC;AAEjF,kFAAkF;AAClF,qBAAa,sBAAuB,SAAQ,aAAc,YAAW,SAAS;aAQ1D,MAAM,EAAE,MAAM;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI;IARvB,YACE,aAAa,EAAE,IAAI,CACjB,aAAa,EACb,WAAW,GAAG,gBAAgB,GAAG,WAAW,GAAG,gBAAgB,GAAG,uBAAuB,CAC1F,EACD,SAAS,EAAE,8BAA8B,EACzC,OAAO,EAAE,yBAAyB,EAClB,MAAM,EAAE,MAAM,EACb,IAAI,GAAE,MAAwB,EAC/C,GAAG,yCAAqC,EACxC,IAAI,GAAE;QACJ,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,aAAa,CAAC,EAAE,WAAW,CAAC;KACxB,EAGP;IAOQ,IAAI,kBAEZ;CACF"}
|
|
@@ -1,400 +0,0 @@
|
|
|
1
|
-
function applyDecs2203RFactory() {
|
|
2
|
-
function createAddInitializerMethod(initializers, decoratorFinishedRef) {
|
|
3
|
-
return function addInitializer(initializer) {
|
|
4
|
-
assertNotFinished(decoratorFinishedRef, "addInitializer");
|
|
5
|
-
assertCallable(initializer, "An initializer");
|
|
6
|
-
initializers.push(initializer);
|
|
7
|
-
};
|
|
8
|
-
}
|
|
9
|
-
function memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value) {
|
|
10
|
-
var kindStr;
|
|
11
|
-
switch(kind){
|
|
12
|
-
case 1:
|
|
13
|
-
kindStr = "accessor";
|
|
14
|
-
break;
|
|
15
|
-
case 2:
|
|
16
|
-
kindStr = "method";
|
|
17
|
-
break;
|
|
18
|
-
case 3:
|
|
19
|
-
kindStr = "getter";
|
|
20
|
-
break;
|
|
21
|
-
case 4:
|
|
22
|
-
kindStr = "setter";
|
|
23
|
-
break;
|
|
24
|
-
default:
|
|
25
|
-
kindStr = "field";
|
|
26
|
-
}
|
|
27
|
-
var ctx = {
|
|
28
|
-
kind: kindStr,
|
|
29
|
-
name: isPrivate ? "#" + name : name,
|
|
30
|
-
static: isStatic,
|
|
31
|
-
private: isPrivate,
|
|
32
|
-
metadata: metadata
|
|
33
|
-
};
|
|
34
|
-
var decoratorFinishedRef = {
|
|
35
|
-
v: false
|
|
36
|
-
};
|
|
37
|
-
ctx.addInitializer = createAddInitializerMethod(initializers, decoratorFinishedRef);
|
|
38
|
-
var get, set;
|
|
39
|
-
if (kind === 0) {
|
|
40
|
-
if (isPrivate) {
|
|
41
|
-
get = desc.get;
|
|
42
|
-
set = desc.set;
|
|
43
|
-
} else {
|
|
44
|
-
get = function() {
|
|
45
|
-
return this[name];
|
|
46
|
-
};
|
|
47
|
-
set = function(v) {
|
|
48
|
-
this[name] = v;
|
|
49
|
-
};
|
|
50
|
-
}
|
|
51
|
-
} else if (kind === 2) {
|
|
52
|
-
get = function() {
|
|
53
|
-
return desc.value;
|
|
54
|
-
};
|
|
55
|
-
} else {
|
|
56
|
-
if (kind === 1 || kind === 3) {
|
|
57
|
-
get = function() {
|
|
58
|
-
return desc.get.call(this);
|
|
59
|
-
};
|
|
60
|
-
}
|
|
61
|
-
if (kind === 1 || kind === 4) {
|
|
62
|
-
set = function(v) {
|
|
63
|
-
desc.set.call(this, v);
|
|
64
|
-
};
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
ctx.access = get && set ? {
|
|
68
|
-
get: get,
|
|
69
|
-
set: set
|
|
70
|
-
} : get ? {
|
|
71
|
-
get: get
|
|
72
|
-
} : {
|
|
73
|
-
set: set
|
|
74
|
-
};
|
|
75
|
-
try {
|
|
76
|
-
return dec(value, ctx);
|
|
77
|
-
} finally{
|
|
78
|
-
decoratorFinishedRef.v = true;
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
function assertNotFinished(decoratorFinishedRef, fnName) {
|
|
82
|
-
if (decoratorFinishedRef.v) {
|
|
83
|
-
throw new Error("attempted to call " + fnName + " after decoration was finished");
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
function assertCallable(fn, hint) {
|
|
87
|
-
if (typeof fn !== "function") {
|
|
88
|
-
throw new TypeError(hint + " must be a function");
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
function assertValidReturnValue(kind, value) {
|
|
92
|
-
var type = typeof value;
|
|
93
|
-
if (kind === 1) {
|
|
94
|
-
if (type !== "object" || value === null) {
|
|
95
|
-
throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0");
|
|
96
|
-
}
|
|
97
|
-
if (value.get !== undefined) {
|
|
98
|
-
assertCallable(value.get, "accessor.get");
|
|
99
|
-
}
|
|
100
|
-
if (value.set !== undefined) {
|
|
101
|
-
assertCallable(value.set, "accessor.set");
|
|
102
|
-
}
|
|
103
|
-
if (value.init !== undefined) {
|
|
104
|
-
assertCallable(value.init, "accessor.init");
|
|
105
|
-
}
|
|
106
|
-
} else if (type !== "function") {
|
|
107
|
-
var hint;
|
|
108
|
-
if (kind === 0) {
|
|
109
|
-
hint = "field";
|
|
110
|
-
} else if (kind === 10) {
|
|
111
|
-
hint = "class";
|
|
112
|
-
} else {
|
|
113
|
-
hint = "method";
|
|
114
|
-
}
|
|
115
|
-
throw new TypeError(hint + " decorators must return a function or void 0");
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
|
-
function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata) {
|
|
119
|
-
var decs = decInfo[0];
|
|
120
|
-
var desc, init, value;
|
|
121
|
-
if (isPrivate) {
|
|
122
|
-
if (kind === 0 || kind === 1) {
|
|
123
|
-
desc = {
|
|
124
|
-
get: decInfo[3],
|
|
125
|
-
set: decInfo[4]
|
|
126
|
-
};
|
|
127
|
-
} else if (kind === 3) {
|
|
128
|
-
desc = {
|
|
129
|
-
get: decInfo[3]
|
|
130
|
-
};
|
|
131
|
-
} else if (kind === 4) {
|
|
132
|
-
desc = {
|
|
133
|
-
set: decInfo[3]
|
|
134
|
-
};
|
|
135
|
-
} else {
|
|
136
|
-
desc = {
|
|
137
|
-
value: decInfo[3]
|
|
138
|
-
};
|
|
139
|
-
}
|
|
140
|
-
} else if (kind !== 0) {
|
|
141
|
-
desc = Object.getOwnPropertyDescriptor(base, name);
|
|
142
|
-
}
|
|
143
|
-
if (kind === 1) {
|
|
144
|
-
value = {
|
|
145
|
-
get: desc.get,
|
|
146
|
-
set: desc.set
|
|
147
|
-
};
|
|
148
|
-
} else if (kind === 2) {
|
|
149
|
-
value = desc.value;
|
|
150
|
-
} else if (kind === 3) {
|
|
151
|
-
value = desc.get;
|
|
152
|
-
} else if (kind === 4) {
|
|
153
|
-
value = desc.set;
|
|
154
|
-
}
|
|
155
|
-
var newValue, get, set;
|
|
156
|
-
if (typeof decs === "function") {
|
|
157
|
-
newValue = memberDec(decs, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
|
|
158
|
-
if (newValue !== void 0) {
|
|
159
|
-
assertValidReturnValue(kind, newValue);
|
|
160
|
-
if (kind === 0) {
|
|
161
|
-
init = newValue;
|
|
162
|
-
} else if (kind === 1) {
|
|
163
|
-
init = newValue.init;
|
|
164
|
-
get = newValue.get || value.get;
|
|
165
|
-
set = newValue.set || value.set;
|
|
166
|
-
value = {
|
|
167
|
-
get: get,
|
|
168
|
-
set: set
|
|
169
|
-
};
|
|
170
|
-
} else {
|
|
171
|
-
value = newValue;
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
} else {
|
|
175
|
-
for(var i = decs.length - 1; i >= 0; i--){
|
|
176
|
-
var dec = decs[i];
|
|
177
|
-
newValue = memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
|
|
178
|
-
if (newValue !== void 0) {
|
|
179
|
-
assertValidReturnValue(kind, newValue);
|
|
180
|
-
var newInit;
|
|
181
|
-
if (kind === 0) {
|
|
182
|
-
newInit = newValue;
|
|
183
|
-
} else if (kind === 1) {
|
|
184
|
-
newInit = newValue.init;
|
|
185
|
-
get = newValue.get || value.get;
|
|
186
|
-
set = newValue.set || value.set;
|
|
187
|
-
value = {
|
|
188
|
-
get: get,
|
|
189
|
-
set: set
|
|
190
|
-
};
|
|
191
|
-
} else {
|
|
192
|
-
value = newValue;
|
|
193
|
-
}
|
|
194
|
-
if (newInit !== void 0) {
|
|
195
|
-
if (init === void 0) {
|
|
196
|
-
init = newInit;
|
|
197
|
-
} else if (typeof init === "function") {
|
|
198
|
-
init = [
|
|
199
|
-
init,
|
|
200
|
-
newInit
|
|
201
|
-
];
|
|
202
|
-
} else {
|
|
203
|
-
init.push(newInit);
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
|
-
}
|
|
207
|
-
}
|
|
208
|
-
}
|
|
209
|
-
if (kind === 0 || kind === 1) {
|
|
210
|
-
if (init === void 0) {
|
|
211
|
-
init = function(instance, init) {
|
|
212
|
-
return init;
|
|
213
|
-
};
|
|
214
|
-
} else if (typeof init !== "function") {
|
|
215
|
-
var ownInitializers = init;
|
|
216
|
-
init = function(instance, init) {
|
|
217
|
-
var value = init;
|
|
218
|
-
for(var i = 0; i < ownInitializers.length; i++){
|
|
219
|
-
value = ownInitializers[i].call(instance, value);
|
|
220
|
-
}
|
|
221
|
-
return value;
|
|
222
|
-
};
|
|
223
|
-
} else {
|
|
224
|
-
var originalInitializer = init;
|
|
225
|
-
init = function(instance, init) {
|
|
226
|
-
return originalInitializer.call(instance, init);
|
|
227
|
-
};
|
|
228
|
-
}
|
|
229
|
-
ret.push(init);
|
|
230
|
-
}
|
|
231
|
-
if (kind !== 0) {
|
|
232
|
-
if (kind === 1) {
|
|
233
|
-
desc.get = value.get;
|
|
234
|
-
desc.set = value.set;
|
|
235
|
-
} else if (kind === 2) {
|
|
236
|
-
desc.value = value;
|
|
237
|
-
} else if (kind === 3) {
|
|
238
|
-
desc.get = value;
|
|
239
|
-
} else if (kind === 4) {
|
|
240
|
-
desc.set = value;
|
|
241
|
-
}
|
|
242
|
-
if (isPrivate) {
|
|
243
|
-
if (kind === 1) {
|
|
244
|
-
ret.push(function(instance, args) {
|
|
245
|
-
return value.get.call(instance, args);
|
|
246
|
-
});
|
|
247
|
-
ret.push(function(instance, args) {
|
|
248
|
-
return value.set.call(instance, args);
|
|
249
|
-
});
|
|
250
|
-
} else if (kind === 2) {
|
|
251
|
-
ret.push(value);
|
|
252
|
-
} else {
|
|
253
|
-
ret.push(function(instance, args) {
|
|
254
|
-
return value.call(instance, args);
|
|
255
|
-
});
|
|
256
|
-
}
|
|
257
|
-
} else {
|
|
258
|
-
Object.defineProperty(base, name, desc);
|
|
259
|
-
}
|
|
260
|
-
}
|
|
261
|
-
}
|
|
262
|
-
function applyMemberDecs(Class, decInfos, metadata) {
|
|
263
|
-
var ret = [];
|
|
264
|
-
var protoInitializers;
|
|
265
|
-
var staticInitializers;
|
|
266
|
-
var existingProtoNonFields = new Map();
|
|
267
|
-
var existingStaticNonFields = new Map();
|
|
268
|
-
for(var i = 0; i < decInfos.length; i++){
|
|
269
|
-
var decInfo = decInfos[i];
|
|
270
|
-
if (!Array.isArray(decInfo)) continue;
|
|
271
|
-
var kind = decInfo[1];
|
|
272
|
-
var name = decInfo[2];
|
|
273
|
-
var isPrivate = decInfo.length > 3;
|
|
274
|
-
var isStatic = kind >= 5;
|
|
275
|
-
var base;
|
|
276
|
-
var initializers;
|
|
277
|
-
if (isStatic) {
|
|
278
|
-
base = Class;
|
|
279
|
-
kind = kind - 5;
|
|
280
|
-
staticInitializers = staticInitializers || [];
|
|
281
|
-
initializers = staticInitializers;
|
|
282
|
-
} else {
|
|
283
|
-
base = Class.prototype;
|
|
284
|
-
protoInitializers = protoInitializers || [];
|
|
285
|
-
initializers = protoInitializers;
|
|
286
|
-
}
|
|
287
|
-
if (kind !== 0 && !isPrivate) {
|
|
288
|
-
var existingNonFields = isStatic ? existingStaticNonFields : existingProtoNonFields;
|
|
289
|
-
var existingKind = existingNonFields.get(name) || 0;
|
|
290
|
-
if (existingKind === true || existingKind === 3 && kind !== 4 || existingKind === 4 && kind !== 3) {
|
|
291
|
-
throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + name);
|
|
292
|
-
} else if (!existingKind && kind > 2) {
|
|
293
|
-
existingNonFields.set(name, kind);
|
|
294
|
-
} else {
|
|
295
|
-
existingNonFields.set(name, true);
|
|
296
|
-
}
|
|
297
|
-
}
|
|
298
|
-
applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata);
|
|
299
|
-
}
|
|
300
|
-
pushInitializers(ret, protoInitializers);
|
|
301
|
-
pushInitializers(ret, staticInitializers);
|
|
302
|
-
return ret;
|
|
303
|
-
}
|
|
304
|
-
function pushInitializers(ret, initializers) {
|
|
305
|
-
if (initializers) {
|
|
306
|
-
ret.push(function(instance) {
|
|
307
|
-
for(var i = 0; i < initializers.length; i++){
|
|
308
|
-
initializers[i].call(instance);
|
|
309
|
-
}
|
|
310
|
-
return instance;
|
|
311
|
-
});
|
|
312
|
-
}
|
|
313
|
-
}
|
|
314
|
-
function applyClassDecs(targetClass, classDecs, metadata) {
|
|
315
|
-
if (classDecs.length > 0) {
|
|
316
|
-
var initializers = [];
|
|
317
|
-
var newClass = targetClass;
|
|
318
|
-
var name = targetClass.name;
|
|
319
|
-
for(var i = classDecs.length - 1; i >= 0; i--){
|
|
320
|
-
var decoratorFinishedRef = {
|
|
321
|
-
v: false
|
|
322
|
-
};
|
|
323
|
-
try {
|
|
324
|
-
var nextNewClass = classDecs[i](newClass, {
|
|
325
|
-
kind: "class",
|
|
326
|
-
name: name,
|
|
327
|
-
addInitializer: createAddInitializerMethod(initializers, decoratorFinishedRef),
|
|
328
|
-
metadata
|
|
329
|
-
});
|
|
330
|
-
} finally{
|
|
331
|
-
decoratorFinishedRef.v = true;
|
|
332
|
-
}
|
|
333
|
-
if (nextNewClass !== undefined) {
|
|
334
|
-
assertValidReturnValue(10, nextNewClass);
|
|
335
|
-
newClass = nextNewClass;
|
|
336
|
-
}
|
|
337
|
-
}
|
|
338
|
-
return [
|
|
339
|
-
defineMetadata(newClass, metadata),
|
|
340
|
-
function() {
|
|
341
|
-
for(var i = 0; i < initializers.length; i++){
|
|
342
|
-
initializers[i].call(newClass);
|
|
343
|
-
}
|
|
344
|
-
}
|
|
345
|
-
];
|
|
346
|
-
}
|
|
347
|
-
}
|
|
348
|
-
function defineMetadata(Class, metadata) {
|
|
349
|
-
return Object.defineProperty(Class, Symbol.metadata || Symbol.for("Symbol.metadata"), {
|
|
350
|
-
configurable: true,
|
|
351
|
-
enumerable: true,
|
|
352
|
-
value: metadata
|
|
353
|
-
});
|
|
354
|
-
}
|
|
355
|
-
return function applyDecs2203R(targetClass, memberDecs, classDecs, parentClass) {
|
|
356
|
-
if (parentClass !== void 0) {
|
|
357
|
-
var parentMetadata = parentClass[Symbol.metadata || Symbol.for("Symbol.metadata")];
|
|
358
|
-
}
|
|
359
|
-
var metadata = Object.create(parentMetadata === void 0 ? null : parentMetadata);
|
|
360
|
-
var e = applyMemberDecs(targetClass, memberDecs, metadata);
|
|
361
|
-
if (!classDecs.length) defineMetadata(targetClass, metadata);
|
|
362
|
-
return {
|
|
363
|
-
e: e,
|
|
364
|
-
get c () {
|
|
365
|
-
return applyClassDecs(targetClass, classDecs, metadata);
|
|
366
|
-
}
|
|
367
|
-
};
|
|
368
|
-
};
|
|
369
|
-
}
|
|
370
|
-
function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
|
|
371
|
-
return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
|
|
372
|
-
}
|
|
373
|
-
var _dec, _initProto;
|
|
374
|
-
import { createLogger } from '@aztec/foundation/log';
|
|
375
|
-
import { L2BlockStream } from '@aztec/stdlib/block';
|
|
376
|
-
import { trackSpan } from '@aztec/telemetry-client';
|
|
377
|
-
_dec = trackSpan(function() {
|
|
378
|
-
return `${this.name}.work`;
|
|
379
|
-
});
|
|
380
|
-
/** Extends an L2BlockStream with a tracer to create a new trace per iteration. */ export class TraceableL2BlockStream extends L2BlockStream {
|
|
381
|
-
tracer;
|
|
382
|
-
name;
|
|
383
|
-
static{
|
|
384
|
-
({ e: [_initProto] } = _apply_decs_2203_r(this, [
|
|
385
|
-
[
|
|
386
|
-
_dec,
|
|
387
|
-
2,
|
|
388
|
-
"work"
|
|
389
|
-
]
|
|
390
|
-
], []));
|
|
391
|
-
}
|
|
392
|
-
constructor(l2BlockSource, localData, handler, tracer, name = 'L2BlockStream', log = createLogger('types:block_stream'), opts = {}){
|
|
393
|
-
super(l2BlockSource, localData, handler, log, opts), this.tracer = tracer, this.name = name, _initProto(this);
|
|
394
|
-
}
|
|
395
|
-
// We need to use a non-arrow function to be able to access `this`
|
|
396
|
-
// See https://www.typescriptlang.org/docs/handbook/2/functions.html#declaring-this-in-a-function
|
|
397
|
-
work() {
|
|
398
|
-
return super.work();
|
|
399
|
-
}
|
|
400
|
-
}
|
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
2
|
-
import { createLogger } from '@aztec/foundation/log';
|
|
3
|
-
import {
|
|
4
|
-
type L2BlockSource,
|
|
5
|
-
L2BlockStream,
|
|
6
|
-
type L2BlockStreamEventHandler,
|
|
7
|
-
type L2BlockStreamLocalDataProvider,
|
|
8
|
-
} from '@aztec/stdlib/block';
|
|
9
|
-
import { type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client';
|
|
10
|
-
|
|
11
|
-
/** Extends an L2BlockStream with a tracer to create a new trace per iteration. */
|
|
12
|
-
export class TraceableL2BlockStream extends L2BlockStream implements Traceable {
|
|
13
|
-
constructor(
|
|
14
|
-
l2BlockSource: Pick<
|
|
15
|
-
L2BlockSource,
|
|
16
|
-
'getBlocks' | 'getBlockHeader' | 'getL2Tips' | 'getCheckpoints' | 'getCheckpointedBlocks'
|
|
17
|
-
>,
|
|
18
|
-
localData: L2BlockStreamLocalDataProvider,
|
|
19
|
-
handler: L2BlockStreamEventHandler,
|
|
20
|
-
public readonly tracer: Tracer,
|
|
21
|
-
private readonly name: string = 'L2BlockStream',
|
|
22
|
-
log = createLogger('types:block_stream'),
|
|
23
|
-
opts: {
|
|
24
|
-
proven?: boolean;
|
|
25
|
-
pollIntervalMS?: number;
|
|
26
|
-
batchSize?: number;
|
|
27
|
-
startingBlock?: BlockNumber;
|
|
28
|
-
} = {},
|
|
29
|
-
) {
|
|
30
|
-
super(l2BlockSource, localData, handler, log, opts);
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
// We need to use a non-arrow function to be able to access `this`
|
|
34
|
-
// See https://www.typescriptlang.org/docs/handbook/2/functions.html#declaring-this-in-a-function
|
|
35
|
-
@trackSpan(function () {
|
|
36
|
-
return `${this!.name}.work`;
|
|
37
|
-
})
|
|
38
|
-
override work() {
|
|
39
|
-
return super.work();
|
|
40
|
-
}
|
|
41
|
-
}
|