@aztec/telemetry-client 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/wrappers/fetch.js

@@ -10,21 +10,23 @@ import { ATTR_JSONRPC_METHOD, ATTR_JSONRPC_REQUEST_ID } from '../vendor/attribut
  * @param log - Optional logger for logging attempts.
  * @returns A fetch function.
  */ export function makeTracedFetch(retries, defaultNoRetry, fetch = defaultFetch, log) {
-    return (host, rpcMethod, body, useApiEndpoints, extraHeaders = {}, noRetry)=>{
+    return (host, body, extraHeaders = {}, noRetry)=>{
         const telemetry = getTelemetryClient();
-        return telemetry.getTracer('fetch').startActiveSpan(`JsonRpcClient.${rpcMethod}`, {
+        return telemetry.getTracer('fetch').startActiveSpan(`JsonRpcClient`, {
             kind: SpanKind.CLIENT
         }, async (span)=>{
             try {
-                if (body && typeof body.id === 'number') {
+                if (body && typeof body === 'object' && 'id' in body && typeof body.id === 'number') {
                     span.setAttribute(ATTR_JSONRPC_REQUEST_ID, body.id);
                 }
-                span.setAttribute(ATTR_JSONRPC_METHOD, rpcMethod);
+                if (body && typeof body === 'object' && 'method' in body && typeof body.method === 'string') {
+                    span.setAttribute(ATTR_JSONRPC_METHOD, body.method);
+                }
                 const headers = {
                     ...extraHeaders
                 };
                 propagation.inject(context.active(), headers);
-                return await retry(()=>fetch(host, rpcMethod, body, useApiEndpoints, headers, noRetry ?? defaultNoRetry), `JsonRpcClient request ${rpcMethod} to ${host}`, makeBackoff(retries), log, false);
+                return await retry(()=>fetch(host, body, headers, noRetry ?? defaultNoRetry), `JsonRpcClient request to ${host}`, makeBackoff(retries), log, false);
             } catch (err) {
                 span.setStatus({
                     code: SpanStatusCode.ERROR,

package/dest/wrappers/json_rpc_server.d.ts

@@ -1,4 +1,4 @@
 import { type SafeJsonRpcServerOptions } from '@aztec/foundation/json-rpc/server';
 import type { ApiSchemaFor } from '@aztec/stdlib/schemas';
-export declare function createTracedJsonRpcServer<T extends object = any>(handler: T, schema: ApiSchemaFor<T>, options?: Partial<SafeJsonRpcServerOptions>): import("@aztec/foundation/json-rpc/server").SafeJsonRpcServer;
+export declare function createTracedJsonRpcServer<T extends object = any>(handler: T, schema: ApiSchemaFor<T>, options?: SafeJsonRpcServerOptions): import("@aztec/foundation/json-rpc/server").SafeJsonRpcServer;
 //# sourceMappingURL=json_rpc_server.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"json_rpc_server.d.ts","sourceRoot":"","sources":["../../src/wrappers/json_rpc_server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,wBAAwB,EAA2B,MAAM,mCAAmC,CAAC;AAC3G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAI1D,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,MAAM,GAAG,GAAG,EAC9D,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EACvB,OAAO,GAAE,OAAO,CAAC,wBAAwB,CAAM,iEAMhD"}
+{"version":3,"file":"json_rpc_server.d.ts","sourceRoot":"","sources":["../../src/wrappers/json_rpc_server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,wBAAwB,EAA2B,MAAM,mCAAmC,CAAC;AAC3G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAI1D,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,MAAM,GAAG,GAAG,EAC9D,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EACvB,OAAO,GAAE,wBAA6B,iEAMvC"}

package/dest/wrappers/l2_block_stream.d.ts

@@ -4,7 +4,7 @@ import { type Traceable, type Tracer } from '@aztec/telemetry-client';
 export declare class TraceableL2BlockStream extends L2BlockStream implements Traceable {
     readonly tracer: Tracer;
     private readonly name;
-    constructor(l2BlockSource: Pick<L2BlockSource, 'getBlocks' | 'getBlockHeader' | 'getL2Tips'>, localData: L2BlockStreamLocalDataProvider, handler: L2BlockStreamEventHandler, tracer: Tracer, name?: string, log?: import("@aztec/foundation/log").Logger, opts?: {
+    constructor(l2BlockSource: Pick<L2BlockSource, 'getPublishedBlocks' | 'getBlockHeader' | 'getL2Tips'>, localData: L2BlockStreamLocalDataProvider, handler: L2BlockStreamEventHandler, tracer: Tracer, name?: string, log?: import("@aztec/foundation/log").Logger, opts?: {
         proven?: boolean;
         pollIntervalMS?: number;
         batchSize?: number;

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

@@ -1 +1 @@
-{"version":3,"file":"l2_block_stream.d.ts","sourceRoot":"","sources":["../../src/wrappers/l2_block_stream.ts"],"names":[],"mappings":"AACA,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;aAK1D,MAAM,EAAE,MAAM;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAJrB,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,WAAW,GAAG,gBAAgB,GAAG,WAAW,CAAC,EAChF,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,MAAM,CAAC;KACnB;IAUC,IAAI;CAGd"}
+{"version":3,"file":"l2_block_stream.d.ts","sourceRoot":"","sources":["../../src/wrappers/l2_block_stream.ts"],"names":[],"mappings":"AACA,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;aAK1D,MAAM,EAAE,MAAM;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAJrB,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,oBAAoB,GAAG,gBAAgB,GAAG,WAAW,CAAC,EACzF,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,MAAM,CAAC;KACnB;IAUC,IAAI;CAGd"}

package/package.json

@@ -1,5 +1,6 @@
 {
   "name": "@aztec/telemetry-client",
+  "version": "0.0.1-commit.b655e406",
   "inherits": [
     "../package.common.json"
   ],
@@ -13,12 +14,10 @@
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   },
   "files": [
     "dest",
@@ -26,15 +25,15 @@
     "!*.test.*"
   ],
   "dependencies": {
-    "@aztec/foundation": "0.0.0-test.1",
-    "@aztec/stdlib": "0.0.0-test.1",
+    "@aztec/foundation": "0.0.1-commit.b655e406",
+    "@aztec/stdlib": "0.0.1-commit.b655e406",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/api-logs": "^0.55.0",
     "@opentelemetry/core": "^1.28.0",
     "@opentelemetry/exporter-logs-otlp-http": "^0.55.0",
     "@opentelemetry/exporter-metrics-otlp-http": "^0.55.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.55.0",
-    "@opentelemetry/host-metrics": "^0.35.4",
+    "@opentelemetry/host-metrics": "^0.36.2",
     "@opentelemetry/otlp-exporter-base": "^0.55.0",
     "@opentelemetry/resource-detector-gcp": "^0.32.0",
     "@opentelemetry/resources": "^1.28.0",
@@ -42,15 +41,16 @@
     "@opentelemetry/sdk-metrics": "^1.28.0",
     "@opentelemetry/sdk-trace-node": "^1.28.0",
     "@opentelemetry/semantic-conventions": "^1.28.0",
-    "prom-client": "^15.1.3"
+    "prom-client": "^15.1.3",
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
   },
   "devDependencies": {
-    "@jest/globals": "^29.5.0",
-    "@types/jest": "^29.5.0",
+    "@jest/globals": "^30.0.0",
+    "@types/jest": "^30.0.0",
     "@types/koa": "^2.15.0",
-    "jest": "^29.5.0",
+    "jest": "^30.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "jest": {
     "extensionsToTreatAsEsm": [
@@ -83,7 +83,10 @@
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs",
+    "setupFilesAfterEnv": [
+      "../../foundation/src/jest/setupAfterEnv.mjs"
     ]
-  },
-  "version": "0.0.0-test.1"
+  }
 }

package/src/attributes.ts

@@ -14,34 +14,35 @@
  * @see {@link https://opentelemetry.io/docs/specs/semconv/general/attribute-naming/}
  */
 
+/** The host of an HTTP request */
+export const HTTP_REQUEST_HOST = 'http.header.request.host';
+export const HTTP_RESPONSE_STATUS_CODE = 'http.response.status_code';
+
 /** The Aztec network identifier */
 export const NETWORK_NAME = 'aztec.network_name';
 
+export const AZTEC_NODE_ROLE = 'aztec.node_role';
+export const AZTEC_ROLLUP_VERSION = 'aztec.rollup_version';
+export const AZTEC_ROLLUP_ADDRESS = 'aztec.rollup_address';
+export const AZTEC_REGISTRY_ADDRESS = 'aztec.registry_address';
+
 /**
  * The name of the protocol circuit being run (e.g. public-kernel-setup or base-rollup)
  * @see {@link @aztec/stdlib/stats:CircuitName}
  */
 export const PROTOCOL_CIRCUIT_NAME = 'aztec.circuit.protocol_circuit_name';
 
-/**
- * The type of protocol circuit being run: server or client
- */
-export const PROTOCOL_CIRCUIT_TYPE = 'aztec.circuit.protocol_circuit_type';
-
 /**
  * For an app circuit, the contract:function being run (e.g. Token:transfer)
  */
 export const APP_CIRCUIT_NAME = 'aztec.circuit.app_circuit_name';
 
-/**
- * The type of app circuit being run: server or client
- */
-export const APP_CIRCUIT_TYPE = 'aztec.circuit.app_circuit_type';
-
 /** The block archive */
 export const BLOCK_ARCHIVE = 'aztec.block.archive';
 /** The block number */
 export const BLOCK_NUMBER = 'aztec.block.number';
+/** The L2 block hash */
+export const BLOCK_HASH = 'aztec.block.hash';
 /** The slot number */
 export const SLOT_NUMBER = 'aztec.slot.number';
 /** The parent's block number */
@@ -70,6 +71,8 @@ export const ERROR_TYPE = 'aztec.error_type';
 export const L1_TX_TYPE = 'aztec.l1.tx_type';
 /** The L1 address of the entity that sent a transaction to L1 */
 export const L1_SENDER = 'aztec.l1.sender';
+/** The L1 address receiving rewards */
+export const COINBASE = 'aztec.coinbase';
 /** The phase of the transaction */
 export const TX_PHASE_NAME = 'aztec.tx.phase_name';
 /** The reason for disconnecting a peer */
@@ -78,12 +81,14 @@ export const P2P_GOODBYE_REASON = 'aztec.p2p.goodbye.reason';
 export const PROVING_JOB_TYPE = 'aztec.proving.job_type';
 /** The proving job id */
 export const PROVING_JOB_ID = 'aztec.proving.job_id';
-
+/** Merkle tree name */
 export const MERKLE_TREE_NAME = 'aztec.merkle_tree.name';
 /** The prover-id in a root rollup proof. */
 export const ROLLUP_PROVER_ID = 'aztec.rollup.prover_id';
 /** Whether the proof submission was timed out (delayed more than 20 min) */
 export const PROOF_TIMED_OUT = 'aztec.proof.timed_out';
+/** Status of the validator (eg proposer, in-committee, none) */
+export const VALIDATOR_STATUS = 'aztec.validator_status';
 
 export const P2P_ID = 'aztec.p2p.id';
 export const P2P_REQ_RESP_PROTOCOL = 'aztec.p2p.req_resp.protocol';
@@ -96,6 +101,7 @@ export const SIMULATOR_PHASE = 'aztec.simulator.phase';
 export const TARGET_ADDRESS = 'aztec.address.target';
 export const SENDER_ADDRESS = 'aztec.address.sender';
 export const MANA_USED = 'aztec.mana.used';
+export const TOTAL_INSTRUCTIONS = 'aztec.total_instructions';
 
 /** Whether a sync process is the initial run, which is usually slower than iterative ones. */
 export const INITIAL_SYNC = 'aztec.initial_sync';
@@ -113,3 +119,13 @@ export const GAS_DIMENSION = 'aztec.gas_dimension';
 export const WORLD_STATE_REQUEST_TYPE = 'aztec.world_state_request';
 
 export const NODEJS_EVENT_LOOP_STATE = 'nodejs.eventloop.state';
+
+export const TOPIC_NAME = 'aztec.gossip.topic_name';
+
+export const TX_COLLECTION_METHOD = 'aztec.tx_collection.method';
+
+/** Scope of L1 transaction (sequencer, prover, or other) */
+export const L1_TX_SCOPE = 'aztec.l1_tx.scope';
+
+/** Generic error type attribute */
+export const IS_COMMITTEE_MEMBER = 'aztec.is_committee_member';

package/src/bench.ts

@@ -1,3 +1,5 @@
+import { createLogger } from '@aztec/foundation/log';
+
 import type { BatchObservableCallback, Context, MetricOptions, Observable, ValueType } from '@opentelemetry/api';
 
 import { NoopTracer } from './noop.js';
@@ -29,6 +31,14 @@ export type BenchmarkMetricsType = {
 export class BenchmarkTelemetryClient implements TelemetryClient {
   private meters: InMemoryPlainMeter[] = [];
 
+  constructor() {
+    const log = createLogger('telemetry:client');
+    log.info(`Using benchmark telemetry client`);
+  }
+
+  setExportedPublicTelemetry(_prefixes: string[]): void {}
+  setPublicTelemetryCollectFrom(_roles: string[]): void {}
+
   getMeter(name: string): Meter {
     const meter = new InMemoryPlainMeter(name);
     this.meters.push(meter);
@@ -69,23 +79,23 @@ class InMemoryPlainMeter implements Meter {
     this.metrics.forEach(metric => metric.clear());
   }
 
-  createGauge(name: MetricsType, options?: MetricOptions | undefined): Gauge {
+  createGauge(name: MetricsType, options?: MetricOptions): Gauge {
     return this.createMetric('gauge', name, options);
   }
 
-  createObservableGauge(name: MetricsType, options?: MetricOptions | undefined): ObservableGauge {
+  createObservableGauge(name: MetricsType, options?: MetricOptions): ObservableGauge {
     return this.createMetric('gauge', name, options);
   }
 
-  createHistogram(name: MetricsType, options?: MetricOptions | undefined): Histogram {
+  createHistogram(name: MetricsType, options?: MetricOptions): Histogram {
     return this.createMetric('histogram', name, options);
   }
 
-  createUpDownCounter(name: MetricsType, options?: MetricOptions | undefined): UpDownCounter {
+  createUpDownCounter(name: MetricsType, options?: MetricOptions): UpDownCounter {
     return this.createMetric('counter', name, options);
   }
 
-  createObservableUpDownCounter(name: MetricsType, options?: MetricOptions | undefined): ObservableUpDownCounter {
+  createObservableUpDownCounter(name: MetricsType, options?: MetricOptions): ObservableUpDownCounter {
     return this.createMetric('counter', name, options);
   }
 

package/src/config.ts

@@ -1,12 +1,16 @@
-import { type ConfigMappingsType, getConfigFromMappings } from '@aztec/foundation/config';
+import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
 
 export interface TelemetryClientConfig {
   metricsCollectorUrl?: URL;
+  publicMetricsCollectorUrl?: URL;
+  publicIncludeMetrics: string[];
+  publicMetricsOptOut: boolean;
+  publicMetricsCollectFrom: string[];
   tracesCollectorUrl?: URL;
   logsCollectorUrl?: URL;
   otelCollectIntervalMs: number;
   otelExportTimeoutMs: number;
-  otelExcludeMetrics?: string[];
+  otelExcludeMetrics: string[];
 }
 
 export const telemetryClientConfigMappings: ConfigMappingsType<TelemetryClientConfig> = {
@@ -49,6 +53,41 @@ export const telemetryClientConfigMappings: ConfigMappingsType<TelemetryClientCo
         : [],
     defaultValue: [],
   },
+
+  publicMetricsCollectorUrl: {
+    env: 'PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT',
+    description: 'A URL to publish a subset of metrics for public consumption',
+    parseEnv: (val: string) => val && new URL(val),
+  },
+  publicMetricsCollectFrom: {
+    env: 'PUBLIC_OTEL_COLLECT_FROM',
+    description: 'The role types to collect metrics from',
+    parseEnv: (val: string) =>
+      val
+        ? val
+            .split(',')
+            .map(s => s.trim())
+            .filter(s => s.length > 0)
+        : [],
+    defaultValue: [],
+  },
+  publicIncludeMetrics: {
+    env: 'PUBLIC_OTEL_INCLUDE_METRICS',
+    description: 'A list of metric prefixes to publicly export',
+    parseEnv: (val: string) =>
+      val
+        ? val
+            .split(',')
+            .map(s => s.trim())
+            .filter(s => s.length > 0)
+        : [],
+    defaultValue: [],
+  },
+  publicMetricsOptOut: {
+    env: 'PUBLIC_OTEL_OPT_OUT',
+    description: 'Whether to opt out of sharing optional telemetry',
+    ...booleanConfigHelper(false),
+  },
 };
 
 export function getConfigEnvVars(): TelemetryClientConfig {

package/src/index.ts

@@ -4,6 +4,7 @@ export * as Attributes from './attributes.js';
 export * from './with_tracer.js';
 export * from './prom_otel_adapter.js';
 export * from './lmdb_metrics.js';
+export * from './l1_metrics.js';
 export * from './wrappers/index.js';
 export * from './start.js';
 export * from './otel_propagation.js';

package/src/l1_metrics.ts

@@ -0,0 +1,80 @@
+import type { EthAddress } from '@aztec/foundation/eth-address';
+
+import { type Chain, type FallbackTransport, type Hex, type HttpTransport, type PublicClient, formatEther } from 'viem';
+
+import { L1_SENDER } from './attributes.js';
+import { L1_BALANCE_ETH, L1_BLOB_BASE_FEE_WEI, L1_BLOCK_HEIGHT, L1_GAS_PRICE_WEI } from './metrics.js';
+import { type BatchObservableResult, type Meter, type ObservableGauge, ValueType } from './telemetry.js';
+
+export class L1Metrics {
+  private l1BlockHeight: ObservableGauge;
+  private l1BalanceEth: ObservableGauge;
+  private gasPriceWei: ObservableGauge;
+  private blobBaseFeeWei: ObservableGauge;
+  private addresses: Hex[];
+
+  constructor(
+    private meter: Meter,
+    private client: PublicClient<FallbackTransport<HttpTransport[]>, Chain>,
+    addresses: EthAddress[],
+  ) {
+    this.l1BlockHeight = meter.createObservableGauge(L1_BLOCK_HEIGHT, {
+      description: 'The latest L1 block seen',
+      valueType: ValueType.INT,
+    });
+    this.l1BalanceEth = meter.createObservableGauge(L1_BALANCE_ETH, {
+      description: 'Eth balance of an address',
+      unit: 'eth',
+      valueType: ValueType.DOUBLE,
+    });
+    this.gasPriceWei = meter.createObservableGauge(L1_GAS_PRICE_WEI, {
+      description: 'L1 gas price',
+      unit: 'wei',
+      valueType: ValueType.DOUBLE,
+    });
+    this.blobBaseFeeWei = meter.createObservableGauge(L1_BLOB_BASE_FEE_WEI, {
+      description: 'L1 blob fee',
+      unit: 'wei',
+      valueType: ValueType.DOUBLE,
+    });
+
+    this.addresses = addresses.map(addr => addr.toString());
+  }
+
+  start() {
+    this.meter.addBatchObservableCallback(this.observe, [this.l1BalanceEth, this.l1BlockHeight]);
+  }
+
+  stop() {
+    this.meter.removeBatchObservableCallback(this.observe, [this.l1BalanceEth, this.l1BlockHeight]);
+  }
+
+  private observe = async (observer: BatchObservableResult) => {
+    const blockNumber = await this.client.getBlockNumber();
+    const ethBalances = await Promise.all(
+      this.addresses.map(address =>
+        this.client.getBalance({
+          address,
+          blockNumber,
+        }),
+      ),
+    );
+
+    const gasPrice = await this.client.getGasPrice();
+    const blobFee = await this.client.getBlobBaseFee();
+
+    observer.observe(this.l1BlockHeight, Number(blockNumber));
+    observer.observe(this.gasPriceWei, Number(gasPrice));
+    observer.observe(this.blobBaseFeeWei, Number(blobFee));
+
+    for (let i = 0; i < ethBalances.length; i++) {
+      const wei = ethBalances[i];
+      const address = this.addresses[i];
+      const eth = parseFloat(formatEther(wei, 'wei'));
+
+      observer.observe(this.l1BalanceEth, eth, {
+        [L1_SENDER]: address,
+      });
+    }
+  };
+}

package/src/lmdb_metrics.ts

@@ -7,19 +7,34 @@ import {
   ValueType,
 } from './telemetry.js';
 
-export type LmdbStatsCallback = () => Promise<{ mappingSize: number; numItems: number; actualSize: number }>;
+export type LmdbStatsCallback = () => Promise<{
+  mappingSize: number;
+  physicalFileSize: number;
+  numItems: number;
+  actualSize: number;
+}>;
 
 export class LmdbMetrics {
   private dbMapSize: ObservableGauge;
+  private dbPhysicalFileSize: ObservableGauge;
   private dbUsedSize: ObservableGauge;
   private dbNumItems: ObservableGauge;
 
-  constructor(meter: Meter, private attributes?: AttributesType, private getStats?: LmdbStatsCallback) {
+  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.dbPhysicalFileSize = meter.createObservableGauge(Metrics.DB_PHYSICAL_FILE_SIZE, {
+      description: 'LMDB Physical File Size',
+      valueType: ValueType.INT,
+      unit: 'By',
+    });
     this.dbUsedSize = meter.createObservableGauge(Metrics.DB_USED_SIZE, {
       description: 'LMDB Used Size',
       valueType: ValueType.INT,
@@ -30,7 +45,12 @@ export class LmdbMetrics {
       valueType: ValueType.INT,
     });
 
-    meter.addBatchObservableCallback(this.recordDBMetrics, [this.dbMapSize, this.dbUsedSize, this.dbNumItems]);
+    meter.addBatchObservableCallback(this.recordDBMetrics, [
+      this.dbMapSize,
+      this.dbPhysicalFileSize,
+      this.dbUsedSize,
+      this.dbNumItems,
+    ]);
   }
 
   private recordDBMetrics = async (observable: BatchObservableResult) => {
@@ -39,6 +59,7 @@ export class LmdbMetrics {
     }
     const metrics = await this.getStats();
     observable.observe(this.dbMapSize, metrics.mappingSize, this.attributes);
+    observable.observe(this.dbPhysicalFileSize, metrics.physicalFileSize, this.attributes);
     observable.observe(this.dbNumItems, metrics.numItems, this.attributes);
     observable.observe(this.dbUsedSize, metrics.actualSize, this.attributes);
   };