values collected as Double

mweirauch · mweirauch · commit 0e7f13eb5ed1 · 2017-10-07T19:13:11.000+02:00
diff --git a/src/main/java/io/github/mweirauch/micrometer/jvm/extras/ProcessMemoryMetrics.java b/src/main/java/io/github/mweirauch/micrometer/jvm/extras/ProcessMemoryMetrics.java
@@ -47,7 +47,7 @@ public void bindTo(MeterRegistry registry) {
     }
 
     private Double value(KEY key) {
-        return smaps.get(key).doubleValue();
+        return smaps.get(key);
     }
 
 }
diff --git a/src/main/java/io/github/mweirauch/micrometer/jvm/extras/procfs/ProcfsEntry.java b/src/main/java/io/github/mweirauch/micrometer/jvm/extras/procfs/ProcfsEntry.java
@@ -34,7 +34,7 @@ abstract class ProcfsEntry {
 
     private final ProcfsReader reader;
 
-    private final Map<ValueKey, Long> values = new HashMap<>();
+    private final Map<ValueKey, Double> values = new HashMap<>();
 
     private long lastHandle = -1;
 
@@ -46,7 +46,7 @@ protected ProcfsEntry(ProcfsReader reader) {
         this.reader = Objects.requireNonNull(reader);
     }
 
-    public Long get(ValueKey key) {
+    public Double get(ValueKey key) {
         Objects.requireNonNull(key);
 
         collect();
@@ -69,10 +69,10 @@ public Long get(ValueKey key) {
         }
     }
 
-    protected abstract Map<ValueKey, Long> handle(Collection<String> lines);
+    protected abstract Map<ValueKey, Double> handle(Collection<String> lines);
 
-    protected Long defaultValue() {
-        return Long.valueOf(-1L);
+    protected Double defaultValue() {
+        return Double.valueOf(-1);
     }
 
 }
diff --git a/src/main/java/io/github/mweirauch/micrometer/jvm/extras/procfs/ProcfsSmaps.java b/src/main/java/io/github/mweirauch/micrometer/jvm/extras/procfs/ProcfsSmaps.java
@@ -56,10 +56,10 @@ public ProcfsSmaps() {
     }
 
     @Override
-    protected Map<ValueKey, Long> handle(Collection<String> lines) {
+    protected Map<ValueKey, Double> handle(Collection<String> lines) {
         Objects.requireNonNull(lines);
 
-        final Map<ValueKey, Long> values = new HashMap<>();
+        final Map<ValueKey, Double> values = new HashMap<>();
 
         for (final String line : lines) {
             KEY valueKey = null;
@@ -76,19 +76,19 @@ protected Map<ValueKey, Long> handle(Collection<String> lines) {
             }
 
             if (valueKey != null) {
-                final long kiloBytes = parseKiloBytes(line) * KILOBYTE;
+                final Double kiloBytes = parseKiloBytes(line) * KILOBYTE;
                 values.compute(valueKey, (key, value) -> (value == null) ? kiloBytes
-                        : value.longValue() + kiloBytes);
+                        : value.doubleValue() + kiloBytes);
             }
         }
 
         return values;
     }
 
-    private static long parseKiloBytes(String line) {
+    private static Double parseKiloBytes(String line) {
         Objects.requireNonNull(line);
 
-        return Long.parseLong(line.split("\\s+")[1]);
+        return Double.parseDouble(line.split("\\s+")[1]);
     }
 
 }
diff --git a/src/test/java/io/github/mweirauch/micrometer/jvm/extras/ProcessMemoryMetricsTest.java b/src/test/java/io/github/mweirauch/micrometer/jvm/extras/ProcessMemoryMetricsTest.java
@@ -51,11 +51,11 @@ public void testInstantiation() {
 
     @Test
     public void testGetMetrics() throws Exception {
-        when(smaps.get(KEY.VSS)).thenReturn(1L);
-        when(smaps.get(KEY.RSS)).thenReturn(2L);
-        when(smaps.get(KEY.PSS)).thenReturn(3L);
-        when(smaps.get(KEY.SWAP)).thenReturn(4L);
-        when(smaps.get(KEY.SWAPPSS)).thenReturn(5L);
+        when(smaps.get(KEY.VSS)).thenReturn(1D);
+        when(smaps.get(KEY.RSS)).thenReturn(2D);
+        when(smaps.get(KEY.PSS)).thenReturn(3D);
+        when(smaps.get(KEY.SWAP)).thenReturn(4D);
+        when(smaps.get(KEY.SWAPPSS)).thenReturn(5D);
 
         final SimpleMeterRegistry registry = new SimpleMeterRegistry();
         final ProcessMemoryMetrics uut = new ProcessMemoryMetrics(smaps);
diff --git a/src/test/java/io/github/mweirauch/micrometer/jvm/extras/procfs/ProcfsEntryTest.java b/src/test/java/io/github/mweirauch/micrometer/jvm/extras/procfs/ProcfsEntryTest.java
@@ -66,13 +66,13 @@ public void testValueHandling() throws IOException {
                 // last three calls to get()
                 readResult2, readResult2, readResult2);
 
-        assertEquals(Long.valueOf(1), uut.get(TestKey.ONE));
-        assertEquals(Long.valueOf(2), uut.get(TestKey.TWO));
-        assertEquals(Long.valueOf(3), uut.get(TestKey.THREE));
+        assertEquals(Double.valueOf(1), uut.get(TestKey.ONE));
+        assertEquals(Double.valueOf(2), uut.get(TestKey.TWO));
+        assertEquals(Double.valueOf(3), uut.get(TestKey.THREE));
 
-        assertEquals(Long.valueOf(1), uut.get(TestKey.ONE));
-        assertEquals(Long.valueOf(2), uut.get(TestKey.TWO));
-        assertEquals(Long.valueOf(-1), uut.get(TestKey.THREE));
+        assertEquals(Double.valueOf(1), uut.get(TestKey.ONE));
+        assertEquals(Double.valueOf(2), uut.get(TestKey.TWO));
+        assertEquals(Double.valueOf(-1), uut.get(TestKey.THREE));
     }
 
     @Test
@@ -175,25 +175,25 @@ protected TestProcfsEntry(ProcfsReader reader) {
         }
 
         @Override
-        protected Map<ValueKey, Long> handle(Collection<String> lines) {
+        protected Map<ValueKey, Double> handle(Collection<String> lines) {
             Objects.requireNonNull(lines);
 
-            final Map<ValueKey, Long> values = new HashMap<>();
+            final Map<ValueKey, Double> values = new HashMap<>();
 
             switch (lines.size()) {
             case 0:
                 break;
             case 1:
-                values.put(TestKey.ONE, 1L);
+                values.put(TestKey.ONE, 1D);
                 break;
             case 2:
-                values.put(TestKey.ONE, 1L);
-                values.put(TestKey.TWO, 2L);
+                values.put(TestKey.ONE, 1D);
+                values.put(TestKey.TWO, 2D);
                 break;
             case 3:
-                values.put(TestKey.ONE, 1L);
-                values.put(TestKey.TWO, 2L);
-                values.put(TestKey.THREE, 3L);
+                values.put(TestKey.ONE, 1D);
+                values.put(TestKey.TWO, 2D);
+                values.put(TestKey.THREE, 3d);
                 break;
             default:
                 throw new IllegalArgumentException(
diff --git a/src/test/java/io/github/mweirauch/micrometer/jvm/extras/procfs/ProcfsSmapsTest.java b/src/test/java/io/github/mweirauch/micrometer/jvm/extras/procfs/ProcfsSmapsTest.java
@@ -62,22 +62,22 @@ public void testInstantiation() {
     public void testSimple() {
         final ProcfsSmaps uut = new ProcfsSmaps(new ProcfsReader(BASE, "smaps-001.txt"));
 
-        assertEquals(Long.valueOf(4096), uut.get(KEY.VSS));
-        assertEquals(Long.valueOf(4096), uut.get(KEY.RSS));
-        assertEquals(Long.valueOf(2048), uut.get(KEY.PSS));
-        assertEquals(Long.valueOf(0), uut.get(KEY.SWAP));
-        assertEquals(Long.valueOf(-1), uut.get(KEY.SWAPPSS));
+        assertEquals(Double.valueOf(4096), uut.get(KEY.VSS));
+        assertEquals(Double.valueOf(4096), uut.get(KEY.RSS));
+        assertEquals(Double.valueOf(2048), uut.get(KEY.PSS));
+        assertEquals(Double.valueOf(0), uut.get(KEY.SWAP));
+        assertEquals(Double.valueOf(-1), uut.get(KEY.SWAPPSS));
     }
 
     @Test
     public void testComplex() {
         final ProcfsSmaps uut = new ProcfsSmaps(new ProcfsReader(BASE, "smaps-002.txt"));
 
-        assertEquals(Long.valueOf(4318720000L), uut.get(KEY.VSS));
-        assertEquals(Long.valueOf(30535680), uut.get(KEY.RSS));
-        assertEquals(Long.valueOf(20059136), uut.get(KEY.PSS));
-        assertEquals(Long.valueOf(0), uut.get(KEY.SWAP));
-        assertEquals(Long.valueOf(0), uut.get(KEY.SWAPPSS));
+        assertEquals(Double.valueOf(4318720000L), uut.get(KEY.VSS));
+        assertEquals(Double.valueOf(30535680), uut.get(KEY.RSS));
+        assertEquals(Double.valueOf(20059136), uut.get(KEY.PSS));
+        assertEquals(Double.valueOf(0), uut.get(KEY.SWAP));
+        assertEquals(Double.valueOf(0), uut.get(KEY.SWAPPSS));
     }
 
     @Test
@@ -87,11 +87,11 @@ public void testReturnDefaultValuesOnReaderFailure() throws IOException {
 
         final ProcfsSmaps uut = new ProcfsSmaps(reader);
 
-        assertEquals(Long.valueOf(-1), uut.get(KEY.VSS));
-        assertEquals(Long.valueOf(-1), uut.get(KEY.RSS));
-        assertEquals(Long.valueOf(-1), uut.get(KEY.PSS));
-        assertEquals(Long.valueOf(-1), uut.get(KEY.SWAP));
-        assertEquals(Long.valueOf(-1), uut.get(KEY.SWAPPSS));
+        assertEquals(Double.valueOf(-1), uut.get(KEY.VSS));
+        assertEquals(Double.valueOf(-1), uut.get(KEY.RSS));
+        assertEquals(Double.valueOf(-1), uut.get(KEY.PSS));
+        assertEquals(Double.valueOf(-1), uut.get(KEY.SWAP));
+        assertEquals(Double.valueOf(-1), uut.get(KEY.SWAPPSS));
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void bindTo(MeterRegistry registry) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`private Double value(KEY key) {`
`50`		`- return smaps.get(key).doubleValue();`
	`50`	`+ return smaps.get(key);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ abstract class ProcfsEntry {`
`34`	`34`
`35`	`35`	`private final ProcfsReader reader;`
`36`	`36`
`37`		`- private final Map<ValueKey, Long> values = new HashMap<>();`
	`37`	`+ private final Map<ValueKey, Double> values = new HashMap<>();`
`38`	`38`
`39`	`39`	`private long lastHandle = -1;`
`40`	`40`
`@@ -46,7 +46,7 @@ protected ProcfsEntry(ProcfsReader reader) {`
`46`	`46`	`this.reader = Objects.requireNonNull(reader);`
`47`	`47`	`}`
`48`	`48`
`49`		`- public Long get(ValueKey key) {`
	`49`	`+ public Double get(ValueKey key) {`
`50`	`50`	`Objects.requireNonNull(key);`
`51`	`51`
`52`	`52`	`collect();`
`@@ -69,10 +69,10 @@ public Long get(ValueKey key) {`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- protected abstract Map<ValueKey, Long> handle(Collection<String> lines);`
	`72`	`+ protected abstract Map<ValueKey, Double> handle(Collection<String> lines);`
`73`	`73`
`74`		`- protected Long defaultValue() {`
`75`		`- return Long.valueOf(-1L);`
	`74`	`+ protected Double defaultValue() {`
	`75`	`+ return Double.valueOf(-1);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,10 @@ public ProcfsSmaps() {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Override`
`59`		`- protected Map<ValueKey, Long> handle(Collection<String> lines) {`
	`59`	`+ protected Map<ValueKey, Double> handle(Collection<String> lines) {`
`60`	`60`	`Objects.requireNonNull(lines);`
`61`	`61`
`62`		`- final Map<ValueKey, Long> values = new HashMap<>();`
	`62`	`+ final Map<ValueKey, Double> values = new HashMap<>();`
`63`	`63`
`64`	`64`	`for (final String line : lines) {`
`65`	`65`	`KEY valueKey = null;`
`@@ -76,19 +76,19 @@ protected Map<ValueKey, Long> handle(Collection<String> lines) {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`if (valueKey != null) {`
`79`		`- final long kiloBytes = parseKiloBytes(line) * KILOBYTE;`
	`79`	`+ final Double kiloBytes = parseKiloBytes(line) * KILOBYTE;`
`80`	`80`	`values.compute(valueKey, (key, value) -> (value == null) ? kiloBytes`
`81`		`- : value.longValue() + kiloBytes);`
	`81`	`+ : value.doubleValue() + kiloBytes);`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`return values;`
`86`	`86`	`}`
`87`	`87`
`88`		`- private static long parseKiloBytes(String line) {`
	`88`	`+ private static Double parseKiloBytes(String line) {`
`89`	`89`	`Objects.requireNonNull(line);`
`90`	`90`
`91`		`- return Long.parseLong(line.split("\\s+")[1]);`
	`91`	`+ return Double.parseDouble(line.split("\\s+")[1]);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`}`