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.

Sign up for GitHub

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

Add metrics to DefaultBlockchain to get TPS and Mgas/s #7105

Merged
merged 7 commits into from
May 31, 2024
Merged

Add metrics to DefaultBlockchain to get TPS and Mgas/s #7105

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1f9cacf
Add gasUsedCounter and numberOfTransactionsCounter counters to Defaul…
ahamlat May 15, 2024
68191aa
Make the attributes final
ahamlat May 15, 2024
4cb113a
Spotless
ahamlat May 15, 2024
0466544
Merge branch 'main' into blockchain-metrics-counters
ahamlat May 29, 2024
ceacc97
Add a changelog entry
ahamlat May 29, 2024
f88daef
Merge branch 'main' into blockchain-metrics-counters
macfarla May 30, 2024
fb50ac0
Merge branch 'main' into blockchain-metrics-counters
macfarla May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.hyperledger.besu.metrics.BesuMetricCategory;
import org.hyperledger.besu.metrics.prometheus.PrometheusMetricsSystem;
import org.hyperledger.besu.plugin.services.MetricsSystem;
import org.hyperledger.besu.plugin.services.metrics.Counter;
import org.hyperledger.besu.util.InvalidConfigurationException;
import org.hyperledger.besu.util.Subscribers;

Expand Down Expand Up @@ -83,6 +84,9 @@ public class DefaultBlockchain implements MutableBlockchain {
private final Optional<Cache<Hash, List<TransactionReceipt>>> transactionReceiptsCache;
private final Optional<Cache<Hash, Difficulty>> totalDifficultyCache;

private final Counter gasUsedCounter;
private final Counter numberOfTransactionsCounter;

private DefaultBlockchain(
final Optional<Block> genesisBlock,
final BlockchainStorage blockchainStorage,
Expand Down Expand Up @@ -117,6 +121,7 @@ private DefaultBlockchain(
"blockchain_height",
"The current height of the canonical chain",
this::getChainHeadBlockNumber);

metricsSystem.createGauge(
BesuMetricCategory.BLOCKCHAIN,
"difficulty_total",
Expand All @@ -135,6 +140,10 @@ private DefaultBlockchain(
"Gas used by the current chain head block",
() -> getChainHeadHeader().getGasUsed());

gasUsedCounter =
metricsSystem.createCounter(
BesuMetricCategory.BLOCKCHAIN, "chain_head_gas_used_counter", "Counter for Gas used");

metricsSystem.createLongGauge(
BesuMetricCategory.BLOCKCHAIN,
"chain_head_gas_limit",
Expand All @@ -147,6 +156,12 @@ private DefaultBlockchain(
"Number of transactions in the current chain head block",
() -> chainHeadTransactionCount);

numberOfTransactionsCounter =
metricsSystem.createCounter(
BesuMetricCategory.BLOCKCHAIN,
"chain_head_transaction_count_counter",
"Counter for the number of transactions");

metricsSystem.createIntegerGauge(
BesuMetricCategory.BLOCKCHAIN,
"chain_head_ommer_count",
Expand Down Expand Up @@ -524,6 +539,10 @@ private BlockAddedEvent handleNewHead(
updater.setChainHead(newBlockHash);
indexTransactionForBlock(
updater, newBlockHash, blockWithReceipts.getBlock().getBody().getTransactions());
gasUsedCounter.inc(blockWithReceipts.getHeader().getGasUsed());
numberOfTransactionsCounter.inc(
blockWithReceipts.getBlock().getBody().getTransactions().size());

return BlockAddedEvent.createForHeadAdvancement(
blockWithReceipts.getBlock(),
LogWithMetadata.generate(
Expand Down
Loading