You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/07/17 03:10:31 UTC
[incubator-skywalking-data-collect-protocol] branch master updated:
Separate downstream object.
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 0eb3ac7 Separate downstream object.
0eb3ac7 is described below
commit 0eb3ac71096ece7957ca4bf65e15e059bfce54d5
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Jul 17 11:10:24 2018 +0800
Separate downstream object.
---
language-agent/DiscoveryService.proto | 2 +-
Downstream.proto => language-agent/Downstream.proto | 0
language-agent/JVMMetricsService.proto | 2 +-
service-mesh-probe/service-mesh.proto | 6 ++----
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/language-agent/DiscoveryService.proto b/language-agent/DiscoveryService.proto
index 7b166fe..d7aebad 100644
--- a/language-agent/DiscoveryService.proto
+++ b/language-agent/DiscoveryService.proto
@@ -23,7 +23,7 @@ option java_package = "org.apache.skywalking.apm.network.language.agent";
option csharp_namespace = "SkyWalking.NetworkProtocol";
import "Common.proto";
-import "../Downstream.proto";
+import "Downstream.proto";
service InstanceDiscoveryService {
rpc registerInstance (ApplicationInstance) returns (ApplicationInstanceMapping) {
diff --git a/Downstream.proto b/language-agent/Downstream.proto
similarity index 100%
rename from Downstream.proto
rename to language-agent/Downstream.proto
diff --git a/language-agent/JVMMetricsService.proto b/language-agent/JVMMetricsService.proto
index e42f84a..eec0e45 100644
--- a/language-agent/JVMMetricsService.proto
+++ b/language-agent/JVMMetricsService.proto
@@ -22,7 +22,7 @@ option java_multiple_files = true;
option java_package = "org.apache.skywalking.apm.network.language.agent";
option csharp_namespace = "SkyWalking.NetworkProtocol";
-import "../Downstream.proto";
+import "Downstream.proto";
service JVMMetricsService {
rpc collect (JVMMetrics) returns (Downstream) {
diff --git a/service-mesh-probe/service-mesh.proto b/service-mesh-probe/service-mesh.proto
index c6c8d78..ceec3ef 100644
--- a/service-mesh-probe/service-mesh.proto
+++ b/service-mesh-probe/service-mesh.proto
@@ -21,10 +21,8 @@ syntax = "proto3";
option java_multiple_files = true;
option java_package = "org.apache.skywalking.apm.network.servicemesh";
-import "../Downstream.proto";
-
service ServiceMeshMetricService {
- rpc collect(stream serviceMeshMetric) returns (Downstream) {
+ rpc collect(stream serviceMeshMetric) returns (MeshProbeDownstream) {
}
}
@@ -56,5 +54,5 @@ enum DetectPoint {
proxy = 2;
}
-message Downstream {
+message MeshProbeDownstream {
}