Use complete image as dimension

2 files changed, 8 insertions, 8 deletions

diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerEngine.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerEngine.java
index 25b8a1c2747..bbd622a0d2a 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerEngine.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerEngine.java
@@ -384,7 +384,7 @@ public class DockerEngine implements ContainerEngine {
 
         private void sampleDuration() {
             Gauge gauge = metrics.declareGauge("docker.imagePullDurationSecs",
-                                               new Dimensions(Map.of("tag", dockerImage.tagAsVersion().toFullString())));
+                                               new Dimensions(Map.of("image", dockerImage.asString())));
             Duration pullDuration = Duration.between(startedAt, clock.instant());
             gauge.sample(pullDuration.getSeconds());
         }
diff --git a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerEngineTest.java b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerEngineTest.java
index b6e9c4976bf..71bdb321305 100644
--- a/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerEngineTest.java
+++ b/docker-api/src/test/java/com/yahoo/vespa/hosted/dockerapi/DockerEngineTest.java
@@ -104,7 +104,7 @@ public class DockerEngineTest {
         assertTrue(docker.imageIsDownloaded(image));
         clock.advance(Duration.ofMinutes(10));
         resultCallback.getValue().onComplete();
-        assertPullDuration(Duration.ofMinutes(10), "1.2.3");
+        assertPullDuration(Duration.ofMinutes(10), image.asString());
         assertFalse(docker.pullImageAsyncIfNeeded(image, RegistryCredentials.none));
     }
 
@@ -134,12 +134,12 @@ public class DockerEngineTest {
         assertTrue("Should return true, new pull scheduled", docker.pullImageAsyncIfNeeded(image, RegistryCredentials.none));
     }
 
-    private void assertPullDuration(Duration duration, String tag) {
-        Optional<DimensionMetrics> byTag = metrics.getDefaultMetrics().stream()
-                                                  .filter(metrics -> tag.equals(metrics.getDimensions().asMap().get("tag")))
-                                                  .findFirst();
-        assertTrue("Found metric for tag=" + tag, byTag.isPresent());
-        Number durationInSecs = byTag.get().getMetrics().get("docker.imagePullDurationSecs");
+    private void assertPullDuration(Duration duration, String image) {
+        Optional<DimensionMetrics> byImage = metrics.getDefaultMetrics().stream()
+                                                         .filter(metrics -> image.equals(metrics.getDimensions().asMap().get("image")))
+                                                         .findFirst();
+        assertTrue("Found metric for image=" + image, byImage.isPresent());
+        Number durationInSecs = byImage.get().getMetrics().get("docker.imagePullDurationSecs");
         assertNotNull(durationInSecs);
         assertEquals(duration, Duration.ofSeconds(durationInSecs.longValue()));
     }