dio closed pull request #2: WIP: Hydrate .Command in common.proto
URL: https://github.com/apache/incubator-skywalking-data-collect-protocol/pull/2
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/common/common.proto b/common/common.proto
index 72c433b..2ad2b5b 100644
--- a/common/common.proto
+++ b/common/common.proto
@@ -18,6 +18,8 @@
syntax = "proto3";
+package org.apache.skywalking.apm.network.common;
+
option java_multiple_files = true;
option java_package = "org.apache.skywalking.apm.network.common";
option csharp_namespace = "SkyWalking.NetworkProtocol";
@@ -41,11 +43,11 @@ enum DetectPoint {
proxy = 2;
}
-message Commands {
- repeated Command commands = 1;
-}
-
message Command {
string command = 1;
repeated KeyStringValuePair args = 2;
}
+
+message Commands {
+ repeated Command commands = 1;
+}
diff --git a/service-mesh-probe/service-mesh.proto
b/service-mesh-probe/service-mesh.proto
index 87e0b70..ad1c325 100644
--- a/service-mesh-probe/service-mesh.proto
+++ b/service-mesh-probe/service-mesh.proto
@@ -18,11 +18,13 @@
syntax = "proto3";
-option java_multiple_files = true;
-option java_package = "org.apache.skywalking.apm.network.servicemesh";
+package org.apache.skywalking.apm.network.servicemesh;
import "common/common.proto";
+option java_multiple_files = true;
+option java_package = "org.apache.skywalking.apm.network.servicemesh";
+
service ServiceMeshMetricService {
rpc collect(stream ServiceMeshMetric) returns (MeshProbeDownstream) {
}
@@ -44,7 +46,7 @@ message ServiceMeshMetric {
int32 responseCode = 13;
bool status = 14;
Protocol protocol = 15;
- DetectPoint detectPoint = 16;
+ org.apache.skywalking.apm.network.common.DetectPoint detectPoint = 16;
}
enum Protocol {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
