kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/collector' of https://github.com/wu-sheng/sky-walking into feature/collector

This commit is contained in:
pengys5 2017-03-10 11:53:23 +08:00
parent 813aef07c0 b29479fe33
commit fce707e722
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java
View File

@ -270,6 +270,7 @@ public class Span implements ISerializable<SpanMessage> {
public SpanMessage serialize() {
SpanMessage.Builder builder = SpanMessage.newBuilder();
builder.setSpanId(spanId);
builder.setParentSpanId(parentSpanId);
builder.setStartTime(startTime);
builder.setEndTime(endTime);
builder.setOperationName(operationName);
@ -292,6 +293,7 @@ public class Span implements ISerializable<SpanMessage> {
@Override
public void deserialize(SpanMessage message) {
spanId = message.getSpanId();
parentSpanId = message.getParentSpanId();
startTime = message.getStartTime();
endTime = message.getEndTime();
operationName = message.getOperationName();

11
skywalking-commons/skywalking-trace/src/main/proto/trace.proto
View File

@ -22,11 +22,12 @@ message SegmentRefMessage {
message SpanMessage {
int32 spanId = 1;
int64 startTime = 2;
int64 endTime = 3;
string operationName = 4;
repeated KeyValue tags = 5;
repeated LogDataMessage logs = 6;
int32 parentSpanId = 2;
int64 startTime = 3;
int64 endTime = 4;
string operationName = 5;
repeated KeyValue tags = 6;
repeated LogDataMessage logs = 7;
}
message LogDataMessage {