Push Metrics don't work (#1164)

When we added the no-op metrics optimization this broke push-metrics.
PegaSysEng · Mar 26, 2019 · faebbc8 · faebbc8
1 parent 142d7b3
commit faebbc8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/metrics/src/main/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusMetricsSystem.java b/metrics/src/main/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusMetricsSystem.java
@@ -61,7 +61,7 @@ public class PrometheusMetricsSystem implements MetricsSystem {
   PrometheusMetricsSystem() {}
 
   public static MetricsSystem init(final MetricsConfiguration metricsConfiguration) {
-    if (!metricsConfiguration.isEnabled()) {
+    if (!metricsConfiguration.isEnabled() && !metricsConfiguration.isPushEnabled()) {
       return new NoOpMetricsSystem();
     }
     final PrometheusMetricsSystem metricsSystem = new PrometheusMetricsSystem();

diff --git a/...s/src/test/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusMetricsSystemTest.java b/...s/src/test/java/tech/pegasys/pantheon/metrics/prometheus/PrometheusMetricsSystemTest.java
@@ -195,4 +195,34 @@ public void shouldOnlyObserveEnabledMetrics() {
     assertThat(localMetricSystem.getMetrics())
         .containsExactly(new Observation(RPC, "name", 1.0, singletonList("op")));
   }
+
+  @Test
+  public void returnsNoOpMetricsWhenAllDisabled() {
+    final MetricsConfiguration metricsConfiguration = MetricsConfiguration.createDefault();
+    metricsConfiguration.setEnabled(false);
+    metricsConfiguration.setPushEnabled(false);
+    final MetricsSystem localMetricSystem = PrometheusMetricsSystem.init(metricsConfiguration);
+
+    assertThat(localMetricSystem).isInstanceOf(NoOpMetricsSystem.class);
+  }
+
+  @Test
+  public void returnsPrometheusMetricsWhenEnabled() {
+    final MetricsConfiguration metricsConfiguration = MetricsConfiguration.createDefault();
+    metricsConfiguration.setEnabled(true);
+    metricsConfiguration.setPushEnabled(false);
+    final MetricsSystem localMetricSystem = PrometheusMetricsSystem.init(metricsConfiguration);
+
+    assertThat(localMetricSystem).isInstanceOf(PrometheusMetricsSystem.class);
+  }
+
+  @Test
+  public void returnsNoOpMetricsWhenPushEnabled() {
+    final MetricsConfiguration metricsConfiguration = MetricsConfiguration.createDefault();
+    metricsConfiguration.setEnabled(false);
+    metricsConfiguration.setPushEnabled(true);
+    final MetricsSystem localMetricSystem = PrometheusMetricsSystem.init(metricsConfiguration);
+
+    assertThat(localMetricSystem).isInstanceOf(PrometheusMetricsSystem.class);
+  }
 }
diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/cli/BlocksSubCommand.java b/pantheon/src/main/java/tech/pegasys/pantheon/cli/BlocksSubCommand.java
@@ -105,7 +105,7 @@ public void run() {
       try {
         final MetricsConfiguration metricsConfiguration =
             parentCommand.parentCommand.metricsConfiguration();
-        if (metricsConfiguration.isEnabled()) {
+        if (metricsConfiguration.isEnabled() || metricsConfiguration.isPushEnabled()) {
           metricsService =
               Optional.of(
                   MetricsService.create(