From 7770b92411be6d0790e36d209d54045686b2f005 Mon Sep 17 00:00:00 2001 From: Johannes Stelzer Date: Fri, 7 Nov 2014 20:40:40 +0100 Subject: [PATCH] Add systemload.average to SystemPublicMetrics Fixes gh-1865 --- .../boot/actuate/endpoint/SystemPublicMetrics.java | 3 +++ .../boot/actuate/endpoint/SystemPublicMetricsTests.java | 1 + 2 files changed, 4 insertions(+) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SystemPublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SystemPublicMetrics.java index 8e510add1f..1b5269a7cf 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SystemPublicMetrics.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SystemPublicMetrics.java @@ -35,6 +35,7 @@ import org.springframework.util.StringUtils; * @author Dave Syer * @author Christian Dupuis * @author Stephane Nicoll + * @author Johannes Stelzer * @since 1.2.0 */ public class SystemPublicMetrics implements PublicMetrics, Ordered { @@ -74,6 +75,8 @@ public class SystemPublicMetrics implements PublicMetrics, Ordered { .getUptime())); result.add(new Metric("instance.uptime", System.currentTimeMillis() - this.timestamp)); + result.add(new Metric("systemload.average", ManagementFactory + .getOperatingSystemMXBean().getSystemLoadAverage())); } /** diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SystemPublicMetricsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SystemPublicMetricsTests.java index fea92e43ea..2f49a1aeb9 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SystemPublicMetricsTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SystemPublicMetricsTests.java @@ -42,6 +42,7 @@ public class SystemPublicMetricsTests { assertTrue(results.containsKey("mem.free")); assertTrue(results.containsKey("processors")); assertTrue(results.containsKey("uptime")); + assertTrue(results.containsKey("systemload.average")); assertTrue(results.containsKey("heap.committed")); assertTrue(results.containsKey("heap.init"));