-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: block watcher metrics and last processed block #147
Open
mfw78
wants to merge
1
commit into
main
Choose a base branch
from
improve-block-watcher
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -325,8 +325,11 @@ export class ChainContext { | |
log.debug(`Watchdog timeout: ${watchdogTimeout} seconds`); | ||
let lastBlockReceived = lastProcessedBlock; | ||
provider.on("block", async (blockNumber: number) => { | ||
// Intentionally don't guard the getBlock call with a try/catch block | ||
// because we want to crash the process if this fails. This will result | ||
// in the kubernetes pod restarting and trying to recover. | ||
const block = await provider.getBlock(blockNumber); | ||
try { | ||
const block = await provider.getBlock(blockNumber); | ||
log.debug(`New block ${blockNumber}`); | ||
|
||
// Set the block time metric | ||
|
@@ -352,23 +355,15 @@ export class ChainContext { | |
this | ||
); | ||
|
||
try { | ||
await processBlock(this, block, events); | ||
|
||
// Block height metric | ||
this.registry.lastProcessedBlock = blockToRegistryBlock(block); | ||
this.registry.write(); | ||
metrics.blockHeight.labels(chainId.toString()).set(blockNumber); | ||
} catch { | ||
log.error(`Error processing block ${blockNumber}`); | ||
} | ||
|
||
await processBlock(this, block, events); | ||
log.debug(`Block ${blockNumber} has been processed`); | ||
} catch (error) { | ||
log.error( | ||
`Error in pollContractForEvents for block ${blockNumber}`, | ||
error | ||
); | ||
log.error(`Error processing block ${blockNumber}`, error); | ||
} finally { | ||
// Block height metric | ||
this.registry.lastProcessedBlock = blockToRegistryBlock(block); | ||
await this.registry.write(); | ||
metrics.blockHeight.labels(chainId.toString()).set(blockNumber); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. but if the block was not process, why should we write it is. |
||
} | ||
}); | ||
|
||
|
@@ -445,6 +440,7 @@ export class ChainContext { | |
* @param events an array of conditional order created events | ||
* @param blockNumberOverride to override the block number when polling the SDK | ||
* @param blockTimestampOverride to override the block timestamp when polling the SDK | ||
* @throws if there are any *unexpected errors* in processing the block | ||
*/ | ||
async function processBlock( | ||
context: ChainContext, | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i would rephrase and not reference kubernetes here, as this is code that can be run in various ways