From 1dbb9ee3f7aadc301a2851ae7459ceba2c749e65 Mon Sep 17 00:00:00 2001 From: Ola Aunronning Date: Thu, 15 Sep 2022 14:21:51 +0200 Subject: Sanitize label names --- .../com/yahoo/container/jdisc/state/PrometheusHelper.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'container-core/src/main/java/com/yahoo') diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java index adb5f389d54..ca4eca1595f 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/PrometheusHelper.java @@ -25,7 +25,11 @@ public class PrometheusHelper { var dimensionBuilder = new StringBuilder(); for (var dimension : metricDimensions) { - dimensionBuilder.append(dimension.getKey()).append("=\"").append(dimension.getValue()).append("\","); + dimensionBuilder + .append(sanitize(dimension.getKey())) + .append("=\"") + .append(dimension.getValue()) + .append("\","); } dimensionBuilder.append("vespa_service=\"").append(application).append("\","); var dimensions = dimensionBuilder.toString(); @@ -70,7 +74,11 @@ public class PrometheusHelper { } private static String getSanitizedMetricName(String metricName, String suffix) { - return metricName.replaceAll("([-.])", "_") + "_" + suffix; + return sanitize(metricName) + "_" + suffix; + } + + private static String sanitize(String name) { + return name.replaceAll("([-.])", "_"); } } -- cgit v1.2.3