fix escaping

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

Author: zeitlinger

prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/ExpositionFormatsTest.java

@@ -507,7 +507,10 @@ public void testGaugeUTF8() throws IOException {
                     .labels(Labels.builder().label("name.1", "Björn").label("name*2", "佖佥").build())
                     .build())
             .build();
-    assertPrometheusText(prometheusText, gauge);
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    getPrometheusWriter(PrometheusTextFormatWriter.builder().setIncludeCreatedTimestamps(true))
+        .write(out, MetricSnapshots.of((MetricSnapshot) gauge), EscapingScheme.NO_ESCAPING);
+    assertThat(out).hasToString(prometheusText);
   }
 
   @Test
@@ -2830,7 +2833,7 @@ private void assertOpenMetricsText(String expected, MetricSnapshot snapshot) thr
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     OpenMetricsTextFormatWriter writer =
         OpenMetricsTextFormatWriter.builder().setCreatedTimestampsEnabled(true).build();
-    writer.write(out, MetricSnapshots.of(snapshot), EscapingScheme.NO_ESCAPING);
+    writer.write(out, MetricSnapshots.of(snapshot), EscapingScheme.UNDERSCORE_ESCAPING);
     assertThat(out).hasToString(expected);
   }
 
@@ -2842,22 +2845,22 @@ private void assertOpenMetricsTextWithExemplarsOnAllTimeSeries(
             .setCreatedTimestampsEnabled(true)
             .setExemplarsOnAllMetricTypesEnabled(true)
             .build();
-    writer.write(out, MetricSnapshots.of(snapshot), EscapingScheme.NO_ESCAPING);
+    writer.write(out, MetricSnapshots.of(snapshot), EscapingScheme.UNDERSCORE_ESCAPING);
     assertThat(out).hasToString(expected);
   }
 
   private void assertOpenMetricsTextWithoutCreated(String expected, MetricSnapshot snapshot)
       throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     OpenMetricsTextFormatWriter writer = OpenMetricsTextFormatWriter.create();
-    writer.write(out, MetricSnapshots.of(snapshot), EscapingScheme.NO_ESCAPING);
+    writer.write(out, MetricSnapshots.of(snapshot), EscapingScheme.UNDERSCORE_ESCAPING);
     assertThat(out).hasToString(expected);
   }
 
   private void assertPrometheusText(String expected, MetricSnapshot snapshot) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     getPrometheusWriter(PrometheusTextFormatWriter.builder().setIncludeCreatedTimestamps(true))
-        .write(out, MetricSnapshots.of(snapshot), EscapingScheme.NO_ESCAPING);
+        .write(out, MetricSnapshots.of(snapshot), EscapingScheme.UNDERSCORE_ESCAPING);
     assertThat(out).hasToString(expected);
   }
 
@@ -2871,7 +2874,7 @@ private void assertPrometheusTextWithoutCreated(String expected, MetricSnapshot
       throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     getPrometheusWriter(PrometheusTextFormatWriter.builder())
-        .write(out, MetricSnapshots.of(snapshot), EscapingScheme.NO_ESCAPING);
+        .write(out, MetricSnapshots.of(snapshot), EscapingScheme.UNDERSCORE_ESCAPING);
     assertThat(out).hasToString(expected);
   }
 

prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/PrometheusNaming.java

@@ -46,7 +46,7 @@ public class PrometheusNaming {
 
   /** Legal characters for metric names, including dot. */
   private static final Pattern LEGACY_METRIC_NAME_PATTERN =
-      Pattern.compile("^[a-zA-Z_.:][a-zA-Z0-9_.:]*$");
+      Pattern.compile("^[a-zA-Z_:][a-zA-Z0-9_:]*$");
 
   private static final Pattern METRIC_NAME_PATTERN = Pattern.compile("^[a-zA-Z_:][a-zA-Z0-9_:]*$");