Avoid duplicating string constants

3 files changed, 4 insertions, 7 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
index 44d981cf1c2..6cd0a80bee3 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
@@ -75,9 +75,6 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
     static final Path METRICS_PROXY_BUNDLE_FILE = absoluteBundlePath((Paths.get(METRICS_PROXY_NAME + JAR_WITH_DEPS.suffix)));
     static final String METRICS_PROXY_BUNDLE_NAME = "com.yahoo.vespa." + METRICS_PROXY_NAME;
 
-    private static final String METRICS_HANDLER_BINDING = "/metrics/v1";
-    private static final String PROMETHEUS_HANDLER_BINDING = "/prometheus/v1";
-
     static final class AppDimensionNames {
         static final String ZONE = "zone";
         static final String APPLICATION_ID = "applicationId";  // tenant.app.instance
@@ -112,8 +109,8 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
         addMetricsProxyComponent(RpcServer.class);
         addMetricsProxyComponent(SystemPollerProvider.class);
         addMetricsProxyComponent(VespaMetrics.class);
-        addHttpHandler(MetricsHandler.class, METRICS_HANDLER_BINDING);
-        addHttpHandler(PrometheusHandler.class, PROMETHEUS_HANDLER_BINDING);
+        addHttpHandler(MetricsHandler.class, MetricsHandler.V1_PATH);
+        addHttpHandler(PrometheusHandler.class, PrometheusHandler.V1_PATH);
     }
 
     private void addHttpHandler(Class<? extends ThreadedHttpRequestHandler> clazz, String bindingPath) {
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/MetricsHandler.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/MetricsHandler.java
index e191c5e1c43..0d641b6cca4 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/MetricsHandler.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/MetricsHandler.java
@@ -33,7 +33,7 @@ import static com.yahoo.jdisc.http.HttpRequest.Method.GET;
  */
 public class MetricsHandler extends ThreadedHttpRequestHandler {
 
-    static final String V1_PATH = "/metrics/v1";
+    public static final String V1_PATH = "/metrics/v1";
     static final String VALUES_PATH = V1_PATH + "/values";
 
     private final ValuesFetcher valuesFetcher;
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/prometheus/PrometheusHandler.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/prometheus/PrometheusHandler.java
index 7c018ea6d85..f2009280128 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/prometheus/PrometheusHandler.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/prometheus/PrometheusHandler.java
@@ -35,7 +35,7 @@ import static com.yahoo.jdisc.http.HttpRequest.Method.GET;
  */
 public class PrometheusHandler extends ThreadedHttpRequestHandler {
 
-    static final String V1_PATH = "/prometheus/v1";
+    public static final String V1_PATH = "/prometheus/v1";
     static final String VALUES_PATH = V1_PATH + "/values";
 
     private final ValuesFetcher valuesFetcher;