From 585c2279b9aba5bfbf0db7263e9d85739d8139a3 Mon Sep 17 00:00:00 2001 From: Administrator <55846420@qq.com> Date: Thu, 17 Dec 2015 11:49:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9uid=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ai/cloud/util/view/BaseFreeMarkerView.java | 2 +- skywalking-webui/src/main/webapp/js/webui-0.1.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/skywalking-webui/src/main/java/com/ai/cloud/util/view/BaseFreeMarkerView.java b/skywalking-webui/src/main/java/com/ai/cloud/util/view/BaseFreeMarkerView.java index 68c5e136d..714dad4ef 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/util/view/BaseFreeMarkerView.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/util/view/BaseFreeMarkerView.java @@ -41,7 +41,7 @@ public class BaseFreeMarkerView extends FreeMarkerView { } String uid = (String) session.getAttribute("uid"); if(StringUtil.isBlank(uid)){ - uid = "0"; + uid = "-1"; } String userName = (String) session.getAttribute("userName"); if(StringUtil.isBlank(userName)){ diff --git a/skywalking-webui/src/main/webapp/js/webui-0.1.js b/skywalking-webui/src/main/webapp/js/webui-0.1.js index fee057468..e6f3b138f 100644 --- a/skywalking-webui/src/main/webapp/js/webui-0.1.js +++ b/skywalking-webui/src/main/webapp/js/webui-0.1.js @@ -22,7 +22,7 @@ $().ready(function() { changeFrameUrl(baseUrl + "/showTraceLog/" + srchKey); } } else { - if(uid>0){ + if(uid>=0){ changeFrameUrl(baseUrl + "/applist"); } $("#srchKey").val(""); From 0aa540b5d1a09cbcfd028613e8e844c5dc24a355 Mon Sep 17 00:00:00 2001 From: wusheng Date: Thu, 17 Dec 2015 13:05:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=96=B0=E7=9A=84trace?= =?UTF-8?q?id=E7=94=9F=E6=88=90=E7=AE=97=E6=B3=95=EF=BC=8C=E8=83=BD?= =?UTF-8?q?=E5=A4=9F=E6=AF=94UUID=E5=9C=A8200=E5=B9=B6=E5=8F=91=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E9=80=9F=E5=BA=A6=E6=8F=90=E9=AB=98?= =?UTF-8?q?30=E5=80=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skywalking/util/TraceIdGenerator.java | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java index 61ea2fe51..64f0bf6fb 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java @@ -1,13 +1,34 @@ package com.ai.cloud.skywalking.util; +import java.util.HashMap; +import java.util.Random; import java.util.UUID; public final class TraceIdGenerator { + private static final ThreadLocal ThreadTraceIdSequence = new ThreadLocal(); + + private static final String PROCESS_UUID; + + static{ + String uuid = UUID.randomUUID().toString().replaceAll("-", ""); + PROCESS_UUID = uuid.substring(uuid.length() - 7); + } + private TraceIdGenerator() { - // Non } - - public static String generate() { - return UUID.randomUUID().toString().replaceAll("-", ""); + + public static String generate(){ + Integer seq = ThreadTraceIdSequence.get(); + if(seq == null || seq == 10000 || seq > 10000){ + seq = 0; + } + seq++; + ThreadTraceIdSequence.set(seq); + + return System.currentTimeMillis() + + "." + PROCESS_UUID + + "." + BuriedPointMachineUtil.getProcessNo() + + "." + Thread.currentThread().getId() + + "." + seq; } } From 55f385e82fb977ac27769e27be8a1208a6d59935 Mon Sep 17 00:00:00 2001 From: wusheng Date: Thu, 17 Dec 2015 13:10:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/cloud/skywalking/util/TraceIdGenerator.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java index 64f0bf6fb..1fc259806 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java @@ -1,7 +1,5 @@ package com.ai.cloud.skywalking.util; -import java.util.HashMap; -import java.util.Random; import java.util.UUID; public final class TraceIdGenerator { From c269d81e8f6c0d85935e05bb5dcb47e465d5da8e Mon Sep 17 00:00:00 2001 From: Administrator <55846420@qq.com> Date: Thu, 17 Dec 2015 18:22:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=9D=A1?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E7=9C=8B=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/webapp/ftl/lib/ai.cloud/common.ftl | 27 +++++++++++++++++-- .../src/main/webapp/ftl/traceLog.ftl | 12 ++++++++- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/skywalking-webui/src/main/webapp/ftl/lib/ai.cloud/common.ftl b/skywalking-webui/src/main/webapp/ftl/lib/ai.cloud/common.ftl index c33ff42c9..14241ba48 100644 --- a/skywalking-webui/src/main/webapp/ftl/lib/ai.cloud/common.ftl +++ b/skywalking-webui/src/main/webapp/ftl/lib/ai.cloud/common.ftl @@ -111,7 +111,7 @@ ${logInfo.spanTypeName!'UNKNOWN'} ${logInfo.statusCodeName!'MISSING'} - ${logInfo.viewPointIdSub!} ${logInfo.address!} @@ -250,6 +250,8 @@
    +
  • + 服务/方法：${logInfo.viewPointId!''}
  • 调用类型：${logInfo.spanTypeName!'UNKNOWN'}
  • @@ -280,4 +282,25 @@
- \ No newline at end of file + + +<#macro detailTraceLog> + + + diff --git a/skywalking-webui/src/main/webapp/ftl/traceLog.ftl b/skywalking-webui/src/main/webapp/ftl/traceLog.ftl index ed7bc3eca..84153a869 100644 --- a/skywalking-webui/src/main/webapp/ftl/traceLog.ftl +++ b/skywalking-webui/src/main/webapp/ftl/traceLog.ftl @@ -12,10 +12,13 @@ + + <@common.detailTraceLog /> + <@common.dealTraceLog /> - + <@common.importOriginLog /> @@ -54,6 +57,13 @@ } }); + $("a[name='detailInfo']").each(function(index,ele){ + $(this).bind("click",function(){ + $("#detailContent").html($("#collapse"+index).html()); + $("#detailLog").modal('show'); + }); + }); + $('#example-advanced').treetable('expandAll'); });