Skip to content

Commit d95bcb3

Browse files
committed
Use original prometheusName() implementation
Signed-off-by: Federico Torres <[email protected]>
1 parent 1956a75 commit d95bcb3

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static Labels of(String... keyValuePairs) {
7575
static String[] makePrometheusNames(String[] names) {
7676
String[] prometheusNames = names;
7777
for (int i=0; i<names.length; i++) {
78-
if (names[i].contains(".")) {
78+
if (names[i].contains(".") && PrometheusNaming.nameValidationScheme == ValidationScheme.LEGACY_VALIDATION) {
7979
if (prometheusNames == names) {
8080
prometheusNames = Arrays.copyOf(names, names.length);
8181
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public MetricMetadata(String name, String help, Unit unit) {
6161
this.help = help;
6262
this.unit = unit;
6363
validate();
64-
this.prometheusName = name.contains(".") ? PrometheusNaming.prometheusName(name) : name;
64+
this.prometheusName = name.contains(".") && PrometheusNaming.nameValidationScheme == ValidationScheme.LEGACY_VALIDATION ? PrometheusNaming.prometheusName(name) : name;
6565
}
6666

6767
/**

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,14 +180,7 @@ public static boolean isValidLegacyLabelName(String name) {
180180
* @return the name with dots replaced by underscores.
181181
*/
182182
public static String prometheusName(String name) {
183-
switch (nameValidationScheme) {
184-
case LEGACY_VALIDATION:
185-
return name.replace(".", "_");
186-
case UTF_8_VALIDATION:
187-
return name;
188-
default:
189-
throw new RuntimeException("Invalid name validation scheme requested: " + nameValidationScheme);
190-
}
183+
return name.replace(".", "_");
191184
}
192185

193186
/**

0 commit comments

Comments
 (0)