From 2deb0843d3b303d4f20e0bfb69b4c9ca63cface7 Mon Sep 17 00:00:00 2001
From: lican <295198088@qq.com>
Date: Mon, 30 Apr 2018 07:48:26 +0800
Subject: [PATCH] Fix Protocol doc Error And LogJsonReader Bug (#1135)

* fix based on org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan.logs

* Fix Code Bug

* Fix Doc
---
 .../provider/handler/reader/LogJsonReader.java   |  5 +++++
 docs/cn/Trace-Data-Protocol-CN.md                | 16 ++++++++--------
 docs/en/Trace-Data-Protocol.md                   | 16 ++++++++--------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReader.java
index be9d718431..150fa83fc8 100644
--- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReader.java
+++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReader.java
@@ -36,20 +36,25 @@ public class LogJsonReader implements StreamJsonReader<LogMessage> {
     @Override public LogMessage read(JsonReader reader) throws IOException {
         LogMessage.Builder builder = LogMessage.newBuilder();
 
+        reader.beginObject();
         while (reader.hasNext()) {
             switch (reader.nextName()) {
                 case TIME:
                     builder.setTime(reader.nextLong());
+                    break;
                 case LOG_DATA:
                     reader.beginArray();
                     while (reader.hasNext()) {
                         builder.addData(keyWithStringValueJsonReader.read(reader));
                     }
                     reader.endArray();
+                    break;
                 default:
                     reader.skipValue();
+                    break;
             }
         }
+        reader.endObject();
 
         return builder.build();
     }
diff --git a/docs/cn/Trace-Data-Protocol-CN.md b/docs/cn/Trace-Data-Protocol-CN.md
index 40826c266c..0e1a237d0e 100644
--- a/docs/cn/Trace-Data-Protocol-CN.md
+++ b/docs/cn/Trace-Data-Protocol-CN.md
@@ -209,7 +209,7 @@ HTTP JSON服务, 属性名与gRPC对应，属性解释详见gRPC协议说明，
               "eii": 2, //entryApplicationInstanceId, 入口的实例编号
               "esi": 0, //entryServiceId, 入口的服务编号
               "esn": "/dubbox-case/case/dubbox-rest", //entryServiceName, 入口的服务名词
-              "rn": 0 //RefType, 调用方式（CrossProcess，CrossThread）
+              "rv": 0 //RefTypeValue, 调用方式（CrossProcess，CrossThread）
             }
           ],
           "to": [ //KeyWithStringValue
@@ -222,13 +222,13 @@ HTTP JSON服务, 属性名与gRPC对应，属性解释详见gRPC协议说明，
               "v": "GET"
             }
           ],
-          "lo": { //LogMessage
-            "t": 1501858094726,
-            "d": [
-                "k": "NullPointException",
-                "v": "Error Stack"
-            }
-          }
+          "lo": [{
+                  "ti": 1501858094726,
+                  "ld": [{ 
+                          "k": "NullPointException",
+                          "v": "Error Stack"
+                      }]
+             }]
         },
         {
           "si": 1,
diff --git a/docs/en/Trace-Data-Protocol.md b/docs/en/Trace-Data-Protocol.md
index 811ec60384..f098ae6152 100644
--- a/docs/en/Trace-Data-Protocol.md
+++ b/docs/en/Trace-Data-Protocol.md
@@ -186,7 +186,7 @@ Input：
               "eii": 2, //entryApplicationInstanceId
               "esi": 0, //entryServiceId
               "esn": "/dubbox-case/case/dubbox-rest", //entryServiceName
-              "rn": 0 //RefType
+              "rv": 0 //RefTypeValue
             }
           ],
           "to": [ //KeyWithStringValue
@@ -199,13 +199,13 @@ Input：
               "v": "GET"
             }
           ],
-          "lo": { //LogMessage
-            "t": 1501858094726,
-            "d": [
-                "k": "NullPointException",
-                "v": "Error Stack"
-            }
-          }
+          "lo": [{
+                "ti": 1501858094726,
+                "ld": [{ 
+                        "k": "NullPointException",
+                        "v": "Error Stack"
+                    }]
+           }]
         },
         {
           "si": 1,
-- 
GitLab