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/incubator-skywalking-data-collect-protocol.git
The following commit(s) were added to refs/heads/master by this push:
new a37d6d4 Add ping service.
a37d6d4 is described below
commit a37d6d48df3f9630adb5abbeaa8a3febd950f71b
Author: Wu Sheng <[email protected]>
AuthorDate: Thu Aug 16 16:24:47 2018 +0800
Add ping service.
---
common/common.proto | 9 +++++++++
common/common.proto => register/InstancePing.proto | 23 ++++++++--------------
register/Register.proto | 5 +++--
3 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/common/common.proto b/common/common.proto
index 5135091..71d39f6 100644
--- a/common/common.proto
+++ b/common/common.proto
@@ -40,3 +40,12 @@ enum DetectPoint {
server = 1;
proxy = 2;
}
+
+meesage Commands {
+ repeated Command commands = 1;
+}
+
+message Command {
+ string command = 1;
+ repeated KeyStringValuePair args = 2;
+}
diff --git a/common/common.proto b/register/InstancePing.proto
similarity index 68%
copy from common/common.proto
copy to register/InstancePing.proto
index 5135091..9d9069b 100644
--- a/common/common.proto
+++ b/register/InstancePing.proto
@@ -19,24 +19,17 @@
syntax = "proto3";
option java_multiple_files = true;
-option java_package = "org.apache.skywalking.apm.network.common";
+option java_package = "org.apache.skywalking.apm.network.register";
option csharp_namespace = "SkyWalking.NetworkProtocol";
-message KeyStringValuePair {
- string key = 1;
- string value = 2;
-}
+import "common/common.proto";
-message KeyIntValuePair {
- string key = 1;
- int32 value = 2;
+service ServiceInstancePing {
+ rpc doPing (ServiceInstancePingPkg) returns (Commands) {
+ }
}
-// In most cases, detect point should be `server` or `client`.
-// Even in service mesh, this means `server`/`client` side sidecar
-// `proxy` is reserved only.
-enum DetectPoint {
- client = 0;
- server = 1;
- proxy = 2;
+message ServiceInstancePingPkg {
+ int32 serviceInstanceId = 1;
+ int64 time = 2;
}
diff --git a/register/Register.proto b/register/Register.proto
index 76d598c..24c83d1 100644
--- a/register/Register.proto
+++ b/register/Register.proto
@@ -62,8 +62,9 @@ message ServiceInstances {
message ServiceInstance {
int32 serviceId = 1;
string instanceUUID = 2;
- repeated KeyStringValuePair tags = 3;
- repeated KeyStringValuePair properties = 4;
+ int64 time = 3;
+ repeated KeyStringValuePair tags = 4;
+ repeated KeyStringValuePair properties = 5;
}
message ServiceInstanceRegisterMapping {
