@aztec/telemetry-client 0.0.1-commit.f504929 → 0.0.1-commit.f5a9928

package/src/otel_propagation.ts

@@ -1,12 +1,17 @@
+import type { DiagnosticsMiddleware } from '@aztec/foundation/json-rpc/server';
+import { Timer } from '@aztec/foundation/timer';
+
 import { ROOT_CONTEXT, type Span, SpanKind, SpanStatusCode, propagation } from '@opentelemetry/api';
 import type Koa from 'koa';
 
+import { getJsonRpcServerMetrics, splitJsonRpcMethod } from './json_rpc_server_metrics.js';
 import { getTelemetryClient } from './start.js';
 import {
   ATTR_JSONRPC_ERROR_CODE,
   ATTR_JSONRPC_ERROR_MSG,
   ATTR_JSONRPC_METHOD,
   ATTR_JSONRPC_REQUEST_ID,
+  ATTR_JSONRPC_SERVICE,
 } from './vendor/attributes.js';
 
 export function getOtelJsonRpcPropagationMiddleware(
@@ -15,21 +20,36 @@ export function getOtelJsonRpcPropagationMiddleware(
   return function otelJsonRpcPropagation(ctx: Koa.Context, next: () => Promise<void>) {
     const tracer = getTelemetryClient().getTracer(scope);
     const context = propagation.extract(ROOT_CONTEXT, ctx.request.headers);
-    const method = (ctx.request.body as any)?.method;
     return tracer.startActiveSpan(
-      `JsonRpcServer.${method ?? 'unknown'}`,
+      `JsonRpcServer`,
       { kind: SpanKind.SERVER },
       context,
       async (span: Span): Promise<void> => {
         if (ctx.id) {
           span.setAttribute(ATTR_JSONRPC_REQUEST_ID, ctx.id);
         }
-        if (method) {
-          span.setAttribute(ATTR_JSONRPC_METHOD, method);
-        }
 
         try {
           await next();
+          const requestBody = (ctx.request as { body?: unknown }).body;
+          if (
+            requestBody &&
+            typeof requestBody === 'object' &&
+            !Array.isArray(requestBody) &&
+            'method' in requestBody
+          ) {
+            const fullMethod = requestBody.method;
+            if (typeof fullMethod === 'string') {
+              const [service, method] = splitJsonRpcMethod(fullMethod);
+              span.updateName(`JsonRpcServer.${service ? `${service}.` : ''}${method}`);
+              span.setAttribute(ATTR_JSONRPC_METHOD, method);
+              if (service) {
+                span.setAttribute(ATTR_JSONRPC_SERVICE, service);
+              }
+            }
+          } else if (Array.isArray(requestBody)) {
+            span.updateName(`JsonRpcServer.batch`);
+          }
           const err = (ctx.body as any).error?.message;
           const code = (ctx.body as any).error?.code;
           if (err) {
@@ -48,3 +68,41 @@ export function getOtelJsonRpcPropagationMiddleware(
     );
   };
 }
+
+export function getOtelJsonRpcDiagnosticsMiddleware(metricsProvider = getJsonRpcServerMetrics): DiagnosticsMiddleware {
+  return function otelJsonRpcDiagnostics(ctx, next) {
+    const [service, method] = splitJsonRpcMethod(ctx.method);
+    const scope = service ?? 'UnknownHandler';
+    const tracer = getTelemetryClient().getTracer(scope);
+    const attributes = {
+      ...(service === undefined ? {} : { [ATTR_JSONRPC_SERVICE]: service }),
+      [ATTR_JSONRPC_METHOD]: method,
+    };
+    return tracer.startActiveSpan(`${scope}.${method}`, { kind: SpanKind.INTERNAL, attributes }, async span => {
+      const timer = new Timer();
+      let ok = false;
+      if (ctx.id !== null) {
+        span.setAttribute(ATTR_JSONRPC_REQUEST_ID, ctx.id);
+      }
+
+      try {
+        await next();
+        ok = true;
+        span.setStatus({ code: SpanStatusCode.OK });
+      } catch (err) {
+        span.setStatus({ code: SpanStatusCode.ERROR, message: err instanceof Error ? err.message : String(err) });
+        if (typeof err === 'string' || err instanceof Error) {
+          span.recordException(err);
+        }
+        throw err;
+      } finally {
+        const metrics = metricsProvider();
+        metrics.recordRequest(ctx.method, timer.ms(), ok);
+        if (ctx.requestValidationDurationMs !== undefined && ctx.requestValidationSucceeded !== undefined) {
+          metrics.recordRequestValidation(ctx.method, ctx.requestValidationDurationMs, ctx.requestValidationSucceeded);
+        }
+        span.end();
+      }
+    });
+  };
+}

package/src/start.ts

@@ -19,7 +19,12 @@ export async function initTelemetryClient(
     return telemetry;
   }
 
-  if (config.metricsCollectorUrl || config.publicMetricsCollectorUrl) {
+  if (
+    config.metricsCollectorUrl ||
+    config.publicMetricsCollectorUrl ||
+    config.tracesCollectorUrl ||
+    config.logsCollectorUrl
+  ) {
     log.info(`Using OpenTelemetry client with custom collector`);
     // Lazy load OpenTelemetry to avoid loading heavy deps at startup
     const { OpenTelemetryClient } = await import('./otel.js');

package/src/telemetry.ts

@@ -19,6 +19,7 @@ import {
 import type * as Attributes from './attributes.js';
 import type { MetricDefinition } from './metrics.js';
 import { getTelemetryClient } from './start.js';
+import type * as VendorAttributes from './vendor/attributes.js';
 
 export { toMetricOptions, createUpDownCounterWithDefault } from './metric-utils.js';
 
@@ -28,6 +29,8 @@ type ValuesOf<T> = T extends Record<string, infer U> ? U : never;
 
 type AttributeNames = ValuesOf<typeof Attributes>;
 
+type AllowedVendorMetricAttributeNames = (typeof VendorAttributes)['ATTR_JSONRPC_METHOD' | 'ATTR_JSONRPC_SERVICE'];
+
 /**
  * This is a set of attributes that could lead to high cardinality in the metrics.
  * If you find yourself wanting to capture this data in a metric consider if it makes sense to capture
@@ -48,7 +51,6 @@ type BannedMetricAttributeNames = (typeof Attributes)[
   | 'TX_HASH'
   | 'PROVING_JOB_ID'
   | 'P2P_ID'
-  | 'P2P_REQ_RESP_BATCH_REQUESTS_COUNT'
   | 'TARGET_ADDRESS'
   | 'MANA_USED'
   | 'TOTAL_INSTRUCTIONS'];
@@ -56,7 +58,9 @@ type BannedMetricAttributeNames = (typeof Attributes)[
 /** Global registry of attributes */
 export type AttributesType = Partial<Record<AttributeNames, AttributeValue>>;
 
-export type AllowedAttributeNames = Exclude<AttributeNames, BannedMetricAttributeNames>;
+export type AllowedAttributeNames =
+  | Exclude<AttributeNames, BannedMetricAttributeNames>
+  | AllowedVendorMetricAttributeNames;
 
 /** Subset of attributes allowed to be added to metrics */
 export type MetricAttributesType = Partial<Record<AllowedAttributeNames, AttributeValue>>;

package/src/vendor/attributes.ts

@@ -1,5 +1,6 @@
 // See https://opentelemetry.io/docs/specs/semconv/rpc/json-rpc/
 export const ATTR_JSONRPC_METHOD = 'rpc.method';
+export const ATTR_JSONRPC_SERVICE = 'rpc.service';
 export const ATTR_JSONRPC_REQUEST_ID = 'rpc.jsonrpc.request_id';
 export const ATTR_JSONRPC_ERROR_CODE = 'rpc.jsonrpc.error_code';
 export const ATTR_JSONRPC_ERROR_MSG = 'rpc.jsonrpc.error_message';

package/src/wrappers/fetch.ts

@@ -9,12 +9,17 @@ import { ATTR_JSONRPC_METHOD, ATTR_JSONRPC_REQUEST_ID } from '../vendor/attribut
 
 /**
  * Makes a fetch function that retries based on the given attempts and propagates trace information.
- * @param retries - Sequence of intervals (in seconds) to retry.
+ * @param retries - Sequence of intervals (in seconds) to retry, or a factory function returning an iterator for custom/indefinite backoff.
  * @param noRetry - Whether to stop retries on server errors.
  * @param log - Optional logger for logging attempts.
  * @returns A fetch function.
  */
-export function makeTracedFetch(retries: number[], defaultNoRetry: boolean, fetch = defaultFetch, log?: Logger) {
+export function makeTracedFetch(
+  retries: number[] | (() => Generator<number>),
+  defaultNoRetry: boolean,
+  fetch = defaultFetch,
+  log?: Logger,
+) {
   return (host: string, body: unknown, extraHeaders: Record<string, string> = {}, noRetry?: boolean) => {
     const telemetry = getTelemetryClient();
     return telemetry.getTracer('fetch').startActiveSpan(`JsonRpcClient`, { kind: SpanKind.CLIENT }, async span => {
@@ -27,10 +32,11 @@ export function makeTracedFetch(retries: number[], defaultNoRetry: boolean, fetc
         }
         const headers = { ...extraHeaders };
         propagation.inject(context.active(), headers);
+        const backoff = typeof retries === 'function' ? retries() : makeBackoff(retries);
         return await retry(
           () => fetch(host, body, headers, noRetry ?? defaultNoRetry),
           `JsonRpcClient request to ${host}`,
-          makeBackoff(retries),
+          backoff,
           log,
           false,
         );

package/src/wrappers/index.ts

@@ -1,3 +1,2 @@
-export * from './l2_block_stream.js';
 export * from './fetch.js';
 export * from './json_rpc_server.js';

package/src/wrappers/json_rpc_server.ts

@@ -1,15 +1,26 @@
 import { type SafeJsonRpcServerOptions, createSafeJsonRpcServer } from '@aztec/foundation/json-rpc/server';
 import type { ApiSchemaFor } from '@aztec/stdlib/schemas';
 
-import { getOtelJsonRpcPropagationMiddleware } from '../otel_propagation.js';
+import { getOtelJsonRpcServerMetricsMiddleware } from '../json_rpc_server_metrics.js';
+import { getOtelJsonRpcDiagnosticsMiddleware, getOtelJsonRpcPropagationMiddleware } from '../otel_propagation.js';
 
 export function createTracedJsonRpcServer<T extends object = any>(
   handler: T,
   schema: ApiSchemaFor<T>,
   options: SafeJsonRpcServerOptions = {},
 ) {
+  const otelDiagnostics = getOtelJsonRpcDiagnosticsMiddleware();
+  const diagnostic = options.diagnostic
+    ? (ctx: Parameters<typeof otelDiagnostics>[0], next: Parameters<typeof otelDiagnostics>[1]) =>
+        options.diagnostic!(ctx, () => otelDiagnostics(ctx, next))
+    : otelDiagnostics;
   return createSafeJsonRpcServer(handler, schema, {
     ...options,
-    middlewares: [...(options.middlewares ?? []), getOtelJsonRpcPropagationMiddleware()],
+    diagnostic,
+    middlewares: [
+      getOtelJsonRpcServerMetricsMiddleware(),
+      ...(options.middlewares ?? []),
+      getOtelJsonRpcPropagationMiddleware(),
+    ],
   });
 }

package/dest/wrappers/l2_block_stream.d.ts

@@ -1,16 +0,0 @@
-import { BlockNumber } from '@aztec/foundation/branded-types';
-import { type L2BlockSource, L2BlockStream, type L2BlockStreamEventHandler, type L2BlockStreamLocalDataProvider } from '@aztec/stdlib/block';
-import { type Traceable, type Tracer } from '@aztec/telemetry-client';
-/** Extends an L2BlockStream with a tracer to create a new trace per iteration. */
-export declare class TraceableL2BlockStream extends L2BlockStream implements Traceable {
-    readonly tracer: Tracer;
-    private readonly name;
-    constructor(l2BlockSource: Pick<L2BlockSource, 'getBlocks' | 'getBlockHeader' | 'getL2Tips' | 'getCheckpoints' | 'getCheckpointedBlocks'>, localData: L2BlockStreamLocalDataProvider, handler: L2BlockStreamEventHandler, tracer: Tracer, name?: string, log?: import("@aztec/foundation/log").Logger, opts?: {
-        proven?: boolean;
-        pollIntervalMS?: number;
-        batchSize?: number;
-        startingBlock?: BlockNumber;
-    });
-    work(): Promise<void>;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfc3RyZWFtLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvd3JhcHBlcnMvbDJfYmxvY2tfc3RyZWFtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU5RCxPQUFPLEVBQ0wsS0FBSyxhQUFhLEVBQ2xCLGFBQWEsRUFDYixLQUFLLHlCQUF5QixFQUM5QixLQUFLLDhCQUE4QixFQUNwQyxNQUFNLHFCQUFxQixDQUFDO0FBQzdCLE9BQU8sRUFBRSxLQUFLLFNBQVMsRUFBRSxLQUFLLE1BQU0sRUFBYSxNQUFNLHlCQUF5QixDQUFDO0FBRWpGLGtGQUFrRjtBQUNsRixxQkFBYSxzQkFBdUIsU0FBUSxhQUFjLFlBQVcsU0FBUzthQVExRCxNQUFNLEVBQUUsTUFBTTtJQUM5QixPQUFPLENBQUMsUUFBUSxDQUFDLElBQUk7SUFSdkIsWUFDRSxhQUFhLEVBQUUsSUFBSSxDQUNqQixhQUFhLEVBQ2IsV0FBVyxHQUFHLGdCQUFnQixHQUFHLFdBQVcsR0FBRyxnQkFBZ0IsR0FBRyx1QkFBdUIsQ0FDMUYsRUFDRCxTQUFTLEVBQUUsOEJBQThCLEVBQ3pDLE9BQU8sRUFBRSx5QkFBeUIsRUFDbEIsTUFBTSxFQUFFLE1BQU0sRUFDYixJQUFJLEdBQUUsTUFBd0IsRUFDL0MsR0FBRyx5Q0FBcUMsRUFDeEMsSUFBSSxHQUFFO1FBQ0osTUFBTSxDQUFDLEVBQUUsT0FBTyxDQUFDO1FBQ2pCLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUN4QixTQUFTLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDbkIsYUFBYSxDQUFDLEVBQUUsV0FBVyxDQUFDO0tBQ3hCLEVBR1A7SUFPUSxJQUFJLGtCQUVaO0NBQ0YifQ==

package/dest/wrappers/l2_block_stream.d.ts.map

@@ -1 +0,0 @@
-{"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"}

package/dest/wrappers/l2_block_stream.js

@@ -1,400 +0,0 @@
-function applyDecs2203RFactory() {
-    function createAddInitializerMethod(initializers, decoratorFinishedRef) {
-        return function addInitializer(initializer) {
-            assertNotFinished(decoratorFinishedRef, "addInitializer");
-            assertCallable(initializer, "An initializer");
-            initializers.push(initializer);
-        };
-    }
-    function memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value) {
-        var kindStr;
-        switch(kind){
-            case 1:
-                kindStr = "accessor";
-                break;
-            case 2:
-                kindStr = "method";
-                break;
-            case 3:
-                kindStr = "getter";
-                break;
-            case 4:
-                kindStr = "setter";
-                break;
-            default:
-                kindStr = "field";
-        }
-        var ctx = {
-            kind: kindStr,
-            name: isPrivate ? "#" + name : name,
-            static: isStatic,
-            private: isPrivate,
-            metadata: metadata
-        };
-        var decoratorFinishedRef = {
-            v: false
-        };
-        ctx.addInitializer = createAddInitializerMethod(initializers, decoratorFinishedRef);
-        var get, set;
-        if (kind === 0) {
-            if (isPrivate) {
-                get = desc.get;
-                set = desc.set;
-            } else {
-                get = function() {
-                    return this[name];
-                };
-                set = function(v) {
-                    this[name] = v;
-                };
-            }
-        } else if (kind === 2) {
-            get = function() {
-                return desc.value;
-            };
-        } else {
-            if (kind === 1 || kind === 3) {
-                get = function() {
-                    return desc.get.call(this);
-                };
-            }
-            if (kind === 1 || kind === 4) {
-                set = function(v) {
-                    desc.set.call(this, v);
-                };
-            }
-        }
-        ctx.access = get && set ? {
-            get: get,
-            set: set
-        } : get ? {
-            get: get
-        } : {
-            set: set
-        };
-        try {
-            return dec(value, ctx);
-        } finally{
-            decoratorFinishedRef.v = true;
-        }
-    }
-    function assertNotFinished(decoratorFinishedRef, fnName) {
-        if (decoratorFinishedRef.v) {
-            throw new Error("attempted to call " + fnName + " after decoration was finished");
-        }
-    }
-    function assertCallable(fn, hint) {
-        if (typeof fn !== "function") {
-            throw new TypeError(hint + " must be a function");
-        }
-    }
-    function assertValidReturnValue(kind, value) {
-        var type = typeof value;
-        if (kind === 1) {
-            if (type !== "object" || value === null) {
-                throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0");
-            }
-            if (value.get !== undefined) {
-                assertCallable(value.get, "accessor.get");
-            }
-            if (value.set !== undefined) {
-                assertCallable(value.set, "accessor.set");
-            }
-            if (value.init !== undefined) {
-                assertCallable(value.init, "accessor.init");
-            }
-        } else if (type !== "function") {
-            var hint;
-            if (kind === 0) {
-                hint = "field";
-            } else if (kind === 10) {
-                hint = "class";
-            } else {
-                hint = "method";
-            }
-            throw new TypeError(hint + " decorators must return a function or void 0");
-        }
-    }
-    function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata) {
-        var decs = decInfo[0];
-        var desc, init, value;
-        if (isPrivate) {
-            if (kind === 0 || kind === 1) {
-                desc = {
-                    get: decInfo[3],
-                    set: decInfo[4]
-                };
-            } else if (kind === 3) {
-                desc = {
-                    get: decInfo[3]
-                };
-            } else if (kind === 4) {
-                desc = {
-                    set: decInfo[3]
-                };
-            } else {
-                desc = {
-                    value: decInfo[3]
-                };
-            }
-        } else if (kind !== 0) {
-            desc = Object.getOwnPropertyDescriptor(base, name);
-        }
-        if (kind === 1) {
-            value = {
-                get: desc.get,
-                set: desc.set
-            };
-        } else if (kind === 2) {
-            value = desc.value;
-        } else if (kind === 3) {
-            value = desc.get;
-        } else if (kind === 4) {
-            value = desc.set;
-        }
-        var newValue, get, set;
-        if (typeof decs === "function") {
-            newValue = memberDec(decs, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
-            if (newValue !== void 0) {
-                assertValidReturnValue(kind, newValue);
-                if (kind === 0) {
-                    init = newValue;
-                } else if (kind === 1) {
-                    init = newValue.init;
-                    get = newValue.get || value.get;
-                    set = newValue.set || value.set;
-                    value = {
-                        get: get,
-                        set: set
-                    };
-                } else {
-                    value = newValue;
-                }
-            }
-        } else {
-            for(var i = decs.length - 1; i >= 0; i--){
-                var dec = decs[i];
-                newValue = memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
-                if (newValue !== void 0) {
-                    assertValidReturnValue(kind, newValue);
-                    var newInit;
-                    if (kind === 0) {
-                        newInit = newValue;
-                    } else if (kind === 1) {
-                        newInit = newValue.init;
-                        get = newValue.get || value.get;
-                        set = newValue.set || value.set;
-                        value = {
-                            get: get,
-                            set: set
-                        };
-                    } else {
-                        value = newValue;
-                    }
-                    if (newInit !== void 0) {
-                        if (init === void 0) {
-                            init = newInit;
-                        } else if (typeof init === "function") {
-                            init = [
-                                init,
-                                newInit
-                            ];
-                        } else {
-                            init.push(newInit);
-                        }
-                    }
-                }
-            }
-        }
-        if (kind === 0 || kind === 1) {
-            if (init === void 0) {
-                init = function(instance, init) {
-                    return init;
-                };
-            } else if (typeof init !== "function") {
-                var ownInitializers = init;
-                init = function(instance, init) {
-                    var value = init;
-                    for(var i = 0; i < ownInitializers.length; i++){
-                        value = ownInitializers[i].call(instance, value);
-                    }
-                    return value;
-                };
-            } else {
-                var originalInitializer = init;
-                init = function(instance, init) {
-                    return originalInitializer.call(instance, init);
-                };
-            }
-            ret.push(init);
-        }
-        if (kind !== 0) {
-            if (kind === 1) {
-                desc.get = value.get;
-                desc.set = value.set;
-            } else if (kind === 2) {
-                desc.value = value;
-            } else if (kind === 3) {
-                desc.get = value;
-            } else if (kind === 4) {
-                desc.set = value;
-            }
-            if (isPrivate) {
-                if (kind === 1) {
-                    ret.push(function(instance, args) {
-                        return value.get.call(instance, args);
-                    });
-                    ret.push(function(instance, args) {
-                        return value.set.call(instance, args);
-                    });
-                } else if (kind === 2) {
-                    ret.push(value);
-                } else {
-                    ret.push(function(instance, args) {
-                        return value.call(instance, args);
-                    });
-                }
-            } else {
-                Object.defineProperty(base, name, desc);
-            }
-        }
-    }
-    function applyMemberDecs(Class, decInfos, metadata) {
-        var ret = [];
-        var protoInitializers;
-        var staticInitializers;
-        var existingProtoNonFields = new Map();
-        var existingStaticNonFields = new Map();
-        for(var i = 0; i < decInfos.length; i++){
-            var decInfo = decInfos[i];
-            if (!Array.isArray(decInfo)) continue;
-            var kind = decInfo[1];
-            var name = decInfo[2];
-            var isPrivate = decInfo.length > 3;
-            var isStatic = kind >= 5;
-            var base;
-            var initializers;
-            if (isStatic) {
-                base = Class;
-                kind = kind - 5;
-                staticInitializers = staticInitializers || [];
-                initializers = staticInitializers;
-            } else {
-                base = Class.prototype;
-                protoInitializers = protoInitializers || [];
-                initializers = protoInitializers;
-            }
-            if (kind !== 0 && !isPrivate) {
-                var existingNonFields = isStatic ? existingStaticNonFields : existingProtoNonFields;
-                var existingKind = existingNonFields.get(name) || 0;
-                if (existingKind === true || existingKind === 3 && kind !== 4 || existingKind === 4 && kind !== 3) {
-                    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);
-                } else if (!existingKind && kind > 2) {
-                    existingNonFields.set(name, kind);
-                } else {
-                    existingNonFields.set(name, true);
-                }
-            }
-            applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata);
-        }
-        pushInitializers(ret, protoInitializers);
-        pushInitializers(ret, staticInitializers);
-        return ret;
-    }
-    function pushInitializers(ret, initializers) {
-        if (initializers) {
-            ret.push(function(instance) {
-                for(var i = 0; i < initializers.length; i++){
-                    initializers[i].call(instance);
-                }
-                return instance;
-            });
-        }
-    }
-    function applyClassDecs(targetClass, classDecs, metadata) {
-        if (classDecs.length > 0) {
-            var initializers = [];
-            var newClass = targetClass;
-            var name = targetClass.name;
-            for(var i = classDecs.length - 1; i >= 0; i--){
-                var decoratorFinishedRef = {
-                    v: false
-                };
-                try {
-                    var nextNewClass = classDecs[i](newClass, {
-                        kind: "class",
-                        name: name,
-                        addInitializer: createAddInitializerMethod(initializers, decoratorFinishedRef),
-                        metadata
-                    });
-                } finally{
-                    decoratorFinishedRef.v = true;
-                }
-                if (nextNewClass !== undefined) {
-                    assertValidReturnValue(10, nextNewClass);
-                    newClass = nextNewClass;
-                }
-            }
-            return [
-                defineMetadata(newClass, metadata),
-                function() {
-                    for(var i = 0; i < initializers.length; i++){
-                        initializers[i].call(newClass);
-                    }
-                }
-            ];
-        }
-    }
-    function defineMetadata(Class, metadata) {
-        return Object.defineProperty(Class, Symbol.metadata || Symbol.for("Symbol.metadata"), {
-            configurable: true,
-            enumerable: true,
-            value: metadata
-        });
-    }
-    return function applyDecs2203R(targetClass, memberDecs, classDecs, parentClass) {
-        if (parentClass !== void 0) {
-            var parentMetadata = parentClass[Symbol.metadata || Symbol.for("Symbol.metadata")];
-        }
-        var metadata = Object.create(parentMetadata === void 0 ? null : parentMetadata);
-        var e = applyMemberDecs(targetClass, memberDecs, metadata);
-        if (!classDecs.length) defineMetadata(targetClass, metadata);
-        return {
-            e: e,
-            get c () {
-                return applyClassDecs(targetClass, classDecs, metadata);
-            }
-        };
-    };
-}
-function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
-    return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
-}
-var _dec, _initProto;
-import { createLogger } from '@aztec/foundation/log';
-import { L2BlockStream } from '@aztec/stdlib/block';
-import { trackSpan } from '@aztec/telemetry-client';
-_dec = trackSpan(function() {
-    return `${this.name}.work`;
-});
-/** Extends an L2BlockStream with a tracer to create a new trace per iteration. */ export class TraceableL2BlockStream extends L2BlockStream {
-    tracer;
-    name;
-    static{
-        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
-            [
-                _dec,
-                2,
-                "work"
-            ]
-        ], []));
-    }
-    constructor(l2BlockSource, localData, handler, tracer, name = 'L2BlockStream', log = createLogger('types:block_stream'), opts = {}){
-        super(l2BlockSource, localData, handler, log, opts), this.tracer = tracer, this.name = name, _initProto(this);
-    }
-    // We need to use a non-arrow function to be able to access `this`
-    // See https://www.typescriptlang.org/docs/handbook/2/functions.html#declaring-this-in-a-function
-    work() {
-        return super.work();
-    }
-}