1.Move ‘application.conf’ to collector-commons module. 2.Remove the...

1.Move ‘application.conf’ to collector-commons module. 2.Remove the unnecessary contents in‘application.conf’. 3.Remove ISerializable interface(useless)

skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/TraceSegmentSerializer.java

 package com.a.eye.skywalking.collector.commons.serializer;
 
 import akka.serialization.JSerializer;
+import com.a.eye.skywalking.collector.CollectorSystem;
+import com.a.eye.skywalking.logging.ILog;
+import com.a.eye.skywalking.logging.LogManager;
 import com.a.eye.skywalking.trace.TraceSegment;
 import com.a.eye.skywalking.trace.proto.SegmentMessage;
 import com.google.protobuf.InvalidProtocolBufferException;
@@ -9,6 +12,8 @@ import com.google.protobuf.InvalidProtocolBufferException;
  * @author pengys5
  */
 public class TraceSegmentSerializer extends JSerializer {
+    private static ILog logger = LogManager.getLogger(CollectorSystem.class);
+
     @Override
     public boolean includeManifest() {
         return false;
@@ -31,7 +36,7 @@ public class TraceSegmentSerializer extends JSerializer {
         try {
             traceSegment = new TraceSegment(SegmentMessage.parseFrom(bytes));
         } catch (InvalidProtocolBufferException e) {
-            e.printStackTrace();
+            logger.warn("Can't covert message from byte[] to SegmentMessage");
         }
         return traceSegment;
     }

skywalking-collector/skywalking-collector-worker/src/main/resources/application.conf → skywalking-collector/skywalking-collector-commons/src/main/resources/application.conf

@@ -5,19 +5,17 @@ akka {
     serializers {
       java = "akka.serialization.JavaSerializer"
       proto = "akka.remote.serialization.ProtobufSerializer"
-      data = "com.a.eye.skywalking.collector.worker.TraceSegmentSerializer"
+      TraceSegment = "com.a.eye.skywalking.collector.worker.TraceSegmentSerializer"
       json = "com.a.eye.skywalking.collector.commons.serializer.JsonSerializer"
     }
 
     serialization-bindings {
       "java.lang.String" = java
       "com.google.protobuf.Message" = proto
-      "com.a.eye.skywalking.messages.ISerializable" = data
+      "com.a.eye.skywalking.trace.TraceSegment" = TraceSegment
       "com.google.gson.JsonObject" = json
-      //      "java.io.Serializable" = none
     }
 
-    //    serialize-messages = on
     warn-about-java-serializer-usage = on
   }
 
@@ -25,8 +23,6 @@ akka {
     log-remote-lifecycle-events = off
 
     netty.tcp {
-      hostname = "127.0.0.1"
-      port = 1000
     }
   }
 
@@ -34,4 +30,4 @@ akka {
     auto-down-unreachable-after = off
     metrics.enabled = off
   }
-}
\ No newline at end of file
+}

skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/messages/ISerializable.java

-package com.a.eye.skywalking.messages;
-
-import com.a.eye.skywalking.trace.TraceSegment;
-
-/**
- * All messages, which need to send between Akka actors, should implement this interface.
- * The whole {@link TraceSegment} supports this.
- *
- * T should be a protobuf Object, which is generated by protoc.
- * {@see /sky-walking/skywalking-commons/skywalking-trace/src/main/proto/trace.proto}
- *
- * {@see https://github.com/google/protobuf/tree/master/java}
- *
- * Created by wusheng on 2017/2/22.
- */
-public interface ISerializable<T> {
-    /**
-     * Serialize this object to T
-     * @return
-     */
-    T serialize();
-
-    /**
-     * Initialize this object by the given message.
-     *
-     * @param message to init object.
-     */
-    void deserialize(T message);
-}

skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/LogData.java

 package com.a.eye.skywalking.trace;
 
 import com.a.eye.skywalking.api.util.StringUtil;
-import com.a.eye.skywalking.messages.ISerializable;
 import com.a.eye.skywalking.trace.proto.KeyValue;
 import com.a.eye.skywalking.trace.proto.LogDataMessage;
 import java.util.Collections;
@@ -14,7 +13,7 @@ import java.util.Map;
  *
  * Created by wusheng on 2017/2/17.
  */
-public class LogData implements ISerializable<LogDataMessage> {
+public class LogData {
     private long time;
     private Map<String, ?> fields;
 
@@ -38,7 +37,6 @@ public class LogData implements ISerializable<LogDataMessage> {
         return Collections.unmodifiableMap(fields);
     }
 
-    @Override
     public LogDataMessage serialize() {
         LogDataMessage.Builder logDataBuilder = LogDataMessage.newBuilder();
         logDataBuilder.setTime(time);
@@ -59,7 +57,6 @@ public class LogData implements ISerializable<LogDataMessage> {
         return logDataBuilder.build();
     }
 
-    @Override
     public void deserialize(LogDataMessage message) {
         time = message.getTime();
         List<KeyValue> list = message.getFieldsList();

skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java

 package com.a.eye.skywalking.trace;
 
 import com.a.eye.skywalking.api.util.StringUtil;
-import com.a.eye.skywalking.messages.ISerializable;
 import com.a.eye.skywalking.trace.proto.KeyValue;
 import com.a.eye.skywalking.trace.proto.LogDataMessage;
 import com.a.eye.skywalking.trace.proto.SpanMessage;
@@ -23,7 +22,7 @@ import java.util.Map;
  *
  * Created by wusheng on 2017/2/17.
  */
-public class Span implements ISerializable<SpanMessage> {
+public class Span{
     private int spanId;
 
     private int parentSpanId;
@@ -266,7 +265,6 @@ public class Span implements ISerializable<SpanMessage> {
         return log(exceptionFields);
     }
 
-    @Override
     public SpanMessage serialize() {
         SpanMessage.Builder builder = SpanMessage.newBuilder();
         builder.setSpanId(spanId);
@@ -290,7 +288,6 @@ public class Span implements ISerializable<SpanMessage> {
         return builder.build();
     }
 
-    @Override
     public void deserialize(SpanMessage message) {
         spanId = message.getSpanId();
         parentSpanId = message.getParentSpanId();

skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegment.java

 package com.a.eye.skywalking.trace;
 
-import com.a.eye.skywalking.messages.ISerializable;
 import com.a.eye.skywalking.trace.TraceId.DistributedTraceId;
 import com.a.eye.skywalking.trace.TraceId.NewDistributedTraceId;
 import com.a.eye.skywalking.trace.TraceId.PropagatedTraceId;
@@ -21,7 +20,7 @@ import java.util.List;
  *
  * Created by wusheng on 2017/2/17.
  */
-public class TraceSegment implements ISerializable<SegmentMessage> {
+public class TraceSegment {
     private static final String ID_TYPE = "Segment";
 
     /**
@@ -191,7 +190,6 @@ public class TraceSegment implements ISerializable<SegmentMessage> {
             '}';
     }
 
-    @Override
     public SegmentMessage serialize() {
         SegmentMessage.Builder segmentBuilder = SegmentMessage.newBuilder();
         segmentBuilder.setTraceSegmentId(traceSegmentId);
@@ -212,7 +210,6 @@ public class TraceSegment implements ISerializable<SegmentMessage> {
         return segmentBuilder.build();
     }
 
-    @Override
     public void deserialize(SegmentMessage message) {
         traceSegmentId = message.getTraceSegmentId();
         startTime = message.getStartTime();

skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java

 package com.a.eye.skywalking.trace;
 
-import com.a.eye.skywalking.messages.ISerializable;
 import com.a.eye.skywalking.trace.proto.SegmentRefMessage;
 import com.a.eye.skywalking.trace.tag.Tags;
 
@@ -10,7 +9,7 @@ import com.a.eye.skywalking.trace.tag.Tags;
  *
  * Created by wusheng on 2017/2/17.
  */
-public class TraceSegmentRef implements ISerializable<SegmentRefMessage> {
+public class TraceSegmentRef{
     /**
      * {@link TraceSegment#traceSegmentId}
      */
@@ -78,7 +77,6 @@ public class TraceSegmentRef implements ISerializable<SegmentRefMessage> {
             '}';
     }
 
-    @Override
     public SegmentRefMessage serialize() {
         SegmentRefMessage.Builder builder = SegmentRefMessage.newBuilder();
         builder.setTraceSegmentId(traceSegmentId);
@@ -90,7 +88,6 @@ public class TraceSegmentRef implements ISerializable<SegmentRefMessage> {
         return builder.build();
     }
 
-    @Override
     public void deserialize(SegmentRefMessage message) {
         traceSegmentId = message.getTraceSegmentId();
         spanId = message.getSpanId();

skywalking-sniffer/skywalking-api/pom.xml

@@ -30,11 +30,6 @@
             <artifactId>skywalking-logging-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.a.eye</groupId>
-            <artifactId>skywalking-collector-cluster</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.a.eye</groupId>
             <artifactId>skywalking-collector-commons</artifactId>