Merge pull request #1489 from jaehong-kim/scatter-agent

add filteredServerMap.
pinpoint-apm · Jan 27, 2016 · fee83c7 · fee83c7
2 parents f9f873e + f31273e
commit fee83c7
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 50 deletions.
diff --git a/web/src/main/java/com/navercorp/pinpoint/web/controller/ScatterChartController.java b/web/src/main/java/com/navercorp/pinpoint/web/controller/ScatterChartController.java
@@ -172,66 +172,62 @@ private ModelAndView createModelAndView(Range range, String jsonpCallback, List<
         mv.addObject("resultFrom", range.getFrom());
         mv.addObject("resultTo", range.getTo());
         mv.addObject("scatterIndex", ScatterIndex.MATA_DATA);
-        if(version <= 2) {
-            mv.addObject("scatter", scatterData);
-        } else {
-            final Map<String, List<Dot>> scatterAgentData = new HashMap<>();
-            for(Dot dot : scatterData) {
-                List<Dot> list = scatterAgentData.get(dot.getAgentId());
-                if(list == null) {
+        final Map<String, List<Dot>> scatterAgentData = new HashMap<>();
+        for (Dot dot : scatterData) {
+            List<Dot> list = scatterAgentData.get(dot.getAgentId());
+            if (list == null) {
+                list = new ArrayList<>();
+                scatterAgentData.put(dot.getAgentId(), list);
+            }
+            list.add(dot);
+        }
+
+        if (version == 4) {
+            TimeWindow timeWindow = new TimeWindow(range);
+            TreeMap<Long, List<Dot>> sortedMap = new TreeMap<>();
+            for (Dot dot : scatterData) {
+                long key = timeWindow.refineTimestamp(dot.getAcceptedTime());
+                List<Dot> list = sortedMap.get(key);
+                if (list == null) {
                     list = new ArrayList<>();
-                    scatterAgentData.put(dot.getAgentId(), list);
+                    sortedMap.put(key, list);
                 }
                 list.add(dot);
             }
 
-            if(version == 4) {
-                TimeWindow timeWindow = new TimeWindow(range);
-                TreeMap<Long, List<Dot>> sortedMap = new TreeMap<>();
-                for(Dot dot : scatterData) {
-                    long key = timeWindow.refineTimestamp(dot.getAcceptedTime());
-                    List<Dot> list = sortedMap.get(key);
-                    if(list == null) {
-                        list = new ArrayList<>();
-                        sortedMap.put(key, list);
+            // average
+            // max
+            // min
+            List<Dot> averageList = new ArrayList<>();
+            List<Dot> maxList = new ArrayList<>();
+            List<Dot> minList = new ArrayList<>();
+            for (Map.Entry<Long, List<Dot>> entry : sortedMap.entrySet()) {
+                Dot max = null;
+                Dot min = null;
+                int totalTime = 0;
+                for (Dot dot : entry.getValue()) {
+                    if (max == null || dot.getElapsedTime() > max.getElapsedTime()) {
+                        max = dot;
                     }
-                    list.add(dot);
-                }
 
-                // average
-                // max
-                // min
-                List<Dot> averageList = new ArrayList<>();
-                List<Dot> maxList = new ArrayList<>();
-                List<Dot> minList = new ArrayList<>();
-                for(Map.Entry<Long, List<Dot>> entry : sortedMap.entrySet()) {
-                    Dot max = null;
-                    Dot min = null;
-                    int totalTime = 0;
-                    for(Dot dot : entry.getValue()) {
-                        if(max == null || dot.getElapsedTime() > max.getElapsedTime()) {
-                            max = dot;
-                        }
-
-                        if(min == null || dot.getElapsedTime() < min.getElapsedTime()) {
-                            min = dot;
-                        }
-
-                        totalTime += dot.getElapsedTime();
+                    if (min == null || dot.getElapsedTime() < min.getElapsedTime()) {
+                        min = dot;
                     }
-                    int averageTime = totalTime / entry.getValue().size();
-                    averageList.add(new Dot(new TransactionId("", 0, 0), entry.getKey(), averageTime, 0, ""));
-                    maxList.add(new Dot(new TransactionId(max.getTransactionId()), entry.getKey(), max.getElapsedTime(), max.getExceptionCode(), max.getAgentId()));
-                    minList.add(new Dot(new TransactionId(min.getTransactionId()), entry.getKey(), min.getElapsedTime(), min.getExceptionCode(), min.getAgentId()));
+
+                    totalTime += dot.getElapsedTime();
                 }
-                scatterAgentData.put("_#AverageAgent", averageList);
-                scatterAgentData.put("_#MaxAgent", maxList);
-                scatterAgentData.put("_#MinAgent", minList);
+                int averageTime = totalTime / entry.getValue().size();
+                averageList.add(new Dot(new TransactionId("", 0, 0), entry.getKey(), averageTime, 0, ""));
+                maxList.add(new Dot(new TransactionId(max.getTransactionId()), entry.getKey(), max.getElapsedTime(), max.getExceptionCode(), max.getAgentId()));
+                minList.add(new Dot(new TransactionId(min.getTransactionId()), entry.getKey(), min.getElapsedTime(), min.getExceptionCode(), min.getAgentId()));
             }
-
-            mv.addObject("scatter", scatterAgentData);
+            scatterAgentData.put("_#AverageAgent", averageList);
+            scatterAgentData.put("_#MaxAgent", maxList);
+            scatterAgentData.put("_#MinAgent", minList);
         }
 
+        mv.addObject("scatter", scatterAgentData);
+
         if (jsonpCallback == null) {
             mv.setViewName("jsonView");
         } else {

diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/scatter/ScatterScanResult.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/scatter/ScatterScanResult.java
@@ -20,8 +20,11 @@
 import com.navercorp.pinpoint.web.vo.scatter.Dot;
 import com.navercorp.pinpoint.web.vo.scatter.ScatterIndex;
 
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * To be used with @ResponseBody.
@@ -76,7 +79,17 @@ public ScatterIndex getScatterIndex() {
     }
 
     @JsonProperty("scatter")
-    public List<Dot> getScatter() {
-        return scatter;
+    public Map<String, List<Dot>> getScatter() {
+        final Map<String, List<Dot>> scatterAgentData = new HashMap<>();
+        for(Dot dot : scatter) {
+            List<Dot> list = scatterAgentData.get(dot.getAgentId());
+            if(list == null) {
+                list = new ArrayList<>();
+                scatterAgentData.put(dot.getAgentId(), list);
+            }
+            list.add(dot);
+        }
+
+        return scatterAgentData;
     }
 }