@aztec/telemetry-client 0.76.4 → 0.77.0-testnet-ignition.21

package/src/config.ts

@@ -1,26 +1,15 @@
-import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
+import { type ConfigMappingsType, getConfigFromMappings } from '@aztec/foundation/config';
 
 export interface TelemetryClientConfig {
-  useGcloudMetrics: boolean;
   metricsCollectorUrl?: URL;
   tracesCollectorUrl?: URL;
   logsCollectorUrl?: URL;
-  serviceName: string;
-  networkName: string;
   otelCollectIntervalMs: number;
   otelExportTimeoutMs: number;
-  k8sPodUid?: string;
-  k8sPodName?: string;
-  k8sNamespaceName?: string;
   otelExcludeMetrics?: string[];
 }
 
 export const telemetryClientConfigMappings: ConfigMappingsType<TelemetryClientConfig> = {
-  useGcloudMetrics: {
-    env: 'USE_GCLOUD_METRICS',
-    description: 'Whether to use GCP metrics and traces',
-    ...booleanConfigHelper(false),
-  },
   metricsCollectorUrl: {
     env: 'OTEL_EXPORTER_OTLP_METRICS_ENDPOINT',
     description: 'The URL of the telemetry collector for metrics',
@@ -36,16 +25,6 @@ export const telemetryClientConfigMappings: ConfigMappingsType<TelemetryClientCo
     description: 'The URL of the telemetry collector for logs',
     parseEnv: (val: string) => val && new URL(val),
   },
-  serviceName: {
-    env: 'OTEL_SERVICE_NAME',
-    description: 'The name of the service (attached as metadata to collected metrics)',
-    defaultValue: 'aztec',
-  },
-  networkName: {
-    env: 'NETWORK_NAME',
-    description: 'The network ID of the telemetry service',
-    defaultValue: 'local',
-  },
   otelCollectIntervalMs: {
     env: 'OTEL_COLLECT_INTERVAL_MS',
     description: 'The interval at which to collect metrics',
@@ -70,18 +49,6 @@ export const telemetryClientConfigMappings: ConfigMappingsType<TelemetryClientCo
         : [],
     defaultValue: [],
   },
-  k8sPodUid: {
-    env: 'K8S_POD_UID',
-    description: 'The UID of the Kubernetes pod (injected automatically by k8s)',
-  },
-  k8sPodName: {
-    env: 'K8S_POD_NAME',
-    description: 'The name of the Kubernetes pod (injected automatically by k8s)',
-  },
-  k8sNamespaceName: {
-    env: 'K8S_NAMESPACE_NAME',
-    description: 'The name of the Kubernetes namespace (injected automatically by k8s)',
-  },
 };
 
 export function getConfigEnvVars(): TelemetryClientConfig {

package/src/event_loop_monitor.ts

@@ -1,6 +1,6 @@
 import { type EventLoopUtilization, type IntervalHistogram, monitorEventLoopDelay, performance } from 'node:perf_hooks';
 
-import { NODEJS_EVENT_LOOP_STATE } from './attributes.js';
+import * as Attributes from './attributes.js';
 import * as Metrics from './metrics.js';
 import {
   type BatchObservableResult,
@@ -103,8 +103,8 @@ export class EventLoopMonitor {
     // - https://youtu.be/WetXnEPraYM
     obs.observe(this.eventLoopUilization, delta.utilization);
 
-    this.eventLoopTime.add(Math.floor(delta.idle), { [NODEJS_EVENT_LOOP_STATE]: 'idle' });
-    this.eventLoopTime.add(Math.floor(delta.active), { [NODEJS_EVENT_LOOP_STATE]: 'active' });
+    this.eventLoopTime.add(Math.floor(delta.idle), { [Attributes.NODEJS_EVENT_LOOP_STATE]: 'idle' });
+    this.eventLoopTime.add(Math.floor(delta.active), { [Attributes.NODEJS_EVENT_LOOP_STATE]: 'active' });
 
     obs.observe(this.eventLoopDelayGauges.min, Math.floor(this.eventLoopDelay.min));
     obs.observe(this.eventLoopDelayGauges.mean, Math.floor(this.eventLoopDelay.mean));

package/src/index.ts

@@ -1,5 +1,6 @@
 export * from './telemetry.js';
-export * from './histogram_utils.js';
+export * as Metrics from './metrics.js';
+export * as Attributes from './attributes.js';
 export * from './with_tracer.js';
 export * from './prom_otel_adapter.js';
 export * from './lmdb_metrics.js';

package/src/lmdb_metrics.ts

@@ -1,6 +1,6 @@
-import { DB_MAP_SIZE, DB_NUM_ITEMS, DB_USED_SIZE } from './metrics.js';
+import * as Metrics from './metrics.js';
 import {
-  type Attributes,
+  type AttributesType,
   type BatchObservableResult,
   type Meter,
   type ObservableGauge,
@@ -14,18 +14,18 @@ export class LmdbMetrics {
   private dbUsedSize: ObservableGauge;
   private dbNumItems: ObservableGauge;
 
-  constructor(meter: Meter, private attributes?: Attributes, private getStats?: LmdbStatsCallback) {
-    this.dbMapSize = meter.createObservableGauge(DB_MAP_SIZE, {
+  constructor(meter: Meter, private attributes?: AttributesType, private getStats?: LmdbStatsCallback) {
+    this.dbMapSize = meter.createObservableGauge(Metrics.DB_MAP_SIZE, {
       description: 'LMDB Map Size',
       valueType: ValueType.INT,
       unit: 'By',
     });
-    this.dbUsedSize = meter.createObservableGauge(DB_USED_SIZE, {
+    this.dbUsedSize = meter.createObservableGauge(Metrics.DB_USED_SIZE, {
       description: 'LMDB Used Size',
       valueType: ValueType.INT,
       unit: 'By',
     });
-    this.dbNumItems = meter.createObservableGauge(DB_NUM_ITEMS, {
+    this.dbNumItems = meter.createObservableGauge(Metrics.DB_NUM_ITEMS, {
       description: 'LMDB Num Items',
       valueType: ValueType.INT,
     });

package/src/metrics.ts

@@ -37,6 +37,7 @@ export const MEMPOOL_ATTESTATIONS_SIZE = 'aztec.mempool.attestations_size';
 
 export const ARCHIVER_SYNC_DURATION = 'aztec.archiver.sync_duration';
 export const ARCHIVER_L1_BLOCKS_SYNCED = 'aztec.archiver.l1_blocks_synced';
+export const ARCHIVER_L1_BLOCK_HEIGHT = 'aztec.archiver.l1_block_height';
 export const ARCHIVER_BLOCK_HEIGHT = 'aztec.archiver.block_height';
 export const ARCHIVER_TX_COUNT = 'aztec.archiver.tx_count';
 export const ARCHIVER_ROLLUP_PROOF_DELAY = 'aztec.archiver.rollup_proof_delay';
@@ -68,6 +69,7 @@ export const L1_PUBLISHER_BLOB_COUNT = 'aztec.l1_publisher.blob_count';
 export const L1_PUBLISHER_BLOB_INCLUSION_BLOCKS = 'aztec.l1_publisher.blob_inclusion_blocks';
 export const L1_PUBLISHER_BLOB_TX_SUCCESS = 'aztec.l1_publisher.blob_tx_success';
 export const L1_PUBLISHER_BLOB_TX_FAILURE = 'aztec.l1_publisher.blob_tx_failure';
+export const L1_PUBLISHER_BALANCE = 'aztec.l1_publisher.balance';
 
 export const PEER_MANAGER_GOODBYES_SENT = 'aztec.peer_manager.goodbyes_sent';
 export const PEER_MANAGER_GOODBYES_RECEIVED = 'aztec.peer_manager.goodbyes_received';
@@ -100,11 +102,13 @@ export const PROVING_ORCHESTRATOR_BASE_ROLLUP_INPUTS_DURATION =
 
 export const PROVING_QUEUE_JOB_SIZE = 'aztec.proving_queue.job_size';
 export const PROVING_QUEUE_SIZE = 'aztec.proving_queue.size';
-export const PROVING_QUEUE_ACTIVE_JOBS = 'aztec.proving_queue.active_jobs';
-export const PROVING_QUEUE_RESOLVED_JOBS = 'aztec.proving_queue.resolved_jobs';
-export const PROVING_QUEUE_REJECTED_JOBS = 'aztec.proving_queue.rejected_jobs';
-export const PROVING_QUEUE_RETRIED_JOBS = 'aztec.proving_queue.retried_jobs';
-export const PROVING_QUEUE_TIMED_OUT_JOBS = 'aztec.proving_queue.timed_out_jobs';
+export const PROVING_QUEUE_TOTAL_JOBS = 'aztec.proving_queue.enqueued_jobs_count';
+export const PROVING_QUEUE_CACHED_JOBS = 'aztec.proving_queue.cached_jobs_count';
+export const PROVING_QUEUE_ACTIVE_JOBS = 'aztec.proving_queue.active_jobs_count';
+export const PROVING_QUEUE_RESOLVED_JOBS = 'aztec.proving_queue.resolved_jobs_count';
+export const PROVING_QUEUE_REJECTED_JOBS = 'aztec.proving_queue.rejected_jobs_count';
+export const PROVING_QUEUE_RETRIED_JOBS = 'aztec.proving_queue.retried_jobs_count';
+export const PROVING_QUEUE_TIMED_OUT_JOBS = 'aztec.proving_queue.timed_out_jobs_count';
 export const PROVING_QUEUE_JOB_WAIT = 'aztec.proving_queue.job_wait';
 export const PROVING_QUEUE_JOB_DURATION = 'aztec.proving_queue.job_duration';
 export const PROVING_QUEUE_DB_NUM_ITEMS = 'aztec.proving_queue.db.num_items';
@@ -130,6 +134,7 @@ export const WORLD_STATE_OLDEST_BLOCK = 'aztec.world_state.oldest_block';
 export const WORLD_STATE_DB_USED_SIZE = 'aztec.world_state.db_used_size';
 export const WORLD_STATE_DB_NUM_ITEMS = 'aztec.world_state.db_num_items';
 export const WORLD_STATE_REQUEST_TIME = 'aztec.world_state.request_time';
+export const WORLD_STATE_CRITICAL_ERROR_COUNT = 'aztec.world_state.critical_error_count';
 
 export const PROOF_VERIFIER_COUNT = 'aztec.proof_verifier.count';
 

package/src/noop.ts

@@ -1,6 +1,6 @@
 import { type Meter, type Span, type SpanContext, type Tracer, createNoopMeter } from '@opentelemetry/api';
 
-import { type TelemetryClient } from './telemetry.js';
+import type { TelemetryClient } from './telemetry.js';
 
 export class NoopTelemetryClient implements TelemetryClient {
   getMeter(): Meter {

package/src/otel.ts

@@ -1,7 +1,5 @@
 import { type LogData, type Logger, addLogDataHandler } from '@aztec/foundation/log';
 
-import { MetricExporter as GoogleCloudMetricExporter } from '@google-cloud/opentelemetry-cloud-monitoring-exporter';
-import { TraceExporter as GoogleCloudTraceExporter } from '@google-cloud/opentelemetry-cloud-trace-exporter';
 import {
   DiagConsoleLogger,
   DiagLogLevel,
@@ -16,8 +14,8 @@ import {
 import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
 import { HostMetrics } from '@opentelemetry/host-metrics';
-import { type IResource } from '@opentelemetry/resources';
-import { type LoggerProvider } from '@opentelemetry/sdk-logs';
+import type { IResource } from '@opentelemetry/resources';
+import type { LoggerProvider } from '@opentelemetry/sdk-logs';
 import {
   ExplicitBucketHistogramAggregation,
   InstrumentType,
@@ -29,20 +27,18 @@ import {
 import { BatchSpanProcessor, NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
 import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
 
-import { type TelemetryClientConfig } from './config.js';
+import type { TelemetryClientConfig } from './config.js';
 import { EventLoopMonitor } from './event_loop_monitor.js';
-import { linearBuckets } from './histogram_utils.js';
 import { OtelFilterMetricExporter } from './otel_filter_metric_exporter.js';
 import { registerOtelLoggerProvider } from './otel_logger_provider.js';
 import { getOtelResource } from './otel_resource.js';
-import { type Gauge, type TelemetryClient } from './telemetry.js';
+import type { TelemetryClient } from './telemetry.js';
 
 export type OpenTelemetryClientFactory = (resource: IResource, log: Logger) => OpenTelemetryClient;
 
 export class OpenTelemetryClient implements TelemetryClient {
   hostMetrics: HostMetrics | undefined;
   eventLoopMonitor: EventLoopMonitor | undefined;
-  targetInfo: Gauge | undefined;
   private meters: Map<string, Meter> = new Map<string, Meter>();
   private tracers: Map<string, Tracer> = new Map<string, Tracer>();
 
@@ -99,14 +95,6 @@ export class OpenTelemetryClient implements TelemetryClient {
       this.meterProvider.getMeter(this.resource.attributes[ATTR_SERVICE_NAME] as string),
     );
 
-    // See these two links for more information on providing target information:
-    // https://opentelemetry.io/docs/specs/otel/compatibility/prometheus_and_openmetrics/#resource-attributes
-    // https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#supporting-target-metadata-in-both-push-based-and-pull-based-systems
-    this.targetInfo = this.meterProvider.getMeter('target').createGauge('target_info', {
-      description: 'Target metadata',
-    });
-
-    this.targetInfo.record(1, this.resource.attributes);
     this.hostMetrics.start();
     this.eventLoopMonitor.start();
   }
@@ -153,22 +141,20 @@ export class OpenTelemetryClient implements TelemetryClient {
 
       views: [
         // Every histogram matching the selector (type + unit) gets these custom buckets assigned
+        new View({
+          instrumentType: InstrumentType.HISTOGRAM,
+          instrumentUnit: 's',
+          aggregation: new ExplicitBucketHistogramAggregation(
+            [1, 2, 4, 6, 10, 15, 30, 60, 90, 120, 180, 240, 300, 480, 600],
+            true,
+          ),
+        }),
         new View({
           instrumentType: InstrumentType.HISTOGRAM,
           instrumentUnit: 'ms',
           aggregation: new ExplicitBucketHistogramAggregation(
-            // 181 buckets between 5ms and 1hr
-            [
-              ...linearBuckets(5, 100, 20), // 20 buckets between 5 and 100ms
-              ...linearBuckets(100, 1_000, 20).slice(1), // another 20 buckets between 100ms and 1s. slice(1) to remove duplicate 100
-              ...linearBuckets(1_000, 10_000, 20).slice(1),
-              ...linearBuckets(10_000, 60_000, 20).slice(1),
-              ...linearBuckets(60_000, 300_000, 20).slice(1),
-              ...linearBuckets(300_000, 600_000, 20).slice(1),
-              ...linearBuckets(600_000, 1_200_000, 20).slice(1),
-              ...linearBuckets(1_200_000, 1_800_000, 20).slice(1),
-              ...linearBuckets(1_800_000, 3_600_000, 20).slice(1), // 1hr
-            ],
+            // 10ms to 1 minute
+            [10, 20, 35, 50, 75, 100, 250, 500, 750, 1_000, 2_500, 5_000, 7_500, 10_000, 15_000, 30_000, 60_000],
             true,
           ),
         }),
@@ -176,13 +162,10 @@ export class OpenTelemetryClient implements TelemetryClient {
           instrumentType: InstrumentType.HISTOGRAM,
           instrumentUnit: 'us',
           aggregation: new ExplicitBucketHistogramAggregation(
+            // 1us to 1s
             [
-              ...linearBuckets(5, 100, 20), // 20 buckets between 5 and 100us
-              ...linearBuckets(100, 1_000, 20).slice(1), // another 20 buckets between 100us and 1ms. slice(1) to remove duplicate 100
-              ...linearBuckets(1_000, 10_000, 90).slice(1), // 90 buckets between 1ms and 10ms
-              ...linearBuckets(10_000, 100_000, 20).slice(1), // 20 buckets between 10ms and 100ms
-              ...linearBuckets(100_000, 1_000_000, 20).slice(1), // 20 buckets between 100ms and 1s
-              ...linearBuckets(1_000_000, 60_000_000, 20).slice(1), // 20 buckets between 1s and 1m
+              5, 10, 25, 50, 75, 100, 250, 500, 750, 1_000, 2_500, 5_000, 7_500, 10_000, 25_000, 50_000, 100_000,
+              250_000, 500_000, 1_000_000,
             ],
             true,
           ),
@@ -191,13 +174,26 @@ export class OpenTelemetryClient implements TelemetryClient {
           instrumentType: InstrumentType.HISTOGRAM,
           instrumentUnit: 'By',
           aggregation: new ExplicitBucketHistogramAggregation(
-            // 143 buckets between 32 bytes and 2MB
+            // from 32 bytes to 2MB
             [
-              ...linearBuckets(2 ** 5, 2 ** 10, 31), // 32 bytes to 1KB at a resolution of 32 bytes
-              ...linearBuckets(2 ** 10, 2 ** 15, 31).slice(1), // 1KB to 32KB at a resolution of 1KB
-              ...linearBuckets(2 ** 15, 2 ** 18, 32).slice(1), // 32KB to 256KB at a resolution of 7KB
-              ...linearBuckets(2 ** 18, 2 ** 20, 32).slice(1), // 256KB to 1MB at a resolution of 24KB
-              ...linearBuckets(2 ** 20, 2 ** 21, 16).slice(1), // 1MB to 2MB at a resolution of 64KB
+              32,
+              64,
+              128,
+              256,
+              512,
+              1024, // 1kb
+              2048,
+              4096,
+              8192,
+              16384,
+              32768,
+              65536,
+              131072,
+              262144,
+              524288,
+              1048576, // 1mb
+              1572864,
+              2097152, // 2mb
             ],
             true,
           ),
@@ -206,7 +202,10 @@ export class OpenTelemetryClient implements TelemetryClient {
           instrumentType: InstrumentType.HISTOGRAM,
           instrumentUnit: 'gas/s',
           aggregation: new ExplicitBucketHistogramAggregation(
-            [...linearBuckets(100_000, 10_000_000, 100), ...linearBuckets(10_000_000, 100_000_000, 100).slice(1)],
+            [
+              1_000, 5_000, 10_000, 25_000, 50_000, 100_000, 250_000, 500_000, 750_000, 1_000_000, 2_000_000, 4_000_000,
+              8_000_000, 10_000_000, 15_000_000, 30_000_000,
+            ],
             true,
           ),
         }),
@@ -214,7 +213,10 @@ export class OpenTelemetryClient implements TelemetryClient {
           instrumentType: InstrumentType.HISTOGRAM,
           instrumentUnit: 'mana/s',
           aggregation: new ExplicitBucketHistogramAggregation(
-            [...linearBuckets(100_000, 10_000_000, 100), ...linearBuckets(10_000_000, 100_000_000, 100).slice(1)],
+            [
+              1_000, 5_000, 10_000, 25_000, 50_000, 100_000, 250_000, 500_000, 750_000, 1_000_000, 2_000_000, 4_000_000,
+              8_000_000, 10_000_000, 15_000_000, 30_000_000,
+            ],
             true,
           ),
         }),
@@ -222,7 +224,10 @@ export class OpenTelemetryClient implements TelemetryClient {
           instrumentType: InstrumentType.HISTOGRAM,
           instrumentUnit: 'gas/block',
           aggregation: new ExplicitBucketHistogramAggregation(
-            [...linearBuckets(100_000, 10_000_000, 100), ...linearBuckets(10_000_000, 50_000_000, 50).slice(1)],
+            [
+              1_000, 5_000, 10_000, 25_000, 50_000, 100_000, 250_000, 500_000, 750_000, 1_000_000, 2_000_000, 4_000_000,
+              8_000_000, 10_000_000, 15_000_000, 30_000_000,
+            ],
             true,
           ),
         }),
@@ -230,7 +235,10 @@ export class OpenTelemetryClient implements TelemetryClient {
           instrumentType: InstrumentType.HISTOGRAM,
           instrumentUnit: 'gas/tx',
           aggregation: new ExplicitBucketHistogramAggregation(
-            [...linearBuckets(50_000, 1_000_000, 20), ...linearBuckets(1_000_000, 10_000_000, 100).slice(1)],
+            [
+              25_000, 50_000, 100_000, 250_000, 500_000, 750_000, 1_000_000, 2_000_000, 4_000_000, 8_000_000,
+              10_000_000, 15_000_000, 30_000_000,
+            ],
             true,
           ),
         }),
@@ -238,25 +246,6 @@ export class OpenTelemetryClient implements TelemetryClient {
     });
   }
 
-  private static getGcloudClientFactory(config: TelemetryClientConfig): OpenTelemetryClientFactory {
-    return (resource: IResource, log: Logger) => {
-      const tracerProvider = new NodeTracerProvider({
-        resource,
-        spanProcessors: [new BatchSpanProcessor(new GoogleCloudTraceExporter({ resourceFilter: /.*/ }))],
-      });
-
-      tracerProvider.register();
-
-      const meterProvider = OpenTelemetryClient.createMeterProvider(resource, {
-        exporter: new OtelFilterMetricExporter(new GoogleCloudMetricExporter(), config.otelExcludeMetrics ?? []),
-        exportTimeoutMillis: config.otelExportTimeoutMs,
-        exportIntervalMillis: config.otelCollectIntervalMs,
-      });
-
-      return new OpenTelemetryClient(resource, meterProvider, tracerProvider, undefined, log);
-    };
-  }
-
   private static getCustomClientFactory(config: TelemetryClientConfig): OpenTelemetryClientFactory {
     return (resource: IResource, log: Logger) => {
       const tracerProvider = new NodeTracerProvider({
@@ -287,9 +276,7 @@ export class OpenTelemetryClient implements TelemetryClient {
 
   public static createAndStart(config: TelemetryClientConfig, log: Logger): OpenTelemetryClient {
     const resource = getOtelResource();
-    const factory = config.useGcloudMetrics
-      ? OpenTelemetryClient.getGcloudClientFactory(config)
-      : OpenTelemetryClient.getCustomClientFactory(config);
+    const factory = OpenTelemetryClient.getCustomClientFactory(config);
 
     const service = factory(resource, log);
     service.start();

package/src/otel_filter_metric_exporter.ts

@@ -1,5 +1,5 @@
-import { type ExportResult } from '@opentelemetry/core';
-import { type MetricData, type PushMetricExporter, type ResourceMetrics } from '@opentelemetry/sdk-metrics';
+import type { ExportResult } from '@opentelemetry/core';
+import type { MetricData, PushMetricExporter, ResourceMetrics } from '@opentelemetry/sdk-metrics';
 
 export class OtelFilterMetricExporter implements PushMetricExporter {
   constructor(private readonly exporter: PushMetricExporter, private readonly excludeMetricPrefixes: string[]) {

package/src/otel_logger_provider.ts

@@ -1,7 +1,7 @@
 import { logs as otelLogs } from '@opentelemetry/api-logs';
 import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-http';
 import { CompressionAlgorithm } from '@opentelemetry/otlp-exporter-base';
-import { type IResource } from '@opentelemetry/resources';
+import type { IResource } from '@opentelemetry/resources';
 import { BatchLogRecordProcessor, LoggerProvider } from '@opentelemetry/sdk-logs';
 
 export function registerOtelLoggerProvider(resource: IResource, otelLogsUrl?: URL) {

package/src/otel_resource.ts

@@ -1,4 +1,3 @@
-import { GcpDetectorSync } from '@google-cloud/opentelemetry-resource-util';
 import {
   type IResource,
   detectResourcesSync,
@@ -8,18 +7,9 @@ import {
   serviceInstanceIdDetectorSync,
 } from '@opentelemetry/resources';
 
-import { aztecDetector } from './aztec_resource_detector.js';
-
 export function getOtelResource(): IResource {
   const resource = detectResourcesSync({
-    detectors: [
-      osDetectorSync,
-      envDetectorSync,
-      processDetectorSync,
-      serviceInstanceIdDetectorSync,
-      aztecDetector,
-      new GcpDetectorSync(),
-    ],
+    detectors: [osDetectorSync, envDetectorSync, processDetectorSync, serviceInstanceIdDetectorSync],
   });
 
   return resource;

package/src/prom_otel_adapter.ts

@@ -2,7 +2,7 @@ import { type Logger, createLogger } from '@aztec/foundation/log';
 
 import { Registry } from 'prom-client';
 
-import { type Meter, type Metrics, type ObservableGauge, type TelemetryClient } from './telemetry.js';
+import type { Meter, MetricsType, ObservableGauge, TelemetryClient } from './telemetry.js';
 
 /**
  * Types matching the gossipsub and libp2p services
@@ -62,7 +62,7 @@ export interface MetricsRegister {
   avgMinMax<Labels extends LabelsGeneric = NoLabels>(config: AvgMinMaxConfig<Labels>): IAvgMinMax<Labels>;
 }
 
-/**Otel Metrics Adapters
+/**Otel MetricsType Adapters
  *
  * Some dependencies we use export metrics directly in a Prometheus format
  * This adapter is used to convert those metrics to a format that we can use with OpenTelemetry
@@ -93,7 +93,7 @@ export class OtelGauge<Labels extends LabelsGeneric = NoLabels> implements IGaug
     help: string,
     private labelNames: Array<keyof Labels> = [],
   ) {
-    this.gauge = meter.createObservableGauge(name as Metrics, {
+    this.gauge = meter.createObservableGauge(name as MetricsType, {
       description: help,
     });
 
@@ -237,7 +237,7 @@ class NoopOtelHistogram<Labels extends LabelsGeneric = NoLabels> implements IHis
   constructor(
     private logger: Logger,
     _meter: Meter,
-    _name: string, // Metrics must be registered in the aztec labels registry
+    _name: string, // MetricsType must be registered in the aztec labels registry
     _help: string,
     _buckets: number[] = [],
     _labelNames: Array<keyof Labels> = [],
@@ -265,7 +265,7 @@ class NoopOtelAvgMinMax<Labels extends LabelsGeneric = NoLabels> implements IAvg
   constructor(
     private _logger: Logger,
     _meter: Meter,
-    _name: string, // Metrics must be registered in the aztec labels registry
+    _name: string, // MetricsType must be registered in the aztec labels registry
     _help: string,
     _labelNames: Array<keyof Labels> = [],
   ) {}
@@ -297,7 +297,7 @@ export class OtelMetricsAdapter extends Registry implements MetricsRegister {
     return new OtelGauge<Labels>(
       this.logger,
       this.meter,
-      configuration.name as Metrics,
+      configuration.name as MetricsType,
       configuration.help,
       configuration.labelNames,
     );
@@ -307,7 +307,7 @@ export class OtelMetricsAdapter extends Registry implements MetricsRegister {
     return new NoopOtelHistogram<Labels>(
       this.logger,
       this.meter,
-      configuration.name as Metrics,
+      configuration.name as MetricsType,
       configuration.help,
       configuration.buckets,
       configuration.labelNames,
@@ -318,7 +318,7 @@ export class OtelMetricsAdapter extends Registry implements MetricsRegister {
     return new NoopOtelAvgMinMax<Labels>(
       this.logger,
       this.meter,
-      configuration.name as Metrics,
+      configuration.name as MetricsType,
       configuration.help,
       configuration.labelNames,
     );

package/src/start.ts

@@ -1,9 +1,9 @@
 import { createLogger } from '@aztec/foundation/log';
 
-import { type TelemetryClientConfig } from './config.js';
+import type { TelemetryClientConfig } from './config.js';
 import { NoopTelemetryClient } from './noop.js';
 import { OpenTelemetryClient } from './otel.js';
-import { type TelemetryClient } from './telemetry.js';
+import type { TelemetryClient } from './telemetry.js';
 
 export * from './config.js';
 
@@ -17,8 +17,8 @@ export function initTelemetryClient(config: TelemetryClientConfig): TelemetryCli
     return telemetry;
   }
 
-  if (config.metricsCollectorUrl || config.useGcloudMetrics) {
-    log.info(`Using OpenTelemetry client ${config.useGcloudMetrics ? 'with GCP' : 'with custom collector'}`);
+  if (config.metricsCollectorUrl) {
+    log.info(`Using OpenTelemetry client with custom collector`);
     telemetry = OpenTelemetryClient.createAndStart(config, log);
   } else {
     log.info('Using NoopTelemetryClient');