MetricReceiver -> Metrics

4 files changed, 27 insertions, 27 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()