remove validation scheme

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

Author: zeitlinger

prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/NamingProperties.java

@@ -20,7 +20,6 @@ public class PrometheusProperties {
   private final ExporterHttpServerProperties exporterHttpServerProperties;
   private final ExporterOpenTelemetryProperties exporterOpenTelemetryProperties;
   private final ExporterPushgatewayProperties exporterPushgatewayProperties;
-  private final NamingProperties namingProperties;
 
   /**
    * Get the properties instance. When called for the first time, {@code get()} loads the properties
@@ -49,8 +48,7 @@ public PrometheusProperties(
       ExporterFilterProperties exporterFilterProperties,
       ExporterHttpServerProperties httpServerConfig,
       ExporterPushgatewayProperties pushgatewayProperties,
-      ExporterOpenTelemetryProperties otelConfig,
-      NamingProperties namingProperties) {
+      ExporterOpenTelemetryProperties otelConfig) {
     this.defaultMetricsProperties = defaultMetricsProperties;
     this.metricProperties.putAll(metricProperties);
     this.exemplarProperties = exemplarProperties;
@@ -59,7 +57,6 @@ public PrometheusProperties(
     this.exporterHttpServerProperties = httpServerConfig;
     this.exporterPushgatewayProperties = pushgatewayProperties;
     this.exporterOpenTelemetryProperties = otelConfig;
-    this.namingProperties = namingProperties;
   }
 
   /**
@@ -103,9 +100,6 @@ public ExporterOpenTelemetryProperties getExporterOpenTelemetryProperties() {
     return exporterOpenTelemetryProperties;
   }
 
-  public NamingProperties getNamingProperties() {
-    return namingProperties;
-  }
 
   public static class Builder {
     private MetricsProperties defaultMetricsProperties;
@@ -116,7 +110,6 @@ public static class Builder {
     private ExporterHttpServerProperties exporterHttpServerProperties;
     private ExporterPushgatewayProperties pushgatewayProperties;
     private ExporterOpenTelemetryProperties otelConfig;
-    private NamingProperties namingProperties;
 
     private Builder() {}
 
@@ -168,10 +161,6 @@ public Builder exporterOpenTelemetryProperties(
       return this;
     }
 
-    public Builder namingProperties(NamingProperties namingProperties) {
-      this.namingProperties = namingProperties;
-      return this;
-    }
 
     public PrometheusProperties build() {
       return new PrometheusProperties(
@@ -182,8 +171,7 @@ public PrometheusProperties build() {
           exporterFilterProperties,
           exporterHttpServerProperties,
           pushgatewayProperties,
-          otelConfig,
-          namingProperties);
+          otelConfig);
     }
   }
 }

prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusProperties.java

@@ -42,7 +42,6 @@ public static PrometheusProperties load(Map<Object, Object> externalProperties)
         ExporterPushgatewayProperties.load(properties);
     ExporterOpenTelemetryProperties exporterOpenTelemetryProperties =
         ExporterOpenTelemetryProperties.load(properties);
-    NamingProperties namingProperties = NamingProperties.load(properties);
     validateAllPropertiesProcessed(properties);
     return new PrometheusProperties(
         defaultMetricsProperties,
@@ -52,8 +51,7 @@ public static PrometheusProperties load(Map<Object, Object> externalProperties)
         exporterFilterProperties,
         exporterHttpServerProperties,
         exporterPushgatewayProperties,
-        exporterOpenTelemetryProperties,
-        namingProperties);
+        exporterOpenTelemetryProperties);
   }
 
   // This will remove entries from properties when they are processed.

prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusPropertiesLoader.java

@@ -49,7 +49,6 @@ public void testBuilder() {
     builder.exporterOpenTelemetryProperties(defaults.getExporterOpenTelemetryProperties());
     builder.pushgatewayProperties(defaults.getExporterPushgatewayProperties());
     builder.exporterProperties(defaults.getExporterProperties());
-    builder.namingProperties(defaults.getNamingProperties());
     PrometheusProperties result = builder.build();
     assertThat(result.getDefaultMetricProperties()).isSameAs(defaults.getDefaultMetricProperties());
     assertThat(result.getExemplarProperties()).isSameAs(defaults.getExemplarProperties());
@@ -67,6 +66,5 @@ public void testBuilder() {
             MetricsProperties.builder().histogramClassicUpperBounds(0.1, 0.2, 0.5, 1.0).build());
     assertThat(result.getMetricProperties("unknown_metric")).isNull();
     assertThat(result.getExporterProperties()).isSameAs(defaults.getExporterProperties());
-    assertThat(result.getNamingProperties()).isSameAs(defaults.getNamingProperties());
   }
 }

prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ValidationScheme.java

@@ -1,6 +1,5 @@
 package io.prometheus.metrics.expositionformats;
 
-import io.prometheus.metrics.config.ValidationScheme;
 import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.PrometheusNaming;
 import java.io.IOException;
@@ -140,8 +139,7 @@ static void writeName(Writer writer, String name, NameType nameType) throws IOEx
         }
         break;
       case Label:
-        if (PrometheusNaming.isValidLegacyLabelName(name)
-            && PrometheusNaming.getValidationScheme() == ValidationScheme.LEGACY_VALIDATION) {
+        if (PrometheusNaming.isValidLegacyLabelName(name)) {
           writer.write(name);
           return;
         }

prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/NamingPropertiesTest.java

@@ -3,7 +3,6 @@
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.isValidLabelName;
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.prometheusName;
 
-import io.prometheus.metrics.config.ValidationScheme;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -120,13 +119,10 @@ public static Labels of(String[] names, String[] values) {
   static String[] makePrometheusNames(String[] names) {
     String[] prometheusNames = names;
     for (int i = 0; i < names.length; i++) {
-      if (names[i].contains(".")
-          && PrometheusNaming.getValidationScheme() == ValidationScheme.LEGACY_VALIDATION) {
-        if (prometheusNames == names) {
-          prometheusNames = Arrays.copyOf(names, names.length);
-        }
-        prometheusNames[i] = PrometheusNaming.prometheusName(names[i]);
+      if (prometheusNames == names) {
+        prometheusNames = Arrays.copyOf(names, names.length);
       }
+      prometheusNames[i] = PrometheusNaming.prometheusName(names[i]);
     }
     return prometheusNames;
   }