Skip to content

[ISSUE #10837] fix(client): skip truncated trace records #10847

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
yuluo-yx wants to merge 1 commit into
base: develop
Choose a base branch
from
+16 −5
Open

[ISSUE #10837] fix(client): skip truncated trace records #10847

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
10 changes: 5 additions & 5 deletions client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static List<TraceContext> decoderFromTraceDataString(String traceData) {
String[] contextList = traceData.split(String.valueOf(TraceConstants.FIELD_SPLITOR));
for (String context : contextList) {
String[] line = context.split(String.valueOf(TraceConstants.CONTENT_SPLITOR));
if (line[0].equals(TraceType.Pub.name())) {
if (line.length >= 13 && line[0].equals(TraceType.Pub.name())) {
TraceContext pubContext = new TraceContext();
pubContext.setTraceType(TraceType.Pub);
pubContext.setTimeStamp(Long.parseLong(line[1]));
Expand Down Expand Up @@ -77,7 +77,7 @@ public static List<TraceContext> decoderFromTraceDataString(String traceData) {
pubContext.setTraceBeans(new ArrayList<>(1));
pubContext.getTraceBeans().add(bean);
resList.add(pubContext);
} else if (line[0].equals(TraceType.SubBefore.name())) {
} else if (line.length >= 8 && line[0].equals(TraceType.SubBefore.name())) {
TraceContext subBeforeContext = new TraceContext();
subBeforeContext.setTraceType(TraceType.SubBefore);
subBeforeContext.setTimeStamp(Long.parseLong(line[1]));
Expand All @@ -91,7 +91,7 @@ public static List<TraceContext> decoderFromTraceDataString(String traceData) {
subBeforeContext.setTraceBeans(new ArrayList<>(1));
subBeforeContext.getTraceBeans().add(bean);
resList.add(subBeforeContext);
} else if (line[0].equals(TraceType.SubAfter.name())) {
} else if (line.length >= 6 && line[0].equals(TraceType.SubAfter.name())) {
TraceContext subAfterContext = new TraceContext();
subAfterContext.setTraceType(TraceType.SubAfter);
subAfterContext.setRequestId(line[1]);
Expand All @@ -112,7 +112,7 @@ public static List<TraceContext> decoderFromTraceDataString(String traceData) {
subAfterContext.setGroupName(line[8]);
}
resList.add(subAfterContext);
} else if (line[0].equals(TraceType.EndTransaction.name())) {
} else if (line.length >= 13 && line[0].equals(TraceType.EndTransaction.name())) {
TraceContext endTransactionContext = new TraceContext();
endTransactionContext.setTraceType(TraceType.EndTransaction);
endTransactionContext.setTimeStamp(Long.parseLong(line[1]));
Expand All @@ -132,7 +132,7 @@ public static List<TraceContext> decoderFromTraceDataString(String traceData) {
endTransactionContext.setTraceBeans(new ArrayList<>(1));
endTransactionContext.getTraceBeans().add(bean);
resList.add(endTransactionContext);
} else if (line[0].equals(TraceType.Recall.name())) {
} else if (line.length >= 7 && line[0].equals(TraceType.Recall.name())) {
TraceContext recallContext = new TraceContext();
recallContext.setTraceType(TraceType.Recall);
recallContext.setTimeStamp(Long.parseLong(line[1]));
Expand Down
11 changes: 11 additions & 0 deletions client/src/test/java/org/apache/rocketmq/client/trace/TraceDataEncoderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,17 @@ public void testDecoderFromTraceDataString() {
Assert.assertEquals(contexts.get(0).getTraceType(), TraceType.Pub);
}

@Test
public void testDecoderSkipsTruncatedRecord() {
String truncatedRecord = TraceType.Pub.name() + TraceConstants.CONTENT_SPLITOR
+ TraceConstants.FIELD_SPLITOR;

List<TraceContext> contexts = TraceDataEncoder.decoderFromTraceDataString(truncatedRecord + traceData);

assertThat(contexts).hasSize(1);
assertThat(contexts.get(0).getTraceType()).isEqualTo(TraceType.Pub);
}

@Test
public void testEncoderFromContextBean() {
TraceContext context = new TraceContext();
Expand Down
Loading