[ICP 2.0] Send JMX metrics to the ICP along with the heartbeat payload

components/org.wso2.micro.integrator.initializer/src/main/java/org/wso2/micro/integrator/initializer/dashboard/HeartBeatComponent.java

@@ -17,9 +17,11 @@
  */
 package org.wso2.micro.integrator.initializer.dashboard;
 
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.sun.management.OperatingSystemMXBean;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpEntity;
@@ -29,6 +31,7 @@
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
@@ -39,8 +42,10 @@
 import org.wso2.micro.core.util.StringUtils;
 
 import java.io.IOException;
-import java.util.Map;
-import java.util.UUID;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.MemoryUsage;
+import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -56,7 +61,6 @@
 import static org.wso2.micro.integrator.initializer.dashboard.Constants.HTTPS_PREFIX;
 import static org.wso2.micro.integrator.initializer.dashboard.Constants.MANAGEMENT;
 import static org.wso2.micro.integrator.initializer.dashboard.Constants.NODE_ID_SYSTEM_PROPERTY;
-import static org.wso2.micro.integrator.initializer.dashboard.Constants.PRODUCT_MI;
 
 /**
  * Manages heartbeats from micro integrator to dashboard.
@@ -69,6 +73,7 @@ private HeartBeatComponent(){
 
     private static final Log log = LogFactory.getLog(HeartBeatComponent.class);
     private static final Map<String, Object> configs = ConfigParser.getParsedConfigs();
+    private static final ObjectMapper objectMapper = new ObjectMapper();
 
     public static void invokeHeartbeatExecutorService() {
 
@@ -80,29 +85,31 @@ public static void invokeHeartbeatExecutorService() {
 
         final HttpPost httpPost = new HttpPost(heartbeatApiUrl);
 
-        JsonObject heartbeatPayload = new JsonObject();
-        heartbeatPayload.addProperty("product", PRODUCT_MI);
-        heartbeatPayload.addProperty("groupId", groupId);
-        heartbeatPayload.addProperty("nodeId", nodeId);
-        heartbeatPayload.addProperty("interval", interval);
-        heartbeatPayload.addProperty("mgtApiUrl", mgtApiUrl);
-
         httpPost.setHeader("Accept", HEADER_VALUE_APPLICATION_JSON);
         httpPost.setHeader("Content-type", HEADER_VALUE_APPLICATION_JSON);
 
         ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
         Runnable runnableTask = () -> {
+            HeartbeatData heartbeatData = new HeartbeatData(groupId, nodeId, interval, mgtApiUrl,
+                    getJMXMemoryMetrics(), getLiveThreadCount(), getCPULoadStats());
+            String heartbeatPayload = null;
+            try {
+                heartbeatPayload = objectMapper.writeValueAsString(heartbeatData);
+            } catch (JsonProcessingException e) {
+                log.debug("Error serializing heartbeat payload: " + e.getMessage());
+            }
 
             try (CloseableHttpClient client = HttpClients.custom().setSSLSocketFactory(
                     new SSLConnectionSocketFactory(
                             SSLContexts.custom().loadTrustMaterial(null,
                                     (TrustStrategy) new TrustSelfSignedStrategy()).build(),
                             NoopHostnameVerifier.INSTANCE)).build()) {
-                final StringEntity entity = new StringEntity(heartbeatPayload.toString());
+                assert heartbeatPayload != null;
+                final StringEntity entity = new StringEntity(heartbeatPayload, ContentType.APPLICATION_JSON);
                 httpPost.setEntity(entity);
                 CloseableHttpResponse response = client.execute(httpPost);
-                JsonObject jsonResponse = getJsonResponse(response);
-                if (jsonResponse != null && jsonResponse.get("status").getAsString().equals("success")) {
+                ObjectNode jsonResponse = getJsonResponse(response);
+                if (jsonResponse != null && jsonResponse.get("status").asText().equals("success")) {
                     log.debug("Heartbeat sent successfully.");
                 } else {
                     log.debug("Error occurred while sending the heartbeat.");
@@ -173,16 +180,44 @@ private static String generateRandomId() {
         return UUID.randomUUID().toString();
     }
 
+    private static long[] getJMXMemoryMetrics() {
+        // Array format: [heapTotal, heapUsed, heapCommitted, heapMax]
+        long[] jmxStats = new long[4];
+        MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
+        MemoryUsage heapMemoryUsage = memoryMXBean.getHeapMemoryUsage();
+        jmxStats[0] = heapMemoryUsage.getInit();
+        jmxStats[1] = heapMemoryUsage.getUsed();
+        jmxStats[2] = heapMemoryUsage.getCommitted();
+        jmxStats[3] = heapMemoryUsage.getMax();
+        return jmxStats;
+    }
+
+    private static int getLiveThreadCount() {
+        return ManagementFactory.getThreadMXBean().getThreadCount();
+    }
+
+    private static double[] getCPULoadStats() {
+        // Array format: [systemCpuLoad, processCpuLoad]
+        double[] cpuUsage = new double[2];
+        OperatingSystemMXBean osMXBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
+        cpuUsage[0] = osMXBean.getCpuLoad();
+        cpuUsage[1] = osMXBean.getProcessCpuLoad();
+        return cpuUsage;
+    }
+
     public static boolean isDashboardConfigured() {
         return configs.get(DASHBOARD_CONFIG_URL) != null;
     }
 
-    public static JsonObject getJsonResponse(CloseableHttpResponse response) {
+    public static ObjectNode getJsonResponse(CloseableHttpResponse response) {
         String stringResponse = getStringResponse(response);
-        JsonObject responseObject = null;
+        ObjectNode responseObject = null;
         try {
-            responseObject = new JsonParser().parse(stringResponse).getAsJsonObject();
-        } catch (JsonParseException e) {
+            JsonNode jsonNode = objectMapper.readTree(stringResponse);
+            if (jsonNode.isObject()) {
+                responseObject = (ObjectNode) jsonNode;
+            }
+        } catch (IOException e) {
             log.debug("Error occurred while parsing the heartbeat response.", e);
         }
         return responseObject;

components/org.wso2.micro.integrator.initializer/src/main/java/org/wso2/micro/integrator/initializer/dashboard/HeartbeatData.java

@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2024, WSO2 LLC. (http://wso2.com).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.wso2.micro.integrator.initializer.dashboard;
+
+import static org.wso2.micro.integrator.initializer.dashboard.Constants.PRODUCT_MI;
+
+public class HeartbeatData {
+
+    private final String product;
+    private String groupId;
+    private String nodeId;
+    private long interval;
+    private String mgtApiUrl;
+    private long[] memoryMetrics;
+    private int threadCount;
+    private double[] cpuUsage;
+
+    public HeartbeatData(String groupId, String nodeId, long interval, String mgtApiUrl, long[] memoryMetrics,
+                         int threadCount, double[] cpuUsage) {
+        this.product = PRODUCT_MI;
+        this.groupId = groupId;
+        this.nodeId = nodeId;
+        this.interval = interval;
+        this.mgtApiUrl = mgtApiUrl;
+        this.memoryMetrics = memoryMetrics;
+        this.threadCount = threadCount;
+        this.cpuUsage = cpuUsage;
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    public void setNodeId(String nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    public long getInterval() {
+        return interval;
+    }
+
+    public void setInterval(long interval) {
+        this.interval = interval;
+    }
+
+    public String getMgtApiUrl() {
+        return mgtApiUrl;
+    }
+
+    public void setMgtApiUrl(String mgtApiUrl) {
+        this.mgtApiUrl = mgtApiUrl;
+    }
+
+    public long[] getMemoryMetrics() {
+        return memoryMetrics;
+    }
+
+    public void setMemoryMetrics(long[] memoryMetrics) {
+        this.memoryMetrics = memoryMetrics;
+    }
+
+    public int getThreadCount() {
+        return threadCount;
+    }
+
+    public void setThreadCount(int threadCount) {
+        this.threadCount = threadCount;
+    }
+
+    public String getProduct() {
+        return product;
+    }
+
+    public double[] getCpuUsage() {
+        return cpuUsage;
+    }
+
+    public void setCpuUsage(double[] cpuUsage) {
+        this.cpuUsage = cpuUsage;
+    }
+}