From 7d6dc495d4c6b780abbbb53d8c701698ebc2be39 Mon Sep 17 00:00:00 2001 From: wusheng Date: Fri, 17 Mar 2017 23:44:50 +0800 Subject: [PATCH] =?UTF-8?q?1.Move=20=E2=80=98application.conf=E2=80=99=20t?= =?UTF-8?q?o=20collector-commons=20module.=202.Remove=20the=20unnecessary?= =?UTF-8?q?=20contents=20in=E2=80=98application.conf=E2=80=99.=203.Remove?= =?UTF-8?q?=20ISerializable=20interface(useless)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serializer/TraceSegmentSerializer.java | 7 ++++- .../src/main/resources/application.conf | 10 ++----- .../skywalking/messages/ISerializable.java | 29 ------------------- .../com/a/eye/skywalking/trace/LogData.java | 5 +--- .../java/com/a/eye/skywalking/trace/Span.java | 5 +--- .../a/eye/skywalking/trace/TraceSegment.java | 5 +--- .../eye/skywalking/trace/TraceSegmentRef.java | 5 +--- skywalking-sniffer/skywalking-api/pom.xml | 5 ---- 8 files changed, 13 insertions(+), 58 deletions(-) rename skywalking-collector/{skywalking-collector-worker => skywalking-collector-commons}/src/main/resources/application.conf (71%) delete mode 100644 skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/messages/ISerializable.java diff --git a/skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/TraceSegmentSerializer.java b/skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/TraceSegmentSerializer.java index 511c90c6e3..4ea94fb52d 100644 --- a/skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/TraceSegmentSerializer.java +++ b/skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/TraceSegmentSerializer.java @@ -1,6 +1,9 @@ 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; } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/resources/application.conf b/skywalking-collector/skywalking-collector-commons/src/main/resources/application.conf similarity index 71% rename from skywalking-collector/skywalking-collector-worker/src/main/resources/application.conf rename to skywalking-collector/skywalking-collector-commons/src/main/resources/application.conf index f347cb9c21..b61bc838ca 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/resources/application.conf +++ b/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 +} diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/messages/ISerializable.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/messages/ISerializable.java deleted file mode 100644 index 25896c30a4..0000000000 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/messages/ISerializable.java +++ /dev/null @@ -1,29 +0,0 @@ -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 { - /** - * Serialize this object to T - * @return - */ - T serialize(); - - /** - * Initialize this object by the given message. - * - * @param message to init object. - */ - void deserialize(T message); -} diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/LogData.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/LogData.java index da6c2c3b5f..d689947f94 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/LogData.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/LogData.java @@ -1,7 +1,6 @@ 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 { +public class LogData { private long time; private Map fields; @@ -38,7 +37,6 @@ public class LogData implements ISerializable { 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 { return logDataBuilder.build(); } - @Override public void deserialize(LogDataMessage message) { time = message.getTime(); List list = message.getFieldsList(); diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java index 90c4569651..e7a6f3b18f 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java @@ -1,7 +1,6 @@ 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 { +public class Span{ private int spanId; private int parentSpanId; @@ -266,7 +265,6 @@ public class Span implements ISerializable { return log(exceptionFields); } - @Override public SpanMessage serialize() { SpanMessage.Builder builder = SpanMessage.newBuilder(); builder.setSpanId(spanId); @@ -290,7 +288,6 @@ public class Span implements ISerializable { return builder.build(); } - @Override public void deserialize(SpanMessage message) { spanId = message.getSpanId(); parentSpanId = message.getParentSpanId(); diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegment.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegment.java index 7860d3e762..a657d84c5f 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegment.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegment.java @@ -1,6 +1,5 @@ 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 { +public class TraceSegment { private static final String ID_TYPE = "Segment"; /** @@ -191,7 +190,6 @@ public class TraceSegment implements ISerializable { '}'; } - @Override public SegmentMessage serialize() { SegmentMessage.Builder segmentBuilder = SegmentMessage.newBuilder(); segmentBuilder.setTraceSegmentId(traceSegmentId); @@ -212,7 +210,6 @@ public class TraceSegment implements ISerializable { return segmentBuilder.build(); } - @Override public void deserialize(SegmentMessage message) { traceSegmentId = message.getTraceSegmentId(); startTime = message.getStartTime(); diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java index 7330b583cc..45c3bc5d79 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java @@ -1,6 +1,5 @@ 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 { +public class TraceSegmentRef{ /** * {@link TraceSegment#traceSegmentId} */ @@ -78,7 +77,6 @@ public class TraceSegmentRef implements ISerializable { '}'; } - @Override public SegmentRefMessage serialize() { SegmentRefMessage.Builder builder = SegmentRefMessage.newBuilder(); builder.setTraceSegmentId(traceSegmentId); @@ -90,7 +88,6 @@ public class TraceSegmentRef implements ISerializable { return builder.build(); } - @Override public void deserialize(SegmentRefMessage message) { traceSegmentId = message.getTraceSegmentId(); spanId = message.getSpanId(); diff --git a/skywalking-sniffer/skywalking-api/pom.xml b/skywalking-sniffer/skywalking-api/pom.xml index 5d503dd40b..c8a4c72be7 100644 --- a/skywalking-sniffer/skywalking-api/pom.xml +++ b/skywalking-sniffer/skywalking-api/pom.xml @@ -30,11 +30,6 @@ skywalking-logging-api ${project.version} - - com.a.eye - skywalking-collector-cluster - ${project.version} - com.a.eye skywalking-collector-commons -- GitLab