Unset metrics via Iterator to avoid concurrent modification

1 files changed, 3 insertions, 3 deletions

diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java
index 821e0db0688..b943a2ac856 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/metrics/MetricReceiverWrapper.java
@@ -11,7 +11,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -63,8 +62,9 @@ public class MetricReceiverWrapper implements Iterable<MetricReceiverWrapper.Dim
 
     public void unsetMetricsForContainer(String hostname) {
         synchronized (monitor) {
-            Set<Dimensions> dimensions = metricsByDimensions.keySet();
-            for (Dimensions dimension : dimensions) {
+            Iterator<Dimensions> dimensionsIterator = metricsByDimensions.keySet().iterator();
+            while (dimensionsIterator.hasNext()) {
+                Dimensions dimension = dimensionsIterator.next();
                 if (dimension.dimensionsMap.containsKey("host") && dimension.dimensionsMap.get("host").equals(hostname)) {
                     metricsByDimensions.remove(dimension);
                 }