You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by pe...@apache.org on 2018/04/29 23:48:28 UTC
[incubator-skywalking] branch master updated: Fix Protocol doc
Error And LogJsonReader Bug (#1135)
This is an automated email from the ASF dual-hosted git repository.
pengys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 2deb084 Fix Protocol doc Error And LogJsonReader Bug (#1135)
2deb084 is described below
commit 2deb0843d3b303d4f20e0bfb69b4c9ca63cface7
Author: lican <29...@qq.com>
AuthorDate: Mon Apr 30 07:48:26 2018 +0800
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
---
.../jetty/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 be9d718..150fa83 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 40826c2..0e1a237 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 811ec60..f098ae6 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,
--
To stop receiving notification emails like this one, please contact
pengys@apache.org.