proton metrics -> searchnode metrics

Use name of service and add API that does not use the generic /metrics
path for searchnode metrics

2 files changed, 11 insertions, 12 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterSearchNodeMetricsRetrieverTest.java
index 585ce3980fc..b9d0be61d65 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterProtonMetricsRetrieverTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ClusterSearchNodeMetricsRetrieverTest.java
@@ -8,7 +8,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.junit.Rule;
 import org.junit.Test;
@@ -20,7 +19,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.Assert.assertEquals;
 
-public class ClusterProtonMetricsRetrieverTest {
+public class ClusterSearchNodeMetricsRetrieverTest {
 
     @Rule
     public final WireMockRule wireMock = new WireMockRule(options().dynamicPort(), true);
@@ -44,10 +43,10 @@ public class ClusterProtonMetricsRetrieverTest {
 
         String expectedClusterNameContent = "content/content/0/0";
         String expectedClusterNameMusic = "content/music/0/0";
-        Map<String, ProtonMetricsAggregator> aggregatorMap = new ClusterProtonMetricsRetriever().requestMetricsGroupedByCluster(hosts);
+        Map<String, SearchNodeMetricsAggregator> aggregatorMap = new ClusterProtonMetricsRetriever().requestMetricsGroupedByCluster(hosts);
 
         compareAggregators(
-                new ProtonMetricsAggregator()
+                new SearchNodeMetricsAggregator()
                 .addDocumentReadyCount(1275)
                 .addDocumentActiveCount(1275)
                 .addDocumentTotalCount(1275)
@@ -58,7 +57,7 @@ public class ClusterProtonMetricsRetrieverTest {
         );
 
         compareAggregators(
-                new ProtonMetricsAggregator()
+                new SearchNodeMetricsAggregator()
                 .addDocumentReadyCount(3008)
                 .addDocumentActiveCount(3008)
                 .addDocumentTotalCount(3008)
@@ -78,7 +77,7 @@ public class ClusterProtonMetricsRetrieverTest {
     // Same tolerance value as used internally in MetricsAggregator.isZero
     private static final double metricsTolerance = 0.001;
 
-    private void compareAggregators(ProtonMetricsAggregator expected, ProtonMetricsAggregator actual) {
+    private void compareAggregators(SearchNodeMetricsAggregator expected, SearchNodeMetricsAggregator actual) {
         assertEquals(expected.aggregateDocumentDiskUsage(), actual.aggregateDocumentDiskUsage(), metricsTolerance);
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/SearchNodeMetricsRetrieverTest.java
index a7b080b2900..f0e6b4171c2 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/ProtonMetricsRetrieverTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/metrics/SearchNodeMetricsRetrieverTest.java
@@ -23,16 +23,16 @@ import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
 
-public class ProtonMetricsRetrieverTest {
+public class SearchNodeMetricsRetrieverTest {
 
     @Test
     public void getMetrics()  {
-        ProtonMetricsRetrieverTest.MockModel mockModel = new MockModel(mockHosts());
-        ProtonMetricsRetrieverTest.MockProtonMetricsRetriever mockMetricsRetriever = new MockProtonMetricsRetriever();
+        SearchNodeMetricsRetrieverTest.MockModel mockModel = new MockModel(mockHosts());
+        SearchNodeMetricsRetrieverTest.MockProtonMetricsRetriever mockMetricsRetriever = new MockProtonMetricsRetriever();
         Application application = new Application(mockModel, null, 0,
                                                   null, null, ApplicationId.fromSerializedForm("tenant:app:instance"));
 
-        ProtonMetricsRetriever clusterMetricsRetriever = new ProtonMetricsRetriever(mockMetricsRetriever);
+        SearchNodeMetricsRetriever clusterMetricsRetriever = new SearchNodeMetricsRetriever(mockMetricsRetriever);
         clusterMetricsRetriever.getMetrics(application);
 
         assertEquals(1, mockMetricsRetriever.hosts.size()); // Verify that logserver was ignored
@@ -58,12 +58,12 @@ public class ProtonMetricsRetrieverTest {
         Collection<URI> hosts = new ArrayList<>();
 
         @Override
-        public Map<String, ProtonMetricsAggregator> requestMetricsGroupedByCluster(Collection<URI> hosts) {
+        public Map<String, SearchNodeMetricsAggregator> requestMetricsGroupedByCluster(Collection<URI> hosts) {
             this.hosts = hosts;
 
             return Map.of(
                     ("content_cluster_id"),
-                    new ProtonMetricsAggregator()
+                    new SearchNodeMetricsAggregator()
             );
         }
     }