You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/03/16 13:16:20 UTC
[skywalking-data-collect-protocol] branch master updated: Fix
illegal protocol.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-data-collect-protocol.git
The following commit(s) were added to refs/heads/master by this push:
new 9abe8e1 Fix illegal protocol.
9abe8e1 is described below
commit 9abe8e1a109241e34ae08665d88b6fb4e20a6eab
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Mar 16 21:15:58 2020 +0800
Fix illegal protocol.
---
browser/BrowserPerf.proto | 4 ++--
common/CLR.proto | 2 +-
common/JVM.proto | 2 +-
language-agent-v2/CLRMetric.proto | 4 ++--
language-agent-v2/JVMMetric.proto | 4 ++--
language-agent-v2/trace.proto | 16 ++++++++--------
profile/Profile.proto | 8 ++++----
register/InstancePing.proto | 2 +-
register/Register.proto | 26 +++++++++++++-------------
service-mesh-probe/service-mesh.proto | 2 +-
10 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/browser/BrowserPerf.proto b/browser/BrowserPerf.proto
index ee6d5a4..9b28e88 100644
--- a/browser/BrowserPerf.proto
+++ b/browser/BrowserPerf.proto
@@ -29,11 +29,11 @@ import "common/common.proto";
service BrowserPerfService {
// report once per page
- rpc collectPerfData (BrowserPerfData) returns (Commands) {
+ rpc collectPerfData (BrowserPerfData) returns (skywalking.network.protocol.common.Commands) {
}
// report one or more error logs for pages, could report multiple times.
- rpc collectErrorLogs (stream BrowserErrorLog) returns (Commands) {
+ rpc collectErrorLogs (stream BrowserErrorLog) returns (skywalking.network.protocol.common.Commands) {
}
}
diff --git a/common/CLR.proto b/common/CLR.proto
index e13a3b0..fdf5f0c 100644
--- a/common/CLR.proto
+++ b/common/CLR.proto
@@ -28,7 +28,7 @@ import "common/common.proto";
message CLRMetric {
int64 time = 1;
- CPU cpu = 2;
+ skywalking.network.protocol.common.CPU cpu = 2;
ClrGC gc = 3;
ClrThread thread = 4;
}
diff --git a/common/JVM.proto b/common/JVM.proto
index 1b61d2f..935b667 100644
--- a/common/JVM.proto
+++ b/common/JVM.proto
@@ -28,7 +28,7 @@ import "common/common.proto";
message JVMMetric {
int64 time = 1;
- CPU cpu = 2;
+ skywalking.network.protocol.common.CPU cpu = 2;
repeated Memory memory = 3;
repeated MemoryPool memoryPool = 4;
repeated GC gc = 5;
diff --git a/language-agent-v2/CLRMetric.proto b/language-agent-v2/CLRMetric.proto
index bcb29d5..0539444 100644
--- a/language-agent-v2/CLRMetric.proto
+++ b/language-agent-v2/CLRMetric.proto
@@ -28,11 +28,11 @@ import "common/common.proto";
import "common/CLR.proto";
service CLRMetricReportService {
- rpc collect (CLRMetricCollection) returns (Commands) {
+ rpc collect (CLRMetricCollection) returns (skywalking.network.protocol.common.Commands) {
}
}
message CLRMetricCollection {
- repeated CLRMetric metrics = 1;
+ repeated skywalking.network.protocol.common.CLRMetric metrics = 1;
int32 serviceInstanceId = 2;
}
\ No newline at end of file
diff --git a/language-agent-v2/JVMMetric.proto b/language-agent-v2/JVMMetric.proto
index 5b22e69..1ab6f4c 100644
--- a/language-agent-v2/JVMMetric.proto
+++ b/language-agent-v2/JVMMetric.proto
@@ -28,11 +28,11 @@ import "common/common.proto";
import "common/JVM.proto";
service JVMMetricReportService {
- rpc collect (JVMMetricCollection) returns (Commands) {
+ rpc collect (JVMMetricCollection) returns (skywalking.network.protocol.common.Commands) {
}
}
message JVMMetricCollection {
- repeated JVMMetric metrics = 1;
+ repeated skywalking.network.protocol.common.JVMMetric metrics = 1;
int32 serviceInstanceId = 2;
}
diff --git a/language-agent-v2/trace.proto b/language-agent-v2/trace.proto
index e5f3cc7..1326d53 100644
--- a/language-agent-v2/trace.proto
+++ b/language-agent-v2/trace.proto
@@ -28,12 +28,12 @@ import "common/common.proto";
import "common/trace-common.proto";
service TraceSegmentReportService {
- rpc collect (stream UpstreamSegment) returns (Commands) {
+ rpc collect (stream skywalking.network.protocol.common.UpstreamSegment) returns (skywalking.network.protocol.common.Commands) {
}
}
message SegmentObject {
- UniqueId traceSegmentId = 1;
+ skywalking.network.protocol.common.UniqueId traceSegmentId = 1;
repeated SpanObjectV2 spans = 2;
int32 serviceId = 3;
int32 serviceInstanceId = 4;
@@ -41,8 +41,8 @@ message SegmentObject {
}
message SegmentReference {
- RefType refType = 1;
- UniqueId parentTraceSegmentId = 2;
+ skywalking.network.protocol.common.RefType refType = 1;
+ skywalking.network.protocol.common.UniqueId parentTraceSegmentId = 2;
int32 parentSpanId = 3;
int32 parentServiceInstanceId = 4;
string networkAddress = 5;
@@ -64,16 +64,16 @@ message SpanObjectV2 {
string operationName = 7;
int32 peerId = 8;
string peer = 9;
- SpanType spanType = 10;
- SpanLayer spanLayer = 11;
+ skywalking.network.protocol.common.SpanType spanType = 10;
+ skywalking.network.protocol.common.SpanLayer spanLayer = 11;
int32 componentId = 12;
string component = 13;
bool isError = 14;
- repeated KeyStringValuePair tags = 15;
+ repeated skywalking.network.protocol.common.KeyStringValuePair tags = 15;
repeated Log logs = 16;
}
message Log {
int64 time = 1;
- repeated KeyStringValuePair data = 2;
+ repeated skywalking.network.protocol.common.KeyStringValuePair data = 2;
}
diff --git a/profile/Profile.proto b/profile/Profile.proto
index 2facd3d..671928c 100644
--- a/profile/Profile.proto
+++ b/profile/Profile.proto
@@ -30,15 +30,15 @@ import "common/trace-common.proto";
service ProfileTask {
// query all sniffer need to execute profile task commands
- rpc getProfileTaskCommands (ProfileTaskCommandQuery) returns (Commands) {
+ rpc getProfileTaskCommands (ProfileTaskCommandQuery) returns (skywalking.network.protocol.common.Commands) {
}
// collect dumped thread snapshot
- rpc collectSnapshot (stream ThreadSnapshot) returns (Commands) {
+ rpc collectSnapshot (stream ThreadSnapshot) returns (skywalking.network.protocol.common.Commands) {
}
// report profiling task finished
- rpc reportTaskFinish (ProfileTaskFinishReport) returns (Commands) {
+ rpc reportTaskFinish (ProfileTaskFinishReport) returns (skywalking.network.protocol.common.Commands) {
}
}
@@ -57,7 +57,7 @@ message ThreadSnapshot {
// profile task id
string taskId = 1;
// dumped segment id
- UniqueId traceSegmentId = 2;
+ skywalking.network.protocol.common.UniqueId traceSegmentId = 2;
// dump timestamp
int64 time = 3;
// snapshot dump sequence, start with zero
diff --git a/register/InstancePing.proto b/register/InstancePing.proto
index a1eaf7c..fa10124 100644
--- a/register/InstancePing.proto
+++ b/register/InstancePing.proto
@@ -27,7 +27,7 @@ option csharp_namespace = "SkyWalking.NetworkProtocol";
import "common/common.proto";
service ServiceInstancePing {
- rpc doPing (ServiceInstancePingPkg) returns (Commands) {
+ rpc doPing (ServiceInstancePingPkg) returns (skywalking.network.protocol.common.Commands) {
}
}
diff --git a/register/Register.proto b/register/Register.proto
index 05f2362..9f75435 100644
--- a/register/Register.proto
+++ b/register/Register.proto
@@ -40,7 +40,7 @@ service Register {
rpc doNetworkAddressRegister (NetAddresses) returns (NetAddressMapping) {
}
- rpc doServiceAndNetworkAddressMappingRegister (ServiceAndNetworkAddressMappings) returns(Commands) {
+ rpc doServiceAndNetworkAddressMappingRegister (ServiceAndNetworkAddressMappings) returns(skywalking.network.protocol.common.Commands) {
}
}
@@ -51,15 +51,15 @@ message Services {
message Service {
string serviceName = 1;
- repeated KeyStringValuePair tags = 3;
- repeated KeyStringValuePair properties = 4;
+ repeated skywalking.network.protocol.common.KeyStringValuePair tags = 3;
+ repeated skywalking.network.protocol.common.KeyStringValuePair properties = 4;
// Type of this register service.
// NULL means type=normal, such as all services before the 7.0.0.
- ServiceType type = 5;
+ skywalking.network.protocol.common.ServiceType type = 5;
}
message ServiceRegisterMapping {
- repeated KeyIntValuePair services = 1;
+ repeated skywalking.network.protocol.common.KeyIntValuePair services = 1;
}
// Service Instance register
@@ -71,12 +71,12 @@ message ServiceInstance {
int32 serviceId = 1;
string instanceUUID = 2;
int64 time = 3;
- repeated KeyStringValuePair tags = 4;
- repeated KeyStringValuePair properties = 5;
+ repeated skywalking.network.protocol.common.KeyStringValuePair tags = 4;
+ repeated skywalking.network.protocol.common.KeyStringValuePair properties = 5;
}
message ServiceInstanceRegisterMapping {
- repeated KeyIntValuePair serviceInstances = 1;
+ repeated skywalking.network.protocol.common.KeyIntValuePair serviceInstances = 1;
}
// Network address register
@@ -88,7 +88,7 @@ message NetAddresses {
}
message NetAddressMapping {
- repeated KeyIntValuePair addressIds = 1;
+ repeated skywalking.network.protocol.common.KeyIntValuePair addressIds = 1;
}
// Endpoints register
@@ -99,11 +99,11 @@ message Endpoints {
message Endpoint {
int32 serviceId = 1;
string endpointName = 2;
- repeated KeyStringValuePair tags = 3;
- repeated KeyStringValuePair properties = 4;
+ repeated skywalking.network.protocol.common.KeyStringValuePair tags = 3;
+ repeated skywalking.network.protocol.common.KeyStringValuePair properties = 4;
// For endpoint
// from DetectPoint is either `client` or `server`. No chance to be `proxy`.
- DetectPoint from = 5;
+ skywalking.network.protocol.common.DetectPoint from = 5;
}
message EndpointMapping {
@@ -114,7 +114,7 @@ message EndpointMappingElement {
int32 serviceId = 1;
string endpointName = 2;
int32 endpointId = 3;
- DetectPoint from = 4;
+ skywalking.network.protocol.common.DetectPoint from = 4;
}
message ServiceAndNetworkAddressMappings {
diff --git a/service-mesh-probe/service-mesh.proto b/service-mesh-probe/service-mesh.proto
index b508489..788cbfe 100644
--- a/service-mesh-probe/service-mesh.proto
+++ b/service-mesh-probe/service-mesh.proto
@@ -46,7 +46,7 @@ message ServiceMeshMetric {
int32 responseCode = 13;
bool status = 14;
Protocol protocol = 15;
- DetectPoint detectPoint = 16;
+ skywalking.network.protocol.common.DetectPoint detectPoint = 16;
}
enum Protocol {