Loading skywalking-collector/pom.xml +1 −1 Original line number Diff line number Diff line Loading @@ -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> Loading skywalking-collector/skywalking-collector-cluster/src/test/resources/application.conf +1 −1 Original line number Diff line number Diff line Loading @@ -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 { Loading skywalking-collector/skywalking-collector-role/pom.xml→skywalking-collector/skywalking-collector-commons/pom.xml +11 −1 Original line number Diff line number Diff line Loading @@ -9,7 +9,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>skywalking-collector-role</artifactId> <artifactId>skywalking-collector-commons</artifactId> <packaging>jar</packaging> <dependencies> Loading @@ -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> No newline at end of file skywalking-collector/skywalking-collector-role/src/main/java/com/a/eye/skywalking/collector/role/TraceSegmentReceiverRole.java→skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/role/TraceSegmentReceiverRole.java +1 −1 Original line number Diff line number Diff line 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; Loading skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/JsonSerializer.java→skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/JsonSerializer.java +2 −2 Original line number Diff line number Diff line package com.a.eye.skywalking.collector.worker; package com.a.eye.skywalking.collector.commons.serializer; import akka.serialization.JSerializer; import com.google.gson.Gson; Loading @@ -15,7 +15,7 @@ public class JsonSerializer extends JSerializer { @Override public int identifier() { return 123; return 31; } @Override Loading Loading
skywalking-collector/pom.xml +1 −1 Original line number Diff line number Diff line Loading @@ -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> Loading
skywalking-collector/skywalking-collector-cluster/src/test/resources/application.conf +1 −1 Original line number Diff line number Diff line Loading @@ -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 { Loading
skywalking-collector/skywalking-collector-role/pom.xml→skywalking-collector/skywalking-collector-commons/pom.xml +11 −1 Original line number Diff line number Diff line Loading @@ -9,7 +9,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>skywalking-collector-role</artifactId> <artifactId>skywalking-collector-commons</artifactId> <packaging>jar</packaging> <dependencies> Loading @@ -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> No newline at end of file
skywalking-collector/skywalking-collector-role/src/main/java/com/a/eye/skywalking/collector/role/TraceSegmentReceiverRole.java→skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/role/TraceSegmentReceiverRole.java +1 −1 Original line number Diff line number Diff line 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; Loading
skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/JsonSerializer.java→skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/JsonSerializer.java +2 −2 Original line number Diff line number Diff line package com.a.eye.skywalking.collector.worker; package com.a.eye.skywalking.collector.commons.serializer; import akka.serialization.JSerializer; import com.google.gson.Gson; Loading @@ -15,7 +15,7 @@ public class JsonSerializer extends JSerializer { @Override public int identifier() { return 123; return 31; } @Override Loading