Commit 050859fd authored by smartcontracts's avatar smartcontracts Committed by GitHub

fix(cmn): BSV2 exposes default options in metadata (#2752)

Fix for BSV2 to expose default options in the metadata metric.
Co-authored-by: default avatarmergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
parent a271b605
---
'@eth-optimism/common-ts': patch
---
Include default options in metadata metric
...@@ -155,11 +155,7 @@ export abstract class BaseServiceV2< ...@@ -155,11 +155,7 @@ export abstract class BaseServiceV2<
this.loop = params.loop !== undefined ? params.loop : true this.loop = params.loop !== undefined ? params.loop : true
this.state = {} as TServiceState this.state = {} as TServiceState
// Add default options to options spec. const stdOptionsSpec: OptionsSpec<StandardOptions> = {
;(params.optionsSpec as any) = {
...(params.optionsSpec || {}),
// Users cannot set these options.
loopIntervalMs: { loopIntervalMs: {
validator: validators.num, validator: validators.num,
desc: 'Loop interval in milliseconds', desc: 'Loop interval in milliseconds',
...@@ -177,6 +173,12 @@ export abstract class BaseServiceV2< ...@@ -177,6 +173,12 @@ export abstract class BaseServiceV2<
}, },
} }
// Add default options to options spec.
;(params.optionsSpec as any) = {
...(params.optionsSpec || {}),
...stdOptionsSpec,
}
// List of options that can safely be logged. // List of options that can safely be logged.
const publicOptionNames = Object.entries(params.optionsSpec) const publicOptionNames = Object.entries(params.optionsSpec)
.filter(([, spec]) => { .filter(([, spec]) => {
...@@ -348,7 +350,11 @@ export abstract class BaseServiceV2< ...@@ -348,7 +350,11 @@ export abstract class BaseServiceV2<
name: params.name, name: params.name,
version: params.version, version: params.version,
...publicOptionNames.reduce((acc, key) => { ...publicOptionNames.reduce((acc, key) => {
acc[key] = config.str(key) if (key in stdOptionsSpec) {
acc[key] = this.options[key].toString()
} else {
acc[key] = config.str(key)
}
return acc return acc
}, {}), }, {}),
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment