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

Merge remote-tracking branch 'upstream/master' into zhangxin/feature/entry-application-instanceID 

# Conflicts:
#	apm-network/src/main/proto/TraceSegmentService.proto
This commit is contained in:
ascrutae 2017-08-07 23:09:12 +08:00
parent 81f73fb5e8 9559c75c58
commit 630705c1f0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apm-network/src/main/proto/TraceSegmentService.proto
View File

@ -35,9 +35,9 @@ message TraceSegmentReference {
int32 parentApplicationInstanceId = 4;
string networkAddress = 5;
int32 networkAddressId = 6;
string entryServiceName = 7;
int32 entryServiceId = 8;
int32 entryServiceApplicationInstanceId = 9;
int32 entryApplicationInstanceId = 7;
string entryServiceName = 8;
int32 entryServiceId = 9;
string parentServiceName = 10;
int32 parentServiceId = 11;
}