diff --git a/apm-network/src/main/proto/ApplicationRegisterService.proto b/apm-network/src/main/proto/ApplicationRegisterService.proto index 702cde9fd..9c3285d54 100644 --- a/apm-network/src/main/proto/ApplicationRegisterService.proto +++ b/apm-network/src/main/proto/ApplicationRegisterService.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_multiple_files = true; option java_package = "org.skywalking.apm.network.trace.proto"; -import "KeyValue.proto"; +import "KeyWithIntegerValue.proto"; //register service for ApplicationCode, this service is called when service starts. service ApplicationRegisterService { @@ -16,5 +16,5 @@ message Application { } message ApplicationMapping { - repeated KeyValue application = 1; + repeated KeyWithIntegerValue application = 1; } \ No newline at end of file diff --git a/apm-network/src/main/proto/KeyWithIntegerValue.proto b/apm-network/src/main/proto/KeyWithIntegerValue.proto new file mode 100644 index 000000000..3a0e4e602 --- /dev/null +++ b/apm-network/src/main/proto/KeyWithIntegerValue.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_multiple_files = true; +option java_package = "org.skywalking.apm.network.collecor.proto"; + +message KeyWithIntegerValue { + string key = 1; + int32 value = 2; +} diff --git a/apm-network/src/main/proto/KeyWithStringValue.proto b/apm-network/src/main/proto/KeyWithStringValue.proto new file mode 100644 index 000000000..dabb4d395 --- /dev/null +++ b/apm-network/src/main/proto/KeyWithStringValue.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +option java_multiple_files = true; +option java_package = "org.skywalking.apm.network.collecor.proto"; + +message KeyWithStringValue { + string key = 1; + string value = 2; +} diff --git a/apm-network/src/main/proto/RegisterService.proto b/apm-network/src/main/proto/RegisterService.proto deleted file mode 100644 index 16978439b..000000000 --- a/apm-network/src/main/proto/RegisterService.proto +++ /dev/null @@ -1,20 +0,0 @@ -syntax = "proto3"; - -option java_multiple_files = true; -option java_package = "org.skywalking.apm.network.trace.proto"; - -//register service for ApplicationCode, this service is called when service starts. -service ApplicationRegisterService { - rpc register (Application) returns (ApplicationMapping) { - } -} - -message Application { - string applicationCode = 1; -} - -message ApplicationMapping { - int32 applicationId = 1; - Application application = 2; -} - diff --git a/apm-network/src/main/proto/TraceSegmentService.proto b/apm-network/src/main/proto/TraceSegmentService.proto index 471cac5a5..6cfa64929 100644 --- a/apm-network/src/main/proto/TraceSegmentService.proto +++ b/apm-network/src/main/proto/TraceSegmentService.proto @@ -4,7 +4,7 @@ option java_multiple_files = true; option java_package = "org.skywalking.apm.network.trace.proto"; import "Downstream.proto"; -import "KeyValue.proto"; +import "KeyWithStringValue.proto"; service TraceSegmentService { rpc collect (stream UpstreamSegment) returns (Downstream) { @@ -49,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; } @@ -68,5 +68,5 @@ enum SpanLayer { message LogMessage { int64 time = 1; - repeated KeyValue data = 2; + repeated KeyWithStringValue data = 2; }