From 4eff915cea49a23fee9d8c705c54dc0552749183 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Tue, 13 Dec 2016 18:47:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log4j/v2/x/Log4j2OutputAppender.java | 2 +- .../log4j/v2/x/TraceIdConverter.java | 2 +- .../logback/v1/x/LogbackPatternConverter.java | 2 +- .../v1/x/TraceIdPatternLogbackLayout.java | 2 +- .../skywalking-registry/pom.xml | 6 ----- .../util/BuriedPointMachineUtil.java | 22 +++++++++---------- .../skywalking-routing/pom.xml | 6 ----- .../routing/alarm/SpanAlarmHandlerTest.java | 2 +- .../main/webapp/pages/common/traceInfo.ftl | 3 --- 9 files changed, 16 insertions(+), 31 deletions(-) rename skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/{ => log}/log4j/v2/x/Log4j2OutputAppender.java (77%) rename skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/{ => log}/log4j/v2/x/TraceIdConverter.java (94%) rename skywalking-application-toolkit/skywalking-toolkit-logback-1.x/src/main/java/com/a/eye/skywalking/toolkit/{ => log}/logback/v1/x/LogbackPatternConverter.java (85%) rename skywalking-application-toolkit/skywalking-toolkit-logback-1.x/src/main/java/com/a/eye/skywalking/toolkit/{ => log}/logback/v1/x/TraceIdPatternLogbackLayout.java (82%) diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/Log4j2OutputAppender.java b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java similarity index 77% rename from skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/Log4j2OutputAppender.java rename to skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java index 890df092d..067e9d3eb 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/Log4j2OutputAppender.java +++ b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.toolkit.log4j.v2.x; +package com.a.eye.skywalking.toolkit.log.log4j.v2.x; /** * Created by wusheng on 2016/12/11. diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/TraceIdConverter.java b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v2/x/TraceIdConverter.java similarity index 94% rename from skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/TraceIdConverter.java rename to skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v2/x/TraceIdConverter.java index 65e3ec77e..5dba2f897 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log4j/v2/x/TraceIdConverter.java +++ b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v2/x/TraceIdConverter.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.toolkit.log4j.v2.x; +package com.a.eye.skywalking.toolkit.log.log4j.v2.x; import org.apache.logging.log4j.core.LogEvent; diff --git a/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/src/main/java/com/a/eye/skywalking/toolkit/logback/v1/x/LogbackPatternConverter.java b/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/logback/v1/x/LogbackPatternConverter.java similarity index 85% rename from skywalking-application-toolkit/skywalking-toolkit-logback-1.x/src/main/java/com/a/eye/skywalking/toolkit/logback/v1/x/LogbackPatternConverter.java rename to skywalking-application-toolkit/skywalking-toolkit-logback-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/logback/v1/x/LogbackPatternConverter.java index 43c6c7a61..cefbb235b 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/src/main/java/com/a/eye/skywalking/toolkit/logback/v1/x/LogbackPatternConverter.java +++ b/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/logback/v1/x/LogbackPatternConverter.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.toolkit.logback.v1.x; +package com.a.eye.skywalking.toolkit.log.logback.v1.x; import ch.qos.logback.classic.pattern.ClassicConverter; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/src/main/java/com/a/eye/skywalking/toolkit/logback/v1/x/TraceIdPatternLogbackLayout.java b/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java similarity index 82% rename from skywalking-application-toolkit/skywalking-toolkit-logback-1.x/src/main/java/com/a/eye/skywalking/toolkit/logback/v1/x/TraceIdPatternLogbackLayout.java rename to skywalking-application-toolkit/skywalking-toolkit-logback-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java index f2c8256d4..118375aff 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/src/main/java/com/a/eye/skywalking/toolkit/logback/v1/x/TraceIdPatternLogbackLayout.java +++ b/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.toolkit.logback.v1.x; +package com.a.eye.skywalking.toolkit.log.logback.v1.x; import ch.qos.logback.classic.PatternLayout; diff --git a/skywalking-commons/skywalking-registry/pom.xml b/skywalking-commons/skywalking-registry/pom.xml index 667fb8b20..4f54004ba 100644 --- a/skywalking-commons/skywalking-registry/pom.xml +++ b/skywalking-commons/skywalking-registry/pom.xml @@ -28,12 +28,6 @@ zookeeper 3.4.8 - - org.mockito - mockito-all - 1.10.19 - test - org.apache.curator curator-test diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/BuriedPointMachineUtil.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/BuriedPointMachineUtil.java index 4d01abd81..ca9d13a88 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/BuriedPointMachineUtil.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/BuriedPointMachineUtil.java @@ -14,11 +14,11 @@ public final class BuriedPointMachineUtil { } public static int getProcessNo() { - if (processNo != -1) { + if (processNo == -1) { String name = ManagementFactory.getRuntimeMXBean().getName(); try { processNo = Integer.parseInt(name.split("@")[0]); - }catch(Throwable t){ + } catch (Throwable t) { processNo = 0; } } @@ -39,9 +39,9 @@ public final class BuriedPointMachineUtil { if (StringUtil.isEmpty(IP)) { InetAddress netAddress = getInetAddress(); if (null == netAddress) { - IP = "N/A"; - }else{ - IP = netAddress.getHostAddress(); //get the ip address + IP = "N/A"; + } else { + IP = netAddress.getHostAddress(); //get the ip address } } return IP; @@ -51,16 +51,16 @@ public final class BuriedPointMachineUtil { if (StringUtil.isEmpty(hostName)) { InetAddress netAddress = getInetAddress(); if (null == netAddress) { - hostName = "N/A"; - }else{ - hostName = netAddress.getHostName(); //get the host address + hostName = "N/A"; + } else { + hostName = netAddress.getHostName(); //get the host address } } return hostName; } - - public static String getHostDesc(){ - return getHostName() + "/" + getHostIp(); + + public static String getHostDesc() { + return getHostName() + "/" + getHostIp(); } private BuriedPointMachineUtil() { diff --git a/skywalking-storage-center/skywalking-routing/pom.xml b/skywalking-storage-center/skywalking-routing/pom.xml index df43386f2..3c27ae590 100644 --- a/skywalking-storage-center/skywalking-routing/pom.xml +++ b/skywalking-storage-center/skywalking-routing/pom.xml @@ -18,12 +18,6 @@ - - io.grpc - grpc-testing - 1.0.1 - test - org.apache.curator curator-test diff --git a/skywalking-storage-center/skywalking-routing/src/test/java/com/a/eye/skywalking/routing/alarm/SpanAlarmHandlerTest.java b/skywalking-storage-center/skywalking-routing/src/test/java/com/a/eye/skywalking/routing/alarm/SpanAlarmHandlerTest.java index 013a60b74..3fb905cf8 100644 --- a/skywalking-storage-center/skywalking-routing/src/test/java/com/a/eye/skywalking/routing/alarm/SpanAlarmHandlerTest.java +++ b/skywalking-storage-center/skywalking-routing/src/test/java/com/a/eye/skywalking/routing/alarm/SpanAlarmHandlerTest.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.storage.alarm; +package com.a.eye.skywalking.routing.alarm; import com.a.eye.skywalking.network.grpc.AckSpan; import com.a.eye.skywalking.network.grpc.TraceId; diff --git a/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl b/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl index 613c5b241..16eab1257 100644 --- a/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl +++ b/skywalking-webui/src/main/webapp/pages/common/traceInfo.ftl @@ -153,9 +153,6 @@ {{else}} {{>totalSize}}个调用节点， {{/if}}消耗总时长：{{>totalTime}}ms。 - {{if hasCallChainTree}} - - {{/if}}