Exclude all attributes starting with "goog_" from outbound Pub/Sub he…

…aders (#845) * migrating the test * Fixing issue #776
GoogleCloudPlatform · Jan 7, 2022 · 7b6c722 · 7b6c722
1 parent 25aa6ff
commit 7b6c722
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/...p-pubsub/src/main/java/com/google/cloud/spring/pubsub/integration/PubSubHeaderMapper.java b/...p-pubsub/src/main/java/com/google/cloud/spring/pubsub/integration/PubSubHeaderMapper.java
@@ -48,6 +48,7 @@ public class PubSubHeaderMapper implements HeaderMapper<Map<String, String>> {
 			"!" + MessageHeaders.ID,
 			"!" + MessageHeaders.TIMESTAMP,
 			"!" + GcpPubSubHeaders.ORIGINAL_MESSAGE,
+			"!" + GcpPubSubHeaders.CLIENT,
 			"!" + NativeMessageHeaderAccessor.NATIVE_HEADERS,
 			"!" + MessageHistory.HEADER_NAME,
 			"*"};

diff --git a/...oud-gcp-pubsub/src/main/java/com/google/cloud/spring/pubsub/support/GcpPubSubHeaders.java b/...oud-gcp-pubsub/src/main/java/com/google/cloud/spring/pubsub/support/GcpPubSubHeaders.java
@@ -30,6 +30,11 @@ private GcpPubSubHeaders() {
 
 	private static final String PREFIX = "gcp_pubsub_";
 
+	/**
+	 * The client header text.
+	 */
+	public static final String CLIENT = "googclient_*";
+
 	/**
 	 * The topic header text.
 	 */

diff --git a/...sub/src/test/java/com/google/cloud/spring/pubsub/integration/PubSubHeaderMapperTests.java b/...sub/src/test/java/com/google/cloud/spring/pubsub/integration/PubSubHeaderMapperTests.java
@@ -40,6 +40,24 @@ public class PubSubHeaderMapperTests {
 	@Rule
 	public ExpectedException expectedException = ExpectedException.none();
 
+	@Test
+	public void testFilterGoogleClientHeaders() {
+		PubSubHeaderMapper mapper = new PubSubHeaderMapper();
+		Map<String, Object> originalHeaders = new HashMap<>();
+		originalHeaders.put("my header", "pantagruel's nativity");
+		MessageHeaders internalHeaders = new MessageHeaders(originalHeaders);
+
+		originalHeaders.put("googclient_deliveryattempt", "header attached when DLQ is enabled");
+		originalHeaders.put("googclient_anyHeader", "any other possible headers");
+
+		Map<String, String> filteredHeaders = new HashMap<>();
+		mapper.fromHeaders(internalHeaders, filteredHeaders);
+		assertThat(filteredHeaders)
+				.hasSize(1)
+				.containsEntry("my header", "pantagruel's nativity");
+	}
+
+
 	@Test
 	public void testFilterHeaders() {
 		PubSubHeaderMapper mapper = new PubSubHeaderMapper();