Mining Parameters Metrics (hyperledger#6587)

* mining parameter metrics Signed-off-by: Brindrajsinh-Chauhan <brindrajsinh@gmail.com> * update changelog Signed-off-by: Brindrajsinh-Chauhan <brindrajsinh@gmail.com> * remove unwanted code Signed-off-by: Brindrajsinh-Chauhan <brindrajsinh@gmail.com> --------- Signed-off-by: Brindrajsinh-Chauhan <brindrajsinh@gmail.com> Signed-off-by: amsmota <antonio.mota@citi.com>
Citi · Apr 16, 2024 · bc7d525 · bc7d525
1 parent 5adad6a
commit bc7d525
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,7 @@
 - New `eth_blobBaseFee`JSON-RPC method [#6581](https://github.com/hyperledger/besu/pull/6581)
 - Upgrade reference tests to version 13.1 [#6574](https://github.com/hyperledger/besu/pull/6574)
 - Extend `BesuConfiguration` service [#6584](https://github.com/hyperledger/besu/pull/6584)
+- Add `ethereum_min_gas_price` and `ethereum_min_priority_fee` metrics to track runtime values of `min-gas-price` and `min-priority-fee` [#6587](https://github.com/hyperledger/besu/pull/6587)
 
 ### Bug fixes
 - Fix the way an advertised host configured with `--p2p-host` is treated when communicating with the originator of a PING packet [#6225](https://github.com/hyperledger/besu/pull/6225)

diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -118,6 +118,7 @@
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.MiningParametersMetrics;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
@@ -2128,6 +2129,7 @@ private MiningParameters getMiningParameters() {
       miningOptions.setGenesisBlockPeriodSeconds(
           getGenesisBlockPeriodSeconds(getActualGenesisConfigOptions()));
       miningParameters = miningOptions.toDomainObject();
+      initMiningParametersMetrics(miningParameters);
     }
     return miningParameters;
   }
@@ -2139,6 +2141,10 @@ private DataStorageConfiguration getDataStorageConfiguration() {
     return dataStorageConfiguration;
   }
 
+  private void initMiningParametersMetrics(final MiningParameters miningParameters) {
+    new MiningParametersMetrics(getMetricsSystem(), miningParameters);
+  }
+
   private OptionalInt getGenesisBlockPeriodSeconds(
       final GenesisConfigOptions genesisConfigOptions) {
     if (genesisConfigOptions.isClique()) {

diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningParametersMetrics.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningParametersMetrics.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core;
+
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+public class MiningParametersMetrics {
+  public static final String MIN_GAS_PRICE_GAUGE = "min_gas_price";
+  public static final String MIN_PRIORITY_FEE_GAUGE = "min_priority_fee";
+
+  public MiningParametersMetrics(
+      final MetricsSystem metricsSystem, final MiningParameters miningParameters) {
+
+    metricsSystem.createGauge(
+        BesuMetricCategory.ETHEREUM,
+        MIN_GAS_PRICE_GAUGE,
+        "Gauge to measure the runtime value of min-gas-price",
+        () -> miningParameters.getMinTransactionGasPrice().toBigInteger().doubleValue());
+
+    metricsSystem.createGauge(
+        BesuMetricCategory.ETHEREUM,
+        MIN_PRIORITY_FEE_GAUGE,
+        "Gauge to measure the runtime value of min-priority-fee",
+        () -> miningParameters.getMinPriorityFeePerGas().toBigInteger().doubleValue());
+  }
+}