Skip to content

fetch heap & nonHeap memory metrics together #871

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

Closed
wants to merge 4 commits into from
Closed

fetch heap & nonHeap memory metrics together #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad703fa
fetch heap & nonHeap memory metrics together
Nov 7, 2022
d679de9
Merge branch 'develop' of github.com:vudayani-vmw/sts4 into develop
Nov 7, 2022
00beb75
Merge branch 'spring-projects:main' into develop
vudayani Nov 8, 2022
64e8100
add null checks
Nov 8, 2022
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 "memory": {
case "heapMemory": {
SpringProcessMemoryMetricsLiveData data = connectorService.getMemoryMetricsLiveData(processKey);
return CompletableFuture.completedFuture(data.getMemoryMetrics());
return CompletableFuture.completedFuture(data.getHeapMemoryMetrics());
}
case "nonHeapMemory": {
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
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 @@ -118,8 +118,9 @@ 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 @@ -135,33 +136,14 @@ 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[] res = (LiveMemoryMetricsModel[]) memoryMetricsList.toArray(new LiveMemoryMetricsModel[memoryMetricsList.size()]);
LiveMemoryMetricsModel[] heapMemResults = getMemoryMetrics(connection, heapMemoryMetricsList, "area:heap");
LiveMemoryMetricsModel[] nonHeapMemResults = getMemoryMetrics(connection, nonHeapMemoryMetricsList, "area:nonheap");
return new SpringProcessMemoryMetricsLiveData(
processType,
processName,
processID,
res
heapMemResults,
nonHeapMemResults
);
}
catch (Exception e) {
Expand All @@ -170,6 +152,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
Expand Down
64 changes: 40 additions & 24 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,12 @@ 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,33 +161,18 @@ 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) {
Expand All @@ -195,6 +181,36 @@ 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
Expand Down
18 changes: 13 additions & 5 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 @@ -19,14 +19,17 @@ public class SpringProcessMemoryMetricsLiveData {
private final String processName;
private final String processID;

private final LiveMemoryMetricsModel[] memoryMetrics;
private final LiveMemoryMetricsModel[] heapMemoryMetrics;

public SpringProcessMemoryMetricsLiveData(ProcessType processType, String processName, String processID, LiveMemoryMetricsModel[] memoryMetrics) {
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;

}

Expand All @@ -42,8 +45,13 @@ public String getProcessID() {
return this.processID;
}

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

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


}