MetricReceiver -> Metrics

10 files changed, 48 insertions, 50 deletions

diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
index 707961fa3b3..b8714d96ccb 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
@@ -27,7 +27,7 @@ import com.yahoo.vespa.hosted.dockerapi.exception.ContainerNotFoundException;
 import com.yahoo.vespa.hosted.dockerapi.exception.DockerException;
 import com.yahoo.vespa.hosted.dockerapi.exception.DockerExecTimeoutException;
 import com.yahoo.vespa.hosted.dockerapi.metrics.Counter;
-import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiver;
+import com.yahoo.vespa.hosted.dockerapi.metrics.Metrics;
 
 import java.io.ByteArrayOutputStream;
 import java.time.Duration;
@@ -58,15 +58,15 @@ public class DockerImpl implements Docker {
     private final Counter numberOfDockerApiFails;
 
     @Inject
-    public DockerImpl(MetricReceiver metricReceiver) {
-        this(createDockerClient(), metricReceiver);
+    public DockerImpl(Metrics metrics) {
+        this(createDockerClient(), metrics);
     }
 
-    DockerImpl(DockerClient dockerClient, MetricReceiver metricReceiver) {
+    DockerImpl(DockerClient dockerClient, Metrics metrics) {
         this.dockerClient = dockerClient;
         this.dockerImageGC = new DockerImageGarbageCollector(this);
 
-        numberOfDockerApiFails = metricReceiver.declareCounter("docker.api_fails");
+        numberOfDockerApiFails = metrics.declareCounter("docker.api_fails");
     }
 
     @Override
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiver.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/Metrics.java
index 234ccba3859..f9b169f0a93 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiver.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/Metrics.java
@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
  *
  * @author freva
  */
-public class MetricReceiver {
+public class Metrics {
     // Application names used
     public static final String APPLICATION_HOST = "vespa.host";
     public static final String APPLICATION_NODE = "vespa.node";
@@ -25,7 +25,7 @@ public class MetricReceiver {
     private final Map<DimensionType, Map<String, ApplicationMetrics>> metrics = new HashMap<>();
 
     @Inject
-    public MetricReceiver() { }
+    public Metrics() { }
 
     /**
      * Creates a counter metric under vespa.host application, with no dimensions and default dimension type
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java
index 81aa5b05ad6..4843d8f9685 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerImplTest.java
@@ -14,7 +14,7 @@ import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.exception.NotFoundException;
 import com.github.dockerjava.core.command.ExecStartResultCallback;
 import com.yahoo.config.provision.DockerImage;
-import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiver;
+import com.yahoo.vespa.hosted.dockerapi.metrics.Metrics;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Matchers;
@@ -36,8 +36,8 @@ import static org.mockito.Mockito.when;
 public class DockerImplTest {
 
     private final DockerClient dockerClient = mock(DockerClient.class);
-    private final MetricReceiver metricReceiver = new MetricReceiver();
-    private final DockerImpl docker = new DockerImpl(dockerClient, metricReceiver);
+    private final Metrics metrics = new Metrics();
+    private final DockerImpl docker = new DockerImpl(dockerClient, metrics);
 
     @Test
     public void testExecuteCompletes() {
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricsTest.java
index 40b7dfa6878..fc153ee0562 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricsTest.java
@@ -6,27 +6,27 @@ import org.junit.Test;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiver.APPLICATION_HOST;
-import static com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiver.DimensionType.DEFAULT;
+import static com.yahoo.vespa.hosted.dockerapi.metrics.Metrics.APPLICATION_HOST;
+import static com.yahoo.vespa.hosted.dockerapi.metrics.Metrics.DimensionType.DEFAULT;
 import static org.junit.Assert.assertEquals;
 
 /**
  * @author freva
  */
-public class MetricReceiverTest {
+public class MetricsTest {
     private static final Dimensions hostDimension = new Dimensions.Builder().add("host", "abc.yahoo.com").build();
-    private final MetricReceiver metricReceiver = new MetricReceiver();
+    private final Metrics metrics = new Metrics();
 
     @Test
     public void testDefaultValue() {
-        metricReceiver.declareCounter("some.name", hostDimension);
+        metrics.declareCounter("some.name", hostDimension);
 
         assertEquals(getMetricsForDimension(hostDimension).get("some.name"), 0L);
     }
 
     @Test
     public void testSimpleIncrementMetric() {
-        Counter counter = metricReceiver.declareCounter("a_counter.value", hostDimension);
+        Counter counter = metrics.declareCounter("a_counter.value", hostDimension);
 
         counter.add(5);
         counter.add(8);
@@ -38,7 +38,7 @@ public class MetricReceiverTest {
 
     @Test
     public void testSimpleGauge() {
-        Gauge gauge = metricReceiver.declareGauge("test.gauge", hostDimension);
+        Gauge gauge = metrics.declareGauge("test.gauge", hostDimension);
 
         gauge.sample(42);
         gauge.sample(-342.23);
@@ -50,12 +50,12 @@ public class MetricReceiverTest {
 
     @Test
     public void testRedeclaringSameGauge() {
-        Gauge gauge = metricReceiver.declareGauge("test.gauge", hostDimension);
+        Gauge gauge = metrics.declareGauge("test.gauge", hostDimension);
         gauge.sample(42);
 
         // Same as hostDimension, but new instance.
         Dimensions newDimension = new Dimensions.Builder().add("host", "abc.yahoo.com").build();
-        Gauge newGauge = metricReceiver.declareGauge("test.gauge", newDimension);
+        Gauge newGauge = metrics.declareGauge("test.gauge", newDimension);
         newGauge.sample(56);
 
         assertEquals(getMetricsForDimension(hostDimension).get("test.gauge"), 56.);
@@ -63,12 +63,12 @@ public class MetricReceiverTest {
 
     @Test
     public void testSameMetricNameButDifferentDimensions() {
-        Gauge gauge = metricReceiver.declareGauge("test.gauge", hostDimension);
+        Gauge gauge = metrics.declareGauge("test.gauge", hostDimension);
         gauge.sample(42);
 
         // Not the same as hostDimension.
         Dimensions newDimension = new Dimensions.Builder().add("host", "abcd.yahoo.com").build();
-        Gauge newGauge = metricReceiver.declareGauge("test.gauge", newDimension);
+        Gauge newGauge = metrics.declareGauge("test.gauge", newDimension);
         newGauge.sample(56);
 
         assertEquals(getMetricsForDimension(hostDimension).get("test.gauge"), 42.);
@@ -77,20 +77,20 @@ public class MetricReceiverTest {
 
     @Test
     public void testDeletingMetric() {
-        metricReceiver.declareGauge("test.gauge", hostDimension);
+        metrics.declareGauge("test.gauge", hostDimension);
 
         Dimensions differentDimension = new Dimensions.Builder().add("host", "abcd.yahoo.com").build();
-        metricReceiver.declareGauge("test.gauge", differentDimension);
+        metrics.declareGauge("test.gauge", differentDimension);
 
-        assertEquals(2, metricReceiver.getMetricsByType(DEFAULT).size());
-        metricReceiver.deleteMetricByDimension(APPLICATION_HOST, differentDimension, DEFAULT);
-        assertEquals(1, metricReceiver.getMetricsByType(DEFAULT).size());
+        assertEquals(2, metrics.getMetricsByType(DEFAULT).size());
+        metrics.deleteMetricByDimension(APPLICATION_HOST, differentDimension, DEFAULT);
+        assertEquals(1, metrics.getMetricsByType(DEFAULT).size());
         assertEquals(getMetricsForDimension(hostDimension).size(), 1);
         assertEquals(getMetricsForDimension(differentDimension).size(), 0);
     }
 
     private Map<String, Number> getMetricsForDimension(Dimensions dimensions) {
-        return metricReceiver.getOrCreateApplicationMetrics(APPLICATION_HOST, DEFAULT)
+        return metrics.getOrCreateApplicationMetrics(APPLICATION_HOST, DEFAULT)
                 .getOrDefault(dimensions, Map.of())
                 .entrySet()
                 .stream()
diff --git a/node-admin/src/main/application/services.xml b/node-admin/src/main/application/services.xml
index 42be8a3c490..d5a4dce7c5a 100644
--- a/node-admin/src/main/application/services.xml
+++ b/node-admin/src/main/application/services.xml
@@ -5,7 +5,7 @@
     <!-- Please update container test when changing this file -->
     <accesslog type="vespa" fileNamePattern="logs/vespa/node-admin/access.log.%Y%m%d%H%M%S" symlinkName="access.log" />
     <component id="docker-api" class="com.yahoo.vespa.hosted.dockerapi.DockerImpl" bundle="docker-api"/>
-    <component id="metrics-wrapper" class="com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiver" bundle="docker-api"/>
+    <component id="metrics" class="com.yahoo.vespa.hosted.dockerapi.metrics.Metrics" bundle="docker-api"/>
 
     <preprocess:include file="variant.xml" required="false"/>
   </container>
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
index f27d32bdf2c..cb10eac9e6c 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.node.admin.nodeadmin;
 import com.yahoo.vespa.hosted.dockerapi.metrics.Counter;
 import com.yahoo.vespa.hosted.dockerapi.metrics.Dimensions;
 import com.yahoo.vespa.hosted.dockerapi.metrics.Gauge;
-import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiver;
+import com.yahoo.vespa.hosted.dockerapi.metrics.Metrics;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgent;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContextManager;
@@ -46,19 +46,19 @@ public class NodeAdminImpl implements NodeAdmin {
     private final Gauge jvmHeapTotal;
     private final Counter numberOfUnhandledExceptions;
 
-    public NodeAdminImpl(NodeAgentFactory nodeAgentFactory, MetricReceiver metricReceiver, Clock clock) {
+    public NodeAdminImpl(NodeAgentFactory nodeAgentFactory, Metrics metrics, Clock clock) {
         this((NodeAgentWithSchedulerFactory) nodeAgentContext -> create(clock, nodeAgentFactory, nodeAgentContext),
-                metricReceiver, clock, NODE_AGENT_FREEZE_TIMEOUT, NODE_AGENT_SPREAD);
+                metrics, clock, NODE_AGENT_FREEZE_TIMEOUT, NODE_AGENT_SPREAD);
     }
 
-    public NodeAdminImpl(NodeAgentFactory nodeAgentFactory, MetricReceiver metricReceiver,
+    public NodeAdminImpl(NodeAgentFactory nodeAgentFactory, Metrics metrics,
                          Clock clock, Duration freezeTimeout, Duration spread) {
         this((NodeAgentWithSchedulerFactory) nodeAgentContext -> create(clock, nodeAgentFactory, nodeAgentContext),
-                metricReceiver, clock, freezeTimeout, spread);
+                metrics, clock, freezeTimeout, spread);
     }
 
     NodeAdminImpl(NodeAgentWithSchedulerFactory nodeAgentWithSchedulerFactory,
-                  MetricReceiver metricReceiver, Clock clock, Duration freezeTimeout, Duration spread) {
+                  Metrics metrics, Clock clock, Duration freezeTimeout, Duration spread) {
         this.nodeAgentWithSchedulerFactory = nodeAgentWithSchedulerFactory;
 
         this.clock = clock;
@@ -68,12 +68,12 @@ public class NodeAdminImpl implements NodeAdmin {
         this.isFrozen = true;
         this.startOfFreezeConvergence = clock.instant();
 
-        this.numberOfUnhandledExceptions = metricReceiver.declareCounter("unhandled_exceptions",
+        this.numberOfUnhandledExceptions = metrics.declareCounter("unhandled_exceptions",
                 new Dimensions(Map.of("src", "node-agents")));
 
-        this.jvmHeapUsed = metricReceiver.declareGauge("mem.heap.used");
-        this.jvmHeapFree = metricReceiver.declareGauge("mem.heap.free");
-        this.jvmHeapTotal = metricReceiver.declareGauge("mem.heap.total");
+        this.jvmHeapUsed = metrics.declareGauge("mem.heap.used");
+        this.jvmHeapFree = metrics.declareGauge("mem.heap.free");
+        this.jvmHeapTotal = metrics.declareGauge("mem.heap.total");
     }
 
     @Override
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index 6e5e03f1253..da6c5224f74 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -18,7 +18,7 @@ import com.yahoo.vespa.hosted.dockerapi.exception.DockerException;
 import com.yahoo.vespa.hosted.dockerapi.exception.DockerExecTimeoutException;
 import com.yahoo.vespa.hosted.dockerapi.metrics.DimensionMetrics;
 import com.yahoo.vespa.hosted.dockerapi.metrics.Dimensions;
-import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiver;
+import com.yahoo.vespa.hosted.dockerapi.metrics.Metrics;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeAttributes;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeOwner;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeRepository;
@@ -533,7 +533,7 @@ public class NodeAgentImpl implements NodeAgent {
         Dimensions dimensions = dimensionsBuilder.build();
 
         ContainerStats stats = containerStats.get();
-        final String APP = MetricReceiver.APPLICATION_NODE;
+        final String APP = Metrics.APPLICATION_NODE;
         final int totalNumCpuCores = stats.getCpuStats().getOnlineCpus();
         final long cpuContainerKernelTime = stats.getCpuStats().getUsageInKernelMode();
         final long cpuContainerTotalTime = stats.getCpuStats().getTotalUsage();
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
index fd9879231a2..7f0f3fd37f6 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
@@ -7,7 +7,7 @@ import com.yahoo.config.provision.NodeType;
 import com.yahoo.system.ProcessExecuter;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.hosted.dockerapi.Docker;
-import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiver;
+import com.yahoo.vespa.hosted.dockerapi.metrics.Metrics;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState;
 import com.yahoo.vespa.hosted.node.admin.configserver.orchestrator.Orchestrator;
@@ -91,11 +91,11 @@ public class DockerTester implements AutoCloseable {
         FileSystem fileSystem = TestFileSystem.create();
         DockerOperations dockerOperations = new DockerOperationsImpl(docker, processExecuter, ipAddresses);
 
-        MetricReceiver mr = new MetricReceiver();
+        Metrics metrics = new Metrics();
         NodeAgentFactory nodeAgentFactory = contextSupplier -> new NodeAgentImpl(
                 contextSupplier, nodeRepository, orchestrator, dockerOperations, storageMaintainer, flagSource,
                 Optional.empty(), Optional.empty(), Optional.empty());
-        nodeAdmin = new NodeAdminImpl(nodeAgentFactory, mr, Clock.systemUTC(), Duration.ofMillis(10), Duration.ZERO);
+        nodeAdmin = new NodeAdminImpl(nodeAgentFactory, metrics, Clock.systemUTC(), Duration.ofMillis(10), Duration.ZERO);
         NodeAgentContextFactory nodeAgentContextFactory = (nodeSpec, acl) ->
                 new NodeAgentContextImpl.Builder(nodeSpec).acl(acl).fileSystem(fileSystem).build();
         nodeAdminStateUpdater = new NodeAdminStateUpdater(nodeAgentContextFactory, nodeRepository, orchestrator,
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java
index af2dfaf3912..6e645e6c70f 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImplTest.java
@@ -3,11 +3,10 @@ package com.yahoo.vespa.hosted.node.admin.nodeadmin;
 
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.test.ManualClock;
-import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiver;
+import com.yahoo.vespa.hosted.dockerapi.metrics.Metrics;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeSpec;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeState;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContext;
-import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContextFactory;
 import com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentContextImpl;
 import org.junit.Test;
 import org.mockito.InOrder;
@@ -39,11 +38,10 @@ import static org.mockito.Mockito.when;
 public class NodeAdminImplTest {
 
     private final NodeAgentWithSchedulerFactory nodeAgentWithSchedulerFactory = mock(NodeAgentWithSchedulerFactory.class);
-    private final NodeAgentContextFactory nodeAgentContextFactory = mock(NodeAgentContextFactory.class);
     private final ManualClock clock = new ManualClock();
 
     private final NodeAdminImpl nodeAdmin = new NodeAdminImpl(nodeAgentWithSchedulerFactory,
-            new MetricReceiver(), clock, Duration.ZERO, Duration.ZERO);
+            new Metrics(), clock, Duration.ZERO, Duration.ZERO);
 
     @Test
     public void nodeAgentsAreProperlyLifeCycleManaged() {
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
index 25317d30a39..3a92e345801 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
@@ -12,7 +12,7 @@ import com.yahoo.vespa.hosted.dockerapi.ContainerName;
 import com.yahoo.vespa.hosted.dockerapi.ContainerResources;
 import com.yahoo.vespa.hosted.dockerapi.ContainerStats;
 import com.yahoo.vespa.hosted.dockerapi.exception.DockerException;
-import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiver;
+import com.yahoo.vespa.hosted.dockerapi.metrics.Metrics;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeAttributes;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeMembership;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.NodeOwner;
@@ -76,7 +76,7 @@ public class NodeAgentImplTest {
     private final NodeRepository nodeRepository = mock(NodeRepository.class);
     private final Orchestrator orchestrator = mock(Orchestrator.class);
     private final StorageMaintainer storageMaintainer = mock(StorageMaintainer.class);
-    private final MetricReceiver metricReceiver = new MetricReceiver();
+    private final Metrics metrics = new Metrics();
     private final AclMaintainer aclMaintainer = mock(AclMaintainer.class);
     private final HealthChecker healthChecker = mock(HealthChecker.class);
     private final CredentialsMaintainer credentialsMaintainer = mock(CredentialsMaintainer.class);
@@ -710,7 +710,7 @@ public class NodeAgentImplTest {
 
         nodeAgent.updateContainerNodeMetrics();
 
-        assertEquals(List.of(), metricReceiver.getDefaultMetrics());
+        assertEquals(List.of(), metrics.getDefaultMetrics());
     }
 
     @Test