Skip to content

[#12419] Remove unused json field in ServerMap #12433

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
emeroad merged 1 commit into from
May 13, 2025
Merged

[#12419] Remove unused json field in ServerMap #12433

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
30 changes: 0 additions & 30 deletions web/src/main/java/com/navercorp/pinpoint/web/applicationmap/view/LinkView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,6 @@ public void serialize(LinkView linkView, JsonGenerator jgen, SerializerProvider
jgen.writeObjectField("from", link.getFrom().getNodeName()); // necessary for go.js
jgen.writeObjectField("to", link.getTo().getNodeName()); // necessary for go.js

// for FilterWizard. from, to agent mapping data
writeAgentId("fromAgent", link.getFrom(), jgen);
writeAgentId("toAgent", link.getTo(), jgen);

//for FilterWizard. show agent name as tooltip on instance
// writeAgentIdNameMap("fromAgentIdNameMap", link.getFrom(), jgen);
// writeAgentIdNameMap("toAgentIdNameMap", link.getTo(), jgen);

// for FilterWizard, to agent mapping data
writeAgents("fromAgents", link.getFrom(), jgen);
writeAgents("toAgents", link.getFrom(), jgen);
Expand Down Expand Up @@ -116,13 +108,6 @@ public void serialize(LinkView linkView, JsonGenerator jgen, SerializerProvider

private void writerFilterHint(Link link, JsonGenerator jgen) throws IOException {
Application filterApplication = link.getFilterApplication();
jgen.writeStringField("filterApplicationName", filterApplication.getName());
jgen.writeNumberField("filterApplicationServiceTypeCode", filterApplication.getServiceTypeCode());
jgen.writeStringField("filterApplicationServiceTypeName", filterApplication.getServiceType().getName());
if (link.isWasToWasLink()) {
writeWasToWasTargetRpcList("filterTargetRpcList", link, jgen);
}

jgen.writeFieldName("filter");
jgen.writeStartObject();
jgen.writeStringField("applicationName", filterApplication.getName());
Expand All @@ -148,21 +133,6 @@ private void writeAgentId(String fieldName, Node node, JsonGenerator jgen) throw
}
}

@Deprecated
private void writeAgentIdNameMap(String fieldName, Node node, JsonGenerator jgen) throws IOException {
if (node.getServiceType().isWas()) {
jgen.writeFieldName(fieldName);
jgen.writeStartObject();
ServerGroupList serverGroupList = node.getServerGroupList();
if (serverGroupList != null) {
for (Map.Entry<String, String> entry : serverGroupList.getAgentIdNameMap().entrySet()) {
jgen.writeStringField(entry.getKey(), entry.getValue());
}
}
jgen.writeEndObject();
}
}

private void writeAgents(String fieldName, Node node, JsonGenerator jgen) throws IOException {
if (node.getServiceType().isWas()) {
jgen.writeFieldName(fieldName);
Expand Down
32 changes: 1 addition & 31 deletions web/src/main/java/com/navercorp/pinpoint/web/applicationmap/view/NodeView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,12 @@ static class NodeViewSerializer extends JsonSerializer<NodeView> {

public static final String AGENT_TIME_SERIES_HISTOGRAM = "agentTimeSeriesHistogram";

public static final String AGENTID_NAME_MAP_KEY = "agentIdNameMap";

@Override
public void serialize(NodeView nodeView, JsonGenerator jgen, SerializerProvider provider) throws IOException {
Node node = nodeView.getNode();

jgen.writeStartObject();
// jgen.writeStringField("id", node.getNodeName());serverInstanceList
// jgen.writeStringField("id", node.getNodeName()); serverInstanceList
jgen.writeObjectField("key", node.getNodeName()); // necessary for go.js

jgen.writeStringField("applicationName", node.getApplicationTextName()); // for go.js
Expand All @@ -75,13 +73,6 @@ public void serialize(NodeView nodeView, JsonGenerator jgen, SerializerProvider
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");
// }

jgen.writeNumberField("serviceTypeCode", serviceType.getCode());
// jgen.writeStringField("terminal", Boolean.toString(serviceType.isTerminal()));
Expand All @@ -107,8 +98,6 @@ private void writeServerGroupList(NodeView nodeView, JsonGenerator jgen) throws
if (serverGroupList == null) {
jgen.writeNumberField("instanceCount", 0);
jgen.writeNumberField("instanceErrorCount", 0);
JacksonWriterUtils.writeEmptyArray(jgen, "agentIds");
// JacksonWriterUtils.writeEmptyObject(jgen, AGENTID_NAME_MAP_KEY);
JacksonWriterUtils.writeEmptyArray(jgen, "agents");

if (activeView.isDetailed()) {
Expand All @@ -118,8 +107,6 @@ private void writeServerGroupList(NodeView nodeView, JsonGenerator jgen) throws
jgen.writeNumberField("instanceCount", serverGroupList.getInstanceCount());
long instanceErrorCount = getInstanceErrorCount(node);
jgen.writeNumberField("instanceErrorCount", instanceErrorCount);
writeAgentIds("agentIds", serverGroupList, jgen);
// writeAgentIdMap(AGENTID_NAME_MAP_KEY, serverGroupList, jgen);
writeAgentList("agents", serverGroupList, jgen);

if (activeView.isDetailed()) {
Expand All @@ -128,23 +115,6 @@ private void writeServerGroupList(NodeView nodeView, JsonGenerator jgen) throws
}
}

private void writeAgentIds(String fieldName, ServerGroupList serverGroupList, JsonGenerator jgen) throws IOException {
jgen.writeArrayFieldStart(fieldName);
for (String agentId : serverGroupList.getAgentIdList()) {
jgen.writeString(agentId);
}
jgen.writeEndArray();
}

@Deprecated
private void writeAgentIdMap(String fieldName, ServerGroupList serverGroupList, JsonGenerator jgen) throws IOException {
jgen.writeObjectFieldStart(fieldName);
for (Map.Entry<String, String> entry : serverGroupList.getAgentIdNameMap().entrySet()) {
jgen.writeStringField(entry.getKey(), entry.getValue());
}
jgen.writeEndObject();
}

private void writeAgentList(String fieldName, ServerGroupList serverGroupList, JsonGenerator jgen) throws IOException {
jgen.writeFieldName(fieldName);
jgen.writeStartArray();
Expand Down