From cca8ca74261811cdee35a732443fdb879612c340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= <wu.sheng@foxmail.com>
Date: Tue, 4 Jul 2017 17:40:30 +0800
Subject: [PATCH] Update JVMMetricsService.proto

---
 .../src/main/proto/JVMMetricsService.proto    | 44 +++++++++++++++----
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/apm-network/src/main/proto/JVMMetricsService.proto b/apm-network/src/main/proto/JVMMetricsService.proto
index 48e6eb038..b1e90d30e 100644
--- a/apm-network/src/main/proto/JVMMetricsService.proto
+++ b/apm-network/src/main/proto/JVMMetricsService.proto
@@ -15,21 +15,47 @@ message JVMMetrics {
 message JVMMetric {
     long time = 1;
     CPU cpu = 2;
-    MEMORY memory = 3;
-    GC gc = 4;
+    repeated Memory memory = 3;
+    repeated MemoryPool memoryPool = 4;
+    repeated GC gc = 5;
 }
 
 message CPU {
 }
 
-message MEMORY {
-    long heapInit = 1;
-    long heapMax = 2;
-    long heapUsed = 3;
-    long nonHeapInit = 4;
-    long nonHeapMax = 5;
-    long nonHeapUsed = 6;
+message Memory {
+    boolean isHeap = 1;
+    long init = 2;
+    long max = 3;
+    long used = 4；
+    long committed = 5;
+}
+
+message MemoryPool {
+    boolean isHeap = 1;
+    PoolType type = 2;
+    long init = 3;
+    long max = 4;
+    long used = 5;
+    long commited = 6;
+}
+
+message PoolType {
+    CODE_CACHE_USAGE = 0;
+    NEWGEN_USAGE = 1;
+    OLDGEN_USAGE = 2;
+    SURVIVOR_USAGE = 3;
+    PERMGEN_USAGE = 4;
+    METASPACE_USAGE = 5;
 }
 
 message GC {
+    GCPhrase phrase = 1;
+    long count = 2;
+    long time = 3;
+}
+
+message GCPhrase {
+    NEW = 0;
+    OLD = 1;
 }