fix tests

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

Author: zeitlinger

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterTest.java

@@ -23,6 +23,8 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 class CounterTest {
 
@@ -104,22 +106,21 @@ public void testLabels() {
     assertThat(getValue(labels, "l", "b")).isCloseTo(3.0, offset(.001));
   }
 
-  @Test
-  public void testTotalStrippedFromName() {
-    for (String name :
-        new String[] {
-          "my_counter_total", "my.counter.total",
-          "my_counter_seconds_total", "my.counter.seconds.total",
-          "my_counter", "my.counter",
-          "my_counter_seconds", "my.counter.seconds"
-        }) {
-      Counter counter = Counter.builder().name(name).unit(Unit.SECONDS).build();
-      Metrics.MetricFamily protobufData =
-          new PrometheusProtobufWriterImpl().convert(counter.collect());
-      assertThat(ProtobufUtil.shortDebugString(protobufData))
-          .isEqualTo(
-              "name: \"my_counter_seconds_total\" type: COUNTER metric { counter { value: 0.0 } }");
-    }
+  @ParameterizedTest
+  @ValueSource(
+      strings = {
+        "my_counter_total",
+        "my_counter_seconds_total",
+        "my_counter",
+        "my_counter_seconds",
+      })
+  public void testTotalStrippedFromName(String name) {
+    Counter counter = Counter.builder().name(name).unit(Unit.SECONDS).build();
+    Metrics.MetricFamily protobufData =
+        new PrometheusProtobufWriterImpl().convert(counter.collect());
+    assertThat(ProtobufUtil.shortDebugString(protobufData))
+        .isEqualTo(
+            "name: \"my_counter_seconds_total\" type: COUNTER metric { counter { value: 0.0 } }");
   }
 
   @Test

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java

@@ -1254,12 +1254,6 @@ public void testIllegalLabelNamePrefix() {
         .isThrownBy(() -> Histogram.builder().name("test").labelNames("__hello"));
   }
 
-  @Test
-  public void testIllegalName() {
-    assertThatExceptionOfType(IllegalArgumentException.class)
-        .isThrownBy(() -> Histogram.builder().name("my_namespace/server.durations"));
-  }
-
   @Test
   public void testNoName() {
     assertThatExceptionOfType(IllegalArgumentException.class)

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/InfoTest.java

@@ -15,27 +15,21 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 class InfoTest {
 
-  @Test
-  public void testInfoStrippedFromName() {
-    for (String name :
-        new String[] {
-          "jvm.runtime", "jvm_runtime",
-          "jvm.runtime.info", "jvm_runtime_info"
-        }) {
-      for (String labelName : new String[] {"my.key", "my_key"}) {
-        Info info = Info.builder().name(name).labelNames(labelName).build();
-        info.addLabelValues("value");
-        Metrics.MetricFamily protobufData =
-            new PrometheusProtobufWriterImpl().convert(info.collect());
-        assertThat(ProtobufUtil.shortDebugString(protobufData))
-            .isEqualTo(
-                "name: \"jvm_runtime_info\" type: GAUGE metric { label { name: \"my_key\" value:"
-                    + " \"value\" } gauge { value: 1.0 } }");
-      }
-    }
+  @ParameterizedTest
+  @ValueSource(strings = {"jvm.runtime", "jvm.runtime.info"})
+  public void testInfoStrippedFromName(String name) {
+    Info info = Info.builder().name(name).labelNames("my.key").build();
+    info.addLabelValues("value");
+    Metrics.MetricFamily protobufData = new PrometheusProtobufWriterImpl().convert(info.collect());
+    assertThat(ProtobufUtil.shortDebugString(protobufData))
+        .isEqualTo(
+            "name: \"jvm.runtime_info\" type: GAUGE metric { label { name: \"my.key\" value:"
+                + " \"value\" } gauge { value: 1.0 } }");
   }
 
   @Test
@@ -127,7 +121,8 @@ public void testConstLabelsDuplicate2() {
   private void assertTextFormat(String expected, Info info) throws IOException {
     OpenMetricsTextFormatWriter writer = new OpenMetricsTextFormatWriter(true, true);
     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-    writer.write(outputStream, MetricSnapshots.of(info.collect()), EscapingScheme.NO_ESCAPING);
+    writer.write(
+        outputStream, MetricSnapshots.of(info.collect()), EscapingScheme.UNDERSCORE_ESCAPING);
     String result = outputStream.toString(StandardCharsets.UTF_8.name());
     if (!result.contains(expected)) {
       throw new AssertionError(expected + " is not contained in the following output:\n" + result);

prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufWriterImpl.java

@@ -63,7 +63,7 @@ public void write(
     }
   }
 
-  Metrics.MetricFamily convert(MetricSnapshot snapshot) {
+  public Metrics.MetricFamily convert(MetricSnapshot snapshot) {
     Metrics.MetricFamily.Builder builder = Metrics.MetricFamily.newBuilder();
     if (snapshot instanceof CounterSnapshot) {
       for (CounterDataPointSnapshot data : ((CounterSnapshot) snapshot).getDataPoints()) {

prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/ProtobufExpositionFormatsTest.java

@@ -5,14 +5,18 @@
 import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_31_1.Metrics;
 import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
 import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
+import io.prometheus.metrics.model.snapshots.EscapingScheme;
 import io.prometheus.metrics.model.snapshots.MetricSnapshot;
+import io.prometheus.metrics.model.snapshots.PrometheusNaming;
 
 class ProtobufExpositionFormatsTest extends ExpositionFormatsTest {
 
   @Override
   protected void assertPrometheusProtobuf(String expected, MetricSnapshot snapshot) {
     PrometheusProtobufWriterImpl writer = new PrometheusProtobufWriterImpl();
-    Metrics.MetricFamily protobufData = writer.convert(snapshot);
+    Metrics.MetricFamily protobufData =
+        writer.convert(
+            PrometheusNaming.escapeMetricSnapshot(snapshot, EscapingScheme.UNDERSCORE_ESCAPING));
     String actual = ProtobufUtil.shortDebugString(protobufData);
     assertThat(actual).isEqualTo(expected);
   }