[ISSUE #3136] TraceDataEncoder add SubAfter trace bean timestamp

apache · Jul 10, 2021 · 0933774 · 0933774
1 parent 589e87c
commit 0933774
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java b/client/src/main/java/org/apache/rocketmq/client/trace/TraceDataEncoder.java
@@ -104,9 +104,8 @@ public static List<TraceContext> decoderFromTraceDataString(String traceData) {
                     subAfterContext.setContextCode(Integer.parseInt(line[6]));
                 }
                 // compatible with the old version
-                if (line.length >= 9) {
+                if (line.length >= 8) {
                     subAfterContext.setTimeStamp(Long.parseLong(line[7]));
-                    subAfterContext.setGroupName(line[8]);
                 }
                 resList.add(subAfterContext);
             } else if (line[0].equals(TraceType.EndTransaction.name())) {
@@ -188,7 +187,8 @@ public static TraceTransferBean encoderFromContextBean(TraceContext ctx) {
                         .append(ctx.getCostTime()).append(TraceConstants.CONTENT_SPLITOR)//
                         .append(ctx.isSuccess()).append(TraceConstants.CONTENT_SPLITOR)//
                         .append(bean.getKeys()).append(TraceConstants.CONTENT_SPLITOR)//
-                        .append(ctx.getContextCode()).append(TraceConstants.FIELD_SPLITOR);
+                        .append(ctx.getContextCode()).append(TraceConstants.CONTENT_SPLITOR)
+                        .append(ctx.getTimeStamp()).append(TraceConstants.FIELD_SPLITOR);
 
                 }
             }

diff --git a/client/src/test/java/org/apache/rocketmq/client/trace/TraceDataEncoderTest.java b/client/src/test/java/org/apache/rocketmq/client/trace/TraceDataEncoderTest.java
@@ -189,6 +189,7 @@ public void testSubAfterTraceDataFormatTest() {
         subAfterContext.setRequestId("3455848576927");
         subAfterContext.setCostTime(20);
         subAfterContext.setSuccess(true);
+        subAfterContext.setTimeStamp(1625883640000L);
         subAfterContext.setContextCode(98623046);
         TraceBean bean = new TraceBean();
         bean.setMsgId("AC1415116D1418B4AAC217FE1B4E0000");
@@ -200,7 +201,7 @@ public void testSubAfterTraceDataFormatTest() {
         String transData = traceTransferBean.getTransData();
         Assert.assertNotNull(transData);
         String[] items = transData.split(String.valueOf(TraceConstants.CONTENT_SPLITOR));
-        Assert.assertEquals(7, items.length);
+        Assert.assertEquals(8, items.length);
 
     }