Stop using docker application for metrics

1 files changed, 15 insertions, 17 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 8cdb0bee7c2..ce8a7df3166 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,6 @@ 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.CounterWrapper;
-import com.yahoo.vespa.hosted.dockerapi.metrics.Dimensions;
 import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper;
 
 import java.io.ByteArrayOutputStream;
@@ -56,7 +55,7 @@ public class DockerImpl implements Docker {
 
     private final DockerClient dockerClient;
     private final DockerImageGarbageCollector dockerImageGC;
-    private final CounterWrapper numberOfDockerDaemonFails;
+    private final CounterWrapper numberOfDockerApiFails;
 
     @Inject
     public DockerImpl(MetricReceiverWrapper metricReceiverWrapper) {
@@ -67,8 +66,7 @@ public class DockerImpl implements Docker {
         this.dockerClient = dockerClient;
         this.dockerImageGC = new DockerImageGarbageCollector(this);
 
-        Dimensions dimensions = new Dimensions.Builder().add("role", "docker").build();
-        numberOfDockerDaemonFails = metricReceiver.declareCounter(MetricReceiverWrapper.APPLICATION_DOCKER, dimensions, "daemon.api_fails");
+        numberOfDockerApiFails = metricReceiver.declareCounter("docker.api_fails");
     }
 
     @Override
@@ -86,7 +84,7 @@ public class DockerImpl implements Docker {
                 return true;
             }
         } catch (RuntimeException e) {
-            numberOfDockerDaemonFails.add();
+            numberOfDockerApiFails.add();
             throw new DockerException("Failed to pull image '" + image.asString() + "'", e);
         }
     }
@@ -110,7 +108,7 @@ public class DockerImpl implements Docker {
         } catch (NotFoundException e) {
             return Optional.empty();
         } catch (RuntimeException e) {
-            numberOfDockerDaemonFails.add();
+            numberOfDockerApiFails.add();
             throw new DockerException("Failed to inspect image '" + dockerImage.asString() + "'", e);
         }
     }
@@ -146,7 +144,7 @@ public class DockerImpl implements Docker {
 
             return new ProcessResult(state.getExitCode(), new String(output.toByteArray()), new String(errors.toByteArray()));
         } catch (RuntimeException | InterruptedException e) {
-            numberOfDockerDaemonFails.add();
+            numberOfDockerApiFails.add();
             throw new DockerException("Container '" + containerName.asString()
                     + "' failed to execute " + Arrays.toString(command), e);
         }
@@ -171,7 +169,7 @@ public class DockerImpl implements Docker {
         } catch (NotFoundException ignored) {
             return Optional.empty();
         } catch (RuntimeException e) {
-            numberOfDockerDaemonFails.add();
+            numberOfDockerApiFails.add();
             throw new DockerException("Failed to get info for container '" + container + "'", e);
         }
     }
@@ -186,7 +184,7 @@ public class DockerImpl implements Docker {
         } catch (NotFoundException ignored) {
             return Optional.empty();
         } catch (RuntimeException | InterruptedException e) {
-            numberOfDockerDaemonFails.add();
+            numberOfDockerApiFails.add();
             throw new DockerException("Failed to get stats for container '" + containerName.asString() + "'", e);
         }
     }
@@ -200,7 +198,7 @@ public class DockerImpl implements Docker {
         } catch (NotModifiedException ignored) {
             // If is already started, ignore
         } catch (RuntimeException e) {
-            numberOfDockerDaemonFails.add();
+            numberOfDockerApiFails.add();
             throw new DockerException("Failed to start container '" + containerName.asString() + "'", e);
         }
     }
@@ -214,7 +212,7 @@ public class DockerImpl implements Docker {
         } catch (NotModifiedException ignored) {
             // If is already stopped, ignore
         } catch (RuntimeException e) {
-            numberOfDockerDaemonFails.add();
+            numberOfDockerApiFails.add();
             throw new DockerException("Failed to stop container '" + containerName.asString() + "'", e);
         }
     }
@@ -226,7 +224,7 @@ public class DockerImpl implements Docker {
         } catch (NotFoundException e) {
             throw new ContainerNotFoundException(containerName);
         } catch (RuntimeException e) {
-            numberOfDockerDaemonFails.add();
+            numberOfDockerApiFails.add();
             throw new DockerException("Failed to delete container '" + containerName.asString() + "'", e);
         }
     }
@@ -253,7 +251,7 @@ public class DockerImpl implements Docker {
         } catch (NotFoundException e) {
             throw new ContainerNotFoundException(containerName);
         } catch (RuntimeException e) {
-            numberOfDockerDaemonFails.add();
+            numberOfDockerApiFails.add();
             throw new DockerException("Failed to update container '" + containerName.asString() + "' to " + resources, e);
         }
     }
@@ -307,7 +305,7 @@ public class DockerImpl implements Docker {
         try {
             return dockerClient.listContainersCmd().withShowAll(true).exec();
         } catch (RuntimeException e) {
-            numberOfDockerDaemonFails.add();
+            numberOfDockerApiFails.add();
             throw new DockerException("Failed to list all containers", e);
         }
     }
@@ -316,7 +314,7 @@ public class DockerImpl implements Docker {
         try {
             return dockerClient.listImagesCmd().withShowAll(true).exec();
         } catch (RuntimeException e) {
-            numberOfDockerDaemonFails.add();
+            numberOfDockerApiFails.add();
             throw new DockerException("Failed to list all images", e);
         }
     }
@@ -327,7 +325,7 @@ public class DockerImpl implements Docker {
         } catch (NotFoundException ignored) {
             // Image was already deleted, ignore
         } catch (RuntimeException e) {
-            numberOfDockerDaemonFails.add();
+            numberOfDockerApiFails.add();
             throw new DockerException("Failed to delete docker image " + dockerImage.asString(), e);
         }
     }
@@ -357,7 +355,7 @@ public class DockerImpl implements Docker {
                 logger.log(LogLevel.INFO, "Download completed: " + dockerImage.asString());
                 removeScheduledPoll(dockerImage);
             } else {
-                numberOfDockerDaemonFails.add();
+                numberOfDockerApiFails.add();
                 throw new DockerClientException("Could not download image: " + dockerImage);
             }
         }