feat: add monitor metrics #262

colinlyguo · 2023-01-20T11:12:43Z

Purpose or design rationale of this PR
Add monitor metrics. Currently added metrics:
(a) BridgeL1MsgSyncHeightGauge.
(b) BridgeL2MsgSyncHeightGauge.
Does this PR involve a new deployment, and involve a new git tag & docker image tag? If so, has tag in common/version.go been updated?
Y.
Is this PR a breaking change? If so, have it been attached a breaking-change label?
N.

ChuhanJin · 2023-01-20T11:17:03Z

ChuhanJin · 2023-01-20T11:21:14Z

ChuhanJin · 2023-01-20T11:28:03Z

ChuhanJin · 2023-01-20T12:23:13Z

Thegaram · 2023-01-27T12:08:09Z

Fyi we have an old (abandoned) PR that's similar: https://github.com/scroll-tech/scroll-node/pull/181. Might be interesting for reference.

Thegaram

Looks good 👍

common/metrics/metrics.go

bridge/l2/watcher.go

bridge/l1/watcher.go

ChuhanJin · 2023-01-28T05:06:59Z

mask-pp · 2023-01-28T07:32:59Z

Suggest add metrics test case in tests/integration-test, i.g: runBridgeApp(t, "--metrics", "--metrics.addr", "localhost", "--metrics.port", "6060"). And then create a new http client to call metrics api and verify the result.

common/utils/flags.go

ChuhanJin · 2023-01-28T09:52:26Z

ChuhanJin · 2023-01-28T17:30:20Z

ChuhanJin · 2023-01-28T17:37:14Z

ChuhanJin · 2023-01-29T08:09:07Z

ChuhanJin · 2023-01-29T13:13:10Z

ChuhanJin · 2023-01-30T04:04:44Z

This reverts commit 346c713.

This reverts commit c8c063b.

…d trace api in bridge.l2backend. (#228)" This reverts commit b5549f6.

ChuhanJin · 2023-01-31T09:58:34Z

ChuhanJin · 2023-02-01T05:46:41Z

# This is the 1st commit message: feat: add monitor metrics (#262) Co-authored-by: colinlyguo <[email protected]> Co-authored-by: maskpp <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> Co-authored-by: Péter Garamvölgyi <[email protected]> # This is the commit message #2: refactor(bridge): remove layer1 client in in layer1 relayer constructor (#274) Co-authored-by: vincent <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> # This is the commit message #3: fix: add gas multiplier (#275) # This is the commit message #4: feat(libzkp): use dylib instead of staticlib (#266) Co-authored-by: maskpp <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> Co-authored-by: colin <[email protected]> Co-authored-by: colinlyguo <[email protected]> # This is the commit message #5: Revert "fix: add gas multiplier (#275)" (#279) # This is the commit message #6: build: add nightly-2022-12-10 rust-related builder image (#282) # This is the commit message #7: fix(bridge): compatible with DynamicFeeTxType not supported chain (#280) Co-authored-by: colinlyguo <[email protected]> # This is the commit message #8: feat(contract): enable whitelist relayer (#272) Co-authored-by: Péter Garamvölgyi <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> # This is the commit message #9: perf(bridge): execute relayer loops independently (#258) Co-authored-by: colin <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> # This is the commit message #10: feat(bridge): confirm block based on "safe" and "finalized" tags (#265) # This is the commit message #11: feat: allow to override L2 deployment when address is provided (#293) # This is the commit message #12: feat(contracts): Add fee vault (#223) # This is the commit message #13: feat(confirmations): Upgrade confirm (#291) # This is the commit message #14: feat(coordinator): Enable set ws compression level. (#292) # This is the commit message #15: feat(roller&coordinator): upgrade lizkp to zkevm-0215 version (#281) Co-authored-by: HAOYUatHZ <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> Co-authored-by: xinran chen <[email protected]> Co-authored-by: Ubuntu <[email protected]> # This is the commit message #16: build: update version to `alpha-v1.0` (#301) # This is the commit message #17: feat: import genesis batch during startup (#299) Co-authored-by: HAOYUatHZ <[email protected]> # This is the commit message #18: feat(contracts): new bridge contracts (#288) Co-authored-by: Haichen Shen <[email protected]> Co-authored-by: Thegaram <[email protected]> Co-authored-by: colin <[email protected]> # This is the commit message #19: chore: upgrade l2geth dependency for trace type (#304)

Co-authored-by: colinlyguo <[email protected]> Co-authored-by: maskpp <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> Co-authored-by: Péter Garamvölgyi <[email protected]> refactor(bridge): remove layer1 client in in layer1 relayer constructor (#274) Co-authored-by: vincent <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> fix: add gas multiplier (#275) feat(libzkp): use dylib instead of staticlib (#266) Co-authored-by: maskpp <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> Co-authored-by: colin <[email protected]> Co-authored-by: colinlyguo <[email protected]> Revert "fix: add gas multiplier (#275)" (#279) build: add nightly-2022-12-10 rust-related builder image (#282) fix(bridge): compatible with DynamicFeeTxType not supported chain (#280) Co-authored-by: colinlyguo <[email protected]> feat(contract): enable whitelist relayer (#272) Co-authored-by: Péter Garamvölgyi <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> perf(bridge): execute relayer loops independently (#258) Co-authored-by: colin <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> feat(bridge): confirm block based on "safe" and "finalized" tags (#265) feat: allow to override L2 deployment when address is provided (#293) feat(contracts): Add fee vault (#223) feat(confirmations): Upgrade confirm (#291) feat(coordinator): Enable set ws compression level. (#292) feat(roller&coordinator): upgrade lizkp to zkevm-0215 version (#281) Co-authored-by: HAOYUatHZ <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> Co-authored-by: xinran chen <[email protected]> Co-authored-by: Ubuntu <[email protected]> build: update version to `alpha-v1.0` (#301) feat: import genesis batch during startup (#299) Co-authored-by: HAOYUatHZ <[email protected]> feat(contracts): new bridge contracts (#288) Co-authored-by: Haichen Shen <[email protected]> Co-authored-by: Thegaram <[email protected]> Co-authored-by: colin <[email protected]> chore: upgrade l2geth dependency for trace type (#304) feat(bridge): update the watcher and relayer based on the new contract (#305) Co-authored-by: colinlyguo <[email protected]> Co-authored-by: zimpha <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> fix incorrect block order during batch recovery (#311) fix(bridge): fix batch proposer (#312) Co-authored-by: HAOYUatHZ <[email protected]> Co-authored-by: Péter Garamvölgyi <[email protected]> fix: Flush buffered writer (#314) fix(config): fix typos (#315) feat(bridge): only update gas price oracle for exceeding diff threshold (#319) fix(bridge): fix typos (#321) feat(batch proposer): add time limit to commit batches (#323) fix(db): fix `SetMaxOpenConns` (#328) Fix(zkevm): fix zkevm bug for goerli. (#334) fix(build): jenkinsfile tag job optimized and fix (#331) Co-authored-by: vincent <[email protected]> Co-authored-by: HAOYUatHZ <[email protected]> fix: reduce finalize batch tx frequency (#332) alpha inegration with multibin fix makefile fix lint fix lint try fix commit op fix lint goimports trigger ci bugfix(libzkp): fix difficulty (#343) fix(contract): forbid to call message queue and l2 messenger from l1 (#341) Co-authored-by: HAOYUatHZ <[email protected]> fix(roller): fix stack bug (#320) Co-authored-by: HAOYUatHZ <[email protected]>

colinlyguo added 2 commits January 20, 2023 19:02

feat(bridge): add monitor metrics

9150346

bump version

5137dde

colinlyguo requested review from Thegaram, mask-pp and 0xmountaintop January 20, 2023 11:12

fix CI

f5b4f9c

Merge branch 'staging' into feat/add-bridge-monitor-metrics

ba6fa40

colinlyguo marked this pull request as draft January 20, 2023 11:26

bump version

c4d4937

Thegaram reviewed Jan 27, 2023

View reviewed changes

common/metrics/metrics.go Outdated Show resolved Hide resolved

common/metrics/metrics.go Outdated Show resolved Hide resolved

bridge/l2/watcher.go Outdated Show resolved Hide resolved

bridge/l1/watcher.go Outdated Show resolved Hide resolved

fix comments

dd128e4

colinlyguo marked this pull request as ready for review January 28, 2023 04:57

trigger ci

a202775

colinlyguo requested a review from Thegaram January 28, 2023 05:49

0xmountaintop previously approved these changes Jan 28, 2023

View reviewed changes

mask-pp reviewed Jan 28, 2023

View reviewed changes

common/utils/flags.go Show resolved Hide resolved

fix comments

c0d7cb6

colinlyguo dismissed 0xmountaintop’s stale review via c0d7cb6 January 28, 2023 09:48

0xmountaintop previously approved these changes Jan 28, 2023

View reviewed changes

colinlyguo dismissed 0xmountaintop’s stale review via 67f1f17 January 28, 2023 17:26

colinlyguo dismissed mask-pp’s stale review via dae2780 January 29, 2023 07:55

fix CI

0fba32e

mask-pp previously approved these changes Jan 29, 2023

View reviewed changes

colinlyguo requested a review from 0xmountaintop January 29, 2023 11:13

0xmountaintop previously approved these changes Jan 29, 2023

View reviewed changes

mask-pp and others added 2 commits January 29, 2023 20:46

fix(docker redis): Fix redis docker randomly panic. (#267)

c8c063b

Merge branch 'staging' into feat/add-bridge-monitor-metrics

2fe7948

0xmountaintop and others added 3 commits January 30, 2023 10:48

feat(redis): support ClusterClient (#268)

346c713

Merge branch 'staging' into feat/add-bridge-monitor-metrics

b235f8b

add try times

ac2a0f7

colinlyguo dismissed stale reviews from 0xmountaintop and mask-pp via ac2a0f7 January 30, 2023 04:00

Thegaram previously approved these changes Jan 30, 2023

View reviewed changes

mask-pp previously approved these changes Jan 31, 2023

View reviewed changes

0xmountaintop force-pushed the staging branch from 346c713 to 16576b6 Compare January 31, 2023 02:24

Thegaram added 3 commits January 31, 2023 10:49

Revert "feat(redis): support ClusterClient (#268)"

f53b9fd

This reverts commit 346c713.

Revert "fix(docker redis): Fix redis docker randomly panic. (#267)"

63261c7

This reverts commit c8c063b.

Revert "feat(cache and trace api): Add redis cache in database and ad…

6e3b937

…d trace api in bridge.l2backend. (#228)" This reverts commit b5549f6.

Thegaram dismissed stale reviews from mask-pp and themself via 6e3b937 January 31, 2023 09:54

Update version.go

50197bf

scroll-dev merged commit ea9c1c6 into staging Feb 1, 2023

scroll-dev deleted the feat/add-bridge-monitor-metrics branch February 1, 2023 05:46

feat: add monitor metrics #262

feat: add monitor metrics #262

Uh oh!

Conversation

colinlyguo commented Jan 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ChuhanJin commented Jan 20, 2023

Uh oh!

ChuhanJin commented Jan 20, 2023

Uh oh!

ChuhanJin commented Jan 20, 2023

Uh oh!

ChuhanJin commented Jan 20, 2023

Uh oh!

Thegaram commented Jan 27, 2023

Uh oh!

Thegaram left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ChuhanJin commented Jan 28, 2023

Uh oh!

mask-pp commented Jan 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

ChuhanJin commented Jan 28, 2023

Uh oh!

ChuhanJin commented Jan 28, 2023

Uh oh!

ChuhanJin commented Jan 28, 2023

Uh oh!

ChuhanJin commented Jan 29, 2023

Uh oh!

ChuhanJin commented Jan 29, 2023

Uh oh!

ChuhanJin commented Jan 30, 2023

Uh oh!

ChuhanJin commented Jan 31, 2023

Uh oh!

ChuhanJin commented Feb 1, 2023

Uh oh!

Uh oh!

colinlyguo commented Jan 20, 2023 •

edited

Loading

mask-pp commented Jan 28, 2023 •

edited

Loading