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/31 06:01:05 UTC
[skywalking-data-collect-protocol] 03/03: Merge commit
'9abe8e1a109241e34ae08665d88b6fb4e20a6eab' into v3-proto
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch v3-proto
in repository https://gitbox.apache.org/repos/asf/skywalking-data-collect-protocol.git
commit 42ca27ef0174f61a62e535158b2fb63b013f1347
Merge: 3e0c49b 9abe8e1
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Mar 31 14:00:26 2020 +0800
Merge commit '9abe8e1a109241e34ae08665d88b6fb4e20a6eab' into v3-proto
# Conflicts:
# browser/BrowserPerf.proto
# common/trace-common.proto
# language-agent-v2/CLRMetric.proto
# language-agent-v2/JVMMetric.proto
# language-agent/Tracing.proto
# management/Management.proto
# profile/Profile.proto
# register/Register.proto
README.md | 10 +++++++++-
service-mesh-probe/service-mesh.proto | 22 +++++++++-------------
2 files changed, 18 insertions(+), 14 deletions(-)
diff --cc service-mesh-probe/service-mesh.proto
index 78af44b,788cbfe..54e1838
--- a/service-mesh-probe/service-mesh.proto
+++ b/service-mesh-probe/service-mesh.proto
@@@ -32,19 -34,19 +32,15 @@@ message ServiceMeshMetric
int64 startTime = 1;
int64 endTime = 2;
string sourceServiceName = 3;
-- int32 sourceServiceId = 4;
-- string sourceServiceInstance = 5;
-- int32 sourceServiceInstanceId = 6;
-- string destServiceName = 7;
-- int32 destServiceId = 8;
-- string destServiceInstance = 9;
-- int32 destServiceInstanceId = 10;
-- string endpoint = 11;
-- int32 latency = 12;
-- int32 responseCode = 13;
-- bool status = 14;
-- Protocol protocol = 15;
- DetectPoint detectPoint = 16;
- skywalking.network.protocol.common.DetectPoint detectPoint = 16;
++ string sourceServiceInstance = 4;
++ string destServiceName = 5;
++ string destServiceInstance = 6;
++ string endpoint = 7;
++ int32 latency = 8;
++ int32 responseCode = 9;
++ bool status = 10;
++ Protocol protocol = 11;
++ DetectPoint detectPoint = 12;
}
enum Protocol {