cleanup

Signed-off-by: Gregor Zeitlinger <[email protected]>

Author: zeitlinger

prometheus-metrics-instrumentation-dropwizard/src/test/java/io/prometheus/metrics/instrumentation/dropwizard/DropwizardExportsTest.java

@@ -17,7 +17,7 @@
 
 class DropwizardExportsTest {
 
-  private PrometheusRegistry registry = new PrometheusRegistry();
+  private final PrometheusRegistry registry = new PrometheusRegistry();
   private MetricRegistry metricRegistry;
 
   @BeforeEach
@@ -39,20 +39,20 @@ public void testBuilderThrowsErrorOnNullRegistry() {
   @Test
   public void testBuilderCreatesOkay() {
     assertThatCode(
-            () -> {
-              DropwizardExports.builder().dropwizardRegistry(metricRegistry).register(registry);
-            })
+            () -> DropwizardExports.builder().dropwizardRegistry(metricRegistry).register(registry))
         .doesNotThrowAnyException();
   }
 
   @Test
   public void testCounter() {
     metricRegistry.counter("foo.bar").inc(1);
     String expected =
-        "# TYPE foo_bar counter\n"
-            + "# HELP foo_bar Generated from Dropwizard metric import (metric=foo.bar, type=com.codahale.metrics.Counter)\n"
-            + "foo_bar_total 1.0\n"
-            + "# EOF\n";
+        """
+        # TYPE foo_bar counter
+        # HELP foo_bar Generated from Dropwizard metric import (metric=foo.bar, type=com.codahale.metrics.Counter)
+        foo_bar_total 1.0
+        # EOF
+        """;
 
     assertThat(convertToOpenMetricsFormat()).isEqualTo(expected);
   }
@@ -103,22 +103,24 @@ public Boolean getValue() {
     metricRegistry.register("boolean.gauge", booleanGauge);
 
     String expected =
-        "# TYPE boolean_gauge gauge\n"
-            + "# HELP boolean_gauge Generated from Dropwizard metric import (metric=boolean.gauge, type=io.prometheus.metrics.instrumentation.dropwizard.DropwizardExportsTest$5)\n"
-            + "boolean_gauge 1.0\n"
-            + "# TYPE double_gauge gauge\n"
-            + "# HELP double_gauge Generated from Dropwizard metric import (metric=double.gauge, type=io.prometheus.metrics.instrumentation.dropwizard.DropwizardExportsTest$2)\n"
-            + "double_gauge 1.234\n"
-            + "# TYPE float_gauge gauge\n"
-            + "# HELP float_gauge Generated from Dropwizard metric import (metric=float.gauge, type=io.prometheus.metrics.instrumentation.dropwizard.DropwizardExportsTest$4)\n"
-            + "float_gauge 0.1234000027179718\n"
-            + "# TYPE integer_gauge gauge\n"
-            + "# HELP integer_gauge Generated from Dropwizard metric import (metric=integer.gauge, type=io.prometheus.metrics.instrumentation.dropwizard.DropwizardExportsTest$1)\n"
-            + "integer_gauge 1234.0\n"
-            + "# TYPE long_gauge gauge\n"
-            + "# HELP long_gauge Generated from Dropwizard metric import (metric=long.gauge, type=io.prometheus.metrics.instrumentation.dropwizard.DropwizardExportsTest$3)\n"
-            + "long_gauge 1234.0\n"
-            + "# EOF\n";
+        """
+        # TYPE boolean_gauge gauge
+        # HELP boolean_gauge Generated from Dropwizard metric import (metric=boolean.gauge, type=io.prometheus.metrics.instrumentation.dropwizard.DropwizardExportsTest$5)
+        boolean_gauge 1.0
+        # TYPE double_gauge gauge
+        # HELP double_gauge Generated from Dropwizard metric import (metric=double.gauge, type=io.prometheus.metrics.instrumentation.dropwizard.DropwizardExportsTest$2)
+        double_gauge 1.234
+        # TYPE float_gauge gauge
+        # HELP float_gauge Generated from Dropwizard metric import (metric=float.gauge, type=io.prometheus.metrics.instrumentation.dropwizard.DropwizardExportsTest$4)
+        float_gauge 0.1234000027179718
+        # TYPE integer_gauge gauge
+        # HELP integer_gauge Generated from Dropwizard metric import (metric=integer.gauge, type=io.prometheus.metrics.instrumentation.dropwizard.DropwizardExportsTest$1)
+        integer_gauge 1234.0
+        # TYPE long_gauge gauge
+        # HELP long_gauge Generated from Dropwizard metric import (metric=long.gauge, type=io.prometheus.metrics.instrumentation.dropwizard.DropwizardExportsTest$3)
+        long_gauge 1234.0
+        # EOF
+        """;
 
     assertThat(convertToOpenMetricsFormat()).isEqualTo(expected);
   }
@@ -157,30 +159,34 @@ public void testHistogram() {
 
     // The result should look like this
     String expected1 =
-        "# TYPE hist summary\n"
-            + "# HELP hist Generated from Dropwizard metric import (metric=hist, type=com.codahale.metrics.Histogram)\n"
-            + "hist{quantile=\"0.5\"} 49.0\n"
-            + "hist{quantile=\"0.75\"} 74.0\n"
-            + "hist{quantile=\"0.95\"} 94.0\n"
-            + "hist{quantile=\"0.98\"} 97.0\n"
-            + "hist{quantile=\"0.99\"} 98.0\n"
-            + "hist{quantile=\"0.999\"} 99.0\n"
-            + "hist_count 100\n"
-            + "# EOF\n";
+        """
+        # TYPE hist summary
+        # HELP hist Generated from Dropwizard metric import (metric=hist, type=com.codahale.metrics.Histogram)
+        hist{quantile="0.5"} 49.0
+        hist{quantile="0.75"} 74.0
+        hist{quantile="0.95"} 94.0
+        hist{quantile="0.98"} 97.0
+        hist{quantile="0.99"} 98.0
+        hist{quantile="0.999"} 99.0
+        hist_count 100
+        # EOF
+        """;
 
     // However, Dropwizard uses a random reservoir sampling algorithm, so the values could as well
     // be off-by-one
     String expected2 =
-        "# TYPE hist summary\n"
-            + "# HELP hist Generated from Dropwizard metric import (metric=hist, type=com.codahale.metrics.Histogram)\n"
-            + "hist{quantile=\"0.5\"} 50.0\n"
-            + "hist{quantile=\"0.75\"} 75.0\n"
-            + "hist{quantile=\"0.95\"} 95.0\n"
-            + "hist{quantile=\"0.98\"} 98.0\n"
-            + "hist{quantile=\"0.99\"} 99.0\n"
-            + "hist{quantile=\"0.999\"} 99.0\n"
-            + "hist_count 100\n"
-            + "# EOF\n";
+        """
+        # TYPE hist summary
+        # HELP hist Generated from Dropwizard metric import (metric=hist, type=com.codahale.metrics.Histogram)
+        hist{quantile="0.5"} 50.0
+        hist{quantile="0.75"} 75.0
+        hist{quantile="0.95"} 95.0
+        hist{quantile="0.98"} 98.0
+        hist{quantile="0.99"} 99.0
+        hist{quantile="0.999"} 99.0
+        hist_count 100
+        # EOF
+        """;
 
     // The following asserts the values matches either of the expected value.
     String textFormat = convertToOpenMetricsFormat(pmRegistry);
@@ -197,10 +203,12 @@ public void testMeter() {
     meter.mark();
 
     String expected =
-        "# TYPE meter counter\n"
-            + "# HELP meter Generated from Dropwizard metric import (metric=meter_total, type=com.codahale.metrics.Meter)\n"
-            + "meter_total 2.0\n"
-            + "# EOF\n";
+        """
+        # TYPE meter counter
+        # HELP meter Generated from Dropwizard metric import (metric=meter_total, type=com.codahale.metrics.Meter)
+        meter_total 2.0
+        # EOF
+        """;
     assertThat(convertToOpenMetricsFormat()).isEqualTo(expected);
   }
 
@@ -213,61 +221,60 @@ public void testTimer() throws InterruptedException {
     Thread.sleep(100L);
     long timeSpentNanos = time.stop();
     double timeSpentMillis = TimeUnit.NANOSECONDS.toMillis(timeSpentNanos);
-    System.out.println(timeSpentMillis);
 
-    SummarySnapshot.SummaryDataPointSnapshot dataPointSnapshot =
-        (SummarySnapshot.SummaryDataPointSnapshot)
-            exports.collect().stream().flatMap(i -> i.getDataPoints().stream()).findFirst().get();
-    // We slept for 1Ms so we ensure that all timers are above 1ms:
-    assertThat(dataPointSnapshot.getQuantiles().size()).isGreaterThan(1);
-    dataPointSnapshot
-        .getQuantiles()
-        .forEach(
-            i -> {
-              System.out.println(i.getQuantile() + " : " + i.getValue());
-              assertThat(i.getValue()).isGreaterThan(timeSpentMillis / 1000d);
+    assertThat(exports.collect().stream().flatMap(i1 -> i1.getDataPoints().stream()).findFirst())
+        .containsInstanceOf(SummarySnapshot.SummaryDataPointSnapshot.class)
+        .hasValueSatisfying(
+            snapshot -> {
+              var dataPointSnapshot = (SummarySnapshot.SummaryDataPointSnapshot) snapshot;
+              // We slept for 1Ms so we ensure that all timers are above 1ms:
+              assertThat(dataPointSnapshot.getQuantiles().size()).isGreaterThan(1);
+              dataPointSnapshot
+                  .getQuantiles()
+                  .forEach(i -> assertThat(i.getValue()).isGreaterThan(timeSpentMillis / 1000d));
+              assertThat(dataPointSnapshot.getCount()).isOne();
             });
-    assertThat(dataPointSnapshot.getCount()).isOne();
   }
 
   @Test
   public void testThatMetricHelpUsesOriginalDropwizardName() {
-
     metricRegistry.timer("my.application.namedTimer1");
     metricRegistry.counter("my.application.namedCounter1");
     metricRegistry.meter("my.application.namedMeter1");
     metricRegistry.histogram("my.application.namedHistogram1");
     metricRegistry.register("my.application.namedGauge1", new ExampleDoubleGauge());
 
     String expected =
-        "# TYPE my_application_namedCounter1 counter\n"
-            + "# HELP my_application_namedCounter1 Generated from Dropwizard metric import (metric=my.application.namedCounter1, type=com.codahale.metrics.Counter)\n"
-            + "my_application_namedCounter1_total 0.0\n"
-            + "# TYPE my_application_namedGauge1 gauge\n"
-            + "# HELP my_application_namedGauge1 Generated from Dropwizard metric import (metric=my.application.namedGauge1, type=io.prometheus.metrics.instrumentation.dropwizard.DropwizardExportsTest$ExampleDoubleGauge)\n"
-            + "my_application_namedGauge1 0.0\n"
-            + "# TYPE my_application_namedHistogram1 summary\n"
-            + "# HELP my_application_namedHistogram1 Generated from Dropwizard metric import (metric=my.application.namedHistogram1, type=com.codahale.metrics.Histogram)\n"
-            + "my_application_namedHistogram1{quantile=\"0.5\"} 0.0\n"
-            + "my_application_namedHistogram1{quantile=\"0.75\"} 0.0\n"
-            + "my_application_namedHistogram1{quantile=\"0.95\"} 0.0\n"
-            + "my_application_namedHistogram1{quantile=\"0.98\"} 0.0\n"
-            + "my_application_namedHistogram1{quantile=\"0.99\"} 0.0\n"
-            + "my_application_namedHistogram1{quantile=\"0.999\"} 0.0\n"
-            + "my_application_namedHistogram1_count 0\n"
-            + "# TYPE my_application_namedMeter1 counter\n"
-            + "# HELP my_application_namedMeter1 Generated from Dropwizard metric import (metric=my.application.namedMeter1_total, type=com.codahale.metrics.Meter)\n"
-            + "my_application_namedMeter1_total 0.0\n"
-            + "# TYPE my_application_namedTimer1 summary\n"
-            + "# HELP my_application_namedTimer1 Generated from Dropwizard metric import (metric=my.application.namedTimer1, type=com.codahale.metrics.Timer)\n"
-            + "my_application_namedTimer1{quantile=\"0.5\"} 0.0\n"
-            + "my_application_namedTimer1{quantile=\"0.75\"} 0.0\n"
-            + "my_application_namedTimer1{quantile=\"0.95\"} 0.0\n"
-            + "my_application_namedTimer1{quantile=\"0.98\"} 0.0\n"
-            + "my_application_namedTimer1{quantile=\"0.99\"} 0.0\n"
-            + "my_application_namedTimer1{quantile=\"0.999\"} 0.0\n"
-            + "my_application_namedTimer1_count 0\n"
-            + "# EOF\n";
+        """
+        # TYPE my_application_namedCounter1 counter
+        # HELP my_application_namedCounter1 Generated from Dropwizard metric import (metric=my.application.namedCounter1, type=com.codahale.metrics.Counter)
+        my_application_namedCounter1_total 0.0
+        # TYPE my_application_namedGauge1 gauge
+        # HELP my_application_namedGauge1 Generated from Dropwizard metric import (metric=my.application.namedGauge1, type=io.prometheus.metrics.instrumentation.dropwizard.DropwizardExportsTest$ExampleDoubleGauge)
+        my_application_namedGauge1 0.0
+        # TYPE my_application_namedHistogram1 summary
+        # HELP my_application_namedHistogram1 Generated from Dropwizard metric import (metric=my.application.namedHistogram1, type=com.codahale.metrics.Histogram)
+        my_application_namedHistogram1{quantile="0.5"} 0.0
+        my_application_namedHistogram1{quantile="0.75"} 0.0
+        my_application_namedHistogram1{quantile="0.95"} 0.0
+        my_application_namedHistogram1{quantile="0.98"} 0.0
+        my_application_namedHistogram1{quantile="0.99"} 0.0
+        my_application_namedHistogram1{quantile="0.999"} 0.0
+        my_application_namedHistogram1_count 0
+        # TYPE my_application_namedMeter1 counter
+        # HELP my_application_namedMeter1 Generated from Dropwizard metric import (metric=my.application.namedMeter1_total, type=com.codahale.metrics.Meter)
+        my_application_namedMeter1_total 0.0
+        # TYPE my_application_namedTimer1 summary
+        # HELP my_application_namedTimer1 Generated from Dropwizard metric import (metric=my.application.namedTimer1, type=com.codahale.metrics.Timer)
+        my_application_namedTimer1{quantile="0.5"} 0.0
+        my_application_namedTimer1{quantile="0.75"} 0.0
+        my_application_namedTimer1{quantile="0.95"} 0.0
+        my_application_namedTimer1{quantile="0.98"} 0.0
+        my_application_namedTimer1{quantile="0.99"} 0.0
+        my_application_namedTimer1{quantile="0.999"} 0.0
+        my_application_namedTimer1_count 0
+        # EOF
+        """;
     assertThat(convertToOpenMetricsFormat()).isEqualTo(expected);
   }
 
@@ -283,7 +290,7 @@ private String convertToOpenMetricsFormat(PrometheusRegistry _registry) {
     OpenMetricsTextFormatWriter writer = new OpenMetricsTextFormatWriter(true, true);
     try {
       writer.write(out, _registry.scrape());
-      return out.toString(StandardCharsets.UTF_8.name());
+      return out.toString(StandardCharsets.UTF_8);
     } catch (IOException e) {
       throw new RuntimeException(e);
     }