Skip to content

GH-3211: Restore timestamp header on consumed messages #3245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PRAHLAD09-dev wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −3
Open

GH-3211: Restore timestamp header on consumed messages #3245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions ...ntegration-tests/src/test/java/org/springframework/cloud/stream/function/HeaderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,24 @@ void checkMessageWrappedFunctionalConsumer() {
assertThat(headers.get(MessageHeaders.CONTENT_TYPE)).isEqualTo("application/json");
}

@Test
void timestampHeaderIsPresentOnConsumedMessage() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
TestChannelBinderConfiguration.getCompleteConfiguration(FunctionUpperCaseConfiguration.class))
.web(WebApplicationType.NONE)
.run("--spring.jmx.enabled=false",
"--spring.cloud.function.definition=uppercase")) {

InputDestination input = context.getBean(InputDestination.class);
input.send(new GenericMessage<>("hello".getBytes()), "uppercase-in-0");

OutputDestination output = context.getBean(OutputDestination.class);
Message<byte[]> result = output.receive(1000, "uppercase-out-0");

assertThat(result.getHeaders().getTimestamp()).isNotNull();
}
}

@EnableAutoConfiguration
public static class EmptyConfiguration {

Expand Down
14 changes: 11 additions & 3 deletions ...stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.SubscribableChannel;
import org.springframework.messaging.support.ChannelInterceptor;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.Trigger;
import org.springframework.scheduling.support.CronTrigger;
Expand Down Expand Up @@ -409,12 +410,19 @@ private <T> Message<T> wrapToMessageIfNecessary(T value) {
}

private static <P> Message<P> sanitize(Message<P> inputMessage) {
return MessageBuilder
Message<P> sanitized = MessageBuilder
.fromMessage(inputMessage)
.removeHeader("spring.cloud.stream.sendto.destination")
// .setHeader(MessageUtils.SOURCE_TYPE, inputMessage.getHeaders().get(MessageUtils.TARGET_PROTOCOL))
// .removeHeader(MessageUtils.TARGET_PROTOCOL)
.build();
if (sanitized == inputMessage) {
// MessageBuilder.build() returns the same instance when no header was
// actually modified (fast-path in BaseMessageBuilder), which skips the
// GenericMessage constructor and therefore skips stamping a "timestamp"
// header. Force a fresh GenericMessage so the header is always present,
// restoring pre-4.3.3 behavior. See GH-3211.
sanitized = new GenericMessage<>(inputMessage.getPayload(), inputMessage.getHeaders());
}
return sanitized;
}

private static class FunctionToDestinationBinder implements InitializingBean, ApplicationContextAware {
Expand Down