diff --git a/src/main/java/com/nhn/hippo/web/calltree/rpc/RPCCallTree.java b/src/main/java/com/nhn/hippo/web/calltree/rpc/RPCCallTree.java index f802427e6..b62e75f32 100644 --- a/src/main/java/com/nhn/hippo/web/calltree/rpc/RPCCallTree.java +++ b/src/main/java/com/nhn/hippo/web/calltree/rpc/RPCCallTree.java @@ -30,7 +30,7 @@ public class RPCCallTree { * make RPCs */ // TODO: 여기에서 이러지말고 수집할 때 처음부터 table에 저장해둘 수 있나?? - RPC rpc = new RPC(span.getAgentID(), span.getServiceName(), span.getName(), span.isTerminal()); + RPC rpc = new RPC(span.getAgentId(), span.getServiceName(), span.getName(), span.isTerminal()); // TODO: remove this later. if (rpc.getId().contains("mysql:jdbc:") || rpc.getId().contains("favicon")) { @@ -40,13 +40,13 @@ public class RPCCallTree { if (!rpcs.containsKey(rpc.getId())) { rpcs.put(rpc.getId(), rpc); } - spanIdToRPCId.put(String.valueOf(span.getSpanID()), rpc.getId()); + spanIdToRPCId.put(String.valueOf(span.getSpanId()), rpc.getId()); // TODO remove client node if (span.getParentSpanId() == -1) { - RPC client = new RPC(PREFIX_CLIENT + span.getAgentID(), span.getServiceName(), span.getName(), false); + RPC client = new RPC(PREFIX_CLIENT + span.getAgentId(), span.getServiceName(), span.getName(), false); rpcs.put(client.getId(), client); - spanIdToRPCId.put(PREFIX_CLIENT + span.getSpanID(), client.getId()); + spanIdToRPCId.put(PREFIX_CLIENT + span.getSpanId(), client.getId()); } /** @@ -66,7 +66,7 @@ public class RPCCallTree { for (Span span : spans) { String from = String.valueOf(span.getParentSpanId()); - String to = String.valueOf(span.getSpanID()); + String to = String.valueOf(span.getSpanId()); RPC fromRPC = rpcs.get(spanIdToRPCId.get(from)); RPC toRPC = rpcs.get(spanIdToRPCId.get(to)); diff --git a/src/main/java/com/nhn/hippo/web/calltree/server/ServerCallTree.java b/src/main/java/com/nhn/hippo/web/calltree/server/ServerCallTree.java index 89a1e23fc..29b53aa98 100644 --- a/src/main/java/com/nhn/hippo/web/calltree/server/ServerCallTree.java +++ b/src/main/java/com/nhn/hippo/web/calltree/server/ServerCallTree.java @@ -32,7 +32,7 @@ public class ServerCallTree { * make Servers */ // TODO: 여기에서 이러지말고 수집할 때 처음부터 table에 저장해둘 수 있나?? - Server Server = new Server(span.getAgentID(), span.getEndPoint(), span.isTerminal()); + Server Server = new Server(span.getAgentId(), span.getEndPoint(), span.isTerminal()); // TODO: remove this later. if (Server.getId().contains("mysql:jdbc:") || Server.getId().contains("favicon")) { @@ -42,7 +42,7 @@ public class ServerCallTree { if (!servers.containsKey(Server.getId())) { servers.put(Server.getId(), Server); } - spanIdToServerId.put(String.valueOf(span.getSpanID()), Server.getId()); + spanIdToServerId.put(String.valueOf(span.getSpanId()), Server.getId()); // TODO: remove client node // if (span.getParentSpanId() == -1) { @@ -72,7 +72,7 @@ public class ServerCallTree { for (Span span : spans) { String from = String.valueOf(span.getParentSpanId()); - String to = String.valueOf(span.getSpanID()); + String to = String.valueOf(span.getSpanId()); Server fromServer = servers.get(spanIdToServerId.get(from)); Server toServer = servers.get(spanIdToServerId.get(to)); diff --git a/src/main/java/com/nhn/hippo/web/calltree/span/SpanAligner.java b/src/main/java/com/nhn/hippo/web/calltree/span/SpanAligner.java index b349dd974..a1eab0327 100644 --- a/src/main/java/com/nhn/hippo/web/calltree/span/SpanAligner.java +++ b/src/main/java/com/nhn/hippo/web/calltree/span/SpanAligner.java @@ -109,11 +109,11 @@ public class SpanAligner { private List nextSpan(Span parent) { - List child = this.parentSpanIdMap.get(parent.getSpanID()); + List child = this.parentSpanIdMap.get(parent.getSpanId()); if (child == null) { return null; } - this.parentSpanIdMap.remove(parent.getSpanID()); + this.parentSpanIdMap.remove(parent.getSpanId()); // 동일 레벨은 시간순으로 정렬. Collections.sort(child, timeComparator); return child; @@ -142,11 +142,11 @@ public class SpanAligner { } public void check(Span span) { - Span before = spanCheck.put(span.getSpanID(), span); + Span before = spanCheck.put(span.getSpanId(), span); if (before != null) { // span id 중복체크 deplicatedSpanIdDump(span); - throw new IllegalStateException("duplicated spanId. id:" + span.getSpanID()); + throw new IllegalStateException("duplicated spanId. id:" + span.getSpanId()); } } diff --git a/src/main/java/com/nhn/hippo/web/utils/AnnotationUtils.java b/src/main/java/com/nhn/hippo/web/utils/AnnotationUtils.java index c9d6ea97d..4b68cdea9 100644 --- a/src/main/java/com/nhn/hippo/web/utils/AnnotationUtils.java +++ b/src/main/java/com/nhn/hippo/web/utils/AnnotationUtils.java @@ -1,10 +1,15 @@ package com.nhn.hippo.web.utils; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.UUID; + import com.profiler.common.util.AnnotationTranscoder; public class AnnotationUtils { private static final AnnotationTranscoder transcoder = new AnnotationTranscoder(); + private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss SSS"); public static String bytesToString(int dataType, byte[] data) { Object decoded = transcoder.decode(dataType, data); @@ -14,4 +19,11 @@ public class AnnotationUtils { return null; } + public static String longToDateStr(long date) { + return dateFormat.format(new Date(date)); + } + + public static String longLongToUUID(long mostTraceId, long leastTraceId) { + return new UUID(mostTraceId, leastTraceId).toString(); + } } diff --git a/src/main/java/com/nhn/hippo/web/vo/BusinessTransaction.java b/src/main/java/com/nhn/hippo/web/vo/BusinessTransaction.java index 6eee3e58c..93fc767d6 100644 --- a/src/main/java/com/nhn/hippo/web/vo/BusinessTransaction.java +++ b/src/main/java/com/nhn/hippo/web/vo/BusinessTransaction.java @@ -18,7 +18,7 @@ public class BusinessTransaction { public BusinessTransaction(Span span) { this.name = span.getName(); - this.traces.add(new UUID(span.getMostTraceID(), span.getLeastTraceID()).toString()); + this.traces.add(new UUID(span.getMostTraceId(), span.getLeastTraceId()).toString()); calls++; List annotations = span.getAnnotations(); @@ -37,7 +37,7 @@ public class BusinessTransaction { } public void add(Span span) { - this.traces.add(new UUID(span.getMostTraceID(), span.getLeastTraceID()).toString()); + this.traces.add(new UUID(span.getMostTraceId(), span.getLeastTraceId()).toString()); if (span.getParentSpanId() == -1) { calls++; } diff --git a/src/main/webapp/WEB-INF/hippo-function.tld b/src/main/webapp/WEB-INF/hippo-function.tld index 5877c36b7..7bc0fe2e4 100644 --- a/src/main/webapp/WEB-INF/hippo-function.tld +++ b/src/main/webapp/WEB-INF/hippo-function.tld @@ -15,4 +15,18 @@ com.nhn.hippo.web.utils.AnnotationUtils java.lang.String bytesToString(int, byte[]) + + + + longToDateStr + com.nhn.hippo.web.utils.AnnotationUtils + java.lang.String longToDateStr(long) + + + + + longLongToUUID + com.nhn.hippo.web.utils.AnnotationUtils + java.lang.String longLongToUUID(long, long) + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/selectTransaction.jsp b/src/main/webapp/WEB-INF/views/selectTransaction.jsp index 3b271a8b4..084d3dd39 100644 --- a/src/main/webapp/WEB-INF/views/selectTransaction.jsp +++ b/src/main/webapp/WEB-INF/views/selectTransaction.jsp @@ -46,20 +46,27 @@