diff --git a/pom.xml b/pom.xml
index 961e4351a921662898dc6166038774c2d6284463..917382703a5e39ed00fb7fe88e9cb00501d763a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,30 +53,6 @@
2.11.7
1.6.4
0.4.13
-
- com.a.eye.skywalking.dependencies
- net.bytebuddy
- ${shade.package}.${shade.net.bytebuddy.source}
- com.lmax.disruptor
- ${shade.package}.${shade.com.lmax.disruptor.source}
- akka
- ${shade.package}.${shade.akka.source}
- scala
- ${shade.package}.${shade.scala.source}
- org.agrona
- ${shade.package}.${shade.org.agrona.source}
- org.jboss.netty
- ${shade.package}.${shade.org.jboss.netty.source}
- org.reactivestreams
- ${shade.package}.${shade.org.reactivestreams.source}
- org.uncommons.maths
- ${shade.package}.${shade.org.uncommons.maths.source}
- com.google
- ${shade.package}.${shade.com.google.source}
- io.aeron
- ${shade.package}.${shade.io.aeron.source}
- com.typesafe
- ${shade.package}.${shade.com.typesafe.source}
diff --git a/skywalking-collector/skywalking-collector-worker/pom.xml b/skywalking-collector/skywalking-collector-worker/pom.xml
index 8a72245decf06965f9518ed591869504b884abc6..12ee2668c974baca9e3d333b6307bd29601ad1cb 100644
--- a/skywalking-collector/skywalking-collector-worker/pom.xml
+++ b/skywalking-collector/skywalking-collector-worker/pom.xml
@@ -45,35 +45,4 @@
test
-
-
- ${artifactId}
-
-
- org.apache.maven.plugins
- maven-shade-plugin
- 2.4.1
-
-
- package
-
- shade
-
-
- false
- true
- true
- true
-
-
- ${shade.akka.source}
- ${shade.akka.target}
-
-
-
-
-
-
-
-
diff --git a/skywalking-sniffer/skywalking-agent/pom.xml b/skywalking-sniffer/skywalking-agent/pom.xml
index ce9fe98cda09c1e3336517714ff448a6dfc6e723..bbee6a93336d5e57a39abdb2aa1fd7916a1285f4 100644
--- a/skywalking-sniffer/skywalking-agent/pom.xml
+++ b/skywalking-sniffer/skywalking-agent/pom.xml
@@ -17,6 +17,14 @@
UTF-8
com.a.eye.skywalking.agent.SkyWalkingAgent
+
+ com.a.eye.skywalking.dependencies
+ net.bytebuddy
+ ${shade.package}.${shade.net.bytebuddy.source}
+ com.lmax.disruptor
+ ${shade.package}.${shade.com.lmax.disruptor.source}
+ com.google
+ ${shade.package}.${shade.com.google.source}
@@ -121,42 +129,10 @@
${shade.com.lmax.disruptor.source}
${shade.com.lmax.disruptor.target}
-
- ${shade.akka.source}
- ${shade.akka.target}
-
${shade.com.google.source}
${shade.com.google.target}
-
- ${shade.org.agrona.source}
- ${shade.org.agrona.target}
-
-
- ${shade.org.jboss.netty.source}
- ${shade.org.jboss.netty.target}
-
-
- ${shade.org.reactivestreams.source}
- ${shade.org.reactivestreams.target}
-
-
- ${shade.org.uncommons.maths.source}
- ${shade.org.uncommons.maths.target}
-
-
- ${shade.scala.source}
- ${shade.scala.target}
-
-
- ${shade.io.aeron.source}
- ${shade.io.aeron.target}
-
-
- ${shade.com.typesafe.source}
- ${shade.com.typesafe.target}
-
diff --git a/skywalking-sniffer/skywalking-api/pom.xml b/skywalking-sniffer/skywalking-api/pom.xml
index c8a4c72be79ddb4e824cc822f1d05520c0d86d29..08611b1c9dabe0d9f9c9fc4498e3856f23a3d62c 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-commons
- ${project.version}
-
net.bytebuddy
byte-buddy
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 55099e385785d61b6971e21eb7deb019545f905b..dd187faf1cd1092136f306bc81e773f0a725d38b 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
@@ -3,15 +3,9 @@ package com.a.eye.skywalking.api.client;
import com.a.eye.skywalking.api.boot.ServiceManager;
import com.a.eye.skywalking.api.boot.StatusBootService;
import com.a.eye.skywalking.api.queue.TraceSegmentProcessQueue;
-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.commons.role.TraceSegmentReceiverRole;
import com.a.eye.skywalking.logging.ILog;
import com.a.eye.skywalking.logging.LogManager;
import com.a.eye.skywalking.trace.TraceSegment;
-
import java.util.List;
/**
@@ -20,7 +14,6 @@ import java.util.List;
public class CollectorClientService extends StatusBootService implements Runnable {
private static ILog logger = LogManager.getLogger(CollectorClientService.class);
private static long SLEEP_TIME_MILLIS = 500;
- private LookUp clusterContext;
/**
* Start a new {@link Thread} to get finished {@link TraceSegment} by {@link TraceSegmentProcessQueue#getCachedTraceSegments()}
@@ -29,9 +22,6 @@ public class CollectorClientService extends StatusBootService implements Runnabl
protected void bootUpWithStatus() throws Exception {
Thread collectorClientThread = new Thread(this, "collectorClientThread");
collectorClientThread.start();
- CollectorSystem collectorSystem = new CollectorSystem();
- collectorSystem.boot();
- clusterContext = collectorSystem.getClusterContext();
}
@Override
@@ -43,17 +33,11 @@ public class CollectorClientService extends StatusBootService implements Runnabl
List cachedTraceSegments = segmentProcessQueue.getCachedTraceSegments();
if (cachedTraceSegments.size() > 0) {
for (TraceSegment segment : cachedTraceSegments) {
- try {
- WorkerRefs workerRefs = clusterContext.lookup(TraceSegmentReceiverRole.INSTANCE);
- workerRefs.tell(segment);
- } catch (WorkerNotFoundException t) {
- logger.error(t, "Role={} not found.", TraceSegmentReceiverRole.INSTANCE.roleName());
/**
* No receiver found, means collector server is off-line.
*/
sleepTime = SLEEP_TIME_MILLIS * 10;
break;
- }
}
} else {
sleepTime = SLEEP_TIME_MILLIS;
diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializerTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializerTest.java
index 3c32e45ecfa55414c5edf5192a048ef715996150..4804c74ba7336e5e52f64980bf1c8977f6b4bec1 100644
--- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializerTest.java
+++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializerTest.java
@@ -14,7 +14,6 @@ public class SnifferConfigInitializerTest {
Config.SkyWalking.IS_PREMAIN_MODE = false;
SnifferConfigInitializer.initialize();
- Assert.assertEquals("testUser", Config.SkyWalking.USERNAME);
Assert.assertEquals("crmApp", Config.SkyWalking.APPLICATION_CODE);
Assert.assertEquals("127.0.0.1:8080", Config.SkyWalking.SERVERS);
diff --git a/skywalking-sniffer/skywalking-api/src/test/resources/sky-walking.config b/skywalking-sniffer/skywalking-api/src/test/resources/sky-walking.config
index 8c35dada7d1d6e6a5232b712c835b86be33d7251..7817dd446d1a0019ad890d51119de05ea12c6360 100644
--- a/skywalking-sniffer/skywalking-api/src/test/resources/sky-walking.config
+++ b/skywalking-sniffer/skywalking-api/src/test/resources/sky-walking.config
@@ -1,3 +1,2 @@
-skywalking.username = testUser
skywalking.application_code = crmApp
skywalking.servers = 127.0.0.1:8080