kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename field name to osName in type AppServerInfo. (#1006) 

#998
This commit is contained in:
彭勇升 pengys 2018-03-30 22:44:18 +08:00 committed by 吴晟 Wu Sheng
parent bade4fd6c8
commit eff39b0f1c
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/server/AppServerInfo.java
View File

@ -24,11 +24,12 @@ import java.util.List;
* @author peng-yongsheng
*/
public class AppServerInfo {
private int id;
private int applicationId;
private String applicationCode;
private String osInfo;
private String name;
private String osName;
private int callsPerSec;
private String host;
private int pid;
@ -66,12 +67,12 @@ public class AppServerInfo {
this.osInfo = osInfo;
}
public String getName() {
return name;
public String getOsName() {
return osName;
}
public void setName(String name) {
this.name = name;
public void setOsName(String osName) {
this.osName = osName;
}
public int getCallsPerSec() {

10
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServerService.java
View File

@ -166,12 +166,10 @@ public class ServerService {
private void buildAppServerInfo(List<AppServerInfo> serverInfos) {
serverInfos.forEach(serverInfo -> {
serverInfo.setApplicationCode(applicationCacheService.getApplicationById(serverInfo.getApplicationId()).getApplicationCode());
StringBuilder nameBuilder = new StringBuilder();
nameBuilder.append(serverInfo.getApplicationCode());
if (StringUtils.isNotEmpty(serverInfo.getOsInfo())) {
JsonObject osInfoJson = gson.fromJson(serverInfo.getOsInfo(), JsonObject.class);
if (osInfoJson.has("osName")) {
serverInfo.setName(osInfoJson.get("osName").getAsString());
serverInfo.setOsName(osInfoJson.get("osName").getAsString());
}
if (osInfoJson.has("hostName")) {
serverInfo.setHost(osInfoJson.get("hostName").getAsString());
@ -184,14 +182,10 @@ public class ServerService {
JsonArray ipv4Array = osInfoJson.get("ipv4s").getAsJsonArray();
List<String> ipv4s = new LinkedList<>();
ipv4Array.forEach(ipv4 -> {
ipv4s.add(ipv4.getAsString());
nameBuilder.append(Const.ID_SPLIT).append(ipv4.getAsString());
});
ipv4Array.forEach(ipv4 -> ipv4s.add(ipv4.getAsString()));
serverInfo.setIpv4(ipv4s);
}
}
serverInfo.setName(nameBuilder.toString());
});
}
}

2
apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/server-layer.graphqls
View File

@ -21,7 +21,7 @@
# 2. A Tomcat server instance
type AppServerInfo {
id: ID!
name: String!
osName: String!
applicationId: Int!
applicationCode: String
callsPerSec: Int!