From 662c8e6184cba0d8f2081713b9818878040edfca Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Wed, 26 Apr 2017 22:28:20 +0800 Subject: [PATCH 1/8] Add log4j.xml into test package --- .../worker/httpserver/AbstractGet.java | 1 + .../SegmentTopSearchWithTimeSlice.java | 27 +++++++++------- .../span/persistence/SpanSearchWithId.java | 1 + .../src/main/resources/log4j2.xml | 11 +++++-- .../src/test/resources/log4j2.xml | 31 +++++++++++++++++++ 5 files changed, 57 insertions(+), 14 deletions(-) create mode 100644 skywalking-collector/skywalking-collector-worker/src/test/resources/log4j2.xml diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java index b7bb77a9d..0c2c0c3a2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java @@ -26,6 +26,7 @@ public abstract class AbstractGet extends AbstractLocalSyncWorker { } catch (Exception e) { ((JsonObject)response).addProperty("isSuccess", false); ((JsonObject)response).addProperty("reason", e.getMessage()); + logger().error(e); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentTopSearchWithTimeSlice.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentTopSearchWithTimeSlice.java index 14eb9fcf4..0dbdde6de 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentTopSearchWithTimeSlice.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentTopSearchWithTimeSlice.java @@ -1,6 +1,11 @@ package com.a.eye.skywalking.collector.worker.segment.persistence; -import com.a.eye.skywalking.collector.actor.*; +import com.a.eye.skywalking.collector.actor.AbstractLocalSyncWorker; +import com.a.eye.skywalking.collector.actor.AbstractLocalSyncWorkerProvider; +import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; +import com.a.eye.skywalking.collector.actor.LocalWorkerContext; +import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; +import com.a.eye.skywalking.collector.actor.Role; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.segment.SegmentCostIndex; @@ -13,6 +18,7 @@ import com.a.eye.skywalking.collector.worker.storage.EsClient; import com.a.eye.skywalking.collector.worker.tools.CollectionTools; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import java.util.List; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; @@ -22,15 +28,13 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.sort.SortOrder; -import java.util.List; - /** * @author pengys5 */ public class SegmentTopSearchWithTimeSlice extends AbstractLocalSyncWorker { private SegmentTopSearchWithTimeSlice(Role role, ClusterWorkerContext clusterContext, - LocalWorkerContext selfContext) { + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -42,7 +46,7 @@ public class SegmentTopSearchWithTimeSlice extends AbstractLocalSyncWorker { @Override protected void onWork(Object request, Object response) throws Exception { if (request instanceof RequestEntity) { - RequestEntity search = (RequestEntity) request; + RequestEntity search = (RequestEntity)request; SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(SegmentCostIndex.INDEX); searchRequestBuilder.setTypes(SegmentCostIndex.TYPE_RECORD); @@ -77,17 +81,18 @@ public class SegmentTopSearchWithTimeSlice extends AbstractLocalSyncWorker { for (SearchHit searchHit : searchResponse.getHits().getHits()) { JsonObject topSegmentJson = new JsonObject(); topSegmentJson.addProperty("num", num); - String segId = (String) searchHit.getSource().get(SegmentCostIndex.SEG_ID); + String segId = (String)searchHit.getSource().get(SegmentCostIndex.SEG_ID); topSegmentJson.addProperty(SegmentCostIndex.SEG_ID, segId); - topSegmentJson.addProperty(SegmentCostIndex.START_TIME, (Number) searchHit.getSource().get(SegmentCostIndex.START_TIME)); + topSegmentJson.addProperty(SegmentCostIndex.START_TIME, (Number)searchHit.getSource().get(SegmentCostIndex.START_TIME)); if (searchHit.getSource().containsKey(SegmentCostIndex.END_TIME)) { - topSegmentJson.addProperty(SegmentCostIndex.END_TIME, (Number) searchHit.getSource().get(SegmentCostIndex.END_TIME)); + topSegmentJson.addProperty(SegmentCostIndex.END_TIME, (Number)searchHit.getSource().get(SegmentCostIndex.END_TIME)); } - topSegmentJson.addProperty(SegmentCostIndex.OPERATION_NAME, (String) searchHit.getSource().get(SegmentCostIndex.OPERATION_NAME)); - topSegmentJson.addProperty(SegmentCostIndex.COST, (Number) searchHit.getSource().get(SegmentCostIndex.COST)); + topSegmentJson.addProperty(SegmentCostIndex.OPERATION_NAME, (String)searchHit.getSource().get(SegmentCostIndex.OPERATION_NAME)); + topSegmentJson.addProperty(SegmentCostIndex.COST, (Number)searchHit.getSource().get(SegmentCostIndex.COST)); String segmentSource = EsClient.INSTANCE.getClient().prepareGet(SegmentIndex.INDEX, SegmentIndex.TYPE_RECORD, segId).get().getSourceAsString(); + logger().debug("segmentSource:" + segmentSource); Segment segment = SegmentDeserialize.INSTANCE.deserializeSingle(segmentSource); List distributedTraceIdList = segment.getRelatedGlobalTraces(); @@ -114,7 +119,7 @@ public class SegmentTopSearchWithTimeSlice extends AbstractLocalSyncWorker { topSegArray.add(topSegmentJson); } - JsonObject resJsonObj = (JsonObject) response; + JsonObject resJsonObj = (JsonObject)response; resJsonObj.add("result", topSegPaging); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithId.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithId.java index fe753148e..6e981c686 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithId.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithId.java @@ -39,6 +39,7 @@ public class SpanSearchWithId extends AbstractLocalSyncWorker { for (Span span : spanList) { if (String.valueOf(span.getSpanId()).equals(search.spanId)) { + span.setJsonStr(""); String spanJsonStr = gson.toJson(span); dataJson = gson.fromJson(spanJsonStr, JsonObject.class); } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml b/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml index d139c48ed..b2a7cc07b 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml +++ b/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml @@ -1,5 +1,5 @@ - + ../logs @@ -15,12 +15,17 @@ + + + + + - + - + diff --git a/skywalking-collector/skywalking-collector-worker/src/test/resources/log4j2.xml b/skywalking-collector/skywalking-collector-worker/src/test/resources/log4j2.xml new file mode 100644 index 000000000..05d825327 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/test/resources/log4j2.xml @@ -0,0 +1,31 @@ + + + + ../logs + + + + + %d - %c -%-4r [%t] %-5p %x - %m%n + + + + + + + + + + + + + + + + + + + + + From 3f1766373f6f1d380b35ecdc5e0dc1a01f3173a2 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Wed, 26 Apr 2017 22:36:58 +0800 Subject: [PATCH 2/8] no message --- .../skywalking/collector/worker/httpserver/AbstractGet.java | 1 - .../skywalking-collector-worker/src/main/resources/log4j2.xml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java index 0c2c0c3a2..b7bb77a9d 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java @@ -26,7 +26,6 @@ public abstract class AbstractGet extends AbstractLocalSyncWorker { } catch (Exception e) { ((JsonObject)response).addProperty("isSuccess", false); ((JsonObject)response).addProperty("reason", e.getMessage()); - logger().error(e); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml b/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml index b2a7cc07b..9a9dd7649 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml +++ b/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml @@ -22,10 +22,10 @@ - + - + From 91a0c2d337c7086cea2da5b754fe2f68585b3e70 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Wed, 26 Apr 2017 22:47:28 +0800 Subject: [PATCH 3/8] no message --- .../src/main/resources/log4j2.xml | 7 +------ .../src/test/resources/log4j2.xml | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml b/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml index 9a9dd7649..0e2c12e8b 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml +++ b/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml @@ -1,5 +1,5 @@ - + ../logs @@ -15,11 +15,6 @@ - - - - - diff --git a/skywalking-collector/skywalking-collector-worker/src/test/resources/log4j2.xml b/skywalking-collector/skywalking-collector-worker/src/test/resources/log4j2.xml index 05d825327..a5dfab766 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/resources/log4j2.xml +++ b/skywalking-collector/skywalking-collector-worker/src/test/resources/log4j2.xml @@ -1,5 +1,5 @@ - + ../logs From 1f960e45030681282b956acfa79194f097d42719 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Wed, 26 Apr 2017 23:09:59 +0800 Subject: [PATCH 4/8] no message --- .../src/test/resources/log4j2.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/skywalking-collector/skywalking-collector-worker/src/test/resources/log4j2.xml b/skywalking-collector/skywalking-collector-worker/src/test/resources/log4j2.xml index a5dfab766..070276a29 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/resources/log4j2.xml +++ b/skywalking-collector/skywalking-collector-worker/src/test/resources/log4j2.xml @@ -15,11 +15,6 @@ - - - - - From 7ee7d8e0d6547197cee911d11fe30b28b1bbbfd0 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Wed, 26 Apr 2017 23:45:56 +0800 Subject: [PATCH 5/8] no message --- skywalking-collector/pom.xml | 6 ++++++ .../collector/actor/AbstractClusterWorkerTestCase.java | 2 ++ skywalking-collector/skywalking-collector-worker/pom.xml | 5 ----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/skywalking-collector/pom.xml b/skywalking-collector/pom.xml index bf65dec4b..e1f593c93 100644 --- a/skywalking-collector/pom.xml +++ b/skywalking-collector/pom.xml @@ -30,6 +30,12 @@ com.typesafe.akka akka-slf4j_2.11 ${akka.version} + + + org.slf4j + slf4j-api + + org.apache.logging.log4j diff --git a/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/AbstractClusterWorkerTestCase.java b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/AbstractClusterWorkerTestCase.java index 96c2de6ea..20d84eb72 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/AbstractClusterWorkerTestCase.java +++ b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/AbstractClusterWorkerTestCase.java @@ -10,6 +10,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; @@ -24,6 +25,7 @@ import static org.mockito.Mockito.when; */ @RunWith(PowerMockRunner.class) @PrepareForTest({ClusterEvent.MemberUp.class, Address.class}) +@PowerMockIgnore({"javax.management.*"}) public class AbstractClusterWorkerTestCase { private AbstractClusterWorker.WorkerWithAkka workerWithAkka = mock(AbstractClusterWorker.WorkerWithAkka.class, CALLS_REAL_METHODS); diff --git a/skywalking-collector/skywalking-collector-worker/pom.xml b/skywalking-collector/skywalking-collector-worker/pom.xml index fdae9454e..200d37d01 100644 --- a/skywalking-collector/skywalking-collector-worker/pom.xml +++ b/skywalking-collector/skywalking-collector-worker/pom.xml @@ -51,11 +51,6 @@ ${project.version} test - - org.jetbrains - annotations - RELEASE - From 1c3423a4c0a90b0adb990df05078ed8a35669515 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Wed, 26 Apr 2017 23:51:43 +0800 Subject: [PATCH 6/8] no message --- .../skywalking-collector-cluster/src/test/resources/log4j2.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skywalking-collector/skywalking-collector-cluster/src/test/resources/log4j2.xml b/skywalking-collector/skywalking-collector-cluster/src/test/resources/log4j2.xml index e6e23fe93..cc2fe771e 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/test/resources/log4j2.xml +++ b/skywalking-collector/skywalking-collector-cluster/src/test/resources/log4j2.xml @@ -1,5 +1,5 @@ - + From c72e1c4f33bb32467ebd2ee45591706a2e9047b5 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Thu, 27 Apr 2017 02:14:12 +0800 Subject: [PATCH 7/8] no message --- .../skywalking-toolkit-logback-1.x/pom.xml | 2 +- .../collector/actor/AbstractWorkerProviderTestCase.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml index d7a90c2db..4ce149fc6 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml +++ b/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml @@ -16,7 +16,7 @@ ch.qos.logback logback-classic 1.1.7 - provided + runtime diff --git a/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProviderTestCase.java b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProviderTestCase.java index 5ff6ca51f..eeb974f70 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProviderTestCase.java +++ b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProviderTestCase.java @@ -6,6 +6,7 @@ import org.junit.runner.RunWith; import static org.powermock.api.mockito.PowerMockito.*; import org.mockito.Mockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -14,6 +15,7 @@ import org.powermock.modules.junit4.PowerMockRunner; */ @RunWith(PowerMockRunner.class) @PrepareForTest({AbstractWorker.class}) +@PowerMockIgnore({"javax.management.*"}) public class AbstractWorkerProviderTestCase { @Test(expected = IllegalArgumentException.class) From 717bc584d221283591feeba02e0c594c34035af2 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Thu, 27 Apr 2017 02:18:09 +0800 Subject: [PATCH 8/8] no message --- .../skywalking-toolkit-logback-1.x/pom.xml | 2 +- skywalking-collector/pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml index 4ce149fc6..d7a90c2db 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml +++ b/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml @@ -16,7 +16,7 @@ ch.qos.logback logback-classic 1.1.7 - runtime + provided diff --git a/skywalking-collector/pom.xml b/skywalking-collector/pom.xml index e1f593c93..8e09f8cd1 100644 --- a/skywalking-collector/pom.xml +++ b/skywalking-collector/pom.xml @@ -51,6 +51,7 @@ org.apache.logging.log4j log4j-slf4j-impl ${log4j.version} + runtime org.apache.logging.log4j