[ISSUE #682] Fix wrong message trace detail (#683)

* Fix message trace detail wrong field * Use constants to distinguish different message version * Add UT Co-authored-by: zhangxu16 <zhangxu16@xiaomi.com>
2026-02-20 12:07:10 +08:00 · 2021-03-11 16:54:07 +08:00
parent 1fc200212c
commit be476bc146
4 changed files with 206 additions and 9 deletions
--- a/src/test/java/org/apache/rocketmq/console/util/MsgTraceDecodeUtilTest.java
+++ b/src/test/java/org/apache/rocketmq/console/util/MsgTraceDecodeUtilTest.java
@@ -0,0 +1,137 @@
+package org.apache.rocketmq.console.util;
+
+import java.util.List;
+import org.apache.rocketmq.client.trace.TraceConstants;
+import org.apache.rocketmq.client.trace.TraceContext;
+import org.apache.rocketmq.common.UtilAll;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class MsgTraceDecodeUtilTest {
+    private StringBuilder pubTraceDataBase;
+    private StringBuilder subTraceDataBase;
+
+    @Before
+    public void init() {
+        pubTraceDataBase = new StringBuilder()
+            .append("Pub").append(TraceConstants.CONTENT_SPLITOR)
+            .append("1614663055253").append(TraceConstants.CONTENT_SPLITOR)
+            .append("DefaultRegion").append(TraceConstants.CONTENT_SPLITOR)
+            .append("DEFAULT_GROUP").append(TraceConstants.CONTENT_SPLITOR)
+            .append("Trace_test").append(TraceConstants.CONTENT_SPLITOR)
+            .append("0A741C02622500000000080cc6980189").append(TraceConstants.CONTENT_SPLITOR)
+            .append(TraceConstants.CONTENT_SPLITOR)
+            .append("123 456").append(TraceConstants.CONTENT_SPLITOR)
+            .append("10.10.10.10:30911").append(TraceConstants.CONTENT_SPLITOR)
+            .append("25").append(TraceConstants.CONTENT_SPLITOR)
+            .append("1").append(TraceConstants.CONTENT_SPLITOR)
+            .append("0").append(TraceConstants.CONTENT_SPLITOR);
+        subTraceDataBase = new StringBuilder()
+            .append("SubBefore").append(TraceConstants.CONTENT_SPLITOR)
+            .append("1614666740499").append(TraceConstants.CONTENT_SPLITOR)
+            .append(TraceConstants.CONTENT_SPLITOR)
+            .append("test_consumer_group").append(TraceConstants.CONTENT_SPLITOR)
+            .append("0A741C029C1800000000084501200121").append(TraceConstants.CONTENT_SPLITOR)
+            .append("0A741C02622500000000080cc698003f").append(TraceConstants.CONTENT_SPLITOR)
+            .append("2").append(TraceConstants.CONTENT_SPLITOR)
+            .append("789 ").append(TraceConstants.CONTENT_SPLITOR)
+            .append("10.10.10.11@39960").append(TraceConstants.CONTENT_SPLITOR)
+            .append(TraceConstants.FIELD_SPLITOR)
+            .append("SubAfter").append(TraceConstants.CONTENT_SPLITOR)
+            .append("0A741C029C1800000000084501200121").append(TraceConstants.CONTENT_SPLITOR)
+            .append("0A741C02622500000000080cc698003f").append(TraceConstants.CONTENT_SPLITOR)
+            .append("0").append(TraceConstants.CONTENT_SPLITOR)
+            .append("false").append(TraceConstants.CONTENT_SPLITOR)
+            .append("789 ").append(TraceConstants.CONTENT_SPLITOR);
+    }
+
+    @Test
+    public void testDecodePubTraceMessage() {
+        String pubTraceData_V1 = new String(pubTraceDataBase);
+        List<TraceContext> traceContextListV1 = MsgTraceDecodeUtil.decoderFromTraceDataString(pubTraceData_V1);
+        Assert.assertEquals(traceContextListV1.size(), 1);
+        Assert.assertEquals(traceContextListV1.get(0).getTraceType().toString(), "Pub");
+        Assert.assertEquals(traceContextListV1.get(0).isSuccess(), true);
+        Assert.assertEquals(traceContextListV1.get(0).getTraceBeans().get(0).getMsgId(), "0A741C02622500000000080cc6980189");
+        Assert.assertEquals(traceContextListV1.get(0).getTraceBeans().get(0).getOffsetMsgId(), "");
+        Assert.assertEquals(traceContextListV1.get(0).getTraceBeans().get(0).getStoreHost(), "10.10.10.10:30911");
+        Assert.assertEquals(traceContextListV1.get(0).getTraceBeans().get(0).getClientHost(), UtilAll.ipToIPv4Str(UtilAll.getIP()));
+
+        String pubTraceData_V2 = new StringBuilder(pubTraceDataBase)
+            .append("false").append(TraceConstants.CONTENT_SPLITOR)
+            .toString();
+        List<TraceContext> traceContextListV2 = MsgTraceDecodeUtil.decoderFromTraceDataString(pubTraceData_V2);
+        Assert.assertEquals(traceContextListV2.size(), 1);
+        Assert.assertEquals(traceContextListV2.get(0).getTraceType().toString(), "Pub");
+        Assert.assertEquals(traceContextListV2.get(0).isSuccess(), false);
+        Assert.assertEquals(traceContextListV2.get(0).getTraceBeans().get(0).getMsgId(), "0A741C02622500000000080cc6980189");
+        Assert.assertEquals(traceContextListV2.get(0).getTraceBeans().get(0).getOffsetMsgId(), "");
+        Assert.assertEquals(traceContextListV2.get(0).getTraceBeans().get(0).getStoreHost(), "10.10.10.10:30911");
+        Assert.assertEquals(traceContextListV2.get(0).getTraceBeans().get(0).getClientHost(), UtilAll.ipToIPv4Str(UtilAll.getIP()));
+
+        String pubTraceData_V3 = new StringBuilder(pubTraceDataBase)
+            .append("0A741D02000078BF000000000132F7C9").append(TraceConstants.CONTENT_SPLITOR)
+            .append("true").append(TraceConstants.CONTENT_SPLITOR)
+            .toString();
+        List<TraceContext> traceContextListV3 = MsgTraceDecodeUtil.decoderFromTraceDataString(pubTraceData_V3);
+        Assert.assertEquals(traceContextListV3.size(), 1);
+        Assert.assertEquals(traceContextListV3.get(0).getTraceType().toString(), "Pub");
+        Assert.assertEquals(traceContextListV3.get(0).isSuccess(), true);
+        Assert.assertEquals(traceContextListV3.get(0).getTraceBeans().get(0).getMsgId(), "0A741C02622500000000080cc6980189");
+        Assert.assertEquals(traceContextListV3.get(0).getTraceBeans().get(0).getOffsetMsgId(), "0A741D02000078BF000000000132F7C9");
+        Assert.assertEquals(traceContextListV3.get(0).getTraceBeans().get(0).getStoreHost(), "10.10.10.10:30911");
+        Assert.assertEquals(traceContextListV3.get(0).getTraceBeans().get(0).getClientHost(), UtilAll.ipToIPv4Str(UtilAll.getIP()));
+
+        String pubTraceData_V4 = new StringBuilder(pubTraceDataBase)
+            .append("0A741D02000078BF000000000132F7C9").append(TraceConstants.CONTENT_SPLITOR)
+            .append("true").append(TraceConstants.CONTENT_SPLITOR)
+            .append("10.10.10.11").append(TraceConstants.CONTENT_SPLITOR)
+            .toString();
+        List<TraceContext> traceContextListV4 = MsgTraceDecodeUtil.decoderFromTraceDataString(pubTraceData_V4);
+        Assert.assertEquals(traceContextListV4.size(), 1);
+        Assert.assertEquals(traceContextListV4.get(0).getTraceType().toString(), "Pub");
+        Assert.assertEquals(traceContextListV4.get(0).isSuccess(), true);
+        Assert.assertEquals(traceContextListV4.get(0).getTraceBeans().get(0).getMsgId(), "0A741C02622500000000080cc6980189");
+        Assert.assertEquals(traceContextListV4.get(0).getTraceBeans().get(0).getOffsetMsgId(), "0A741D02000078BF000000000132F7C9");
+        Assert.assertEquals(traceContextListV4.get(0).getTraceBeans().get(0).getStoreHost(), "10.10.10.10:30911");
+        Assert.assertEquals(traceContextListV4.get(0).getTraceBeans().get(0).getClientHost(), "10.10.10.11");
+    }
+
+    @Test
+    public void testDecodeSubTraceMessage() {
+        String subTraceData_V1 = new String(subTraceDataBase);
+        List<TraceContext> traceContextListV1 = MsgTraceDecodeUtil.decoderFromTraceDataString(subTraceData_V1);
+        Assert.assertEquals(traceContextListV1.size(), 2);
+        Assert.assertEquals(traceContextListV1.get(0).getTraceType().toString(), "SubBefore");
+        Assert.assertEquals(traceContextListV1.get(0).isSuccess(), true);
+        Assert.assertEquals(traceContextListV1.get(0).getTraceBeans().get(0).getMsgId(), "0A741C02622500000000080cc698003f");
+        Assert.assertEquals(traceContextListV1.get(0).getTraceBeans().get(0).getRetryTimes(), 2);
+        Assert.assertEquals(traceContextListV1.get(0).getTraceBeans().get(0).getClientHost(), "10.10.10.11@39960");
+        Assert.assertEquals(traceContextListV1.get(1).getTraceType().toString(), "SubAfter");
+        Assert.assertEquals(traceContextListV1.get(1).isSuccess(), false);
+        Assert.assertEquals(traceContextListV1.get(1).getTraceBeans().get(0).getMsgId(), "0A741C02622500000000080cc698003f");
+
+        String subTraceData_V2 = new StringBuilder(subTraceDataBase)
+            .append("4").append(TraceConstants.CONTENT_SPLITOR)
+            .toString();
+        List<TraceContext> traceContextListV2 = MsgTraceDecodeUtil.decoderFromTraceDataString(subTraceData_V2);
+        Assert.assertEquals(traceContextListV2.size(), 2);
+        Assert.assertEquals(traceContextListV2.get(1).getTraceType().toString(), "SubAfter");
+        Assert.assertEquals(traceContextListV2.get(1).isSuccess(), false);
+        Assert.assertEquals(traceContextListV2.get(1).getTraceBeans().get(0).getMsgId(), "0A741C02622500000000080cc698003f");
+        Assert.assertEquals(traceContextListV2.get(1).getContextCode(), 4);
+
+        String subTraceData_V3 = new StringBuilder(subTraceDataBase)
+            .append("4").append(TraceConstants.CONTENT_SPLITOR)
+            .append("1614666740499").append(TraceConstants.CONTENT_SPLITOR)
+            .append("test_consumer_group").append(TraceConstants.CONTENT_SPLITOR)
+            .toString();
+        List<TraceContext> traceContextListV3 = MsgTraceDecodeUtil.decoderFromTraceDataString(subTraceData_V3);
+        Assert.assertEquals(traceContextListV3.size(), 2);
+        Assert.assertEquals(traceContextListV3.get(1).getTraceType().toString(), "SubAfter");
+        Assert.assertEquals(traceContextListV3.get(1).isSuccess(), false);
+        Assert.assertEquals(traceContextListV3.get(1).getTraceBeans().get(0).getMsgId(), "0A741C02622500000000080cc698003f");
+        Assert.assertEquals(traceContextListV3.get(1).getGroupName(), "test_consumer_group");
+    }
+}