@aztec/aztec 1.0.0-staging.0 → 1.0.0-staging.2

package/dest/cli/chain_l2_config.d.ts

@@ -20,6 +20,9 @@ export type L2ChainConfig = {
     autoUpdate: SharedNodeConfig['autoUpdate'];
     autoUpdateUrl?: string;
     maxTxPoolSize: number;
+    publicIncludeMetrics?: string[];
+    publicMetricsCollectorUrl?: string;
+    publicMetricsCollectFrom?: string[];
 };
 export declare const testnetIgnitionL2ChainConfig: L2ChainConfig;
 export declare const alphaTestnetL2ChainConfig: L2ChainConfig;

package/dest/cli/chain_l2_config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/cli/chain_l2_config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI/D,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAEhE,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,aAoB1C,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,aAoBvC,CAAC;AAEF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,gBAW3D;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAWpG;AAmBD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBAiC/E"}
+{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/cli/chain_l2_config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAM/D,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAEhE,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;CACrC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,aAoB1C,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,aAuBvC,CAAC;AAEF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,gBAW3D;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAWpG;AAmBD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBA6C/E"}

package/dest/cli/chain_l2_config.js

@@ -1,5 +1,8 @@
 import { EthAddress } from '@aztec/aztec.js';
 import path from 'path';
+import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with {
+    type: 'json'
+};
 export const testnetIgnitionL2ChainConfig = {
     l1ChainId: 11155111,
     ethereumSlotDuration: 12,
@@ -40,7 +43,12 @@ export const alphaTestnetL2ChainConfig = {
     snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/',
     autoUpdate: 'config-and-version',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/alpha-testnet.json',
-    maxTxPoolSize: 2 * 1024 * 1024 * 1024
+    maxTxPoolSize: 100_000_000,
+    publicIncludeMetrics,
+    publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec.network',
+    publicMetricsCollectFrom: [
+        'sequencer'
+    ]
 };
 export async function getBootnodes(networkName) {
     const url = `http://static.aztec.network/${networkName}/bootnodes.json`;
@@ -109,6 +117,15 @@ export async function enrichEnvironmentWithChainConfig(networkName) {
     if (config.autoUpdateUrl) {
         enrichVar('AUTO_UPDATE_URL', config.autoUpdateUrl);
     }
+    if (config.publicIncludeMetrics) {
+        enrichVar('PUBLIC_OTEL_INCLUDE_METRICS', config.publicIncludeMetrics.join(','));
+    }
+    if (config.publicMetricsCollectorUrl) {
+        enrichVar('PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT', config.publicMetricsCollectorUrl);
+    }
+    if (config.publicMetricsCollectFrom) {
+        enrichVar('PUBLIC_OTEL_COLLECT_FROM', config.publicMetricsCollectFrom.join(','));
+    }
     enrichEthAddressVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
     enrichEthAddressVar('SLASH_FACTORY_CONTRACT_ADDRESS', config.slashFactoryAddress);
     enrichEthAddressVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', config.feeAssetHandlerAddress);

package/dest/cli/util.d.ts

@@ -8,6 +8,18 @@ import type { PXEService } from '@aztec/pxe/server';
 import type { ProverConfig } from '@aztec/stdlib/interfaces/server';
 import type { Command } from 'commander';
 import { type AztecStartOption } from './aztec_start_options.js';
+export declare const enum ExitCode {
+    SUCCESS = 0,
+    ERROR = 1,
+    ROLLUP_UPGRADE = 78,// EX_CONFIG from FreeBSD (https://man.freebsd.org/cgi/man.cgi?query=sysexits)
+    VERSION_UPGRADE = 79,// prev + 1 because there's nothing better
+    SIGHUP = 129,
+    SIGINT = 130,
+    SIGQUIT = 131,
+    SIGTERM = 143
+}
+export declare function shutdown(logFn: LogFn, exitCode: ExitCode, cb?: Array<() => Promise<void>>): Promise<never>;
+export declare function isShuttingDown(): boolean;
 export declare const installSignalHandlers: (logFn: LogFn, cb?: Array<() => Promise<void>>) => void;
 /**
  * Creates logs for the initial accounts
@@ -60,5 +72,4 @@ export declare function preloadCrsDataForVerifying({ realProofs }: Pick<AztecNod
  */
 export declare function preloadCrsDataForServerSideProving({ realProofs }: Pick<ProverConfig, 'realProofs'>, log: LogFn): Promise<void>;
 export declare function setupUpdateMonitor(autoUpdateMode: SharedNodeConfig['autoUpdate'], updatesLocation: URL, followsCanonicalRollup: boolean, publicClient: ViemClient, registryContractAddress: EthAddress, signalHandlers: Array<() => Promise<void>>, updateNodeConfig?: (config: object) => Promise<void>): Promise<void>;
-export declare function shutdown(logFn: LogFn, cb?: Array<() => Promise<void>>): Promise<void>;
 //# sourceMappingURL=util.d.ts.map

package/dest/cli/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"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"}

package/dest/cli/util.js

@@ -3,13 +3,63 @@ import { UpdateChecker } from '@aztec/stdlib/update-checker';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import chalk from 'chalk';
 import { aztecStartOptions } from './aztec_start_options.js';
+export var ExitCode = /*#__PURE__*/ function(ExitCode) {
+    ExitCode[ExitCode["SUCCESS"] = 0] = "SUCCESS";
+    ExitCode[ExitCode["ERROR"] = 1] = "ERROR";
+    ExitCode[ExitCode["ROLLUP_UPGRADE"] = 78] = "ROLLUP_UPGRADE";
+    ExitCode[ExitCode["VERSION_UPGRADE"] = 79] = "VERSION_UPGRADE";
+    // 128 + int(SIGNAL)
+    ExitCode[ExitCode["SIGHUP"] = 129] = "SIGHUP";
+    ExitCode[ExitCode["SIGINT"] = 130] = "SIGINT";
+    ExitCode[ExitCode["SIGQUIT"] = 131] = "SIGQUIT";
+    ExitCode[ExitCode["SIGTERM"] = 143] = "SIGTERM";
+    return ExitCode;
+}({});
+let shutdownPromise;
+export function shutdown(logFn, exitCode, cb) {
+    if (shutdownPromise) {
+        logFn('Already shutting down.');
+        return shutdownPromise;
+    }
+    logFn('Shutting down...', {
+        exitCode
+    });
+    if (cb) {
+        shutdownPromise = Promise.allSettled(cb).then(()=>process.exit(exitCode));
+    } else {
+        // synchronously shuts down the process
+        // no need to set shutdownPromise on this branch of the if statement because no more code will be executed
+        process.exit(exitCode);
+    }
+    return shutdownPromise;
+}
+export function isShuttingDown() {
+    return shutdownPromise !== undefined;
+}
 export const installSignalHandlers = (logFn, cb)=>{
-    process.removeAllListeners('SIGINT');
-    process.removeAllListeners('SIGTERM');
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    process.once('SIGINT', ()=>shutdown(logFn, cb));
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    process.once('SIGTERM', ()=>shutdown(logFn, cb));
+    const signals = [
+        [
+            'SIGINT',
+            130
+        ],
+        [
+            'SIGTERM',
+            143
+        ],
+        [
+            'SIGHUP',
+            129
+        ],
+        [
+            'SIQUIT',
+            131
+        ]
+    ];
+    for (const [signal, exitCode] of signals){
+        process.removeAllListeners(signal);
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        process.once(signal, ()=>shutdown(logFn, exitCode, cb));
+    }
 };
 /**
  * Creates logs for the initial accounts
@@ -183,6 +233,9 @@ export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, follow
     });
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
     checker.on('newRollupVersion', async ({ latestVersion, currentVersion })=>{
+        if (isShuttingDown()) {
+            return;
+        }
         // if node follows canonical rollup then this is equivalent to a config update
         if (!followsCanonicalRollup) {
             return;
@@ -192,7 +245,7 @@ export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, follow
                 latestVersion,
                 currentVersion
             });
-            await shutdown(logger.info, signalHandlers);
+            await shutdown(logger.info, 78, signalHandlers);
         } else if (autoUpdateMode === 'notify') {
             logger.warn(`New rollup detected. Please restart the node`, {
                 latestVersion,
@@ -202,12 +255,15 @@ export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, follow
     });
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
     checker.on('newNodeVersion', async ({ latestVersion, currentVersion })=>{
+        if (isShuttingDown()) {
+            return;
+        }
         if (autoUpdateMode === 'config-and-version') {
             logger.info(`New node version detected. Please update and restart the node`, {
                 latestVersion,
                 currentVersion
             });
-            await shutdown(logger.info, signalHandlers);
+            await shutdown(logger.info, 79, signalHandlers);
         } else if (autoUpdateMode === 'notify') {
             logger.info(`New node version detected. Please update and restart the node`, {
                 latestVersion,
@@ -217,6 +273,9 @@ export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, follow
     });
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
     checker.on('updateNodeConfig', async (config)=>{
+        if (isShuttingDown()) {
+            return;
+        }
         if ((autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') && updateNodeConfig) {
             logger.warn(`Config change detected. Updating node`, config);
             try {
@@ -237,6 +296,10 @@ export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, follow
                 if (Array.isArray(publicIncludeMetrics) && publicIncludeMetrics.every((m)=>typeof m === 'string')) {
                     getTelemetryClient().setExportedPublicTelemetry(publicIncludeMetrics);
                 }
+                const publicMetricsCollectFrom = config.publicMetricsCollectFrom;
+                if (Array.isArray(publicMetricsCollectFrom) && publicMetricsCollectFrom.every((m)=>typeof m === 'string')) {
+                    getTelemetryClient().setPublicTelemetryCollectFrom(publicMetricsCollectFrom);
+                }
             } catch (err) {
                 logger.warn('Failed to update config', {
                     err
@@ -247,10 +310,3 @@ export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, follow
     });
     checker.start();
 }
-export async function shutdown(logFn, cb) {
-    logFn('Shutting down...');
-    if (cb) {
-        await Promise.all(cb);
-    }
-    process.exit(0);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "1.0.0-staging.0",
+  "version": "1.0.0-staging.2",
   "type": "module",
   "exports": {
     ".": "./dest/index.js"
@@ -27,35 +27,35 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "1.0.0-staging.0",
-    "@aztec/archiver": "1.0.0-staging.0",
-    "@aztec/aztec-faucet": "1.0.0-staging.0",
-    "@aztec/aztec-node": "1.0.0-staging.0",
-    "@aztec/aztec.js": "1.0.0-staging.0",
-    "@aztec/bb-prover": "1.0.0-staging.0",
-    "@aztec/bb.js": "1.0.0-staging.0",
-    "@aztec/blob-sink": "1.0.0-staging.0",
-    "@aztec/bot": "1.0.0-staging.0",
-    "@aztec/builder": "1.0.0-staging.0",
-    "@aztec/cli": "1.0.0-staging.0",
-    "@aztec/cli-wallet": "1.0.0-staging.0",
-    "@aztec/constants": "1.0.0-staging.0",
-    "@aztec/entrypoints": "1.0.0-staging.0",
-    "@aztec/ethereum": "1.0.0-staging.0",
-    "@aztec/foundation": "1.0.0-staging.0",
-    "@aztec/kv-store": "1.0.0-staging.0",
-    "@aztec/noir-contracts.js": "1.0.0-staging.0",
-    "@aztec/noir-protocol-circuits-types": "1.0.0-staging.0",
-    "@aztec/p2p": "1.0.0-staging.0",
-    "@aztec/p2p-bootstrap": "1.0.0-staging.0",
-    "@aztec/protocol-contracts": "1.0.0-staging.0",
-    "@aztec/prover-client": "1.0.0-staging.0",
-    "@aztec/prover-node": "1.0.0-staging.0",
-    "@aztec/pxe": "1.0.0-staging.0",
-    "@aztec/stdlib": "1.0.0-staging.0",
-    "@aztec/telemetry-client": "1.0.0-staging.0",
-    "@aztec/txe": "1.0.0-staging.0",
-    "@aztec/world-state": "1.0.0-staging.0",
+    "@aztec/accounts": "1.0.0-staging.2",
+    "@aztec/archiver": "1.0.0-staging.2",
+    "@aztec/aztec-faucet": "1.0.0-staging.2",
+    "@aztec/aztec-node": "1.0.0-staging.2",
+    "@aztec/aztec.js": "1.0.0-staging.2",
+    "@aztec/bb-prover": "1.0.0-staging.2",
+    "@aztec/bb.js": "1.0.0-staging.2",
+    "@aztec/blob-sink": "1.0.0-staging.2",
+    "@aztec/bot": "1.0.0-staging.2",
+    "@aztec/builder": "1.0.0-staging.2",
+    "@aztec/cli": "1.0.0-staging.2",
+    "@aztec/cli-wallet": "1.0.0-staging.2",
+    "@aztec/constants": "1.0.0-staging.2",
+    "@aztec/entrypoints": "1.0.0-staging.2",
+    "@aztec/ethereum": "1.0.0-staging.2",
+    "@aztec/foundation": "1.0.0-staging.2",
+    "@aztec/kv-store": "1.0.0-staging.2",
+    "@aztec/noir-contracts.js": "1.0.0-staging.2",
+    "@aztec/noir-protocol-circuits-types": "1.0.0-staging.2",
+    "@aztec/p2p": "1.0.0-staging.2",
+    "@aztec/p2p-bootstrap": "1.0.0-staging.2",
+    "@aztec/protocol-contracts": "1.0.0-staging.2",
+    "@aztec/prover-client": "1.0.0-staging.2",
+    "@aztec/prover-node": "1.0.0-staging.2",
+    "@aztec/pxe": "1.0.0-staging.2",
+    "@aztec/stdlib": "1.0.0-staging.2",
+    "@aztec/telemetry-client": "1.0.0-staging.2",
+    "@aztec/txe": "1.0.0-staging.2",
+    "@aztec/world-state": "1.0.0-staging.2",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",

package/src/cli/chain_l2_config.ts

@@ -4,6 +4,8 @@ import type { SharedNodeConfig } from '@aztec/node-lib/config';
 
 import path from 'path';
 
+import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with { type: 'json' };
+
 export type NetworkNames = 'testnet-ignition' | 'alpha-testnet';
 
 export type L2ChainConfig = {
@@ -26,6 +28,9 @@ export type L2ChainConfig = {
   autoUpdate: SharedNodeConfig['autoUpdate'];
   autoUpdateUrl?: string;
   maxTxPoolSize: number;
+  publicIncludeMetrics?: string[];
+  publicMetricsCollectorUrl?: string;
+  publicMetricsCollectFrom?: string[];
 };
 
 export const testnetIgnitionL2ChainConfig: L2ChainConfig = {
@@ -69,7 +74,10 @@ export const alphaTestnetL2ChainConfig: L2ChainConfig = {
   snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/',
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/alpha-testnet.json',
-  maxTxPoolSize: 2 * 1024 * 1024 * 1024, // 2GB
+  maxTxPoolSize: 100_000_000, // 100MB
+  publicIncludeMetrics,
+  publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec.network',
+  publicMetricsCollectFrom: ['sequencer'],
 };
 
 export async function getBootnodes(networkName: NetworkNames) {
@@ -145,6 +153,18 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames
     enrichVar('AUTO_UPDATE_URL', config.autoUpdateUrl);
   }
 
+  if (config.publicIncludeMetrics) {
+    enrichVar('PUBLIC_OTEL_INCLUDE_METRICS', config.publicIncludeMetrics.join(','));
+  }
+
+  if (config.publicMetricsCollectorUrl) {
+    enrichVar('PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT', config.publicMetricsCollectorUrl);
+  }
+
+  if (config.publicMetricsCollectFrom) {
+    enrichVar('PUBLIC_OTEL_COLLECT_FROM', config.publicMetricsCollectFrom.join(','));
+  }
+
   enrichEthAddressVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
   enrichEthAddressVar('SLASH_FACTORY_CONTRACT_ADDRESS', config.slashFactoryAddress);
   enrichEthAddressVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', config.feeAssetHandlerAddress);

package/src/cli/util.ts

@@ -14,13 +14,54 @@ import type { Command } from 'commander';
 
 import { type AztecStartOption, aztecStartOptions } from './aztec_start_options.js';
 
+export const enum ExitCode {
+  SUCCESS = 0,
+  ERROR = 1,
+  ROLLUP_UPGRADE = 78, // EX_CONFIG from FreeBSD (https://man.freebsd.org/cgi/man.cgi?query=sysexits)
+  VERSION_UPGRADE = 79, // prev + 1 because there's nothing better
+  // 128 + int(SIGNAL)
+  SIGHUP = 129,
+  SIGINT = 130,
+  SIGQUIT = 131,
+  SIGTERM = 143,
+}
+
+let shutdownPromise: Promise<never> | undefined;
+export function shutdown(logFn: LogFn, exitCode: ExitCode, cb?: Array<() => Promise<void>>): Promise<never> {
+  if (shutdownPromise) {
+    logFn('Already shutting down.');
+    return shutdownPromise;
+  }
+
+  logFn('Shutting down...', { exitCode });
+  if (cb) {
+    shutdownPromise = Promise.allSettled(cb).then(() => process.exit(exitCode));
+  } else {
+    // synchronously shuts down the process
+    // no need to set shutdownPromise on this branch of the if statement because no more code will be executed
+    process.exit(exitCode);
+  }
+
+  return shutdownPromise;
+}
+
+export function isShuttingDown(): boolean {
+  return shutdownPromise !== undefined;
+}
+
 export const installSignalHandlers = (logFn: LogFn, cb?: Array<() => Promise<void>>) => {
-  process.removeAllListeners('SIGINT');
-  process.removeAllListeners('SIGTERM');
-  // eslint-disable-next-line @typescript-eslint/no-misused-promises
-  process.once('SIGINT', () => shutdown(logFn, cb));
-  // eslint-disable-next-line @typescript-eslint/no-misused-promises
-  process.once('SIGTERM', () => shutdown(logFn, cb));
+  const signals = [
+    ['SIGINT', ExitCode.SIGINT],
+    ['SIGTERM', ExitCode.SIGTERM],
+    ['SIGHUP', ExitCode.SIGHUP],
+    ['SIQUIT', ExitCode.SIGQUIT],
+  ] as const;
+
+  for (const [signal, exitCode] of signals) {
+    process.removeAllListeners(signal);
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    process.once(signal, () => shutdown(logFn, exitCode, cb));
+  }
 };
 
 /**
@@ -262,6 +303,10 @@ export async function setupUpdateMonitor(
 
   // eslint-disable-next-line @typescript-eslint/no-misused-promises
   checker.on('newRollupVersion', async ({ latestVersion, currentVersion }) => {
+    if (isShuttingDown()) {
+      return;
+    }
+
     // if node follows canonical rollup then this is equivalent to a config update
     if (!followsCanonicalRollup) {
       return;
@@ -269,7 +314,7 @@ export async function setupUpdateMonitor(
 
     if (autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') {
       logger.info(`New rollup version detected. Please restart the node`, { latestVersion, currentVersion });
-      await shutdown(logger.info, signalHandlers);
+      await shutdown(logger.info, ExitCode.ROLLUP_UPGRADE, signalHandlers);
     } else if (autoUpdateMode === 'notify') {
       logger.warn(`New rollup detected. Please restart the node`, { latestVersion, currentVersion });
     }
@@ -277,9 +322,12 @@ export async function setupUpdateMonitor(
 
   // eslint-disable-next-line @typescript-eslint/no-misused-promises
   checker.on('newNodeVersion', async ({ latestVersion, currentVersion }) => {
+    if (isShuttingDown()) {
+      return;
+    }
     if (autoUpdateMode === 'config-and-version') {
       logger.info(`New node version detected. Please update and restart the node`, { latestVersion, currentVersion });
-      await shutdown(logger.info, signalHandlers);
+      await shutdown(logger.info, ExitCode.VERSION_UPGRADE, signalHandlers);
     } else if (autoUpdateMode === 'notify') {
       logger.info(`New node version detected. Please update and restart the node`, { latestVersion, currentVersion });
     }
@@ -287,6 +335,10 @@ export async function setupUpdateMonitor(
 
   // eslint-disable-next-line @typescript-eslint/no-misused-promises
   checker.on('updateNodeConfig', async config => {
+    if (isShuttingDown()) {
+      return;
+    }
+
     if ((autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') && updateNodeConfig) {
       logger.warn(`Config change detected. Updating node`, config);
       try {
@@ -306,6 +358,10 @@ export async function setupUpdateMonitor(
         if (Array.isArray(publicIncludeMetrics) && publicIncludeMetrics.every(m => typeof m === 'string')) {
           getTelemetryClient().setExportedPublicTelemetry(publicIncludeMetrics);
         }
+        const publicMetricsCollectFrom: unknown = (config as any).publicMetricsCollectFrom;
+        if (Array.isArray(publicMetricsCollectFrom) && publicMetricsCollectFrom.every(m => typeof m === 'string')) {
+          getTelemetryClient().setPublicTelemetryCollectFrom(publicMetricsCollectFrom);
+        }
       } catch (err) {
         logger.warn('Failed to update config', { err });
       }
@@ -315,11 +371,3 @@ export async function setupUpdateMonitor(
 
   checker.start();
 }
-
-export async function shutdown(logFn: LogFn, cb?: Array<() => Promise<void>>) {
-  logFn('Shutting down...');
-  if (cb) {
-    await Promise.all(cb);
-  }
-  process.exit(0);
-}