move chanid metrics to chainservice #3544
Merged
Conversation
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
Codecov Report
@@ Coverage Diff @@
## master #3544 +/- ##
==========================================
- Coverage 75.43% 74.07% -1.36%
==========================================
Files 247 253 +6
Lines 22845 23324 +479
==========================================
+ Hits 17233 17278 +45
- Misses 4685 5121 +436
+ Partials 927 925 -2
Continue to review full report at Codecov.
|
Liuhaai
reviewed
Jul 14, 2022
| @@ -75,6 +99,13 @@ func (cs *ChainService) HandleAction(ctx context.Context, actPb *iotextypes.Acti | |||
| if err != nil { | |||
| return err | |||
| } | |||
| chainID := strconv.FormatUint(uint64(act.ChainID()), 10) | |||
There was a problem hiding this comment.
final comment: wrapping the code into a subfunc chainIDmetrics(act)
Liuhaai
reviewed
Jul 14, 2022
chainservice/chainservice.go
Outdated
| @@ -83,6 +108,16 @@ func (cs *ChainService) HandleAction(ctx context.Context, actPb *iotextypes.Acti | |||
| return err | |||
| } | |||
|
|
|||
| func (cs *ChainService) chainIDmetrics(act action.SealedEnvelope) { | |||
There was a problem hiding this comment.
func chainIDMetrics(act action.SealedEnvelope) {}
Liuhaai
approved these changes
Jul 14, 2022
dustinxie
reviewed
Jul 18, 2022
| if act.ChainID() > 0 { | ||
| _apiCallWithChainIDMtc.WithLabelValues(chainID).Inc() | ||
| } else { | ||
| recipient, _ := act.Destination() |
There was a problem hiding this comment.
it will be empty for staking action, change string to staking in such case
dustinxie
reviewed
Jul 18, 2022
chainservice/chainservice.go
Outdated
| @@ -75,6 +99,7 @@ func (cs *ChainService) HandleAction(ctx context.Context, actPb *iotextypes.Acti | |||
| if err != nil { | |||
| return err | |||
| } | |||
| chainIDmetrics(act) | |||
There was a problem hiding this comment.
move to L108, so duplicate action won't be counted
dustinxie
reviewed
Jul 19, 2022
| //it will be empty for staking action, change string to staking in such case | ||
| if recipient == "" { | ||
| recipient = "staking" | ||
| } |
There was a problem hiding this comment.
also it might be web3tx, use below to check
act, ok := selp.Action().(action.EthCompatibleAction)
ethTx, err := act.ToEthTx()
when all these did not check out, classify as "staking"
dustinxie
approved these changes
Jul 19, 2022
pocockn
added a commit
to pocockn/iotex-core
that referenced
this pull request
Jul 19, 2022
…task/config-get * 'task/config-get' of github.com:pocockn/iotex-core: modify test move chanid metrics to chainservice (iotexproject#3544) [ioctl] fix log entries created from user input (iotexproject#3546) add log in rolldposctx (iotexproject#3553) fix uncontrolled data used in path expression (iotexproject#3547) [api] impl. TestGrpcServer_GetServerMeta (iotexproject#3559)
pocockn
added a commit
to pocockn/iotex-core
that referenced
this pull request
Jul 20, 2022
…task/set-config * 'task/set-config' of github.com:pocockn/iotex-core: [test] Disable workingset cache in the benchmark test (iotexproject#3558) [pkg] fix deferring unsafe method "Close" on type "*os.File" (iotexproject#3548) [action] Refactor handleTransfer() (iotexproject#3557) Add MinVersion in tls.Config (iotexproject#3562) [ioctl] Modify file permission as 0600 (iotexproject#3563) [httputil] add ReadHeaderTimeout (iotexproject#3550) [staking] unexport namespace (iotexproject#3551) move chanid metrics to chainservice (iotexproject#3544) [ioctl] fix log entries created from user input (iotexproject#3546) add log in rolldposctx (iotexproject#3553) fix uncontrolled data used in path expression (iotexproject#3547) [api] impl. TestGrpcServer_GetServerMeta (iotexproject#3559) [ioctl] Build action command line into new ioctl (iotexproject#3472) fix potential file inclusion via variable (iotexproject#3549)
Liuhaai
pushed a commit
that referenced
this pull request
Jul 29, 2022
Co-authored-by: dustinxie <dahuaxie@gmail.com>
pocockn
added a commit
to pocockn/iotex-core
that referenced
this pull request
Jun 3, 2023
* upstream/master: (45 commits) Task: Get config cmd (iotexproject#3552) [ioctl] fix Errors unhandled (iotexproject#3567) fix dir permission and file inclusion (iotexproject#3566) [test] Disable workingset cache in the benchmark test (iotexproject#3558) [pkg] fix deferring unsafe method "Close" on type "*os.File" (iotexproject#3548) [action] Refactor handleTransfer() (iotexproject#3557) Add MinVersion in tls.Config (iotexproject#3562) [ioctl] Modify file permission as 0600 (iotexproject#3563) [httputil] add ReadHeaderTimeout (iotexproject#3550) [staking] unexport namespace (iotexproject#3551) move chanid metrics to chainservice (iotexproject#3544) [ioctl] fix log entries created from user input (iotexproject#3546) add log in rolldposctx (iotexproject#3553) fix uncontrolled data used in path expression (iotexproject#3547) [api] impl. TestGrpcServer_GetServerMeta (iotexproject#3559) [ioctl] Build action command line into new ioctl (iotexproject#3472) fix potential file inclusion via variable (iotexproject#3549) [ioctl] Incorrect conversion between integer types (iotexproject#3522) [action] fix incorrect conversion between integer types (iotexproject#3545) [test] fix TestLoadBlockchainfromDB (iotexproject#3521) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
delete chainid metrics in gRPC server, added in chainservice
Fixes #3489
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Test Configuration:
Checklist: