Skip to content
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

feat: add metrics in GlobalBlobAwareConflationCalculator and move bri… #654

Open
wants to merge 12 commits into
base: main
Choose a base branch
from

Conversation

jonesho
Copy link
Contributor

@jonesho jonesho commented Feb 5, 2025

…dge logs and state root hash retrieval from execution prover client to coordinator

This PR implements issue(s) #604

Checklist

  • I wrote new tests for my new core changes.
  • I have successfully ran tests, style checker and build against my new changes locally.
  • I have informed the team of any breaking changes if there are any.

@jonesho jonesho self-assigned this Feb 5, 2025
@jonesho jonesho marked this pull request as draft February 5, 2025 08:10
@jonesho jonesho temporarily deployed to docker-build-and-e2e February 5, 2025 08:11 — with GitHub Actions Inactive
@jonesho jonesho had a problem deploying to docker-build-and-e2e February 5, 2025 08:17 — with GitHub Actions Error
@codecov-commenter
Copy link

codecov-commenter commented Feb 5, 2025

Codecov Report

Attention: Patch coverage is 83.33333% with 26 lines in your changes missing coverage. Please review.

Project coverage is 68.67%. Comparing base (1edc38b) to head (984ce59).

Files with missing lines Patch % Lines
...in/kotlin/net/consensys/zkevm/domain/Conflation.kt 25.00% 7 Missing and 2 partials ⚠️
.../conflation/GlobalBlobAwareConflationCalculator.kt 90.12% 4 Missing and 4 partials ⚠️
.../consensys/zkevm/coordinator/app/L1DependentApp.kt 0.00% 5 Missing ⚠️
...on/proofcreation/ZkProofCreationCoordinatorImpl.kt 93.75% 2 Missing ⚠️
...clients/prover/FileBasedExecutionProverClientV2.kt 93.75% 1 Missing ⚠️
.../coordinator/clients/prover/ProverClientFactory.kt 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main     #654      +/-   ##
============================================
+ Coverage     68.38%   68.67%   +0.29%     
- Complexity     1185     1201      +16     
============================================
  Files           323      323              
  Lines         13131    13227      +96     
  Branches       1319     1330      +11     
============================================
+ Hits           8979     9084     +105     
+ Misses         3600     3589      -11     
- Partials        552      554       +2     
Flag Coverage Δ *Carryforward flag
hardhat 98.52% <ø> (ø) Carriedforward from e71c0c8
kotlin 66.37% <83.33%> (+0.33%) ⬆️

*This pull request uses carry forward flags. Click here to find out more.

Files with missing lines Coverage Δ
...tor/clients/BatchExecutionProverRequestResponse.kt 81.81% <100.00%> (+37.37%) ⬆️
...on/conflation/BlockToBatchSubmissionCoordinator.kt 92.10% <100.00%> (+0.43%) ⬆️
...conflation/ConflationCalculatorByDataCompressed.kt 96.00% <100.00%> (ø)
...clients/prover/FileBasedExecutionProverClientV2.kt 48.97% <93.75%> (-10.04%) ⬇️
.../coordinator/clients/prover/ProverClientFactory.kt 62.50% <0.00%> (+2.15%) ⬆️
...on/proofcreation/ZkProofCreationCoordinatorImpl.kt 94.28% <93.75%> (+94.28%) ⬆️
.../consensys/zkevm/coordinator/app/L1DependentApp.kt 1.46% <0.00%> (-0.01%) ⬇️
.../conflation/GlobalBlobAwareConflationCalculator.kt 93.52% <90.12%> (-1.56%) ⬇️
...in/kotlin/net/consensys/zkevm/domain/Conflation.kt 59.37% <25.00%> (-0.28%) ⬇️

... and 5 files with indirect coverage changes

@jonesho jonesho temporarily deployed to docker-build-and-e2e February 5, 2025 08:47 — with GitHub Actions Inactive
@jonesho jonesho temporarily deployed to docker-build-and-e2e February 5, 2025 09:30 — with GitHub Actions Inactive
@jonesho jonesho marked this pull request as ready for review February 5, 2025 19:11
@jonesho jonesho force-pushed the 604-export-extra-metrics-for-conflation-blob-and-aggregation branch from 1412aaf to 40c25db Compare February 6, 2025 05:44
@jonesho jonesho temporarily deployed to docker-build-and-e2e February 6, 2025 05:45 — with GitHub Actions Inactive
@jonesho jonesho requested a review from a team February 6, 2025 18:32
@jonesho jonesho force-pushed the 604-export-extra-metrics-for-conflation-blob-and-aggregation branch from 40c25db to 644ca9c Compare February 11, 2025 08:59
@jonesho jonesho temporarily deployed to docker-build-and-e2e February 11, 2025 08:59 — with GitHub Actions Inactive
@jonesho jonesho requested a review from jpnovais February 11, 2025 14:21
@jonesho jonesho force-pushed the 604-export-extra-metrics-for-conflation-blob-and-aggregation branch from 644ca9c to c25c3f4 Compare February 11, 2025 17:32
@jonesho jonesho temporarily deployed to docker-build-and-e2e February 11, 2025 17:33 — with GitHub Actions Inactive
@jonesho jonesho temporarily deployed to docker-build-and-e2e February 11, 2025 18:15 — with GitHub Actions Inactive
@jonesho jonesho temporarily deployed to docker-build-and-e2e February 11, 2025 19:24 — with GitHub Actions Inactive
@jonesho jonesho temporarily deployed to docker-build-and-e2e February 12, 2025 03:47 — with GitHub Actions Inactive
@jonesho jonesho requested review from jpnovais and removed request for jpnovais February 12, 2025 08:24
@jonesho jonesho temporarily deployed to docker-build-and-e2e February 12, 2025 08:25 — with GitHub Actions Inactive
@@ -86,7 +87,8 @@ class GlobalBlobAwareConflationCalculatorTest {
calculator = GlobalBlobAwareConflationCalculator(
conflationCalculator = globalCalculator,
blobCalculator = calculatorByDataCompressed,
batchesLimit = defaultBatchesLimit
batchesLimit = defaultBatchesLimit,
metricsFacade = mock<MetricsFacade>(defaultAnswer = Mockito.RETURNS_DEEP_STUBS)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same goes here.

Also, we should add tests to check that the metrics are correct.

Copy link
Contributor Author

@jonesho jonesho Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree to add tests for the metrics and would use mocks here for metricsFacade and histogram instances to check the metric values passed to the histogram record function

@jonesho jonesho force-pushed the 604-export-extra-metrics-for-conflation-blob-and-aggregation branch from 787148c to e67bbf9 Compare February 13, 2025 14:24
@jonesho jonesho temporarily deployed to docker-build-and-e2e February 13, 2025 14:25 — with GitHub Actions Inactive
@jonesho jonesho temporarily deployed to docker-build-and-e2e February 14, 2025 18:24 — with GitHub Actions Inactive
@jonesho jonesho temporarily deployed to docker-build-and-e2e February 15, 2025 19:37 — with GitHub Actions Inactive
@jonesho jonesho requested a review from jpnovais February 17, 2025 18:01
@jonesho jonesho temporarily deployed to docker-build-and-e2e February 18, 2025 06:01 — with GitHub Actions Inactive
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants