Merge pull request quarkusio#52637 from brunobat/null-mdc-kafka

Fix NPE when preserving MDC entries in VertxMDC

Author: gsmet

extensions/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxMDC.java

@@ -268,8 +268,8 @@ public boolean isEmpty(Context vertxContext) {
         return contextualDataMap(vertxContext).isEmpty();
     }
 
-    public Set<String> getKeys() {
-        return new HashSet<>(contextualDataMap(getContext()).keySet());
+    public Set<Map.Entry<String, Object>> getEntrySet() {
+        return new HashSet<>(contextualDataMap(getContext()).entrySet());
     }
 
     /**
@@ -349,9 +349,12 @@ public void reinitializeVertxMdc(Context vertxContext, Set<String> discardMdcKey
 
         final Map<String, Object> carryover = new HashMap<>();
         final boolean hasDiscardKeys = discardMdcKeys == null || discardMdcKeys.isEmpty();
-        for (String key : VertxMDC.INSTANCE.getKeys()) {
-            if (hasDiscardKeys || !discardMdcKeys.contains(key)) {
-                carryover.put(key, VertxMDC.INSTANCE.getObject(key));
+        for (Map.Entry<String, Object> entry : VertxMDC.INSTANCE.getEntrySet()) {
+            final String key = entry.getKey();
+            final Object value = entry.getValue();
+            // Not taking chances with null values
+            if (key != null && value != null && (hasDiscardKeys || !discardMdcKeys.contains(key))) {
+                carryover.put(key, value);
             }
         }