Update DropwizardExportsTest.java

Signed-off-by: Kinshuk Bairagi <[email protected]>

Author: kingster

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

@@ -1,5 +1,7 @@
 package io.prometheus.metrics.instrumentation.dropwizard;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.data.Offset.offset;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -13,70 +15,70 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.TimeUnit;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-public class DropwizardExportsTest {
+class DropwizardExportsTest {
 
   private PrometheusRegistry registry = new PrometheusRegistry();
   private MetricRegistry metricRegistry;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     metricRegistry = new MetricRegistry();
-    DropwizardExports.builder().dropwizardRegistry(metricRegistry).register(registry);
+    io.prometheus.metrics.instrumentation.dropwizard.DropwizardExports.builder().dropwizardRegistry(metricRegistry).register(registry);
   }
 
-  @Test
+  @org.junit.jupiter.api.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\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";
 
-    assertEquals(expected, convertToOpenMetricsFormat());
+    assertThat(convertToOpenMetricsFormat()).isEqualTo(expected);
   }
 
-  @Test
+  @org.junit.jupiter.api.Test
   public void testGauge() {
+    // don't convert to lambda, as we need to test the type
     Gauge<Integer> integerGauge =
-        new Gauge<Integer>() {
-          @Override
-          public Integer getValue() {
-            return 1234;
-          }
-        };
+            new Gauge<Integer>() {
+              @Override
+              public Integer getValue() {
+                return 1234;
+              }
+            };
     Gauge<Double> doubleGauge =
-        new Gauge<Double>() {
-          @Override
-          public Double getValue() {
-            return 1.234D;
-          }
-        };
+            new Gauge<Double>() {
+              @Override
+              public Double getValue() {
+                return 1.234D;
+              }
+            };
     Gauge<Long> longGauge =
-        new Gauge<Long>() {
-          @Override
-          public Long getValue() {
-            return 1234L;
-          }
-        };
+            new Gauge<Long>() {
+              @Override
+              public Long getValue() {
+                return 1234L;
+              }
+            };
     Gauge<Float> floatGauge =
-        new Gauge<Float>() {
-          @Override
-          public Float getValue() {
-            return 0.1234F;
-          }
-        };
+            new Gauge<Float>() {
+              @Override
+              public Float getValue() {
+                return 0.1234F;
+              }
+            };
     Gauge<Boolean> booleanGauge =
-        new Gauge<Boolean>() {
-          @Override
-          public Boolean getValue() {
-            return true;
-          }
-        };
+            new Gauge<Boolean>() {
+              @Override
+              public Boolean getValue() {
+                return true;
+              }
+            };
 
     metricRegistry.register("double.gauge", doubleGauge);
     metricRegistry.register("long.gauge", longGauge);
@@ -85,62 +87,50 @@ 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\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";
 
-    assertEquals(expected, convertToOpenMetricsFormat());
+    assertThat(convertToOpenMetricsFormat()).isEqualTo(expected);
   }
 
-  @Test
+  @org.junit.jupiter.api.Test
   public void testInvalidGaugeType() {
-    Gauge<String> invalidGauge =
-        new Gauge<String>() {
-          @Override
-          public String getValue() {
-            return "foobar";
-          }
-        };
+    Gauge<String> invalidGauge = () -> "foobar";
 
     metricRegistry.register("invalid_gauge", invalidGauge);
 
     String expected = "# EOF\n";
-    assertEquals(expected, convertToOpenMetricsFormat());
+    assertThat(convertToOpenMetricsFormat()).isEqualTo(expected);
   }
 
-  @Test
+  @org.junit.jupiter.api.Test
   public void testGaugeReturningNullValue() {
-    Gauge<String> invalidGauge =
-        new Gauge<String>() {
-          @Override
-          public String getValue() {
-            return null;
-          }
-        };
+    Gauge<String> invalidGauge = () -> null;
     metricRegistry.register("invalid_gauge", invalidGauge);
     String expected = "# EOF\n";
-    assertEquals(expected, convertToOpenMetricsFormat());
+    assertThat(convertToOpenMetricsFormat()).isEqualTo(expected);
   }
 
-  @Test
-  public void testHistogram() throws IOException {
+  @org.junit.jupiter.api.Test
+  public void testHistogram() {
     // just test the standard mapper
     final MetricRegistry metricRegistry = new MetricRegistry();
     PrometheusRegistry pmRegistry = new PrometheusRegistry();
-    DropwizardExports.builder().dropwizardRegistry(metricRegistry).register(pmRegistry);
+    io.prometheus.metrics.instrumentation.dropwizard.DropwizardExports.builder().dropwizardRegistry(metricRegistry).register(pmRegistry);
 
     Histogram hist = metricRegistry.histogram("hist");
     int i = 0;
@@ -181,51 +171,51 @@ public void testHistogram() throws IOException {
     // The following asserts the values, but allows an error of 1.0 for quantile values.
 
     MetricSnapshots snapshots = pmRegistry.scrape(name -> name.equals("hist"));
-    Assert.assertEquals(1, snapshots.size());
+    assertThat(snapshots.size()).isOne();
     SummarySnapshot snapshot = (SummarySnapshot) snapshots.get(0);
-    Assert.assertEquals("hist", snapshot.getMetadata().getName());
-    Assert.assertEquals(
-        "Generated from Dropwizard metric import (metric=hist, type=com.codahale.metrics.Histogram)",
-        snapshot.getMetadata().getHelp());
-    Assert.assertEquals(1, snapshot.getDataPoints().size());
+    assertThat(snapshot.getMetadata().getName()).isEqualTo("hist");
+    assertThat(snapshot.getMetadata().getHelp())
+            .isEqualTo(
+                    "Generated from Dropwizard metric import (metric=hist, type=com.codahale.metrics.Histogram)");
+    assertThat(snapshot.getDataPoints().size()).isOne();
     SummarySnapshot.SummaryDataPointSnapshot dataPoint = snapshot.getDataPoints().get(0);
-    Assert.assertTrue(dataPoint.hasCount());
-    Assert.assertEquals(100, dataPoint.getCount());
-    Assert.assertFalse(dataPoint.hasSum());
+    assertThat(dataPoint.hasCount()).isTrue();
+    assertThat(dataPoint.getCount()).isEqualTo(100);
+    assertThat(dataPoint.hasSum()).isFalse();
     Quantiles quantiles = dataPoint.getQuantiles();
-    Assert.assertEquals(6, quantiles.size());
-    Assert.assertEquals(0.5, quantiles.get(0).getQuantile(), 0.0);
-    Assert.assertEquals(49.0, quantiles.get(0).getValue(), 1.0);
-    Assert.assertEquals(0.75, quantiles.get(1).getQuantile(), 0.0);
-    Assert.assertEquals(74.0, quantiles.get(1).getValue(), 1.0);
-    Assert.assertEquals(0.95, quantiles.get(2).getQuantile(), 0.0);
-    Assert.assertEquals(94.0, quantiles.get(2).getValue(), 1.0);
-    Assert.assertEquals(0.98, quantiles.get(3).getQuantile(), 0.0);
-    Assert.assertEquals(97.0, quantiles.get(3).getValue(), 1.0);
-    Assert.assertEquals(0.99, quantiles.get(4).getQuantile(), 0.0);
-    Assert.assertEquals(98.0, quantiles.get(4).getValue(), 1.0);
-    Assert.assertEquals(0.999, quantiles.get(5).getQuantile(), 0.0);
-    Assert.assertEquals(99.0, quantiles.get(5).getValue(), 1.0);
+    assertThat(quantiles.size()).isEqualTo(6);
+    assertThat(quantiles.get(0).getQuantile()).isEqualTo(0.5);
+    assertThat(quantiles.get(0).getValue()).isCloseTo(49.0, offset(1.0));
+    assertThat(quantiles.get(1).getQuantile()).isEqualTo(0.75);
+    assertThat(quantiles.get(1).getValue()).isCloseTo(74.0, offset(1.0));
+    assertThat(quantiles.get(2).getQuantile()).isEqualTo(0.95);
+    assertThat(quantiles.get(2).getValue()).isCloseTo(94.0, offset(1.0));
+    assertThat(quantiles.get(3).getQuantile()).isEqualTo(0.98);
+    assertThat(quantiles.get(3).getValue()).isCloseTo(97.0, offset(1.0));
+    assertThat(quantiles.get(4).getQuantile()).isEqualTo(0.99);
+    assertThat(quantiles.get(4).getValue()).isCloseTo(98.0, offset(1.0));
+    assertThat(quantiles.get(5).getQuantile()).isEqualTo(0.999);
+    assertThat(quantiles.get(5).getValue()).isCloseTo(99.0, offset(1.0));
   }
 
-  @Test
+  @org.junit.jupiter.api.Test
   public void testMeter() {
     Meter meter = metricRegistry.meter("meter");
     meter.mark();
     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";
-    assertEquals(expected, convertToOpenMetricsFormat());
+            "# 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";
+    assertThat(convertToOpenMetricsFormat()).isEqualTo(expected);
   }
 
-  @Test
+  @org.junit.jupiter.api.Test
   public void testTimer() throws InterruptedException {
     final MetricRegistry metricRegistry = new MetricRegistry();
-    DropwizardExports exports = new DropwizardExports(metricRegistry);
+    io.prometheus.metrics.instrumentation.dropwizard.DropwizardExports exports = new DropwizardExports(metricRegistry);
     Timer t = metricRegistry.timer("timer");
     Timer.Context time = t.time();
     Thread.sleep(100L);
@@ -234,18 +224,18 @@ public void testTimer() throws InterruptedException {
     System.out.println(timeSpentMillis);
 
     SummarySnapshot.SummaryDataPointSnapshot dataPointSnapshot =
-        (SummarySnapshot.SummaryDataPointSnapshot)
-            exports.collect().stream().flatMap(i -> i.getDataPoints().stream()).findFirst().get();
+            (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:
-    assertTrue(dataPointSnapshot.getQuantiles().size() > 1);
+    assertThat(dataPointSnapshot.getQuantiles().size()).isGreaterThan(1);
     dataPointSnapshot
-        .getQuantiles()
-        .forEach(
-            i -> {
-              System.out.println(i.getQuantile() + " : " + i.getValue());
-              assertTrue(i.getValue() > timeSpentMillis / 1000d);
-            });
-    assertEquals(1, dataPointSnapshot.getCount());
+            .getQuantiles()
+            .forEach(
+                    i -> {
+                      System.out.println(i.getQuantile() + " : " + i.getValue());
+                      assertThat(i.getValue()).isGreaterThan(timeSpentMillis / 1000d);
+                    });
+    assertThat(dataPointSnapshot.getCount()).isOne();
   }
 
   @Test
@@ -258,35 +248,35 @@ public void testThatMetricHelpUsesOriginalDropwizardName() {
     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";
-    assertEquals(expected, convertToOpenMetricsFormat());
+            "# 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";
+    assertThat(convertToOpenMetricsFormat()).isEqualTo(expected);
   }
 
   private static class ExampleDoubleGauge implements Gauge<Double> {