Mercurial > hg > thermostat-ng > agent

changeset 2681:1f8eb72c6f54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix field names in jvm-gc and jvm-memory plugins Reviewed-by: ebaron Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-June/023465.html
author Jie Kang <jkang@redhat.com>
date Mon, 05 Jun 2017 09:12:56 -0400
parents 8babf77875ec
children 921513fbfa70
files plugins/vm-gc/common/src/main/java/com/redhat/thermostat/vm/gc/common/internal/VmGcStatTypeAdapter.java plugins/vm-gc/common/src/test/java/com/redhat/thermostat/vm/gc/common/internal/VmGcStatTypeAdapterTest.java plugins/vm-memory/common/src/main/java/com/redhat/thermostat/vm/memory/common/internal/VmMemoryStatTypeAdapter.java plugins/vm-memory/common/src/test/java/com/redhat/thermostat/vm/memory/common/internal/VmMemoryStatTypeAdapterTest.java
diffstat 4 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/vm-gc/common/src/main/java/com/redhat/thermostat/vm/gc/common/internal/VmGcStatTypeAdapter.java	Fri Jun 02 11:29:26 2017 -0400
+++ b/plugins/vm-gc/common/src/main/java/com/redhat/thermostat/vm/gc/common/internal/VmGcStatTypeAdapter.java	Mon Jun 05 09:12:56 2017 -0400
@@ -48,7 +48,7 @@
 
     private static final String TYPE_LONG = "$numberLong";
     private static final String AGENT_ID = "agentId";
-    private static final String VM_ID = "vmId";
+    private static final String VM_ID = "jvmId";
     private static final String TIMESTAMP = "timeStamp";
     private static final String COLLECTOR_NAME = "collectorName";
     private static final String RUN_COUNT = "runCount";
--- a/plugins/vm-gc/common/src/test/java/com/redhat/thermostat/vm/gc/common/internal/VmGcStatTypeAdapterTest.java	Fri Jun 02 11:29:26 2017 -0400
+++ b/plugins/vm-gc/common/src/test/java/com/redhat/thermostat/vm/gc/common/internal/VmGcStatTypeAdapterTest.java	Mon Jun 05 09:12:56 2017 -0400
@@ -56,7 +56,7 @@
         stat.setCollectorName("Collector");
         stat.setRunCount(10l);
         stat.setWallTime(200l);
-        assertEquals("[{\"agentId\":\"1\",\"vmId\":\"2\",\"timeStamp\":{\"$numberLong\":\"100\"},\"collectorName\":\"Collector\",\"runCount\":10,\"wallTimeInMicros\":200}]", 
+        assertEquals("[{\"agentId\":\"1\",\"jvmId\":\"2\",\"timeStamp\":{\"$numberLong\":\"100\"},\"collectorName\":\"Collector\",\"runCount\":10,\"wallTimeInMicros\":200}]",
                 typeAdapter.toJson(Arrays.asList(stat)));
     }
 }
--- a/plugins/vm-memory/common/src/main/java/com/redhat/thermostat/vm/memory/common/internal/VmMemoryStatTypeAdapter.java	Fri Jun 02 11:29:26 2017 -0400
+++ b/plugins/vm-memory/common/src/main/java/com/redhat/thermostat/vm/memory/common/internal/VmMemoryStatTypeAdapter.java	Mon Jun 05 09:12:56 2017 -0400
@@ -50,9 +50,9 @@
 public class VmMemoryStatTypeAdapter extends TypeAdapter<List<VmMemoryStat>> {
 
     private static final String GENERATIONS = "generations";
-    private static final String TIMESTAMP = "timestamp";
+    private static final String TIMESTAMP = "timeStamp";
     private static final String AGENT_ID = "agentId";
-    private static final String VM_ID = "vmId";
+    private static final String VM_ID = "jvmId";
     private static final String METASPACE_MAX_CAPACITY = "metaspaceMaxCapacity";
     private static final String METASPACE_MIN_CAPACITY = "metaspaceMinCapacity";
     private static final String METASPACE_CAPACITY = "metaspaceCapacity";
--- a/plugins/vm-memory/common/src/test/java/com/redhat/thermostat/vm/memory/common/internal/VmMemoryStatTypeAdapterTest.java	Fri Jun 02 11:29:26 2017 -0400
+++ b/plugins/vm-memory/common/src/test/java/com/redhat/thermostat/vm/memory/common/internal/VmMemoryStatTypeAdapterTest.java	Mon Jun 05 09:12:56 2017 -0400
@@ -36,8 +36,6 @@
 
 package com.redhat.thermostat.vm.memory.common.internal;
 
-import com.google.gson.GsonBuilder;
-import com.google.gson.Gson;
 import com.redhat.thermostat.vm.memory.common.model.VmMemoryStat;
 import org.junit.Test;
 
@@ -78,6 +76,6 @@
         gen1.setSpaces(spaces);
         gens[0] = gen1;
         stat.setGenerations(gens);
-        assertEquals("[{\"agentId\":\"AGENT-1\",\"vmId\":\"VM-1\",\"timestamp\":{\"$numberLong\":\"100\"},\"metaspaceMaxCapacity\":{\"$numberLong\":\"4096\"},\"metaspaceMinCapacity\":{\"$numberLong\":\"2048\"},\"metaspaceCapacity\":{\"$numberLong\":\"2000\"},\"metaspaceUsed\":{\"$numberLong\":\"3000\"},\"generations\":[{\"name\":\"Name\",\"capacity\":{\"$numberLong\":\"1002\"},\"maxCapacity\":{\"$numberLong\":\"2048\"},\"collector\":\"Collector 1\",\"spaces\":[{\"index\":1,\"name\":\"Space Name\",\"capacity\":{\"$numberLong\":\"500\"},\"maxCapacity\":{\"$numberLong\":\"1024\"},\"used\":{\"$numberLong\":\"400\"}}]}]}]", typeAdapter.toJson(Arrays.asList(stat)));
+        assertEquals("[{\"agentId\":\"AGENT-1\",\"jvmId\":\"VM-1\",\"timeStamp\":{\"$numberLong\":\"100\"},\"metaspaceMaxCapacity\":{\"$numberLong\":\"4096\"},\"metaspaceMinCapacity\":{\"$numberLong\":\"2048\"},\"metaspaceCapacity\":{\"$numberLong\":\"2000\"},\"metaspaceUsed\":{\"$numberLong\":\"3000\"},\"generations\":[{\"name\":\"Name\",\"capacity\":{\"$numberLong\":\"1002\"},\"maxCapacity\":{\"$numberLong\":\"2048\"},\"collector\":\"Collector 1\",\"spaces\":[{\"index\":1,\"name\":\"Space Name\",\"capacity\":{\"$numberLong\":\"500\"},\"maxCapacity\":{\"$numberLong\":\"1024\"},\"used\":{\"$numberLong\":\"400\"}}]}]}]", typeAdapter.toJson(Arrays.asList(stat)));
     }
 }
\ No newline at end of file