Fixes

Signed-off-by: Fabio Di Fabio <[email protected]>

metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystem.java

@@ -42,9 +42,6 @@ public class NoOpMetricsSystem implements ObservableMetricsSystem {
   /** The constant NO_OP_COUNTER. */
   public static final Counter NO_OP_COUNTER = new NoOpCounter();
 
-  /** The constant NO_OP_GAUGE. */
-  public static final LabelledSuppliedMetric NO_OP_GAUGE = new NoOpValueCollector();
-
   private static final OperationTimer.TimingContext NO_OP_TIMING_CONTEXT = () -> 0;
 
   /** The constant NO_OP_OPERATION_TIMER. */

metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetrySystem.java

@@ -250,7 +250,8 @@ public LabelledSuppliedSummary createLabelledSuppliedSummary(
       final String name,
       final String help,
       final String... labelNames) {
-    return null;
+    // not yet supported
+    return (LabelledSuppliedSummary) NoOpMetricsSystem.getLabelledSuppliedMetric(labelNames.length);
   }
 
   @Override

metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/AbstractPrometheusSummary.java

@@ -34,34 +34,18 @@
  */
 abstract class AbstractPrometheusSummary extends CategorizedPrometheusCollector {
   /** The Prometheus collector */
-  protected final Collector collector;
+  protected Collector collector;
 
   /**
    * Constructs a new AbstractPrometheusSummary.
    *
    * @param category The {@link MetricCategory} this collector is assigned to
    * @param name The name of this collector
-   * @param help The help description for this collector
-   * @param labelNames The label names for this collector
    */
-  protected AbstractPrometheusSummary(
-      final MetricCategory category,
-      final String name,
-      final String help,
-      final String... labelNames) {
+  protected AbstractPrometheusSummary(final MetricCategory category, final String name) {
     super(category, name);
-    this.collector = createCollector(help, labelNames);
   }
 
-  /**
-   * Creates the actual Prometheus collector.
-   *
-   * @param help The help description for this collector
-   * @param labelNames The label names for this collector
-   * @return The created Prometheus collector
-   */
-  protected abstract Collector createCollector(final String help, final String... labelNames);
-
   /**
    * Gets the identifier for this collector.
    *

metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusSuppliedSummary.java

@@ -24,7 +24,6 @@
 import java.util.function.Supplier;
 
 import io.prometheus.metrics.core.metrics.SummaryWithCallback;
-import io.prometheus.metrics.model.registry.Collector;
 import io.prometheus.metrics.model.snapshots.Quantile;
 import io.prometheus.metrics.model.snapshots.Quantiles;
 
@@ -43,17 +42,14 @@ public PrometheusSuppliedSummary(
       final String name,
       final String help,
       final String... labelNames) {
-    super(category, name, help, labelNames);
-  }
-
-  @Override
-  protected Collector createCollector(final String help, final String... labelNames) {
-    return SummaryWithCallback.builder()
-        .name(name)
-        .help(help)
-        .labelNames(labelNames)
-        .callback(this::callback)
-        .build();
+    super(category, name);
+    this.collector =
+        SummaryWithCallback.builder()
+            .name(name)
+            .help(help)
+            .labelNames(labelNames)
+            .callback(this::callback)
+            .build();
   }
 
   private void callback(final SummaryWithCallback.Callback callback) {

metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusTimer.java

@@ -22,32 +22,25 @@
 
 import io.prometheus.metrics.core.datapoints.DistributionDataPoint;
 import io.prometheus.metrics.core.metrics.Summary;
-import io.prometheus.metrics.model.registry.Collector;
 
 /**
  * An implementation of Besu timer backed by a Prometheus summary. The summary provides a total
  * count of durations and a sum of all observed durations, it calculates configurable quantiles over
  * a sliding time window.
  */
 class PrometheusTimer extends AbstractPrometheusSummary implements LabelledMetric<OperationTimer> {
-  private final Map<Double, Double> quantiles;
 
   public PrometheusTimer(
       final MetricCategory category,
       final String name,
       final String help,
       final Map<Double, Double> quantiles,
       final String... labelNames) {
-    super(category, name, help, labelNames);
-    this.quantiles = quantiles;
-  }
-
-  @Override
-  protected Collector createCollector(final String help, final String... labelNames) {
+    super(category, name);
     final var summaryBuilder =
         Summary.builder().name(this.prefixedName).help(help).labelNames(labelNames);
     quantiles.forEach(summaryBuilder::quantile);
-    return summaryBuilder.build();
+    this.collector = summaryBuilder.build();
   }
 
   @Override

metrics/core/src/test/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryMetricsSystemTest.java

@@ -266,15 +266,15 @@ public void shouldOnlyObserveEnabledMetrics() throws InterruptedException {
       final LabelledMetric<Counter> counterN =
           localMetricSystem.createLabelledCounter(
               NETWORK, "ABC", "Not that kind of network", "show");
-      assertThat(counterN).isSameAs(NoOpMetricsSystem.NO_OP_LABELLED_1_COUNTER);
+      assertThat(counterN).isInstanceOf(NoOpMetricsSystem.LabelCountingNoOpMetric.class);
 
       counterN.labels("show").inc();
       assertThat(localMetricSystem.streamObservations()).isEmpty();
 
       // do a category we are watching
       final LabelledMetric<Counter> counterR =
           localMetricSystem.createLabelledCounter(RPC, "name", "Not useful", "method");
-      assertThat(counterR).isNotSameAs(NoOpMetricsSystem.NO_OP_LABELLED_1_COUNTER);
+      assertThat(counterR).isNotInstanceOf(NoOpMetricsSystem.LabelCountingNoOpMetric.class);
 
       counterR.labels("op").inc();
       assertThat(getObservation(localMetricSystem))

metrics/core/src/test/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystemTest.java

@@ -244,15 +244,15 @@ public void shouldOnlyObserveEnabledMetrics() {
     // do a category we are not watching
     final LabelledMetric<Counter> counterN =
         localMetricSystem.createLabelledCounter(NETWORK, "ABC", "Not that kind of network", "show");
-    assertThat(counterN).isSameAs(NoOpMetricsSystem.NO_OP_LABELLED_1_COUNTER);
+    assertThat(counterN).isInstanceOf(NoOpMetricsSystem.LabelCountingNoOpMetric.class);
 
     counterN.labels("show").inc();
     assertThat(localMetricSystem.streamObservations()).isEmpty();
 
     // do a category we are watching
     final LabelledMetric<Counter> counterR =
         localMetricSystem.createLabelledCounter(RPC, "name", "Not useful", "method");
-    assertThat(counterR).isNotSameAs(NoOpMetricsSystem.NO_OP_LABELLED_1_COUNTER);
+    assertThat(counterR).isNotInstanceOf(NoOpMetricsSystem.LabelCountingNoOpMetric.class);
 
     counterR.labels("op").inc();
     assertThat(localMetricSystem.streamObservations())

plugin-api/build.gradle

@@ -71,7 +71,7 @@ Calculated : ${currentHash}
 tasks.register('checkAPIChanges', FileStateChecker) {
   description = "Checks that the API for the Plugin-API project does not change without deliberate thought"
   files = sourceSets.main.allJava.files
-  knownHash = '5YqXajl5nrSGiQcU9PXzAvmSE8q65pMtIg4ejSZ3meI='
+  knownHash = 'sLvLKRbqxri7hovTEcpiyF9eV4WnF8YZ1eGo5GF7mYw='
 }
 check.dependsOn('checkAPIChanges')
 

plugin-api/src/main/java/org/hyperledger/besu/plugin/services/MetricsSystem.java

@@ -256,7 +256,6 @@ default void createSummary(
       final Supplier<ExternalSummary> summarySupplier) {
     createLabelledSuppliedSummary(category, name, help).labels(summarySupplier);
   }
-  ;
 
   /**
    * Collect metrics from Guava cache.