@aztec/telemetry-client 0.0.1-commit.4d3c002 → 0.0.1-commit.4d9804df

package/src/otel.ts

@@ -28,12 +28,13 @@ import {
   type PeriodicExportingMetricReaderOptions,
   View,
 } from '@opentelemetry/sdk-metrics';
-import { BatchSpanProcessor, NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
+import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
 import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
 
 import type { TelemetryClientConfig } from './config.js';
 import { toMetricOptions } from './metric-utils.js';
 import type { MetricDefinition } from './metrics.js';
+import { MonitoredBatchSpanProcessor } from './monitored_batch_span_processor.js';
 import { NodejsMetricsMonitor } from './nodejs_metrics_monitor.js';
 import { OtelFilterMetricExporter, PublicOtelFilterMetricExporter } from './otel_filter_metric_exporter.js';
 import { registerOtelLoggerProvider } from './otel_logger_provider.js';
@@ -95,6 +96,11 @@ export class OpenTelemetryClient implements TelemetryClient {
   private meters: Map<string, WrappedMeter> = new Map<string, WrappedMeter>();
   private tracers: Map<string, Tracer> = new Map<string, Tracer>();
 
+  /** Memoized shutdown promise. The telemetry client is shared between the aztec-node and an embedded prover-node,
+   * so stop() can be invoked more than once; the providers throw "shutdown may only be called once" and
+   * "invalid attempt to force flush after shutdown" if that happens. Guarding here makes stop()/flush() idempotent. */
+  private stopPromise: Promise<void> | undefined;
+
   protected constructor(
     private resource: IResource,
     private meterProvider: MeterProvider,
@@ -168,6 +174,10 @@ export class OpenTelemetryClient implements TelemetryClient {
   }
 
   public async flush() {
+    // Flushing after the providers have been shut down throws "invalid attempt to force flush after shutdown".
+    if (this.stopPromise) {
+      return;
+    }
     await Promise.all([
       this.meterProvider.forceFlush(),
       this.loggerProvider?.forceFlush(),
@@ -175,7 +185,11 @@ export class OpenTelemetryClient implements TelemetryClient {
     ]);
   }
 
-  public async stop() {
+  public stop() {
+    return (this.stopPromise ??= this.doStop());
+  }
+
+  private async doStop() {
     this.nodejsMetricsMonitor?.stop();
 
     const flushAndShutdown = async (provider?: { forceFlush: () => Promise<void>; shutdown: () => Promise<void> }) => {
@@ -241,6 +255,23 @@ export class OpenTelemetryClient implements TelemetryClient {
             true,
           ),
         }),
+        // Pending-to-mined delay routinely exceeds the 1-minute ceiling of the generic `ms`
+        // view below under load, so it would saturate at 60s. Give this one metric wider
+        // buckets (1s to 10min). This must precede the generic `ms` view: when multiple views
+        // match an instrument, the SDK keeps the first-registered compatible storage, so the
+        // first view in this list wins the bucket boundaries.
+        new View({
+          instrumentType: InstrumentType.HISTOGRAM,
+          instrumentName: 'aztec.mempool.tx_mined_delay',
+          instrumentUnit: 'ms',
+          aggregation: new ExplicitBucketHistogramAggregation(
+            [
+              1_000, 2_500, 5_000, 7_500, 10_000, 15_000, 30_000, 45_000, 60_000, 90_000, 120_000, 180_000, 300_000,
+              600_000,
+            ],
+            true,
+          ),
+        }),
         new View({
           instrumentType: InstrumentType.HISTOGRAM,
           instrumentUnit: 'ms',
@@ -334,6 +365,36 @@ export class OpenTelemetryClient implements TelemetryClient {
             true,
           ),
         }),
+        // L1 gas prices in gwei: priority fees ~0.01-10, base fees ~1-500, spikes to 1000+
+        new View({
+          instrumentType: InstrumentType.HISTOGRAM,
+          instrumentUnit: 'gwei',
+          aggregation: new ExplicitBucketHistogramAggregation(
+            [0.1, 0.5, 1, 2, 5, 10, 20, 50, 100, 200, 500, 1_000],
+            true,
+          ),
+        }),
+        // L1 gas consumption: tx gas 100k-30M, calldata/blob gas varies
+        new View({
+          instrumentType: InstrumentType.HISTOGRAM,
+          instrumentUnit: 'gas',
+          aggregation: new ExplicitBucketHistogramAggregation(
+            [
+              10_000, 50_000, 100_000, 250_000, 500_000, 1_000_000, 2_000_000, 5_000_000, 10_000_000, 15_000_000,
+              30_000_000,
+            ],
+            true,
+          ),
+        }),
+        // L1 tx total fee in ETH: typically 0.001 - 1 ETH
+        new View({
+          instrumentType: InstrumentType.HISTOGRAM,
+          instrumentUnit: 'eth',
+          aggregation: new ExplicitBucketHistogramAggregation(
+            [0.0001, 0.0005, 0.001, 0.005, 0.01, 0.05, 0.1, 0.5, 1, 5, 10],
+            true,
+          ),
+        }),
       ],
     });
   }
@@ -343,7 +404,12 @@ export class OpenTelemetryClient implements TelemetryClient {
       const tracerProvider = new NodeTracerProvider({
         resource,
         spanProcessors: config.tracesCollectorUrl
-          ? [new BatchSpanProcessor(new OTLPTraceExporter({ url: config.tracesCollectorUrl.href }))]
+          ? [
+              new MonitoredBatchSpanProcessor(new OTLPTraceExporter({ url: config.tracesCollectorUrl.href }), log, {
+                maxQueueSize: config.otelBspMaxQueueSize,
+                minTraceDurationMs: config.otelMinTraceDurationMs,
+              }),
+            ]
           : [],
       });
 

package/src/otel_propagation.ts

@@ -1,3 +1,5 @@
+import type { DiagnosticsMiddleware } from '@aztec/foundation/json-rpc/server';
+
 import { ROOT_CONTEXT, type Span, SpanKind, SpanStatusCode, propagation } from '@opentelemetry/api';
 import type Koa from 'koa';
 
@@ -17,7 +19,7 @@ export function getOtelJsonRpcPropagationMiddleware(
     const context = propagation.extract(ROOT_CONTEXT, ctx.request.headers);
     const method = (ctx.request.body as any)?.method;
     return tracer.startActiveSpan(
-      `JsonRpcServer.${method ?? 'unknown'}`,
+      `JsonRpcServer.${method ?? 'batch'}`,
       { kind: SpanKind.SERVER },
       context,
       async (span: Span): Promise<void> => {
@@ -48,3 +50,42 @@ export function getOtelJsonRpcPropagationMiddleware(
     );
   };
 }
+
+export function getOtelJsonRpcDiagnosticsMiddleware(): DiagnosticsMiddleware {
+  return function otelJsonRpcDiagnostics(ctx, next) {
+    const [namespace, method] = splitNamespace(ctx.method);
+    const scope = namespace ?? 'UnknownHandler';
+    const tracer = getTelemetryClient().getTracer(scope);
+    return tracer.startActiveSpan(
+      `${scope}.${method}`,
+      { kind: SpanKind.INTERNAL, attributes: { [ATTR_JSONRPC_METHOD]: ctx.method } },
+      async span => {
+        if (ctx.id !== null) {
+          span.setAttribute(ATTR_JSONRPC_REQUEST_ID, ctx.id);
+        }
+
+        try {
+          await next();
+          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 {
+          span.end();
+        }
+      },
+    );
+  };
+}
+
+function splitNamespace(fullMethod: string): [namespace: string | undefined, method: string] {
+  const idx = fullMethod.indexOf('_');
+  if (idx > -1) {
+    return [fullMethod.slice(0, idx), fullMethod.slice(idx + 1)];
+  } else {
+    return [undefined, fullMethod];
+  }
+}

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

@@ -48,7 +48,6 @@ type BannedMetricAttributeNames = (typeof Attributes)[
   | 'TX_HASH'
   | 'PROVING_JOB_ID'
   | 'P2P_ID'
-  | 'P2P_REQ_RESP_BATCH_REQUESTS_COUNT'
   | 'TARGET_ADDRESS'
   | 'MANA_USED'
   | 'TOTAL_INSTRUCTIONS'];

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/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();
-    }
-}

package/src/wrappers/l2_block_stream.ts

@@ -1,41 +0,0 @@
-import { BlockNumber } from '@aztec/foundation/branded-types';
-import { createLogger } from '@aztec/foundation/log';
-import {
-  type L2BlockSource,
-  L2BlockStream,
-  type L2BlockStreamEventHandler,
-  type L2BlockStreamLocalDataProvider,
-} from '@aztec/stdlib/block';
-import { type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client';
-
-/** Extends an L2BlockStream with a tracer to create a new trace per iteration. */
-export class TraceableL2BlockStream extends L2BlockStream implements Traceable {
-  constructor(
-    l2BlockSource: Pick<
-      L2BlockSource,
-      'getBlocks' | 'getBlockHeader' | 'getL2Tips' | 'getCheckpoints' | 'getCheckpointedBlocks'
-    >,
-    localData: L2BlockStreamLocalDataProvider,
-    handler: L2BlockStreamEventHandler,
-    public readonly tracer: Tracer,
-    private readonly name: string = 'L2BlockStream',
-    log = createLogger('types:block_stream'),
-    opts: {
-      proven?: boolean;
-      pollIntervalMS?: number;
-      batchSize?: number;
-      startingBlock?: BlockNumber;
-    } = {},
-  ) {
-    super(l2BlockSource, localData, handler, log, opts);
-  }
-
-  // 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
-  @trackSpan(function () {
-    return `${this!.name}.work`;
-  })
-  override work() {
-    return super.work();
-  }
-}