add commons moudle contains roles and serializer

skywalking-collector/pom.xml

@@ -5,7 +5,7 @@
     <modules>
         <module>skywalking-collector-cluster</module>
         <module>skywalking-collector-worker</module>
-        <module>skywalking-collector-role</module>
+        <module>skywalking-collector-commons</module>
     </modules>
     <parent>
         <artifactId>skywalking</artifactId>

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 {

skywalking-collector/skywalking-collector-commons/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>skywalking-collector-role</artifactId>
+    <artifactId>skywalking-collector-commons</artifactId>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -18,5 +18,15 @@
             <artifactId>skywalking-collector-cluster</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.a.eye</groupId>
+            <artifactId>skywalking-trace</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.0</version>
+        </dependency>
     </dependencies>
 </project>

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;

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

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));

skywalking-collector/skywalking-collector-worker/pom.xml

@@ -18,11 +18,6 @@
             <artifactId>skywalking-collector-cluster</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.a.eye</groupId>
-            <artifactId>skywalking-trace</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.a.eye</groupId>
             <artifactId>skywalking-logging-log4j2</artifactId>
@@ -30,7 +25,7 @@
         </dependency>
         <dependency>
             <groupId>com.a.eye</groupId>
-            <artifactId>skywalking-collector-role</artifactId>
+            <artifactId>skywalking-collector-commons</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -38,11 +33,6 @@
             <artifactId>nanohttpd</artifactId>
             <version>2.3.1</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.8.0</version>
-        </dependency>
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>transport</artifactId>

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;

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 {

skywalking-sniffer/skywalking-api/pom.xml

@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>com.a.eye</groupId>
-            <artifactId>skywalking-collector-role</artifactId>
+            <artifactId>skywalking-collector-commons</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

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;