[유치수] [PINPOINT-27] 서버 맵에 필터 기능 추가.

git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@1609 84d0f5b1-2673-498c-a247-62c4ff18d310

src/main/java/com/nhn/hippo/web/controller/ApplicationMapController.java

@@ -1,5 +1,7 @@
 package com.nhn.hippo.web.controller;
 
+import java.util.Set;
+
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +12,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import com.nhn.hippo.web.applicationmap.ApplicationMap;
+import com.nhn.hippo.web.calltree.server.ServerCallTree;
 import com.nhn.hippo.web.service.ApplicationMapService;
+import com.nhn.hippo.web.service.FlowChartService;
+import com.nhn.hippo.web.vo.TraceId;
 
 /**
  * 
@@ -18,10 +23,13 @@ import com.nhn.hippo.web.service.ApplicationMapService;
  */
 @Controller
 public class ApplicationMapController extends BaseController {
-	
+
 	@Autowired
 	private ApplicationMapService applicationMapService;
 
+	@Autowired
+	private FlowChartService flow;
+
 	@RequestMapping(value = "/getServerMapData2", method = RequestMethod.GET)
 	public String getServerMapData2(Model model, HttpServletResponse response, @RequestParam("application") String applicationName, @RequestParam("serviceType") short serviceType, @RequestParam("from") long from, @RequestParam("to") long to) {
 		ApplicationMap map = applicationMapService.selectApplicationMap(applicationName, serviceType, from, to);
@@ -39,4 +47,19 @@ public class ApplicationMapController extends BaseController {
 		long from = to - period;
 		return getServerMapData2(model, response, applicationName, serviceType, from, to);
 	}
+	
+	@RequestMapping(value = "/getFilteredServerMapData", method = RequestMethod.GET)
+	public String getFilteredServerMapData(Model model, HttpServletResponse response, @RequestParam("application") String applicationName, @RequestParam("serviceType") short serviceType, @RequestParam("from") long from, @RequestParam("to") long to) {
+		Set<TraceId> traceIdSet = flow.selectTraceIdsFromApplicationTraceIndex(applicationName, from, to);
+		
+		System.out.println(traceIdSet);
+		
+		ServerCallTree map = flow.selectServerCallTree(traceIdSet);
+		
+		model.addAttribute("nodes", map.getNodes());
+		model.addAttribute("links", map.getLinks());
+
+		addResponseHeader(response);
+		return "applicationmap.filtered";
+	}
 }

src/main/java/com/nhn/hippo/web/dao/TraceDao.java

@@ -18,6 +18,8 @@ public interface TraceDao {
 
     // TODO list하고 set하고 비교해서 하나 없애야 될듯 하다.
     List<List<SpanBo>> selectSpans(List<TraceId> traceIdList);
+    
+    List<List<SpanBo>> selectAllSpans(Set<TraceId> traceIdSet);
 
     List<List<SpanBo>> selectSpans(Set<TraceId> traceIdSet);
 

src/main/java/com/nhn/hippo/web/dao/hbase/HbaseTraceDao.java

@@ -71,6 +71,18 @@ public class HbaseTraceDao implements TraceDao {
 		}
 		return template2.get(HBaseTables.TRACES, gets, spanMapper);
 	}
+	
+	@Override
+	public List<List<SpanBo>> selectAllSpans(Set<TraceId> traceIdSet) {
+		List<Get> gets = new ArrayList<Get>(traceIdSet.size());
+		for (TraceId traceId : traceIdSet) {
+			Get get = new Get(traceId.getBytes());
+			get.addFamily(HBaseTables.TRACES_CF_SPAN);
+			get.addFamily(HBaseTables.TRACES_CF_TERMINALSPAN);
+			gets.add(get);
+		}
+		return template2.get(HBaseTables.TRACES, gets, spanMapper);
+	}
 
 	@Override
 	public List<SpanBo> selectSpans(TraceId traceId) {

src/main/java/com/nhn/hippo/web/service/FlowChartService.java

@@ -20,4 +20,6 @@ public interface FlowChartService {
 	public ServerCallTree selectServerCallTree(TraceId traceId);
 
 	public BusinessTransactions selectBusinessTransactions(Set<TraceId> traceIds, String applicationName, long from, long to);
+	
+	public ServerCallTree selectServerCallTree(Set<TraceId> traceIdSet);
 }

src/main/java/com/nhn/hippo/web/service/FlowChartServiceImpl.java

@@ -12,6 +12,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StopWatch;
 
 import com.nhn.hippo.web.calltree.server.AgentIdNodeSelector;
+import com.nhn.hippo.web.calltree.server.ApplicationIdNodeSelector;
+import com.nhn.hippo.web.calltree.server.NodeSelector;
 import com.nhn.hippo.web.calltree.server.ServerCallTree;
 import com.nhn.hippo.web.dao.ApplicationIndexDao;
 import com.nhn.hippo.web.dao.ApplicationTraceIndexDao;
@@ -57,7 +59,7 @@ public class FlowChartServiceImpl implements FlowChartService {
 		List<SpanBo> transaction = this.traceDao.selectSpans(traceId);
 
 		Set<String> endPoints = createUniqueEndpoint(transaction);
-		ServerCallTree tree = createServerCallTree(transaction);
+		ServerCallTree tree = createServerCallTree(transaction, new AgentIdNodeSelector());
 
 		// subSpan에서 record할 데이터만 골라낸다.
 		List<SpanEventBo> spanEventBoList = findRecordStatisticsSpanEventData(transaction, endPoints);
@@ -70,6 +72,37 @@ public class FlowChartServiceImpl implements FlowChartService {
 
 		return tree;
 	}
+	
+	/**
+	 * filtered application map
+	 */
+	@Override
+	public ServerCallTree selectServerCallTree(Set<TraceId> traceIdSet) {
+		StopWatch watch = new StopWatch();
+		watch.start();
+		
+		List<List<SpanBo>> transactionList = this.traceDao.selectAllSpans(traceIdSet);
+		List<SpanBo> transaction = new ArrayList<SpanBo>();
+		for (List<SpanBo> t : transactionList) {
+			for (SpanBo span : t) {
+				transaction.add(span);
+			}
+		}
+		
+		Set<String> endPoints = createUniqueEndpoint(transaction);
+		ServerCallTree tree = createServerCallTree(transaction, new ApplicationIdNodeSelector());
+		
+		// subSpan에서 record할 데이터만 골라낸다.
+		List<SpanEventBo> spanEventBoList = findRecordStatisticsSpanEventData(transaction, endPoints);
+		
+		tree.addSpanEventList(spanEventBoList);
+		tree.build();
+		
+		watch.stop();
+		logger.info("Fetch single transaction serverCallTree elapsed. {}ms", watch.getLastTaskTimeMillis());
+		
+		return tree;
+	}
 
 	private List<SpanEventBo> findRecordStatisticsSpanEventData(List<SpanBo> transaction, Set<String> endPoints) {
 		List<SpanEventBo> filterSpanEventBo = new ArrayList<SpanEventBo>();
@@ -102,8 +135,8 @@ public class FlowChartServiceImpl implements FlowChartService {
 	 * @param transaction
 	 * @return
 	 */
-	private ServerCallTree createServerCallTree(List<SpanBo> transaction) {
-		ServerCallTree serverCallTree = new ServerCallTree(new AgentIdNodeSelector());
+	private ServerCallTree createServerCallTree(List<SpanBo> transaction, NodeSelector nodeSelector) {
+		ServerCallTree serverCallTree = new ServerCallTree(nodeSelector);
 		serverCallTree.addSpanList(transaction);
 
 		// TODO 이 메소드는 transaction하나만 조회하는 페이지에서 사용되기 때문에 이렇게 한다.