home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-21 10:45:59 +10:00
Code Issues Packages Projects Releases Wiki Activity

[임대현] #108 서버맵 디자인 개선

Browse Source 
git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@3866 84d0f5b1-2673-498c-a247-62c4ff18d310
This commit is contained in:
Denny Lim
2014-05-18 01:13:08 +00:00
parent be5a1c0811
commit 1310d86caa
2 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/nhn/pinpoint/web/view/LinkSerializer.java
+7 -7
View File
@@ -24,10 +24,10 @@ public class LinkSerializer extends JsonSerializer<Link> {
public void serialize(Link link, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
jgen.writeStartObject();
jgen.writeStringField("id", link.getLinkName());
jgen.writeStringField("key", link.getLinkName()); // for servermap
jgen.writeStringField("from", link.getFrom().getNodeName());
jgen.writeStringField("to", link.getTo().getNodeName());
jgen.writeStringField("from", link.getFrom().getNodeName()); // necessary for go.js
jgen.writeStringField("to", link.getTo().getNodeName()); // necessary for go.js
writeSimpleNode("sourceInfo", link.getFrom(), jgen);
@@ -41,9 +41,9 @@ public class LinkSerializer extends JsonSerializer<Link> {
}
Histogram histogram = link.getHistogram();
jgen.writeNumberField("text", histogram.getTotalCount());
jgen.writeNumberField("error", histogram.getErrorCount());
jgen.writeNumberField("slow", histogram.getSlowCount());
jgen.writeNumberField("totalCount", histogram.getTotalCount()); // for go.js
jgen.writeNumberField("errorCount", histogram.getErrorCount());
jgen.writeNumberField("slowCount", histogram.getSlowCount());
jgen.writeObjectField("histogram", histogram);
@@ -56,7 +56,7 @@ public class LinkSerializer extends JsonSerializer<Link> {
String state = link.getLinkState();
jgen.writeStringField("category", state);
jgen.writeStringField("state", state); // for go.js
jgen.writeEndObject();
}
src/main/java/com/nhn/pinpoint/web/view/NodeSerializer.java
+19 -13
View File
@@ -21,25 +21,28 @@ public class NodeSerializer extends JsonSerializer<Node> {
@Override
public void serialize(Node node, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
jgen.writeStartObject();
jgen.writeStringField("id", node.getNodeName());
jgen.writeStringField("key", node.getNodeName());
// jgen.writeStringField("id", node.getNodeName());
jgen.writeStringField("key", node.getNodeName()); // necessary for go.js
jgen.writeStringField("text", node.getApplicationTextName());
jgen.writeStringField("applicationName", node.getApplicationTextName()); // for go.js
jgen.writeStringField("category", node.getServiceType().toString());
jgen.writeStringField("category", node.getServiceType().toString()); // necessary for go.js
jgen.writeStringField("serviceType", node.getServiceType().toString());
final ServiceType serviceType = node.getApplication().getServiceType();
if (serviceType.isUser()) {
jgen.writeStringField("fig", "Ellipse");
} else if(serviceType.isWas()) {
jgen.writeStringField("fig", "RoundedRectangle");
} else {
jgen.writeStringField("fig", "Rectangle");
}
// if (serviceType.isUser()) {
// jgen.writeStringField("fig", "Ellipse");
// } else if(serviceType.isWas()) {
// jgen.writeStringField("fig", "RoundedRectangle");
// } else {
// jgen.writeStringField("fig", "Rectangle");
// }
jgen.writeStringField("serviceTypeCode", Short.toString(serviceType.getCode()));
jgen.writeStringField("terminal", Boolean.toString(serviceType.isTerminal()));
jgen.writeBooleanField("isWas", serviceType.isWas());
// jgen.writeStringField("terminal", Boolean.toString(serviceType.isTerminal()));
jgen.writeBooleanField("isWas", serviceType.isWas()); // for go.js
jgen.writeBooleanField("isFiltered", true); // for go.js
jgen.writeBooleanField("hasAlert", true); // for go.js
writeHistogram(jgen, node);
if (node.getServiceType().isUnknown()) {
@@ -65,6 +68,9 @@ public class NodeSerializer extends JsonSerializer<Node> {
writeEmptyObject(jgen, "histogram");
} else {
jgen.writeObjectField("histogram", applicationHistogram);
jgen.writeNumberField("totalCount", applicationHistogram.getTotalCount()); // for go.js
jgen.writeNumberField("errorCount", applicationHistogram.getErrorCount());
jgen.writeNumberField("slowCount", applicationHistogram.getSlowCount());
}
Map<String, Histogram> agentHistogramMap = nodeHistogram.getAgentHistogramMap();