[incubator-skywalking-data-collect-protocol] branch master updated: Fix proto gen conflict (#4)

[wu...@apache.org]

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 c91b65d  Fix proto gen conflict (#4)
c91b65d is described below

commit c91b65dd8fac2c5866d79834ae73c3c445ce11cf
Author: Lemon <li...@hotmail.com>
AuthorDate: Sat Mar 16 19:03:27 2019 +0800

    Fix proto gen conflict (#4)
    
    * Fix proto gen conflict
    
    * Rename clr metrics
---
 common/CLR.proto    | 18 ++++++++----------
 common/JVM.proto    |  6 ++----
 common/common.proto |  4 ++++
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/CLR.proto b/common/CLR.proto
index 64489cc..57bc860 100644
--- a/common/CLR.proto
+++ b/common/CLR.proto
@@ -22,27 +22,25 @@ option java_multiple_files = true;
 option java_package = "org.apache.skywalking.apm.network.language.agent";
 option csharp_namespace = "SkyWalking.NetworkProtocol";
 
+import "common/common.proto";
+
 message CLRMetric {
     int64 time = 1;
     CPU cpu = 2;
-    GC gc = 3;
-    Thread thread = 4;
-}
-
-message CPU {
-    double usagePercent = 1;
+    ClrGC gc = 3;
+    ClrThread thread = 4;
 }
 
-message GC {
+message ClrGC {
     int64 Gen0CollectCount = 1;
     int64 Gen1CollectCount = 2;
     int64 Gen2CollectCount = 3;
     int64 HeapMemory = 4;
 }
 
-message Thread {
+message ClrThread {
     int32 AvailableCompletionPortThreads = 1;
     int32 AvailableWorkerThreads = 2;
-    int32 MaxCompletionPortThreads = 1;
-    int32 MaxWorkerThreads = 2;
+    int32 MaxCompletionPortThreads = 3;
+    int32 MaxWorkerThreads = 4;
 }
\ No newline at end of file
diff --git a/common/JVM.proto b/common/JVM.proto
index e3a82c1..543c640 100644
--- a/common/JVM.proto
+++ b/common/JVM.proto
@@ -22,6 +22,8 @@ option java_multiple_files = true;
 option java_package = "org.apache.skywalking.apm.network.language.agent";
 option csharp_namespace = "SkyWalking.NetworkProtocol";
 
+import "common/common.proto";
+
 message JVMMetric {
     int64 time = 1;
     CPU cpu = 2;
@@ -30,10 +32,6 @@ message JVMMetric {
     repeated GC gc = 5;
 }
 
-message CPU {
-    double usagePercent = 2;
-}
-
 message Memory {
     bool isHeap = 1;
     int64 init = 2;
diff --git a/common/common.proto b/common/common.proto
index 72c433b..ce50c76 100644
--- a/common/common.proto
+++ b/common/common.proto
@@ -32,6 +32,10 @@ message KeyIntValuePair {
     int32 value = 2;
 }
 
+message CPU {
+    double usagePercent = 2;
+}
+
 // In most cases, detect point should be `server` or `client`.
 // Even in service mesh, this means `server`/`client` side sidecar
 // `proxy` is reserved only.