Skip to content

fix(rocketmq): log warning when FLAG or DELAY header is not numeric #4330

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
daguimu wants to merge 1 commit into
base: 2025.1.x
Choose a base branch
from
+52 −2
Open

fix(rocketmq): log warning when FLAG or DELAY header is not numeric #4330

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
15 changes: 13 additions & 2 deletions ...ava/com/alibaba/cloud/stream/binder/rocketmq/support/RocketMQMessageConverterSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import com.alibaba.cloud.stream.binder.rocketmq.custom.RocketMQBeanContainerCache;
import org.apache.rocketmq.common.message.MessageConst;
import org.apache.rocketmq.common.message.MessageExt;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders;
Expand All @@ -40,6 +42,9 @@
*/
public final class RocketMQMessageConverterSupport {

private static final Logger log = LoggerFactory
.getLogger(RocketMQMessageConverterSupport.class);

private RocketMQMessageConverterSupport() {
}

Expand Down Expand Up @@ -155,17 +160,23 @@ private static org.apache.rocketmq.common.message.Message getAndWrapMessage(
headers.get(toRocketHeaderKey(Headers.FLAG)));
int flag = 0;
int delayLevel = 0;
Object delayLevelObj = null;
try {
flagObj = flagObj == null ? 0 : flagObj;
Object delayLevelObj = headers.getOrDefault(
delayLevelObj = headers.getOrDefault(
RocketMQConst.PROPERTY_DELAY_TIME_LEVEL,
headers.get(toRocketHeaderKey(
RocketMQConst.PROPERTY_DELAY_TIME_LEVEL)));
delayLevelObj = delayLevelObj == null ? 0 : delayLevelObj;
delayLevel = Integer.parseInt(String.valueOf(delayLevelObj));
flag = Integer.parseInt(String.valueOf(flagObj));
}
catch (Exception ignored) {
catch (Exception e) {
log.warn(
"Non-numeric '{}' or '{}' header; falling back to flag=0 and delayLevel=0. "
+ "flagHeader={}, delayLevelHeader={}",
Headers.FLAG, RocketMQConst.PROPERTY_DELAY_TIME_LEVEL,
flagObj, delayLevelObj, e);
}
if (delayLevel > 0) {
rocketMsg.setDelayTimeLevel(delayLevel);
Expand Down
39 changes: 39 additions & 0 deletions ...st/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageConverterSupportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.alibaba.cloud.stream.binder.rocketmq;

import com.alibaba.cloud.stream.binder.rocketmq.constant.RocketMQConst;
import com.alibaba.cloud.stream.binder.rocketmq.support.RocketMQMessageConverterSupport;
import org.apache.rocketmq.common.message.MessageConst;
import org.junit.jupiter.api.Test;
Expand All @@ -24,6 +25,7 @@
import org.springframework.messaging.support.MessageBuilder;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;

/**
* @author Sorie
Expand All @@ -44,4 +46,41 @@ public void convertMessage2MQBlankHeaderTest() {
assertThat(testProp).isNull();
assertThat(tagProp).isEqualTo("a");
}

@Test
public void nonNumericDelayTimeLevelHeaderFallsBackToZero() {
Message<String> message = MessageBuilder.withPayload("msg")
.setHeader(RocketMQConst.PROPERTY_DELAY_TIME_LEVEL, "not-a-number")
.build();

org.apache.rocketmq.common.message.Message rkmqMsg =
RocketMQMessageConverterSupport.convertMessage2MQ("topic", message);

assertThat(rkmqMsg.getDelayTimeLevel()).isEqualTo(0);
assertThat(rkmqMsg.getFlag()).isEqualTo(0);
}

@Test
public void nonNumericFlagHeaderFallsBackToZero() {
Message<String> message = MessageBuilder.withPayload("msg")
.setHeader(RocketMQConst.Headers.FLAG, "not-a-number")
.build();

org.apache.rocketmq.common.message.Message rkmqMsg =
RocketMQMessageConverterSupport.convertMessage2MQ("topic", message);

assertThat(rkmqMsg.getFlag()).isEqualTo(0);
}

@Test
public void invalidNumericHeaderDoesNotPropagateException() {
Message<String> message = MessageBuilder.withPayload("msg")
.setHeader(RocketMQConst.PROPERTY_DELAY_TIME_LEVEL, "x")
.setHeader(RocketMQConst.Headers.FLAG, "y")
.build();

assertThatCode(() ->
RocketMQMessageConverterSupport.convertMessage2MQ("topic", message))
.doesNotThrowAnyException();
}
}