SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Customizing batch message conversion behavior for Kafka binder

Browse Source 
Continuation of the previous commit: 14c10462f8
This commit is contained in:
Soby Chacko
2024-09-17 14:39:30 -04:00
committed by Oleg Zhurakousky
parent 2517760529
commit e4a06ee686
5 changed files with 104 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
binders/kafka-binder/spring-cloud-stream-binder-kafka/pom.xml
View File

@@ -45,6 +45,7 @@
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
<version>3.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

29
binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/DefaultMessageConverterHelper.java
View File

@@ -16,13 +16,18 @@
package org.springframework.cloud.stream.binder.kafka.config;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import org.springframework.cloud.function.context.config.MessageConverterHelper;
import org.springframework.kafka.support.KafkaHeaders;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders;
/**
* @author Oleg Zhurakousky
* @author Soby Chacko
*/
public class DefaultMessageConverterHelper implements MessageConverterHelper {
@@ -32,10 +37,22 @@ public class DefaultMessageConverterHelper implements MessageConverterHelper {
}
public void postProcessBatchMessageOnFailure(Message<?> message, int index) {
AtomicInteger deliveryAttempt = (AtomicInteger) message.getHeaders().get("deliveryAttempt");
// if (message.getHeaders().containsKey("amqp_batchedHeaders") && deliveryAttempt != null && deliveryAttempt.get() == 1) {
// ArrayList<?> list = (ArrayList<?>) message.getHeaders().get("amqp_batchedHeaders");
// list.remove(index);
// }
MessageHeaders headers = message.getHeaders();
Set<String> headerKeySet = headers.keySet();
List<String> matchingHeaderKeys = new ArrayList<>();
for (String string : headerKeySet) {
if (string.startsWith(KafkaHeaders.PREFIX)) {
matchingHeaderKeys.add(string);
}
}
for (String matchingHeaderKey : matchingHeaderKeys) {
Object matchingHeaderValue = message.getHeaders().get(matchingHeaderKey);
if (matchingHeaderValue instanceof ArrayList<?> list) {
if (!list.isEmpty()) {
list.remove(index);
}
}
}
}
}

34
binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/MessageConverterHelperConfiguration.java Normal file
View File

@@ -0,0 +1,34 @@
/*
* Copyright 2019-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.stream.binder.kafka.config;
import org.springframework.cloud.function.context.config.MessageConverterHelper;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @author Oleg Zhurakousky
* @author Soby Chacko
*/
@Configuration(proxyBeanMethods = false)
public class MessageConverterHelperConfiguration {
@Bean
public MessageConverterHelper messageConverterHelper() {
return new DefaultMessageConverterHelper();
}
}

1
binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@@ -1 +1,2 @@
org.springframework.cloud.stream.binder.kafka.config.ExtendedBindingHandlerMappingsProviderConfiguration
org.springframework.cloud.stream.binder.kafka.config.MessageConverterHelperConfiguration

172
binders/kafka-binder/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/FunctionBatchingConversionTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2019-2024 the original author or authors.
* Copyright 2024-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,163 +18,81 @@ package org.springframework.cloud.stream.binder.kafka;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.cloud.function.context.config.MessageConverterHelper;
import org.springframework.cloud.function.json.JacksonMapper;
import org.springframework.cloud.stream.binder.test.InputDestination;
import org.springframework.cloud.stream.binder.test.OutputDestination;
import org.springframework.cloud.stream.binder.test.TestChannelBinder;
import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.stream.function.StreamBridge;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.kafka.test.context.EmbeddedKafka;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandlingException;
import org.springframework.messaging.converter.MessageConversionException;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.util.Assert;
import static org.assertj.core.api.Assertions.assertThat;
/**
*
* @author Soby Chacko
*/
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, properties = {
"spring.cloud.function.definition=batchConsumer",
"spring.cloud.stream.bindings.batchConsumer-in-0.consumer.batch-mode=true",
"spring.cloud.stream.bindings.batchConsumer-in-0.destination=cfrthp-topic",
"spring.cloud.stream.bindings.batchConsumer-in-0.group=cfrthp-group"
})
@EmbeddedKafka
@DirtiesContext
public class FunctionBatchingConversionTests {
@SuppressWarnings("unchecked")
// @Test
void testBatchHeadersMatchingPayload() {
TestChannelBinderConfiguration.applicationContextRunner(BatchFunctionConfiguration.class)
.withPropertyValues("spring.cloud.stream.function.definition=func",
"spring.cloud.stream.bindings.func-in-0.consumer.batch-mode=true",
"spring.cloud.stream.rabbit.bindings.func-in-0.consumer.enable-batching=true")
.run(context -> {
InputDestination inputDestination = context.getBean(InputDestination.class);
OutputDestination outputDestination = context.getBean(OutputDestination.class);
@Autowired
private StreamBridge streamBridge;
List<byte[]> payloads = List.of("hello".getBytes(StandardCharsets.UTF_8),
"{\"name\":\"Ricky\"}".getBytes(StandardCharsets.UTF_8),
"{\"name\":\"Julien\"}".getBytes(StandardCharsets.UTF_8),
"{\"name\":\"Bubbles\"}".getBytes(StandardCharsets.UTF_8),
"hello".getBytes(StandardCharsets.UTF_8));
List<Map<String, String>> amqpBatchHeaders = new ArrayList<>();
for (int i = 0; i < 5; i++) {
Map<String, String> batchHeaders = new LinkedHashMap<>();
batchHeaders.put("amqp_receivedDeliveryMode", "PERSISTENT");
batchHeaders.put("index", String.valueOf(i));
amqpBatchHeaders.add(batchHeaders);
}
static CountDownLatch latch = new CountDownLatch(3);
var message = MessageBuilder.withPayload(payloads)
.setHeader("amqp_batchedHeaders", amqpBatchHeaders)
.setHeader("deliveryAttempt", new AtomicInteger(1)).build();
inputDestination.send(message);
static List<Person> persons = new ArrayList<>();
Message<byte[]> resultMessage = outputDestination.receive();
JacksonMapper mapper = context.getBean(JacksonMapper.class);
List<?> resultPayloads = mapper.fromJson(resultMessage.getPayload(), List.class);
assertThat(resultPayloads).hasSize(3);
@Test
void conversionFailuresRemoveTheHeadersProperly() throws Exception {
streamBridge.send("cfrthp-topic", "hello".getBytes(StandardCharsets.UTF_8));
streamBridge.send("cfrthp-topic", "hello".getBytes(StandardCharsets.UTF_8));
streamBridge.send("cfrthp-topic", "{\"name\":\"Ricky\"}".getBytes(StandardCharsets.UTF_8));
streamBridge.send("cfrthp-topic", "{\"name\":\"Julian\"}".getBytes(StandardCharsets.UTF_8));
streamBridge.send("cfrthp-topic", "{\"name\":\"Bubbles\"}".getBytes(StandardCharsets.UTF_8));
List<Map<String, String>> amqpBatchedHeaders = (List<Map<String, String>>) resultMessage
.getHeaders().get("amqp_batchedHeaders");
assertThat(amqpBatchedHeaders).hasSize(resultPayloads.size());
assertThat(amqpBatchedHeaders.get(0).get("index")).isEqualTo("1");
assertThat(amqpBatchedHeaders.get(1).get("index")).isEqualTo("2");
assertThat(amqpBatchedHeaders.get(2).get("index")).isEqualTo("3");
Assert.isTrue(latch.await(10, TimeUnit.SECONDS), "Failed to receive message");
context.stop();
});
assertThat(persons.size()).isEqualTo(3);
assertThat(persons.get(0).toString().contains("Ricky")).isTrue();
assertThat(persons.get(1).toString().contains("Julian")).isTrue();
assertThat(persons.get(2).toString().contains("Bubbles")).isTrue();
}
// @Test
void testBatchHeadersForcingFatalFailureOnConversiionException() {
TestChannelBinderConfiguration
.applicationContextRunner(BatchFunctionConfigurationWithAdditionalConversionHelper.class)
.withPropertyValues("spring.cloud.stream.function.definition=func",
"spring.cloud.stream.bindings.func-in-0.consumer.batch-mode=true",
"spring.cloud.stream.bindings.func-in-0.consumer.max-attempts=1",
"spring.cloud.stream.rabbit.bindings.func-in-0.consumer.enable-batching=true")
.run(context -> {
InputDestination inputDestination = context.getBean(InputDestination.class);
List<byte[]> payloads = List.of("hello".getBytes(StandardCharsets.UTF_8),
"{\"name\":\"Ricky\"}".getBytes(StandardCharsets.UTF_8),
"{\"name\":\"Julien\"}".getBytes(StandardCharsets.UTF_8),
"{\"name\":\"Bubbles\"}".getBytes(StandardCharsets.UTF_8),
"hello".getBytes(StandardCharsets.UTF_8));
List<Map<String, String>> amqpBatchHeaders = new ArrayList<>();
for (int i = 0; i < 5; i++) {
Map<String, String> batchHeaders = new LinkedHashMap<>();
batchHeaders.put("amqp_receivedDeliveryMode", "PERSISTENT");
batchHeaders.put("index", String.valueOf(i));
amqpBatchHeaders.add(batchHeaders);
}
var message = MessageBuilder.withPayload(payloads)
.setHeader("amqp_batchedHeaders", amqpBatchHeaders)
.setHeader("deliveryAttempt", new AtomicInteger(1)).build();
inputDestination.send(message);
TestChannelBinder binder = context.getBean(TestChannelBinder.class);
assertThat(binder.getLastError().getPayload()).isInstanceOf(MessageHandlingException.class);
MessageHandlingException exception = (MessageHandlingException) binder.getLastError().getPayload();
assertThat(exception.getCause()).isInstanceOf(MessageConversionException.class);
context.stop();
});
}
@Configuration
@EnableAutoConfiguration
public static class BatchFunctionConfiguration {
@Bean
public Function<Message<List<Person>>, Message<List<Person>>> func() {
return x -> {
return x;
};
}
}
@Configuration
@EnableAutoConfiguration
public static class BatchFunctionConfigurationWithAdditionalConversionHelper {
public static class Config {
@Bean
public MessageConverterHelper helper() {
return new MessageConverterHelper() {
public boolean shouldFailIfCantConvert(Message<?> message) {
return true;
Consumer<Message<List<Person>>> batchConsumer() {
return message -> {
if (!message.getPayload().isEmpty()) {
message.getPayload().forEach(c -> {
persons.add(c);
latch.countDown();
});
}
};
}
@Bean
public Function<Message<List<Person>>, Message<List<Person>>> func() {
return x -> {
return x;
};
}
}
static class Person {
private String name;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String toString() {
return "name: " + name;
}
record Person(String name) {
}
}