attach metadata to each individual message in bulkpublish if it exists

Signed-off-by: Chris Walsh <[email protected]>
dapr · Jan 6, 2025 · a371edd · a371edd
1 parent 8b9f932
commit a371edd
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/src/Dapr.Client/DaprClientGrpc.cs b/src/Dapr.Client/DaprClientGrpc.cs
@@ -219,6 +219,12 @@ events[counter] is CloudEvent
                         : Constants.ContentTypeApplicationJson,
                 Metadata = { },
             };
+
+            if (metadata != null)
+            {
+                entry.Metadata.Add(metadata);
+            }
+
             envelope.Entries.Add(entry);
             entryMap.Add(counter.ToString(), new BulkPublishEntry<TValue>(
                 entry.EntryId, events[counter], entry.ContentType, entry.Metadata));

diff --git a/test/Dapr.Client.Test/BulkPublishEventApiTest.cs b/test/Dapr.Client.Test/BulkPublishEventApiTest.cs
@@ -106,16 +106,24 @@ await daprClient.BulkPublishEventAsync(TestPubsubName, TestTopicName, bulkPublis
             firstEntry.ContentType.Should().Be(TestContentType);
             firstEntry.Event.ToStringUtf8().Should()
                 .Be(JsonSerializer.Serialize(bulkPublishData[0], client.InnerClient.JsonSerializerOptions));
-            firstEntry.Metadata.Should().BeEmpty();
+            firstEntry.Metadata.Count.Should().Be(2);
+            firstEntry.Metadata.Keys.Contains("key1").Should().BeTrue();
+            firstEntry.Metadata.Keys.Contains("key2").Should().BeTrue();
+            firstEntry.Metadata["key1"].Should().Be("value1");
+            firstEntry.Metadata["key2"].Should().Be("value2");
 
             var secondEntry = envelope.Entries[1];
 
             secondEntry.EntryId.Should().Be("1");
             secondEntry.ContentType.Should().Be(TestContentType);
             secondEntry.Event.ToStringUtf8().Should()
                 .Be(JsonSerializer.Serialize(bulkPublishData[1], client.InnerClient.JsonSerializerOptions));
-            secondEntry.Metadata.Should().BeEmpty();
-
+            secondEntry.Metadata.Count.Should().Be(2);
+            secondEntry.Metadata.Keys.Contains("key1").Should().BeTrue();
+            secondEntry.Metadata.Keys.Contains("key2").Should().BeTrue();
+            secondEntry.Metadata["key1"].Should().Be("value1");
+            secondEntry.Metadata["key2"].Should().Be("value2");
+
             // Create Response & Respond
             var response = new Autogenerated.BulkPublishResponse
             {
@@ -201,16 +209,24 @@ await daprClient.BulkPublishEventAsync(TestPubsubName, TestTopicName, bulkPublis
             firstEntry.ContentType.Should().Be(TestContentType);
             firstEntry.Event.ToStringUtf8().Should()
                 .Be(JsonSerializer.Serialize(bulkPublishData[0], client.InnerClient.JsonSerializerOptions));
-            firstEntry.Metadata.Should().BeEmpty();
+            firstEntry.Metadata.Count.Should().Be(2);
+            firstEntry.Metadata.Keys.Contains("key1").Should().BeTrue();
+            firstEntry.Metadata.Keys.Contains("key2").Should().BeTrue();
+            firstEntry.Metadata["key1"].Should().Be("value1");
+            firstEntry.Metadata["key2"].Should().Be("value2");
 
             var secondEntry = envelope.Entries[1];
 
             secondEntry.EntryId.Should().Be("1");
             secondEntry.ContentType.Should().Be(TestContentType);
             secondEntry.Event.ToStringUtf8().Should()
                 .Be(JsonSerializer.Serialize(bulkPublishData[1], client.InnerClient.JsonSerializerOptions));
-            secondEntry.Metadata.Should().BeEmpty();
-
+            secondEntry.Metadata.Count.Should().Be(2);
+            secondEntry.Metadata.Keys.Contains("key1").Should().BeTrue();
+            secondEntry.Metadata.Keys.Contains("key2").Should().BeTrue();
+            secondEntry.Metadata["key1"].Should().Be("value1");
+            secondEntry.Metadata["key2"].Should().Be("value2");
+
             // Create Response & Respond
             var response = new Autogenerated.BulkPublishResponse
             {