fix escaping

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

Author: zeitlinger

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

@@ -384,11 +384,6 @@ public static MetricSnapshot escapeMetricSnapshot(MetricSnapshot v, EscapingSche
       return v;
     }
 
-    String outName =
-        isValidLegacyMetricName(v.getMetadata().getPrometheusName())
-            ? v.getMetadata().getPrometheusName()
-            : escapeName(v.getMetadata().getPrometheusName(), scheme);
-
     List<DataPointSnapshot> outDataPoints = new ArrayList<>();
 
     for (DataPointSnapshot d : v.getDataPoints()) {
@@ -401,26 +396,19 @@ public static MetricSnapshot escapeMetricSnapshot(MetricSnapshot v, EscapingSche
 
       for (Label l : d.getLabels()) {
         if (METRIC_NAME_LABEL.equals(l.getName())) {
-          if (l.getValue() == null || isValidLegacyMetricName(l.getValue())) {
-            outLabelsBuilder.label(l.getName(), l.getValue());
-            continue;
-          }
           outLabelsBuilder.label(l.getName(), escapeName(l.getValue(), scheme));
-          continue;
-        }
-        if (l.getName() == null || isValidLegacyMetricName(l.getName())) {
-          outLabelsBuilder.label(l.getName(), l.getValue());
-          continue;
+        } else {
+          outLabelsBuilder.label(escapeName(l.getName(), scheme), l.getValue());
         }
-        outLabelsBuilder.label(escapeName(l.getName(), scheme), l.getValue());
       }
 
       Labels outLabels = outLabelsBuilder.build();
       DataPointSnapshot outDataPointSnapshot = createEscapedDataPointSnapshot(v, d, outLabels);
       outDataPoints.add(outDataPointSnapshot);
     }
 
-    return createEscapedMetricSnapshot(v, outName, outDataPoints);
+    return createEscapedMetricSnapshot(
+        v, escapeName(v.getMetadata().getName(), scheme), outDataPoints);
   }
 
   static boolean metricNeedsEscaping(DataPointSnapshot d) {
@@ -588,9 +576,10 @@ private static MetricSnapshot createEscapedMetricSnapshot(
    * which by definition is a noop). This method does not do any validation of the name.
    */
   public static String escapeName(String name, EscapingScheme scheme) {
-    if (name.isEmpty()) {
+    if (name.isEmpty() || isValidLegacyMetricName(name)) {
       return name;
     }
+
     StringBuilder escaped = new StringBuilder();
     switch (scheme) {
       case NO_ESCAPING: