Rename config fields for clarity.

5 files changed, 14 insertions, 14 deletions

diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
index ce7147d03be..f156221b6e1 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetriever.java
@@ -100,7 +100,7 @@ public class ApplicationMetricsRetriever extends AbstractComponent {
     private List<NodeMetricsClient> createNodeClients(VespaNodesConfig nodesConfig) {
         var clients = new ArrayList<NodeMetricsClient>();
         for (var nc : nodesConfig.node()) {
-            var node = new Node(nc.configId(), nc.hostname(), nc.port(), nc.path());
+            var node = new Node(nc.configId(), nc.hostname(), nc.metricsPort(), nc.metricsPath());
             var client = new NodeMetricsClient(httpClient, node, Clock.systemUTC());
             clients.add(client);
         }
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/Node.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/Node.java
index 7eb0bb2ccf1..3dab7fae4c5 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/Node.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/Node.java
@@ -24,7 +24,7 @@ public class Node {
     private final String metricsUriBase;
 
     public Node(VespaNodesConfig.Node nodeConfig) {
-        this(nodeConfig.configId(), nodeConfig.hostname(), nodeConfig.port() ,nodeConfig.path());
+        this(nodeConfig.configId(), nodeConfig.hostname(), nodeConfig.metricsPort() , nodeConfig.metricsPath());
     }
 
     public Node(String configId, String host, int port, String path) {
diff --git a/metrics-proxy/src/main/resources/configdefinitions/vespa-nodes.def b/metrics-proxy/src/main/resources/configdefinitions/vespa-nodes.def
index 0114e1ecfd2..3f4165c08ec 100644
--- a/metrics-proxy/src/main/resources/configdefinitions/vespa-nodes.def
+++ b/metrics-proxy/src/main/resources/configdefinitions/vespa-nodes.def
@@ -3,5 +3,5 @@ package=ai.vespa.metricsproxy.http.application
 
 node[].configId string
 node[].hostname string
-node[].port int
-node[].path string
+node[].metricsPort int
+node[].metricsPath string
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java
index 45481e4a6ba..fe87a963eb6 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java
@@ -176,8 +176,8 @@ public class ApplicationMetricsHandlerTest {
         return new VespaNodesConfig.Node.Builder()
                 .configId(path)
                 .hostname("localhost")
-                .path(path)
-                .port(port);
+                .metricsPath(path)
+                .metricsPort(port);
     }
 
     private static MetricsConsumers getMetricsConsumers() {
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java
index 375795fb23e..f2948f67c7a 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java
@@ -51,7 +51,7 @@ public class ApplicationMetricsRetrieverTest {
     }
 
     private void verifyRetrievingMetricsFromSingleNode(VespaNodesConfig config, Node node) {
-        wireMockRule.stubFor(get(urlPathEqualTo(config.node(0).path()))
+        wireMockRule.stubFor(get(urlPathEqualTo(config.node(0).metricsPath()))
                                      .willReturn(aResponse().withBody(RESPONSE)));
 
         ApplicationMetricsRetriever retriever = new ApplicationMetricsRetriever(config);
@@ -66,9 +66,9 @@ public class ApplicationMetricsRetrieverTest {
         Node node0 = new Node(config.node(0));
         Node node1 = new Node(config.node(1));
 
-        wireMockRule.stubFor(get(urlPathEqualTo(config.node(0).path()))
+        wireMockRule.stubFor(get(urlPathEqualTo(config.node(0).metricsPath()))
                                      .willReturn(aResponse().withBody(RESPONSE)));
-        wireMockRule.stubFor(get(urlPathEqualTo(config.node(1).path()))
+        wireMockRule.stubFor(get(urlPathEqualTo(config.node(1).metricsPath()))
                                      .willReturn(aResponse().withBody(RESPONSE)));
 
         ApplicationMetricsRetriever retriever = new ApplicationMetricsRetriever(config);
@@ -96,7 +96,7 @@ public class ApplicationMetricsRetrieverTest {
         Node node0 = new Node(config.node(0));
         Node node1 = new Node(config.node(1));
 
-        wireMockRule.stubFor(get(urlPathEqualTo(config.node(1).path()))
+        wireMockRule.stubFor(get(urlPathEqualTo(config.node(1).metricsPath()))
                                      .willReturn(aResponse().withBody(RESPONSE)));
 
         ApplicationMetricsRetriever retriever = new ApplicationMetricsRetriever(config);
@@ -110,7 +110,7 @@ public class ApplicationMetricsRetrieverTest {
     public void an_exception_is_thrown_when_retrieving_times_out() {
         var config = nodesConfig("/node0");
 
-        wireMockRule.stubFor(get(urlPathEqualTo(config.node(0).path()))
+        wireMockRule.stubFor(get(urlPathEqualTo(config.node(0).metricsPath()))
                                      .willReturn(aResponse()
                                                          .withBody(RESPONSE)
                                                          .withFixedDelay(10)));
@@ -131,7 +131,7 @@ public class ApplicationMetricsRetrieverTest {
         var config = nodesConfig("/node0");
         Node node = new Node(config.node(0));
 
-        var delayedStub = wireMockRule.stubFor(get(urlPathEqualTo(config.node(0).path()))
+        var delayedStub = wireMockRule.stubFor(get(urlPathEqualTo(config.node(0).metricsPath()))
                                                        .willReturn(aResponse()
                                                                            .withBody(RESPONSE)
                                                                            .withFixedDelay(10)));
@@ -162,8 +162,8 @@ public class ApplicationMetricsRetrieverTest {
         return new VespaNodesConfig.Node.Builder()
                 .configId(path)
                 .hostname(HOST)
-                .path(path)
-                .port(port);
+                .metricsPath(path)
+                .metricsPort(port);
     }
 
 }