diff --git a/skywalking-collector/pom.xml b/skywalking-collector/pom.xml index bf65dec4b..8e09f8cd1 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 @@ -45,6 +51,7 @@ org.apache.logging.log4j log4j-slf4j-impl ${log4j.version} + runtime 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-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) 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 @@ - + 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 - 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..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 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..070276a29 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/test/resources/log4j2.xml @@ -0,0 +1,26 @@ + + + + ../logs + + + + + %d - %c -%-4r [%t] %-5p %x - %m%n + + + + + + + + + + + + + + + +