From 768f0ac52209cb47b3f3ab89a52c7d887827529f Mon Sep 17 00:00:00 2001
From: Sergey Lapshin <sp.lapshin@gmail.com>
Date: Thu, 28 Aug 2025 17:13:06 +0200
Subject: [PATCH] Extract headers from incoming Kafka messages and map them to
 the envelope

---
 .../Wolverine.Kafka/Internals/KafkaEnvelopeMapper.cs  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Transports/Kafka/Wolverine.Kafka/Internals/KafkaEnvelopeMapper.cs b/src/Transports/Kafka/Wolverine.Kafka/Internals/KafkaEnvelopeMapper.cs
index 0e661191a..8aa5a20d2 100644
--- a/src/Transports/Kafka/Wolverine.Kafka/Internals/KafkaEnvelopeMapper.cs
+++ b/src/Transports/Kafka/Wolverine.Kafka/Internals/KafkaEnvelopeMapper.cs
@@ -28,4 +28,15 @@ protected override bool tryReadIncomingHeader(Message<string, byte[]> incoming,
         value = default!;
         return false;
     }
+
+    protected override void writeIncomingHeaders(Message<string, byte[]> incoming, Envelope envelope)
+    {
+        if (incoming.Headers == null) return;
+        foreach (var header in incoming.Headers)
+        {
+            var bytes = header.GetValueBytes();
+            envelope.Headers[header.Key] = bytes != null ? Encoding.Default.GetString(bytes) : null;
+        }
+    }
+
 }
\ No newline at end of file