root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Add nonheap metrics to /metrics endpoint 

Fixes gh-4712
This commit is contained in:
Dave Syer 2015-12-09 10:16:06 +00:00
parent 2d003a698f
commit 8b97c3b342
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SystemPublicMetrics.java
View File

@ -78,6 +78,7 @@ public class SystemPublicMetrics implements PublicMetrics, Ordered {
* Add metrics from ManagementFactory if possible. Note that ManagementFactory is not
* available on Google App Engine.
* @param result the result
* @param mem
*/
private void addManagementMetrics(Collection<Metric<?>> result) {
try {
@ -107,6 +108,27 @@ public class SystemPublicMetrics implements PublicMetrics, Ordered {
result.add(new Metric<Long>("heap.init", memoryUsage.getInit() / 1024));
result.add(new Metric<Long>("heap.used", memoryUsage.getUsed() / 1024));
result.add(new Metric<Long>("heap", memoryUsage.getMax() / 1024));
memoryUsage = ManagementFactory.getMemoryMXBean().getNonHeapMemoryUsage();
result.add(
new Metric<Long>("nonheap.committed", memoryUsage.getCommitted() / 1024));
result.add(new Metric<Long>("nonheap.init", memoryUsage.getInit() / 1024));
result.add(new Metric<Long>("nonheap.used", memoryUsage.getUsed() / 1024));
result.add(new Metric<Long>("nonheap", memoryUsage.getMax() / 1024));
Metric<Long> mem = findMemory(result);
if (mem != null) {
mem.increment(new Long(memoryUsage.getUsed() / 1024).intValue());
}
}
private Metric<Long> findMemory(Collection<Metric<?>> result) {
for (Metric<?> metric : result) {
if ("mem".equals(metric.getName())) {
@SuppressWarnings("unchecked")
Metric<Long> value = (Metric<Long>) metric;
return value;
}
}
return null;
}
/**

5
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SystemPublicMetricsTests.java
View File

@ -50,6 +50,11 @@ public class SystemPublicMetricsTests {
assertTrue(results.containsKey("heap.used"));
assertTrue(results.containsKey("heap"));
assertTrue(results.containsKey("nonheap.committed"));
assertTrue(results.containsKey("nonheap.init"));
assertTrue(results.containsKey("nonheap.used"));
assertTrue(results.containsKey("nonheap"));
assertTrue(results.containsKey("threads.peak"));
assertTrue(results.containsKey("threads.daemon"));
assertTrue(results.containsKey("threads.totalStarted"));