Ignore dimensions with null key or value

1 files changed, 7 insertions, 3 deletions

diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtil.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtil.java
index d71b11a4ff2..4413a9ebc2e 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtil.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/YamasJsonUtil.java
@@ -108,9 +108,13 @@ public class YamasJsonUtil {
 
         if (packet.dimensions().isEmpty()) model.dimensions = null;
         else {
-            model.dimensions = packet.dimensions().entrySet().stream().collect(
-                    toLinkedMap(id2dim -> id2dim.getKey().id,
-                                Map.Entry::getValue));
+            model.dimensions = packet.dimensions().entrySet()
+                    .stream()
+                    .filter(entry -> entry.getKey() != null && entry.getValue() != null)
+                    .collect(toLinkedMap(
+                            id2dim -> id2dim.getKey().id,
+                            Map.Entry::getValue)
+                    );
         }
 
         YamasJsonModel.YamasJsonNamespace namespaces = toYamasJsonNamespaces(packet.consumers());