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
This commit is contained in:
lican 2018-04-30 07:48:26 +08:00 committed by 彭勇升 pengys
parent 574bb43c87
commit 2deb0843d3
3 changed files with 21 additions and 16 deletions

View File

@ -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();
}

View File

@ -209,7 +209,7 @@ HTTP JSON服务, 属性名与gRPC对应属性解释详见gRPC协议说明
"eii": 2, //entryApplicationInstanceId, 入口的实例编号
"esi": 0, //entryServiceId, 入口的服务编号
"esn": "/dubbox-case/case/dubbox-rest", //entryServiceName, 入口的服务名词
"rn": 0 //RefType, 调用方式CrossProcessCrossThread
"rv": 0 //RefTypeValue, 调用方式CrossProcessCrossThread
}
],
"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,

View File

@ -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,