Skip to content

fetch heap & nonHeap memory metrics together #874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 9, 2022
Merged

fetch heap & nonHeap memory metrics together #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...va/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessCommandHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,10 +305,14 @@ private CompletableFuture<Object> handleLiveMetricsProcessRequest(ExecuteCommand
SpringProcessGcPausesMetricsLiveData data = connectorService.getGcPausesMetricsLiveData(processKey);
return CompletableFuture.completedFuture(data.getGcPausesMetrics());
}
case SpringProcessConnectorService.MEMORY: {
case SpringProcessConnectorService.HEAP_MEMORY: {
SpringProcessMemoryMetricsLiveData data = connectorService.getMemoryMetricsLiveData(processKey);
return CompletableFuture.completedFuture(data.getMemoryMetrics());
return CompletableFuture.completedFuture(data.getHeapMemoryMetrics());
}
case SpringProcessConnectorService.NON_HEAP_MEMORY: {
SpringProcessMemoryMetricsLiveData data = connectorService.getMemoryMetricsLiveData(processKey);
return CompletableFuture.completedFuture(data.getNonHeapMemoryMetrics());
}
default: {}
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessConnectorOverHttp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ public SpringProcessMemoryMetricsLiveData refreshMemoryMetrics(SpringProcessLive
this.processName = liveData.getProcessName();
}

if (liveData != null && liveData.getMemoryMetrics() != null && liveData.getMemoryMetrics().length > 0) {
if (liveData != null && liveData.getHeapMemoryMetrics() != null && liveData.getHeapMemoryMetrics().length > 0 &&
liveData.getNonHeapMemoryMetrics() != null && liveData.getNonHeapMemoryMetrics().length > 0) {
return liveData;
}
}
Expand Down
3 changes: 2 additions & 1 deletion .../org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessConnectorOverJMX.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@ public SpringProcessMemoryMetricsLiveData refreshMemoryMetrics(SpringProcessLive
log.info("retrieve live data from: " + jmxURL);
SpringProcessMemoryMetricsLiveData liveData = springJMXConnector.retrieveLiveMemoryMetricsData(getProcessType(), jmxConnection, processID, processName, currentData, metricName, tags);

if (liveData != null && liveData.getMemoryMetrics() != null && liveData.getMemoryMetrics().length > 0) {
if (liveData != null && liveData.getHeapMemoryMetrics() != null && liveData.getHeapMemoryMetrics().length > 0 &&
liveData.getNonHeapMemoryMetrics() != null && liveData.getNonHeapMemoryMetrics().length > 0) {
return liveData;
}
}
Expand Down
7 changes: 4 additions & 3 deletions .../org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessConnectorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ public class SpringProcessConnectorService {

private static final String METRICS = "metrics";
public static final String GC_PAUSES = "gcPauses";
public static final String MEMORY = "memory";
public static final String HEAP_MEMORY = "heapMemory";
public static final String NON_HEAP_MEMORY = "nonHeapMemory";

private static final Logger log = LoggerFactory.getLogger(SpringProcessConnectorService.class);

Expand Down Expand Up @@ -175,7 +176,7 @@ private void scheduleConnect(ProgressTask progressTask, String processKey, Sprin
progressTask.progressDone();

refreshProcess(new SpringProcessParams(processKey, "", "", ""));
refreshProcess(new SpringProcessParams(processKey, METRICS, MEMORY, "area:heap"));
refreshProcess(new SpringProcessParams(processKey, METRICS, HEAP_MEMORY, "area:heap"));
refreshProcess(new SpringProcessParams(processKey, METRICS, GC_PAUSES, ""));
}
catch (Exception e) {
Expand Down Expand Up @@ -236,7 +237,7 @@ private void scheduleRefresh(ProgressTask progressTask, SpringProcessParams spri

try {
progressTask.progressEvent(progressMessage);
if(METRICS.equals(endpoint) && MEMORY.equals(metricName)) {
if(METRICS.equals(endpoint) && (HEAP_MEMORY.equals(metricName) || NON_HEAP_MEMORY.equals(metricName))) {
SpringProcessMemoryMetricsLiveData newMetricsLiveData = connector.refreshMemoryMetrics(this.liveDataProvider.getCurrent(processKey), metricName, springProcessParams.getTags());

if (newMetricsLiveData != null) {
Expand Down
62 changes: 37 additions & 25 deletions ...ngframework/ide/vscode/boot/java/livehover/v2/SpringProcessLiveDataExtractorOverHttp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ public SpringProcessLiveData retrieveLiveData(ProcessType processType, ActuatorC
public SpringProcessMemoryMetricsLiveData retrieveLiveMemoryMetricsData(ProcessType processType, ActuatorConnection connection, String processID, String processName,
SpringProcessLiveData currentData, String metricName, String tags) {

List<String> memoryMetrics = Arrays.asList("jvm.memory.committed", "jvm.memory.max");
List<LiveMemoryMetricsModel> memoryMetricsList = new ArrayList<>();
List<LiveMemoryMetricsModel> heapMemoryMetricsList = new ArrayList<>();
List<LiveMemoryMetricsModel> nonHeapMemoryMetricsList = new ArrayList<>();

try {

Expand All @@ -137,34 +137,16 @@ public SpringProcessMemoryMetricsLiveData retrieveLiveMemoryMetricsData(ProcessT
}
}

LiveMemoryMetricsModel jvmMemUsedMetrics = getLiveMetrics(connection, "jvm.memory.used", tags);
if(jvmMemUsedMetrics != null) {
memoryMetricsList.add(jvmMemUsedMetrics);
Arrays.sort(jvmMemUsedMetrics.getAvailableTags()[0].getValues());
String[] memoryZones = jvmMemUsedMetrics.getAvailableTags()[0].getValues();
for(String zone : memoryZones) {
String tag = tags+",id:"+zone;
LiveMemoryMetricsModel metrics = getLiveMetrics(connection, "jvm.memory.used", tag );
if(metrics != null) {
memoryMetricsList.add(metrics);
}
}

for(String metric : memoryMetrics) {
LiveMemoryMetricsModel metrics = getLiveMetrics(connection, metric, tags );
if(metrics != null) {
memoryMetricsList.add(metrics);
}
}
}
LiveMemoryMetricsModel[] heapMemResults = getMemoryMetrics(connection, heapMemoryMetricsList, "area:heap");
LiveMemoryMetricsModel[] nonHeapMemResults = getMemoryMetrics(connection, nonHeapMemoryMetricsList, "area:nonheap");

LiveMemoryMetricsModel[] res = (LiveMemoryMetricsModel[]) memoryMetricsList.toArray(new LiveMemoryMetricsModel[memoryMetricsList.size()]);
return new SpringProcessMemoryMetricsLiveData(
processType,
processName,
processID,
res
);
heapMemResults,
nonHeapMemResults
);
}
catch (Exception e) {
log.error("error reading live metrics data from: " + processID + " - " + processName, e);
Expand All @@ -173,6 +155,36 @@ public SpringProcessMemoryMetricsLiveData retrieveLiveMemoryMetricsData(ProcessT
return null;
}

private LiveMemoryMetricsModel[] getMemoryMetrics(ActuatorConnection connection,
List<LiveMemoryMetricsModel> memoryMetricsList, String tags) {

List<String> memoryMetrics = Arrays.asList("jvm.memory.committed", "jvm.memory.max");

LiveMemoryMetricsModel jvmMemUsedMetrics = getLiveMetrics(connection, "jvm.memory.used", tags);
if(jvmMemUsedMetrics != null) {
memoryMetricsList.add(jvmMemUsedMetrics);
Arrays.sort(jvmMemUsedMetrics.getAvailableTags()[0].getValues());
String[] memoryZones = jvmMemUsedMetrics.getAvailableTags()[0].getValues();
for(String zone : memoryZones) {
String tag = tags+",id:"+zone;
LiveMemoryMetricsModel metrics = getLiveMetrics(connection, "jvm.memory.used", tag );
if(metrics != null) {
memoryMetricsList.add(metrics);
}
}

for(String metric : memoryMetrics) {
LiveMemoryMetricsModel metrics = getLiveMetrics(connection, metric, tags );
if(metrics != null) {
memoryMetricsList.add(metrics);
}
}
}

LiveMemoryMetricsModel[] res = (LiveMemoryMetricsModel[]) memoryMetricsList.toArray(new LiveMemoryMetricsModel[memoryMetricsList.size()]);
return res;
}

/**
* @param processType
* @param processID if null, will be determined searching existing mbeans for that information (for remote processes via platform beans runtime name)
Expand Down
67 changes: 41 additions & 26 deletions ...ingframework/ide/vscode/boot/java/livehover/v2/SpringProcessLiveDataExtractorOverJMX.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,10 @@ public SpringProcessLiveData retrieveLiveData(ProcessType processType, JMXConnec
public SpringProcessMemoryMetricsLiveData retrieveLiveMemoryMetricsData(ProcessType processType, JMXConnector jmxConnector, String processID, String processName,
SpringProcessLiveData currentData, String metricName, String tags) {

List<String> memoryMetrics = Arrays.asList("jvm.memory.committed", "jvm.memory.max");

try {
MBeanServerConnection connection = jmxConnector.getMBeanServerConnection();
List<LiveMemoryMetricsModel> memoryMetricsList = new ArrayList<>();
List<LiveMemoryMetricsModel> heapMemoryMetricsList = new ArrayList<>();
List<LiveMemoryMetricsModel> nonHeapMemoryMetricsList = new ArrayList<>();
String domain = getDomainForActuator(connection);

if (processID == null) {
Expand All @@ -160,34 +159,19 @@ public SpringProcessMemoryMetricsLiveData retrieveLiveMemoryMetricsData(ProcessT
}
}

LiveMemoryMetricsModel jvmMemUsedMetrics = getLiveMetrics(connection, domain, "jvm.memory.used", tags);
if(jvmMemUsedMetrics != null ) {
memoryMetricsList.add(jvmMemUsedMetrics);
Arrays.sort(jvmMemUsedMetrics.getAvailableTags()[0].getValues());
String[] memoryZones = jvmMemUsedMetrics.getAvailableTags()[0].getValues();
for(String zone : memoryZones) {
String tag = tags+",id:"+zone;
LiveMemoryMetricsModel metrics = getLiveMetrics(connection, domain, "jvm.memory.used", tag );
if(metrics != null) {
memoryMetricsList.add(metrics);
}
}

for(String metric : memoryMetrics) {
LiveMemoryMetricsModel metrics = getLiveMetrics(connection, domain, metric, tags );
if(metrics != null) {
memoryMetricsList.add(metrics);
}
}
}
LiveMemoryMetricsModel[] heapMemResults = getMemoryMetrics(connection, heapMemoryMetricsList,
domain, "area:heap");

LiveMemoryMetricsModel[] nonHeapMemResults = getMemoryMetrics(connection, nonHeapMemoryMetricsList,
domain, "area:nonheap");

LiveMemoryMetricsModel[] res = (LiveMemoryMetricsModel[]) memoryMetricsList.toArray(new LiveMemoryMetricsModel[memoryMetricsList.size()]);
return new SpringProcessMemoryMetricsLiveData(
processType,
processName,
processID,
res
);
heapMemResults,
nonHeapMemResults
);
}
catch (Exception e) {
log.error("error reading live metrics data from: " + processID + " - " + processName, e);
Expand All @@ -196,6 +180,37 @@ public SpringProcessMemoryMetricsLiveData retrieveLiveMemoryMetricsData(ProcessT
return null;
}


private LiveMemoryMetricsModel[] getMemoryMetrics(MBeanServerConnection connection,
List<LiveMemoryMetricsModel> memoryMetricsList, String domain, String tags) {

List<String> memoryMetrics = Arrays.asList("jvm.memory.committed", "jvm.memory.max");

LiveMemoryMetricsModel jvmMemUsedMetrics = getLiveMetrics(connection, domain, "jvm.memory.used", tags);
if(jvmMemUsedMetrics != null ) {
memoryMetricsList.add(jvmMemUsedMetrics);
Arrays.sort(jvmMemUsedMetrics.getAvailableTags()[0].getValues());
String[] memoryZones = jvmMemUsedMetrics.getAvailableTags()[0].getValues();
for(String zone : memoryZones) {
String tag = tags+",id:"+zone;
LiveMemoryMetricsModel metrics = getLiveMetrics(connection, domain, "jvm.memory.used", tag );
if(metrics != null) {
memoryMetricsList.add(metrics);
}
}

for(String metric : memoryMetrics) {
LiveMemoryMetricsModel metrics = getLiveMetrics(connection, domain, metric, tags );
if(metrics != null) {
memoryMetricsList.add(metrics);
}
}
}

LiveMemoryMetricsModel[] res = (LiveMemoryMetricsModel[]) memoryMetricsList.toArray(new LiveMemoryMetricsModel[memoryMetricsList.size()]);
return res;
}

/**
* @param processType
* @param processID if null, will be determined searching existing mbeans for that information (for remote processes via platform beans runtime name)
Expand Down
31 changes: 19 additions & 12 deletions ...springframework/ide/vscode/boot/java/livehover/v2/SpringProcessMemoryMetricsLiveData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,28 @@
package org.springframework.ide.vscode.boot.java.livehover.v2;

/**
* @author V Udayani
* @author V Udayani
*/
public class SpringProcessMemoryMetricsLiveData {

private final ProcessType processType;
private final String processName;
private final String processID;

private final LiveMemoryMetricsModel[] memoryMetrics;

public SpringProcessMemoryMetricsLiveData(ProcessType processType, String processName, String processID, LiveMemoryMetricsModel[] memoryMetrics) {

private final LiveMemoryMetricsModel[] heapMemoryMetrics;

private final LiveMemoryMetricsModel[] nonHeapMemoryMetrics;

public SpringProcessMemoryMetricsLiveData(ProcessType processType, String processName, String processID,
LiveMemoryMetricsModel[] heapMemoryMetrics, LiveMemoryMetricsModel[] nonHeapMemoryMetrics) {
super();
this.processType = processType;
this.processName = processName;
this.processID = processID;
this.memoryMetrics = memoryMetrics;

this.heapMemoryMetrics = heapMemoryMetrics;
this.nonHeapMemoryMetrics = nonHeapMemoryMetrics;
}

public ProcessType getProcessType() {
return processType;
}
Expand All @@ -41,9 +44,13 @@ public String getProcessName() {
public String getProcessID() {
return this.processID;
}

public LiveMemoryMetricsModel[] getMemoryMetrics() {
return this.memoryMetrics;

public LiveMemoryMetricsModel[] getHeapMemoryMetrics() {
return this.heapMemoryMetrics;
}

public LiveMemoryMetricsModel[] getNonHeapMemoryMetrics() {
return nonHeapMemoryMetrics;
}

}