[유치수] [NOBTS] add terminal info, change dbtype to servicetype

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

src/main/java/com/nhn/hippo/web/calltree/server/Server.java

@@ -18,7 +18,7 @@ public class Server implements Comparable<Server> {
 	private final boolean terminal;
 	private int recursiveCallCount;
 
-	private final ServiceType serverType;
+	private final ServiceType serviceType;
 
 	public Server(SpanBo span) {
 		this.id = span.getServiceName();
@@ -33,7 +33,7 @@ public class Server implements Comparable<Server> {
 		this.endPoint = span.getEndPoint();
 		this.terminal = span.isTerminal();
 		this.recursiveCallCount = span.getRecursiveCallCount();
-		this.serverType = span.getServiceType();
+		this.serviceType = span.getServiceType();
 	}
 
 	public String getId() {
@@ -73,8 +73,8 @@ public class Server implements Comparable<Server> {
 		this.agentIds.addAll(server.getAgentIds());
 	}
 	
-	public ServiceType getServerType() {
-		return serverType;
+	public ServiceType getServiceType() {
+		return serviceType;
 	}
 
 	@Override

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

@@ -21,6 +21,7 @@ import com.nhn.hippo.web.dao.RootTraceIndexDao;
 import com.nhn.hippo.web.dao.TraceDao;
 import com.nhn.hippo.web.dao.TraceIndexDao;
 import com.nhn.hippo.web.vo.TraceId;
+import com.profiler.common.ServiceType;
 import com.profiler.common.bo.SpanBo;
 import com.profiler.common.hbase.HBaseClient;
 import com.profiler.common.hbase.HBaseQuery;
@@ -141,7 +142,8 @@ public class FlowChartServiceImpl implements FlowChartService {
 			String svcName = span.getServiceName();
 
 			// TODO 임시로 HTTP/1.1을 확인하게 해두었음. merge해야하는 span 확인 방법을 바꿔야함.
-			if ("HTTP/1.1".equals(svcName)) {
+			// if ("HTTP/1.1".equals(svcName)) {
+			if (span.getServiceType().isRpcClient()) {
 				SpanBo child = findChildSpan(list, span);
 
 				if (child != null) {
@@ -153,6 +155,7 @@ public class FlowChartServiceImpl implements FlowChartService {
 				} else {
 					// using as a terminal node.
 					span.setServiceName(span.getEndPoint());
+					span.setServiceType(ServiceType.UNKNOWN_CLOUD);
 				}
 			}
 		}

src/main/webapp/WEB-INF/views/flowserver.jsp

@@ -13,7 +13,8 @@
         <c:if test="${!status2.last}">,</c:if>
     </c:forEach>
     ],
-    "serverType" : "${node.serverType}"
+    "serverType" : "${node.serviceType}",
+    "terminal" : "${node.serviceType.terminal}"
     }
     <c:if test="${!status.last}">,</c:if>
 </c:forEach>