(rocketmq) branch develop updated: Revert "[ISSUE #7686] The bornTime is not set when using the popMessage API i…" (#8331)

[zhouxzhan]

This is an automated email from the ASF dual-hosted git repository.

zhouxzhan pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new b31e0cea00 Revert "[ISSUE #7686] The bornTime is not set when using 
the popMessage API i…" (#8331)
b31e0cea00 is described below

commit b31e0cea00a8d95921877fd8c1e4239717b05a9e
Author: Zhouxiang Zhan <zhouxiang....@alibaba-inc.com>
AuthorDate: Wed Jun 26 19:04:45 2024 +0800

    Revert "[ISSUE #7686] The bornTime is not set when using the popMessage API 
i…" (#8331)
    
    This reverts commit 4bb4d78f1d5a8d920b85675ef9628a75b2a86f98.
---
 .../main/java/org/apache/rocketmq/proxy/processor/ConsumerProcessor.java | 1 -
 .../org/apache/rocketmq/proxy/service/message/LocalMessageService.java   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/proxy/src/main/java/org/apache/rocketmq/proxy/processor/ConsumerProcessor.java
 
b/proxy/src/main/java/org/apache/rocketmq/proxy/processor/ConsumerProcessor.java
index 9adf20ebba..24fc0a2a28 100644
--- 
a/proxy/src/main/java/org/apache/rocketmq/proxy/processor/ConsumerProcessor.java
+++ 
b/proxy/src/main/java/org/apache/rocketmq/proxy/processor/ConsumerProcessor.java
@@ -137,7 +137,6 @@ public class ConsumerProcessor extends AbstractProcessor {
             requestHeader.setExp(subscriptionData.getSubString());
             requestHeader.setOrder(fifo);
             requestHeader.setAttemptId(attemptId);
-            requestHeader.setBornTime(System.currentTimeMillis());
 
             future = this.serviceManager.getMessageService().popMessage(
                     ctx,
diff --git 
a/proxy/src/main/java/org/apache/rocketmq/proxy/service/message/LocalMessageService.java
 
b/proxy/src/main/java/org/apache/rocketmq/proxy/service/message/LocalMessageService.java
index 9181f966f4..aaa688fee6 100644
--- 
a/proxy/src/main/java/org/apache/rocketmq/proxy/service/message/LocalMessageService.java
+++ 
b/proxy/src/main/java/org/apache/rocketmq/proxy/service/message/LocalMessageService.java
@@ -195,6 +195,7 @@ public class LocalMessageService implements MessageService {
     @Override
     public CompletableFuture<PopResult> popMessage(ProxyContext ctx, 
AddressableMessageQueue messageQueue,
         PopMessageRequestHeader requestHeader, long timeoutMillis) {
+        requestHeader.setBornTime(System.currentTimeMillis());
         RemotingCommand request = 
LocalRemotingCommand.createRequestCommand(RequestCode.POP_MESSAGE, 
requestHeader, ctx.getLanguage());
         CompletableFuture<RemotingCommand> future = new CompletableFuture<>();
         SimpleChannel channel = channelManager.createInvocationChannel(ctx);