From a50171e9233211df73e5721607776aa69d202e4e Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Fri, 17 Mar 2017 21:02:07 +0800 Subject: [PATCH] add commons moudle contains roles and serializer --- skywalking-collector/pom.xml | 2 +- .../src/test/resources/application.conf | 2 +- .../pom.xml | 12 +++++++++++- .../commons}/role/TraceSegmentReceiverRole.java | 2 +- .../commons/serializer}/JsonSerializer.java | 4 ++-- .../commons/serializer}/TraceSegmentSerializer.java | 6 ++---- .../skywalking-collector-worker/pom.xml | 12 +----------- .../worker/receiver/TraceSegmentReceiver.java | 2 +- .../src/main/resources/application.conf | 2 +- skywalking-sniffer/skywalking-api/pom.xml | 2 +- .../api/client/CollectorClientService.java | 2 +- 11 files changed, 23 insertions(+), 25 deletions(-) rename skywalking-collector/{skywalking-collector-role => skywalking-collector-commons}/pom.xml (62%) rename skywalking-collector/{skywalking-collector-role/src/main/java/com/a/eye/skywalking/collector => skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons}/role/TraceSegmentReceiverRole.java (90%) rename skywalking-collector/{skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker => skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer}/JsonSerializer.java (89%) rename skywalking-collector/{skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker => skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer}/TraceSegmentSerializer.java (85%) diff --git a/skywalking-collector/pom.xml b/skywalking-collector/pom.xml index 8cb53a051..3981bd464 100644 --- a/skywalking-collector/pom.xml +++ b/skywalking-collector/pom.xml @@ -5,7 +5,7 @@ skywalking-collector-cluster skywalking-collector-worker - skywalking-collector-role + skywalking-collector-commons skywalking diff --git a/skywalking-collector/skywalking-collector-cluster/src/test/resources/application.conf b/skywalking-collector/skywalking-collector-cluster/src/test/resources/application.conf index b56848752..63ff45216 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/test/resources/application.conf +++ b/skywalking-collector/skywalking-collector-cluster/src/test/resources/application.conf @@ -6,7 +6,7 @@ akka { java = "akka.serialization.JavaSerializer" proto = "akka.remote.serialization.ProtobufSerializer" // data = "com.a.eye.skywalking.collector.worker.TraceSegmentSerializer" -// json = "com.a.eye.skywalking.collector.worker.JsonSerializer" +// json = "com.a.eye.skywalking.collector.commons.serializer.JsonSerializer" } serialization-bindings { diff --git a/skywalking-collector/skywalking-collector-role/pom.xml b/skywalking-collector/skywalking-collector-commons/pom.xml similarity index 62% rename from skywalking-collector/skywalking-collector-role/pom.xml rename to skywalking-collector/skywalking-collector-commons/pom.xml index bbec608d1..0319fdedf 100644 --- a/skywalking-collector/skywalking-collector-role/pom.xml +++ b/skywalking-collector/skywalking-collector-commons/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - skywalking-collector-role + skywalking-collector-commons jar @@ -18,5 +18,15 @@ skywalking-collector-cluster ${project.version} + + com.a.eye + skywalking-trace + ${project.version} + + + com.google.code.gson + gson + 2.8.0 + \ No newline at end of file diff --git a/skywalking-collector/skywalking-collector-role/src/main/java/com/a/eye/skywalking/collector/role/TraceSegmentReceiverRole.java b/skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/role/TraceSegmentReceiverRole.java similarity index 90% rename from skywalking-collector/skywalking-collector-role/src/main/java/com/a/eye/skywalking/collector/role/TraceSegmentReceiverRole.java rename to skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/role/TraceSegmentReceiverRole.java index 1e77636ff..c665b72f2 100644 --- a/skywalking-collector/skywalking-collector-role/src/main/java/com/a/eye/skywalking/collector/role/TraceSegmentReceiverRole.java +++ b/skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/role/TraceSegmentReceiverRole.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.collector.role; +package com.a.eye.skywalking.collector.commons.role; import com.a.eye.skywalking.collector.actor.Role; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/JsonSerializer.java b/skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/JsonSerializer.java similarity index 89% rename from skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/JsonSerializer.java rename to skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/JsonSerializer.java index bade0def9..f78c63109 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/JsonSerializer.java +++ b/skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/JsonSerializer.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.collector.worker; +package com.a.eye.skywalking.collector.commons.serializer; import akka.serialization.JSerializer; import com.google.gson.Gson; @@ -15,7 +15,7 @@ public class JsonSerializer extends JSerializer { @Override public int identifier() { - return 123; + return 31; } @Override diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/TraceSegmentSerializer.java b/skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/TraceSegmentSerializer.java similarity index 85% rename from skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/TraceSegmentSerializer.java rename to skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/TraceSegmentSerializer.java index f3aab1eb1..511c90c6e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/TraceSegmentSerializer.java +++ b/skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/TraceSegmentSerializer.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.collector.worker; +package com.a.eye.skywalking.collector.commons.serializer; import akka.serialization.JSerializer; import com.a.eye.skywalking.trace.TraceSegment; @@ -16,19 +16,17 @@ public class TraceSegmentSerializer extends JSerializer { @Override public int identifier() { - return 0; + return 30; } @Override public byte[] toBinary(Object o) { -// System.out.println("toBinary"); TraceSegment traceSegment = (TraceSegment) o; return traceSegment.serialize().toByteArray(); } @Override public Object fromBinaryJava(byte[] bytes, Class manifest) { -// System.out.println("fromBinaryJava"); TraceSegment traceSegment = null; try { traceSegment = new TraceSegment(SegmentMessage.parseFrom(bytes)); diff --git a/skywalking-collector/skywalking-collector-worker/pom.xml b/skywalking-collector/skywalking-collector-worker/pom.xml index 88b0d3ccf..8a72245de 100644 --- a/skywalking-collector/skywalking-collector-worker/pom.xml +++ b/skywalking-collector/skywalking-collector-worker/pom.xml @@ -18,11 +18,6 @@ skywalking-collector-cluster ${project.version} - - com.a.eye - skywalking-trace - ${project.version} - com.a.eye skywalking-logging-log4j2 @@ -30,7 +25,7 @@ com.a.eye - skywalking-collector-role + skywalking-collector-commons ${project.version} @@ -38,11 +33,6 @@ nanohttpd 2.3.1 - - com.google.code.gson - gson - 2.8.0 - org.elasticsearch.client transport diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/receiver/TraceSegmentReceiver.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/receiver/TraceSegmentReceiver.java index d41125602..b867bf670 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/receiver/TraceSegmentReceiver.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/receiver/TraceSegmentReceiver.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.collector.worker.receiver; import com.a.eye.skywalking.collector.actor.*; -import com.a.eye.skywalking.collector.role.TraceSegmentReceiverRole; +import com.a.eye.skywalking.collector.commons.role.TraceSegmentReceiverRole; import com.a.eye.skywalking.collector.worker.WorkerConfig; import com.a.eye.skywalking.collector.worker.application.ApplicationMain; import com.a.eye.skywalking.collector.worker.applicationref.ApplicationRefMain; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/resources/application.conf b/skywalking-collector/skywalking-collector-worker/src/main/resources/application.conf index ab9bb7e3f..f347cb9c2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/resources/application.conf +++ b/skywalking-collector/skywalking-collector-worker/src/main/resources/application.conf @@ -6,7 +6,7 @@ akka { java = "akka.serialization.JavaSerializer" proto = "akka.remote.serialization.ProtobufSerializer" data = "com.a.eye.skywalking.collector.worker.TraceSegmentSerializer" - json = "com.a.eye.skywalking.collector.worker.JsonSerializer" + json = "com.a.eye.skywalking.collector.commons.serializer.JsonSerializer" } serialization-bindings { diff --git a/skywalking-sniffer/skywalking-api/pom.xml b/skywalking-sniffer/skywalking-api/pom.xml index 411d3a407..5d503dd40 100644 --- a/skywalking-sniffer/skywalking-api/pom.xml +++ b/skywalking-sniffer/skywalking-api/pom.xml @@ -37,7 +37,7 @@ com.a.eye - skywalking-collector-role + skywalking-collector-commons ${project.version} diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/client/CollectorClientService.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/client/CollectorClientService.java index 54a6811c5..55099e385 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/client/CollectorClientService.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/client/CollectorClientService.java @@ -7,7 +7,7 @@ import com.a.eye.skywalking.collector.CollectorSystem; import com.a.eye.skywalking.collector.actor.LookUp; import com.a.eye.skywalking.collector.actor.WorkerNotFoundException; import com.a.eye.skywalking.collector.actor.WorkerRefs; -import com.a.eye.skywalking.collector.role.TraceSegmentReceiverRole; +import com.a.eye.skywalking.collector.commons.role.TraceSegmentReceiverRole; import com.a.eye.skywalking.logging.ILog; import com.a.eye.skywalking.logging.LogManager; import com.a.eye.skywalking.trace.TraceSegment;