Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bugs with actuator data over HTTP

Browse Source
This commit is contained in:
aboyko
2022-11-08 15:53:46 -05:00
parent 8350c5be7d
commit c2acb0c323
6 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/HttpActuatorConnection.java
View File

@@ -11,6 +11,7 @@
package org.springframework.ide.vscode.boot.java.livehover.v2;
import java.io.IOException;
import java.net.URI;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
@@ -28,8 +29,10 @@ public class HttpActuatorConnection implements ActuatorConnection {
private Gson gson;
private RestTemplate restTemplate;
private String actuatorUrl;
public HttpActuatorConnection(String actuatorUrl) {
this.actuatorUrl = actuatorUrl;
this.restTemplate = new RestTemplateBuilder().rootUri(actuatorUrl).build();
this.gson = new Gson();
}
@@ -80,11 +83,12 @@ public class HttpActuatorConnection implements ActuatorConnection {
@Override
public String getLiveMetrics(String metricName, String tags) throws IOException {
UriComponentsBuilder uriBuilder = UriComponentsBuilder.fromPath("/metrics/"+metricName);
if (tags != null) {
if (tags != null && !tags.isBlank()) {
uriBuilder.queryParam("tag", tags);
}
String url = uriBuilder.encode().toUriString();
return restTemplate.getForObject(url, String.class);
// /{ownerId}/new cases make REST Template URI template handler to think that {ownerId} is a URI parameter which it is not.
String url = actuatorUrl + uriBuilder.toUriString();
return restTemplate.getForObject(URI.create(url), String.class);
}
@Override
@@ -95,8 +99,9 @@ public class HttpActuatorConnection implements ActuatorConnection {
uriBuilder.queryParam("tag", e.getKey() + ":" + e.getValue());
}
}
String url = uriBuilder.encode().toUriString();
return restTemplate.getForObject(url, String.class);
// /{ownerId}/new cases make REST Template URI template handler to think that {ownerId} is a URI parameter which it is not.
String url = actuatorUrl + uriBuilder.toUriString();
return restTemplate.getForObject(URI.create(url), String.class);
}
@Override

14
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/Measurements.java
View File

@@ -1,16 +1,26 @@
/*******************************************************************************
* Copyright (c) 2022 VMware, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* VMware, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.boot.java.livehover.v2;
public class Measurements {
private String statistic;
private Long value;
private Double value;
public String getStatistic() {
return statistic;
}
public Long getValue() {
public Double getValue() {
return value;
}

10
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/ProcessType.java
View File

@@ -1,3 +1,13 @@
/*******************************************************************************
* Copyright (c) 2022 VMware, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* VMware, Inc. - initial API and implementation
*******************************************************************************/
package org.springframework.ide.vscode.boot.java.livehover.v2;
public enum ProcessType {

4
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessCommandHandler.java
View File

@@ -301,11 +301,11 @@ public class SpringProcessCommandHandler {
String metricName = getArgumentByKey(params, "metricName");
if (processKey != null) {
switch(metricName) {
case "gcPauses": {
case SpringProcessConnectorService.GC_PAUSES: {
SpringProcessGcPausesMetricsLiveData data = connectorService.getGcPausesMetricsLiveData(processKey);
return CompletableFuture.completedFuture(data.getGcPausesMetrics());
}
case "memory": {
case SpringProcessConnectorService.MEMORY: {
SpringProcessMemoryMetricsLiveData data = connectorService.getMemoryMetricsLiveData(processKey);
return CompletableFuture.completedFuture(data.getMemoryMetrics());
}

12
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessConnectorService.java
View File

@@ -29,6 +29,10 @@ import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguage
*/
public class SpringProcessConnectorService {
private static final String METRICS = "metrics";
public static final String GC_PAUSES = "gcPauses";
public static final String MEMORY = "memory";
private static final Logger log = LoggerFactory.getLogger(SpringProcessConnectorService.class);
private final SpringProcessLiveDataProvider liveDataProvider;
@@ -171,8 +175,8 @@ public class SpringProcessConnectorService {
progressTask.progressDone();
refreshProcess(new SpringProcessParams(processKey, "", "", ""));
refreshProcess(new SpringProcessParams(processKey, "metrics", "memory", "area:heap"));
refreshProcess(new SpringProcessParams(processKey, "metrics", "gcPauses", ""));
refreshProcess(new SpringProcessParams(processKey, METRICS, MEMORY, "area:heap"));
refreshProcess(new SpringProcessParams(processKey, METRICS, GC_PAUSES, ""));
}
catch (Exception e) {
log.info("problem occured during process connect", e);
@@ -232,7 +236,7 @@ public class SpringProcessConnectorService {
try {
progressTask.progressEvent(progressMessage);
if(endpoint.equals("metrics") && metricName.equals("memory")) {
if(METRICS.equals(endpoint) && MEMORY.equals(metricName)) {
SpringProcessMemoryMetricsLiveData newMetricsLiveData = connector.refreshMemoryMetrics(this.liveDataProvider.getCurrent(processKey), metricName, springProcessParams.getTags());
if (newMetricsLiveData != null) {
@@ -243,7 +247,7 @@ public class SpringProcessConnectorService {
this.connectedSuccess.put(processKey, true);
}
} else if(endpoint.equals("metrics") && metricName.equals("gcPauses")) {
} else if(METRICS.equals(endpoint) && GC_PAUSES.equals(metricName)) {
SpringProcessGcPausesMetricsLiveData newMetricsLiveData = connector.refreshGcPausesMetrics(this.liveDataProvider.getCurrent(processKey), metricName, springProcessParams.getTags());
if (newMetricsLiveData != null) {

11
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessLiveDataExtractorOverHttp.java
View File

@@ -23,6 +23,8 @@ import org.json.JSONArray;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.web.client.HttpClientErrorException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
@@ -198,7 +200,7 @@ public class SpringProcessLiveDataExtractorOverHttp {
}
}
LiveMemoryMetricsModel metrics = getLiveMetrics(connection, metricName, tags);
LiveMemoryMetricsModel metrics = getLiveMetrics(connection, "jvm.gc.pause", tags);
if(metrics != null) {
memoryMetricsList.add(metrics);
}
@@ -240,7 +242,12 @@ public class SpringProcessLiveDataExtractorOverHttp {
return RequestMappingMetrics.parse(metricsData);
} catch (IOException e) {
// ignore
} catch (HttpClientErrorException e) {
if (e.getStatusCode() != null && e.getStatusCode() == HttpStatus.NOT_FOUND) {
// not found 404 - don't log it - means metric is unavailable
} else {
log.error("", e);
}
} catch (Exception e) {
log.error("", e);
}