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

Merge pull request #260 from wu-sheng/feature/254 

change the grpc protocol
This commit is contained in:
吴晟 Wu Sheng 2017-07-03 12:56:27 +08:00 committed by GitHub
parent 6e4cabcbef 5c7e3e674c
commit e64d51ab82
7 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apm-network/src/main/proto/RegisterService.proto → apm-network/src/main/proto/ApplicationRegisterService.proto
View File

@ -1,7 +1,9 @@
syntax = "proto3";
option java_multiple_files = true;
option java_package = "org.skywalking.apm.network.trace.proto";
option java_package = "org.skywalking.apm.network.proto";
import "KeyWithIntegerValue.proto";
//register service for ApplicationCode, this service is called when service starts.
service ApplicationRegisterService {
@ -10,11 +12,9 @@ service ApplicationRegisterService {
}
message Application {
string applicationCode = 1;
repeated string applicationCode = 1;
}
message ApplicationMapping {
int32 applicationId = 1;
Application application = 2;
}
repeated KeyWithIntegerValue application = 1;
}

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

@ -1,7 +1,7 @@
syntax = "proto3";
option java_multiple_files = true;
option java_package = "org.skywalking.apm.network.trace.proto";
option java_package = "org.skywalking.apm.network.proto";
import "Downstream.proto";
@ -16,7 +16,7 @@ service InstanceDiscoveryService {
}
message ApplicationInstance {
string applicationCode = 1;
int32 applicationId = 1;
}
message ApplicationInstanceMapping {
@ -45,6 +45,6 @@ message ServiceNameMappingElement {
message ServiceNameElement {
string serviceName = 1;
string ApplicationCode = 2;
int32 applicationId = 2;
}

2
apm-network/src/main/proto/Downstream.proto
View File

@ -1,7 +1,7 @@
syntax = "proto3";
option java_multiple_files = true;
option java_package = "org.skywalking.apm.network.collecor.proto";
option java_package = "org.skywalking.apm.network.proto";
// nothing down stream from collector yet.
message Downstream {

2
apm-network/src/main/proto/JVMMetricsService.proto
View File

@ -1,5 +1,5 @@
option java_multiple_files = true;
option java_package = "org.skywalking.apm.network.trace.proto";
option java_package = "org.skywalking.apm.network.proto";
import "Downstream.proto";

9
apm-network/src/main/proto/KeyWithIntegerValue.proto Normal file
View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_multiple_files = true;
option java_package = "org.skywalking.apm.network.proto";
message KeyWithIntegerValue {
string key = 1;
int32 value = 2;
}

9
apm-network/src/main/proto/KeyWithStringValue.proto Normal file
View File

@ -0,0 +1,9 @@
syntax = "proto3";
option java_multiple_files = true;
option java_package = "org.skywalking.apm.network.proto";
message KeyWithStringValue {
string key = 1;
string value = 2;
}

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

@ -1,9 +1,10 @@
syntax = "proto3";
option java_multiple_files = true;
option java_package = "org.skywalking.apm.network.trace.proto";
option java_package = "org.skywalking.apm.network.proto";
import "Downstream.proto";
import "KeyWithStringValue.proto";
service TraceSegmentService {
rpc collect (stream UpstreamSegment) returns (Downstream) {
@ -48,7 +49,7 @@ message SpanObject {
int32 componentId = 11;
string component = 12;
bool isError = 13;
repeated KeyValue tags = 14;
repeated KeyWithStringValue tags = 14;
repeated LogMessage logs = 15;
}
@ -65,12 +66,7 @@ enum SpanLayer {
MQ = 3;
}
message KeyValue {
string key = 1;
string value = 2;
}
message LogMessage {
int64 time = 1;
repeated KeyValue data = 2;
repeated KeyWithStringValue data = 2;
}