clusterServiceLoader = ServiceLoader.load(AbstractLocalWorkerProvider.class);
- for (AbstractLocalWorkerProvider provider : clusterServiceLoader) {
- logger.info("loadLocalProviders provider name: %s", provider.getClass().getName());
- provider.setClusterContext(clusterContext);
- clusterContext.putProvider(provider);
- }
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractClusterWorker.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractClusterWorker.java
deleted file mode 100644
index 8a2289366..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractClusterWorker.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.skywalking.apm.collector.actor;
-
-import akka.actor.UntypedActor;
-import akka.cluster.Cluster;
-import akka.cluster.ClusterEvent;
-import akka.cluster.Member;
-import akka.cluster.MemberStatus;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.cluster.WorkerListenerMessage;
-import org.skywalking.apm.collector.cluster.WorkersListener;
-import org.skywalking.apm.collector.rpc.RPCAddress;
-import org.skywalking.apm.collector.rpc.RPCAddressListener;
-import org.skywalking.apm.collector.rpc.RPCAddressListenerMessage;
-import org.skywalking.apm.collector.log.LogManager;
-
-/**
- * The AbstractClusterWorker implementations represent workers,
- * which receive remote messages.
- *
- * Usually, the implementations are doing persistent, or aggregate works.
- *
- * @author pengys5
- * @since v3.0-2017
- */
-public abstract class AbstractClusterWorker extends AbstractWorker {
-
- /**
- * Construct an AbstractClusterWorker with the worker role and context.
- *
- * @param role If multi-workers are for load balance, they should be more likely called worker instance. Meaning,
- * each worker have multi instances.
- * @param clusterContext See {@link ClusterWorkerContext}
- * @param selfContext See {@link LocalWorkerContext}
- */
- protected AbstractClusterWorker(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- /**
- * This method use for message producer to call for send message.
- *
- * @param message The persistence data or metric data.
- * @throws Exception The Exception happen in {@link #onWork(Object)}
- */
- final public void allocateJob(Object message) throws WorkerException {
- onWork(message);
- }
-
- /**
- * This method use for message receiver to analyse message.
- *
- * @param message Cast the message object to a expect subclass.
- * @throws Exception Don't handle the exception, throw it.
- */
- protected abstract void onWork(Object message) throws WorkerException;
-
- static class WorkerWithAkka extends UntypedActor {
- private Logger logger = LogManager.INSTANCE.getFormatterLogger(WorkerWithAkka.class);
-
- private Cluster cluster;
- private final AbstractClusterWorker ownerWorker;
- private final RPCAddress RPCAddress;
-
- public WorkerWithAkka(AbstractClusterWorker ownerWorker, RPCAddress RPCAddress) {
- this.ownerWorker = ownerWorker;
- cluster = Cluster.get(getContext().system());
- this.RPCAddress = RPCAddress;
- }
-
- @Override
- public void preStart() {
- cluster.subscribe(getSelf(), ClusterEvent.MemberUp.class);
- }
-
- @Override
- public void postStop() {
- cluster.unsubscribe(getSelf());
- }
-
- /**
- * Listening {@link ClusterEvent.MemberUp} and {@link ClusterEvent.CurrentClusterState}
- * cluster event, when event send from the member of {@link WorkersListener} then tell
- * the sender to register self.
- */
- @Override
- public void onReceive(Object message) throws WorkerException {
- if (message instanceof ClusterEvent.CurrentClusterState) {
- ClusterEvent.CurrentClusterState state = (ClusterEvent.CurrentClusterState)message;
- for (Member member : state.getMembers()) {
- if (member.status().equals(MemberStatus.up())) {
- register(member);
- }
- }
- } else if (message instanceof ClusterEvent.MemberUp) {
- ClusterEvent.MemberUp memberUp = (ClusterEvent.MemberUp)message;
- logger.info("receive ClusterEvent.MemberUp message, address: %s", memberUp.member().address().toString());
- register(memberUp.member());
- } else {
- logger.debug("worker class: %s, message class: %s", this.getClass().getName(), message.getClass().getName());
- ownerWorker.allocateJob(message);
- }
- }
-
- /**
- * When member role is {@link WorkersListener#WORK_NAME} then Select actor from context
- * and send register message to {@link WorkersListener}
- *
- * @param member is the new created or restart worker
- */
- void register(Member member) {
- if (member.hasRole(WorkersListener.WORK_NAME)) {
- WorkerListenerMessage.RegisterMessage registerMessage = new WorkerListenerMessage.RegisterMessage(ownerWorker.getRole());
- logger.info("member address: %s, worker path: %s", member.address().toString(), getSelf().path().toString());
- getContext().actorSelection(member.address() + "/user/" + WorkersListener.WORK_NAME).tell(registerMessage, getSelf());
- }
- if (member.hasRole(RPCAddressListener.WORK_NAME) && RPCAddress != null) {
- RPCAddressListenerMessage.ConfigMessage configMessage = new RPCAddressListenerMessage.ConfigMessage(RPCAddress);
- logger.info("member address: %s, worker path: %s", member.address().toString(), getSelf().path().toString());
- getContext().actorSelection(member.address() + "/user/" + RPCAddressListener.WORK_NAME).tell(configMessage, getSelf());
- }
- }
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalAsyncWorker.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalAsyncWorker.java
deleted file mode 100644
index 82186c50f..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalAsyncWorker.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.skywalking.apm.collector.actor;
-
-import com.lmax.disruptor.EventHandler;
-import com.lmax.disruptor.RingBuffer;
-import org.skywalking.apm.collector.queue.EndOfBatchCommand;
-import org.skywalking.apm.collector.queue.MessageHolder;
-
-/**
- * The AbstractLocalAsyncWorker implementations represent workers,
- * which receive local asynchronous message.
- *
- * @author pengys5
- * @since v3.0-2017
- */
-public abstract class AbstractLocalAsyncWorker extends AbstractLocalWorker {
-
- /**
- * Construct an AbstractLocalAsyncWorker with the worker role and context.
- *
- * @param role The responsibility of worker in cluster, more than one workers can have same responsibility which use
- * to provide load balancing ability.
- * @param clusterContext See {@link ClusterWorkerContext}
- * @param selfContext See {@link LocalWorkerContext}
- */
- public AbstractLocalAsyncWorker(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- /**
- * The asynchronous worker always use to persistence data into db, this is the end of the streaming,
- * so usually no need to create the next worker instance at the time of this worker instance create.
- *
- * @throws ProviderNotFoundException When worker provider not found, it will be throw this exception.
- */
- @Override
- public void preStart() throws ProviderNotFoundException {
- }
-
- /**
- * Receive message
- *
- * @param message The persistence data or metric data.
- * @throws WorkerException The Exception happen in {@link #onWork(Object)}
- */
- final public void allocateJob(Object message) throws WorkerException {
- onWork(message);
- }
-
- /**
- * The data process logic in this method.
- *
- * @param message Cast the message object to a expect subclass.
- * @throws WorkerException Don't handle the exception, throw it.
- */
- protected abstract void onWork(Object message) throws WorkerException;
-
- static class WorkerWithDisruptor implements EventHandler {
-
- private RingBuffer ringBuffer;
- private AbstractLocalAsyncWorker asyncWorker;
-
- WorkerWithDisruptor(RingBuffer ringBuffer, AbstractLocalAsyncWorker asyncWorker) {
- this.ringBuffer = ringBuffer;
- this.asyncWorker = asyncWorker;
- }
-
- /**
- * Receive the message from disruptor, when message in disruptor is empty, then send the cached data
- * to the next workers.
- *
- * @param event published to the {@link RingBuffer}
- * @param sequence of the event being processed
- * @param endOfBatch flag to indicate if this is the last event in a batch from the {@link RingBuffer}
- */
- public void onEvent(MessageHolder event, long sequence, boolean endOfBatch) {
- try {
- Object message = event.getMessage();
- event.reset();
-
- asyncWorker.allocateJob(message);
- if (endOfBatch) {
- asyncWorker.allocateJob(new EndOfBatchCommand());
- }
- } catch (Exception e) {
- asyncWorker.saveException(e);
- }
- }
-
- /**
- * Push the message into disruptor ring buffer.
- *
- * @param message of the data to process.
- */
- public void tell(Object message) {
- long sequence = ringBuffer.next();
- try {
- ringBuffer.get(sequence).setMessage(message);
- } finally {
- ringBuffer.publish(sequence);
- }
- }
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalAsyncWorkerProvider.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalAsyncWorkerProvider.java
deleted file mode 100644
index d636d9682..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalAsyncWorkerProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.skywalking.apm.collector.actor;
-
-import com.lmax.disruptor.RingBuffer;
-import com.lmax.disruptor.dsl.Disruptor;
-import org.skywalking.apm.collector.queue.DaemonThreadFactory;
-import org.skywalking.apm.collector.queue.MessageHolder;
-import org.skywalking.apm.collector.queue.MessageHolderFactory;
-
-/**
- * @author pengys5
- */
-public abstract class AbstractLocalAsyncWorkerProvider extends AbstractLocalWorkerProvider {
-
- public abstract int queueSize();
-
- @Override final public WorkerRef onCreate(
- LocalWorkerContext localContext) throws ProviderNotFoundException {
- T localAsyncWorker = (T)workerInstance(getClusterContext());
- localAsyncWorker.preStart();
-
- // Specify the size of the ring buffer, must be power of 2.
- int bufferSize = queueSize();
- if (!((((bufferSize - 1) & bufferSize) == 0) && bufferSize != 0)) {
- throw new IllegalArgumentException("queue size must be power of 2");
- }
-
- // Construct the Disruptor
- Disruptor disruptor = new Disruptor(MessageHolderFactory.INSTANCE, bufferSize, DaemonThreadFactory.INSTANCE);
-
- RingBuffer ringBuffer = disruptor.getRingBuffer();
- T.WorkerWithDisruptor disruptorWorker = new T.WorkerWithDisruptor(ringBuffer, localAsyncWorker);
-
- // Connect the handler
- disruptor.handleEventsWith(disruptorWorker);
-
- // Start the Disruptor, starts all threads running
- disruptor.start();
-
- LocalAsyncWorkerRef workerRef = new LocalAsyncWorkerRef(role(), disruptorWorker);
-
- if (localContext != null) {
- localContext.put(workerRef);
- }
-
- return workerRef;
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/ClusterWorkerRef.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/ClusterWorkerRef.java
deleted file mode 100644
index 2a47f19f7..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/ClusterWorkerRef.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.skywalking.apm.collector.actor;
-
-import akka.actor.ActorRef;
-
-/**
- * @author pengys5
- */
-public class ClusterWorkerRef extends WorkerRef {
-
- private ActorRef actorRef;
-
- public ClusterWorkerRef(ActorRef actorRef, Role role) {
- super(role);
- this.actorRef = actorRef;
- }
-
- @Override
- public void tell(Object message) {
- actorRef.tell(message, ActorRef.noSender());
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/LocalAsyncWorkerRef.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/LocalAsyncWorkerRef.java
deleted file mode 100644
index 0e975a241..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/LocalAsyncWorkerRef.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.skywalking.apm.collector.actor;
-
-/**
- * @author pengys5
- */
-public class LocalAsyncWorkerRef extends WorkerRef {
-
- private AbstractLocalAsyncWorker.WorkerWithDisruptor workerWithDisruptor;
-
- public LocalAsyncWorkerRef(Role role, AbstractLocalAsyncWorker.WorkerWithDisruptor workerWithDisruptor) {
- super(role);
- this.workerWithDisruptor = workerWithDisruptor;
- }
-
- @Override
- public void tell(Object message) throws WorkerInvokeException {
- workerWithDisruptor.tell(message);
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/Role.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/Role.java
deleted file mode 100644
index 811c1a275..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/Role.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.skywalking.apm.collector.actor;
-
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-
-/**
- * @author pengys5
- */
-public interface Role {
-
- String roleName();
-
- WorkerSelector workerSelector();
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterConfig.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterConfig.java
deleted file mode 100644
index d2333319e..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterConfig.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.skywalking.apm.collector.cluster;
-
-/**
- * A static class contains some config values of cluster.
- * {@link Cluster.Current#HOSTNAME} is a ip address of server which start this process.
- * {@link Cluster.Current#PORT} is a PORT of server use to bind
- * {@link Cluster.Current#ROLES} is a ROLES of workers that use to create workers which
- * has those role in this process.
- * {@link Cluster#SEED_NODES} is a SEED_NODES which cluster have, List of strings, e.g. SEED_NODES = "ip:PORT,ip:PORT"..
- *
- * @author pengys5
- */
-public class ClusterConfig {
-
- public static class Cluster {
- public static class Current {
- public static String HOSTNAME = "";
- public static String PORT = "";
- public static String ROLES = "";
- }
-
- public static String SEED_NODES = "";
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterConfigProvider.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterConfigProvider.java
deleted file mode 100644
index c5c3c7a85..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterConfigProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.skywalking.apm.collector.cluster;
-
-import org.skywalking.apm.util.StringUtil;
-import org.skywalking.apm.collector.config.ConfigProvider;
-
-/**
- * @author pengys5
- */
-public class ClusterConfigProvider implements ConfigProvider {
-
- @Override
- public Class configClass() {
- return ClusterConfig.class;
- }
-
- @Override
- public void cliArgs() {
- if (!StringUtil.isEmpty(System.getProperty("cluster.current.HOSTNAME"))) {
- ClusterConfig.Cluster.Current.HOSTNAME = System.getProperty("cluster.current.HOSTNAME");
- }
- if (!StringUtil.isEmpty(System.getProperty("cluster.current.PORT"))) {
- ClusterConfig.Cluster.Current.PORT = System.getProperty("cluster.current.PORT");
- }
- if (!StringUtil.isEmpty(System.getProperty("cluster.current.ROLES"))) {
- ClusterConfig.Cluster.Current.ROLES = System.getProperty("cluster.current.ROLES");
- }
- if (!StringUtil.isEmpty(System.getProperty("cluster.SEED_NODES"))) {
- ClusterConfig.Cluster.SEED_NODES = System.getProperty("cluster.SEED_NODES");
- }
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleGroupDefine.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleGroupDefine.java
new file mode 100644
index 000000000..4f5246442
--- /dev/null
+++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleGroupDefine.java
@@ -0,0 +1,17 @@
+package org.skywalking.apm.collector.cluster;
+
+import org.skywalking.apm.collector.core.module.ModuleGroupDefine;
+import org.skywalking.apm.collector.core.module.ModuleInstallMode;
+
+/**
+ * @author pengys5
+ */
+public class ClusterModuleGroupDefine implements ModuleGroupDefine {
+ @Override public String name() {
+ return "cluster";
+ }
+
+ @Override public ModuleInstallMode mode() {
+ return ModuleInstallMode.Single;
+ }
+}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/Const.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/Const.java
deleted file mode 100644
index 72c501acf..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/Const.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.skywalking.apm.collector.cluster;
-
-/**
- * @author pengys5
- */
-public class Const {
- public static final String SYSTEM_NAME = "ClusterSystem";
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/WorkerListenerMessage.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/WorkerListenerMessage.java
deleted file mode 100644
index e5fb162b1..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/WorkerListenerMessage.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.skywalking.apm.collector.cluster;
-
-import java.io.Serializable;
-import org.skywalking.apm.collector.actor.AbstractWorker;
-import org.skywalking.apm.collector.actor.Role;
-
-/**
- * WorkerListenerMessage is a message just for the worker
- * implementation of the {@link AbstractWorker}
- * to register.
- *
- * @author pengys5
- */
-public class WorkerListenerMessage {
-
- public static class RegisterMessage implements Serializable {
- private final Role role;
-
- public RegisterMessage(Role role) {
- this.role = role;
- }
-
- public Role getRole() {
- return role;
- }
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/WorkersListener.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/WorkersListener.java
deleted file mode 100644
index 53b1f330e..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/WorkersListener.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.skywalking.apm.collector.cluster;
-
-import akka.actor.ActorRef;
-import akka.actor.Terminated;
-import akka.actor.UntypedActor;
-import akka.cluster.Cluster;
-import akka.cluster.ClusterEvent;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractWorker;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.ClusterWorkerRef;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * WorkersListener listening the register message from workers
- * implementation of the {@link AbstractWorker}
- * and terminated message from akka cluster.
- *
- * when listened register message then begin to watch the state for this worker
- * and register to {@link ClusterWorkerContext} and {@link #relation}.
- *
- * when listened terminate message then unregister from {@link ClusterWorkerContext} and {@link #relation} .
- *
- * @author pengys5
- */
-public class WorkersListener extends UntypedActor {
- public static final String WORK_NAME = "WorkersListener";
-
- private final Logger logger = LogManager.getFormatterLogger(WorkersListener.class);
- private final ClusterWorkerContext clusterContext;
- private Cluster cluster = Cluster.get(getContext().system());
- private Map relation = new ConcurrentHashMap<>();
-
- public WorkersListener(ClusterWorkerContext clusterContext) {
- this.clusterContext = clusterContext;
- }
-
- @Override
- public void preStart() throws Exception {
- cluster.subscribe(getSelf(), ClusterEvent.UnreachableMember.class);
- }
-
- @Override
- public void onReceive(Object message) throws Throwable {
- if (message instanceof WorkerListenerMessage.RegisterMessage) {
- WorkerListenerMessage.RegisterMessage register = (WorkerListenerMessage.RegisterMessage) message;
- ActorRef sender = getSender();
- logger.info("register worker of role: %s, path: %s", register.getRole().roleName(), sender.toString());
- ClusterWorkerRef workerRef = new ClusterWorkerRef(sender, register.getRole());
- relation.put(sender, workerRef);
- clusterContext.put(new ClusterWorkerRef(sender, register.getRole()));
- } else if (message instanceof Terminated) {
- Terminated terminated = (Terminated) message;
- clusterContext.remove(relation.get(terminated.getActor()));
- relation.remove(terminated.getActor());
- } else if (message instanceof ClusterEvent.UnreachableMember) {
- ClusterEvent.UnreachableMember unreachableMember = (ClusterEvent.UnreachableMember) message;
-
- Iterator> iterator = relation.entrySet().iterator();
- while (iterator.hasNext()) {
- Map.Entry next = iterator.next();
-
- if (next.getKey().path().address().equals(unreachableMember.member().address())) {
- clusterContext.remove(next.getValue());
- iterator.remove();
- }
- }
- } else {
- unhandled(message);
- }
- }
-}
diff --git a/apm-collector/apm-collector-cluster-new/cluster-redis/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfig.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfig.java
similarity index 100%
rename from apm-collector/apm-collector-cluster-new/cluster-redis/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfig.java
rename to apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfig.java
diff --git a/apm-collector/apm-collector-cluster-new/cluster-redis/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfigParser.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfigParser.java
similarity index 100%
rename from apm-collector/apm-collector-cluster-new/cluster-redis/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfigParser.java
rename to apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisConfigParser.java
diff --git a/apm-collector/apm-collector-cluster-new/cluster-redis/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisDataInitializer.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisDataInitializer.java
similarity index 100%
rename from apm-collector/apm-collector-cluster-new/cluster-redis/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisDataInitializer.java
rename to apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisDataInitializer.java
diff --git a/apm-collector/apm-collector-cluster-new/cluster-redis/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleDefine.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleDefine.java
similarity index 100%
rename from apm-collector/apm-collector-cluster-new/cluster-redis/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleDefine.java
rename to apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleDefine.java
diff --git a/apm-collector/apm-collector-cluster-new/cluster-redis/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleRegistrationWriter.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleRegistrationWriter.java
similarity index 100%
rename from apm-collector/apm-collector-cluster-new/cluster-redis/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleRegistrationWriter.java
rename to apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterRedisModuleRegistrationWriter.java
diff --git a/apm-collector/apm-collector-cluster-new/cluster-standalone/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneConfigParser.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneConfigParser.java
similarity index 100%
rename from apm-collector/apm-collector-cluster-new/cluster-standalone/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneConfigParser.java
rename to apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneConfigParser.java
diff --git a/apm-collector/apm-collector-cluster-new/cluster-standalone/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneDataInitializer.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneDataInitializer.java
similarity index 100%
rename from apm-collector/apm-collector-cluster-new/cluster-standalone/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneDataInitializer.java
rename to apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneDataInitializer.java
diff --git a/apm-collector/apm-collector-cluster-new/cluster-standalone/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleDefine.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleDefine.java
similarity index 100%
rename from apm-collector/apm-collector-cluster-new/cluster-standalone/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleDefine.java
rename to apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleDefine.java
diff --git a/apm-collector/apm-collector-cluster-new/cluster-standalone/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleRegistrationWriter.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleRegistrationWriter.java
similarity index 100%
rename from apm-collector/apm-collector-cluster-new/cluster-standalone/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleRegistrationWriter.java
rename to apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneModuleRegistrationWriter.java
diff --git a/apm-collector/apm-collector-cluster-new/cluster-zookeeper/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfig.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfig.java
similarity index 100%
rename from apm-collector/apm-collector-cluster-new/cluster-zookeeper/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfig.java
rename to apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfig.java
diff --git a/apm-collector/apm-collector-cluster-new/cluster-zookeeper/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfigParser.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfigParser.java
similarity index 93%
rename from apm-collector/apm-collector-cluster-new/cluster-zookeeper/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfigParser.java
rename to apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfigParser.java
index 264099154..82e5e86ab 100644
--- a/apm-collector/apm-collector-cluster-new/cluster-zookeeper/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfigParser.java
+++ b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKConfigParser.java
@@ -14,12 +14,13 @@ public class ClusterZKConfigParser implements ModuleConfigParser {
private final String SESSION_TIMEOUT = "sessionTimeout";
@Override public void parse(Map config) throws ConfigParseException {
- if (StringUtils.isEmpty(config.get(HOST_PORT))) {
- throw new ConfigParseException("");
- }
ClusterZKConfig.HOST_PORT = (String)config.get(HOST_PORT);
ClusterZKConfig.SESSION_TIMEOUT = 1000;
+ if (StringUtils.isEmpty(ClusterZKConfig.HOST_PORT)) {
+ throw new ConfigParseException("");
+ }
+
if (!StringUtils.isEmpty(config.get(SESSION_TIMEOUT))) {
ClusterZKConfig.SESSION_TIMEOUT = (Integer)config.get(SESSION_TIMEOUT);
}
diff --git a/apm-collector/apm-collector-cluster-new/cluster-zookeeper/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataInitializer.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataInitializer.java
similarity index 100%
rename from apm-collector/apm-collector-cluster-new/cluster-zookeeper/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataInitializer.java
rename to apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataInitializer.java
diff --git a/apm-collector/apm-collector-cluster-new/cluster-zookeeper/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleDefine.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleDefine.java
similarity index 100%
rename from apm-collector/apm-collector-cluster-new/cluster-zookeeper/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleDefine.java
rename to apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleDefine.java
diff --git a/apm-collector/apm-collector-cluster-new/cluster-zookeeper/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleRegistrationReader.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleRegistrationReader.java
similarity index 100%
rename from apm-collector/apm-collector-cluster-new/cluster-zookeeper/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleRegistrationReader.java
rename to apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleRegistrationReader.java
diff --git a/apm-collector/apm-collector-cluster-new/cluster-zookeeper/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleRegistrationWriter.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleRegistrationWriter.java
similarity index 100%
rename from apm-collector/apm-collector-cluster-new/cluster-zookeeper/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleRegistrationWriter.java
rename to apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKModuleRegistrationWriter.java
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/config/ConfigInitializer.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/config/ConfigInitializer.java
deleted file mode 100644
index 7746883ab..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/config/ConfigInitializer.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.skywalking.apm.collector.config;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-import java.util.ServiceLoader;
-
-/**
- * @author pengys5
- */
-public enum ConfigInitializer {
- INSTANCE;
-
- private Logger logger = LogManager.getFormatterLogger(ConfigInitializer.class);
-
- public void initialize() throws IOException, IllegalAccessException {
- InputStream configFileStream = ConfigInitializer.class.getResourceAsStream("/collector.config");
- initializeConfigFile(configFileStream);
-
- ServiceLoader configProviders = ServiceLoader.load(ConfigProvider.class);
- for (ConfigProvider provider : configProviders) {
- provider.cliArgs();
- }
- }
-
- private void initializeConfigFile(InputStream configFileStream) throws IOException, IllegalAccessException {
- ServiceLoader configProviders = ServiceLoader.load(ConfigProvider.class);
- Properties properties = new Properties();
- properties.load(configFileStream);
-
- for (ConfigProvider provider : configProviders) {
- logger.info("configProvider provider name: %s", provider.getClass().getName());
- Class configClass = provider.configClass();
- org.skywalking.apm.util.ConfigInitializer.initialize(properties, configClass);
- }
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/config/ConfigProvider.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/config/ConfigProvider.java
deleted file mode 100644
index 8de5b2110..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/config/ConfigProvider.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.skywalking.apm.collector.config;
-
-/**
- * @author pengys5
- */
-public interface ConfigProvider {
- Class configClass();
-
- void cliArgs();
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/log/LogManager.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/log/LogManager.java
deleted file mode 100644
index 225269550..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/log/LogManager.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.skywalking.apm.collector.log;
-
-import org.apache.logging.log4j.Logger;
-
-/**
- * @author pengys5
- */
-public enum LogManager {
- INSTANCE;
-
- public Logger getFormatterLogger(final Class clazz) {
- return org.apache.logging.log4j.LogManager.getFormatterLogger(clazz);
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/rpc/RPCAddress.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/rpc/RPCAddress.java
deleted file mode 100644
index 6cf949b78..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/rpc/RPCAddress.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.skywalking.apm.collector.rpc;
-
-/**
- * @author pengys5
- */
-public class RPCAddress {
- private final String address;
- private final int port;
-
- public RPCAddress(String address, int port) {
- this.address = address;
- this.port = port;
- }
-
- public String getAddress() {
- return address;
- }
-
- public int getPort() {
- return port;
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/rpc/RPCAddressContext.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/rpc/RPCAddressContext.java
deleted file mode 100644
index 52dcf27e4..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/rpc/RPCAddressContext.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.skywalking.apm.collector.rpc;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @author pengys5
- */
-public class RPCAddressContext {
-
- private Map rpcAddresses = new ConcurrentHashMap<>();
-
- public Collection rpcAddressCollection() {
- return rpcAddresses.values();
- }
-
- public void putAddress(String ownerAddress, RPCAddress rpcAddress) {
- rpcAddresses.put(ownerAddress, rpcAddress);
- }
-
- public void removeAddress(String ownerAddress) {
- rpcAddresses.remove(ownerAddress);
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/rpc/RPCAddressListener.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/rpc/RPCAddressListener.java
deleted file mode 100644
index d23190c95..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/rpc/RPCAddressListener.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.skywalking.apm.collector.rpc;
-
-import akka.actor.ActorRef;
-import akka.actor.Terminated;
-import akka.actor.UntypedActor;
-import akka.cluster.Cluster;
-import akka.cluster.ClusterEvent;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-
-/**
- * @author pengys5
- */
-public class RPCAddressListener extends UntypedActor {
-
- private final Logger logger = LogManager.getFormatterLogger(RPCAddressListener.class);
-
- public static final String WORK_NAME = "RPCAddressListener";
-
- private final ClusterWorkerContext clusterContext;
- private Cluster cluster = Cluster.get(getContext().system());
-
- public RPCAddressListener(ClusterWorkerContext clusterContext) {
- this.clusterContext = clusterContext;
- }
-
- @Override
- public void preStart() throws Exception {
- cluster.subscribe(getSelf(), ClusterEvent.UnreachableMember.class);
- }
-
- @Override
- public void onReceive(Object message) throws Throwable {
- if (message instanceof RPCAddressListenerMessage.ConfigMessage) {
- RPCAddressListenerMessage.ConfigMessage configMessage = (RPCAddressListenerMessage.ConfigMessage)message;
- ActorRef sender = getSender();
- logger.info("address: %s, port: %s", configMessage.getConfig().getAddress(), configMessage.getConfig().getPort());
- String ownerAddress = sender.path().address().hostPort();
- clusterContext.getRpcContext().putAddress(ownerAddress, configMessage.getConfig());
- } else if (message instanceof Terminated) {
- Terminated terminated = (Terminated)message;
- clusterContext.getRpcContext().removeAddress(terminated.getActor().path().address().hostPort());
- } else if (message instanceof ClusterEvent.UnreachableMember) {
- ClusterEvent.UnreachableMember unreachableMember = (ClusterEvent.UnreachableMember)message;
- clusterContext.getRpcContext().removeAddress(unreachableMember.member().address().hostPort());
- } else {
- unhandled(message);
- }
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/rpc/RPCAddressListenerMessage.java b/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/rpc/RPCAddressListenerMessage.java
deleted file mode 100644
index bcf443024..000000000
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/rpc/RPCAddressListenerMessage.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.skywalking.apm.collector.rpc;
-
-import java.io.Serializable;
-
-/**
- * @author pengys5
- */
-public class RPCAddressListenerMessage {
-
- public static class ConfigMessage implements Serializable {
- private final RPCAddress config;
-
- public ConfigMessage(RPCAddress config) {
- this.config = config;
- }
-
- public RPCAddress getConfig() {
- return config;
- }
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/resources/META-INF/defines/group.define b/apm-collector/apm-collector-cluster/src/main/resources/META-INF/defines/group.define
new file mode 100644
index 000000000..333959bcb
--- /dev/null
+++ b/apm-collector/apm-collector-cluster/src/main/resources/META-INF/defines/group.define
@@ -0,0 +1 @@
+org.skywalking.apm.collector.cluster.ClusterModuleGroupDefine
\ No newline at end of file
diff --git a/apm-collector/apm-collector-cluster/src/main/resources/META-INF/defines/module.define b/apm-collector/apm-collector-cluster/src/main/resources/META-INF/defines/module.define
new file mode 100644
index 000000000..64e4e0bf7
--- /dev/null
+++ b/apm-collector/apm-collector-cluster/src/main/resources/META-INF/defines/module.define
@@ -0,0 +1,3 @@
+org.skywalking.apm.collector.cluster.zookeeper.ClusterZKModuleDefine
+org.skywalking.apm.collector.cluster.standalone.ClusterStandaloneModuleDefine
+org.skywalking.apm.collector.cluster.redis.ClusterRedisModuleDefine
\ No newline at end of file
diff --git a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/AbstractClusterWorkerProviderTestCase.java b/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/AbstractClusterWorkerProviderTestCase.java
deleted file mode 100644
index b1b3f1cab..000000000
--- a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/AbstractClusterWorkerProviderTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.skywalking.apm.collector.actor;
-
-import akka.actor.ActorSystem;
-import org.apache.logging.log4j.Logger;
-import org.mockito.Mockito;
-import org.powermock.reflect.Whitebox;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.log.LogManager;
-
-/**
- * @author pengys5
- */
-//@RunWith(PowerMockRunner.class)
-//@PrepareForTest({LogManager.class})
-public class AbstractClusterWorkerProviderTestCase {
-
- // @Test
- public void testOnCreate() throws ProviderNotFoundException {
- LogManager logManager = Mockito.mock(LogManager.class);
- Whitebox.setInternalState(LogManager.class, "INSTANCE", logManager);
- Logger logger = Mockito.mock(Logger.class);
- Mockito.when(logManager.getFormatterLogger(Mockito.any())).thenReturn(logger);
-
- ActorSystem actorSystem = Mockito.mock(ActorSystem.class);
- ClusterWorkerContext clusterWorkerContext = new ClusterWorkerContext(actorSystem);
- Impl impl = new Impl();
- impl.onCreate(null);
- }
-
- class Impl extends AbstractClusterWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public AbstractClusterWorkerTestCase.Impl workerInstance(ClusterWorkerContext clusterContext) {
- return new AbstractClusterWorkerTestCase.Impl(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int workerNum() {
- return 0;
- }
- }
-
- enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return AbstractClusterWorkerTestCase.Impl.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/AbstractClusterWorkerTestCase.java b/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/AbstractClusterWorkerTestCase.java
deleted file mode 100644
index ff62a9517..000000000
--- a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/AbstractClusterWorkerTestCase.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.skywalking.apm.collector.actor;
-
-import akka.actor.Address;
-import akka.cluster.ClusterEvent;
-import akka.cluster.Member;
-import org.apache.logging.log4j.Logger;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.reflect.Whitebox;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-
-import static org.mockito.Mockito.*;
-
-/**
- * @author pengys5
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest( {ClusterEvent.MemberUp.class, Address.class})
-@PowerMockIgnore( {"javax.management.*"})
-public class AbstractClusterWorkerTestCase {
-
- private AbstractClusterWorker.WorkerWithAkka workerWithAkka = mock(AbstractClusterWorker.WorkerWithAkka.class, CALLS_REAL_METHODS);
- private AbstractClusterWorker worker = PowerMockito.spy(new Impl(WorkerRole.INSTANCE, null, null));
-
- @Before
- public void init() {
- Logger logger = mock(Logger.class);
- Whitebox.setInternalState(workerWithAkka, "logger", logger);
- Whitebox.setInternalState(workerWithAkka, "ownerWorker", worker);
- }
-
- @Test
- public void testAllocateJob() throws Exception {
-
- String jobStr = "TestJob";
- worker.allocateJob(jobStr);
-
- verify(worker).onWork(jobStr);
- }
-
- @Test
- public void testMemberUp() throws Throwable {
- ClusterEvent.MemberUp memberUp = mock(ClusterEvent.MemberUp.class);
-
- Address address = mock(Address.class);
- when(address.toString()).thenReturn("address");
-
- Member member = mock(Member.class);
- when(member.address()).thenReturn(address);
-
- when(memberUp.member()).thenReturn(member);
-
- workerWithAkka.onReceive(memberUp);
-
- verify(workerWithAkka).register(member);
- }
-
- @Test
- public void testMessage() throws Throwable {
- String message = "test";
- workerWithAkka.onReceive(message);
-
- verify(worker).allocateJob(message);
- }
-
- static class Impl extends AbstractClusterWorker {
- @Override
- public void preStart() throws ProviderNotFoundException {
- }
-
- public Impl(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- protected void onWork(Object message) throws IllegalArgumentException {
-
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return Impl.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/AbstractLocalAsyncWorkerTestCase.java b/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/AbstractLocalAsyncWorkerTestCase.java
deleted file mode 100644
index f41feddf1..000000000
--- a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/AbstractLocalAsyncWorkerTestCase.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.skywalking.apm.collector.actor;
-
-import org.junit.Test;
-import org.mockito.ArgumentMatcher;
-import org.skywalking.apm.collector.queue.EndOfBatchCommand;
-import org.skywalking.apm.collector.queue.MessageHolder;
-
-import static org.mockito.Mockito.*;
-
-/**
- * @author pengys5
- */
-public class AbstractLocalAsyncWorkerTestCase {
-
- @Test
- public void testAllocateJob() throws Exception {
- AbstractLocalAsyncWorker worker = mock(AbstractLocalAsyncWorker.class);
-
- String message = "Test";
- worker.allocateJob(message);
- verify(worker).onWork(message);
- }
-
- @Test
- public void testOnEventWhenNotEnd() throws Exception {
- AbstractLocalAsyncWorker worker = mock(AbstractLocalAsyncWorker.class);
-
- AbstractLocalAsyncWorker.WorkerWithDisruptor disruptor = new AbstractLocalAsyncWorker.WorkerWithDisruptor(null, worker);
-
- MessageHolder holder = new MessageHolder();
- String message = "Test";
- holder.setMessage(message);
- disruptor.onEvent(holder, 0, false);
-
- verify(worker).onWork(message);
- }
-
- @Test
- public void testOnEventWhenEnd() throws Exception {
- AbstractLocalAsyncWorker worker = mock(AbstractLocalAsyncWorker.class);
-
- AbstractLocalAsyncWorker.WorkerWithDisruptor disruptor = new AbstractLocalAsyncWorker.WorkerWithDisruptor(null, worker);
-
- MessageHolder holder = new MessageHolder();
- String message = "Test";
- holder.setMessage(message);
- disruptor.onEvent(holder, 0, true);
-
- verify(worker, times(1)).onWork(message);
- verify(worker, times(1)).onWork(argThat(new IsEndOfBatchCommandClass()));
- }
-
- class IsEndOfBatchCommandClass extends ArgumentMatcher {
- public boolean matches(Object para) {
- return para.getClass() == EndOfBatchCommand.class;
- }
- }
-
-}
diff --git a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/AbstractWorkerProviderTestCase.java b/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/AbstractWorkerProviderTestCase.java
deleted file mode 100644
index d6fbfff66..000000000
--- a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/AbstractWorkerProviderTestCase.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.skywalking.apm.collector.actor;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-/**
- * @author pengys5
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest( {AbstractWorker.class})
-@PowerMockIgnore( {"javax.management.*"})
-public class AbstractWorkerProviderTestCase {
-
- @Test(expected = IllegalArgumentException.class)
- public void testNullWorkerInstanceCreate() throws ProviderNotFoundException {
- AbstractWorkerProvider provider = mock(AbstractWorkerProvider.class);
- when(provider.workerInstance(null)).thenReturn(null);
-
- AbstractWorker worker = mock(AbstractWorker.class);
- provider.create(worker);
- }
-
- @Test
- public void testNoneWorkerOwner() throws ProviderNotFoundException {
- AbstractWorkerProvider provider = mock(AbstractWorkerProvider.class);
-
- ClusterWorkerContext context = mock(ClusterWorkerContext.class);
- provider.setClusterContext(context);
-
- AbstractWorker worker = mock(AbstractWorker.class);
- when(provider.workerInstance(context)).thenReturn(worker);
-
- provider.create(null);
- Mockito.verify(provider).onCreate(null);
- }
-
- @Test
- public void testHasWorkerOwner() throws ProviderNotFoundException {
- AbstractWorkerProvider provider = mock(AbstractWorkerProvider.class);
-
- ClusterWorkerContext context = mock(ClusterWorkerContext.class);
- provider.setClusterContext(context);
-
- AbstractWorker worker = mock(AbstractWorker.class);
- when(provider.workerInstance(context)).thenReturn(worker);
-
- AbstractWorker workerOwner = mock(AbstractWorker.class);
- LocalWorkerContext localWorkerContext = mock(LocalWorkerContext.class);
- when(workerOwner.getSelfContext()).thenReturn(localWorkerContext);
-
- provider.create(workerOwner);
- Mockito.verify(provider).onCreate(localWorkerContext);
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void testHasWorkerOwnerButNoneContext() throws ProviderNotFoundException {
- AbstractWorkerProvider provider = mock(AbstractWorkerProvider.class);
-
- ClusterWorkerContext context = mock(ClusterWorkerContext.class);
- provider.setClusterContext(context);
-
- AbstractWorker worker = mock(AbstractWorker.class);
- when(provider.workerInstance(context)).thenReturn(worker);
-
- AbstractWorker workerOwner = mock(AbstractWorker.class);
- when(workerOwner.getSelfContext()).thenReturn(null);
-
- provider.create(workerOwner);
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/selector/AbstractHashMessageTestCase.java b/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/selector/AbstractHashMessageTestCase.java
deleted file mode 100644
index ea3557cc9..000000000
--- a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/selector/AbstractHashMessageTestCase.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.skywalking.apm.collector.actor.selector;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author pengys5
- */
-public class AbstractHashMessageTestCase {
-
- @Test
- public void testGetHashCode() {
- String key = "key";
-
- Impl impl = new Impl(key);
- Assert.assertEquals(key.hashCode(), impl.getHashCode());
- }
-
- class Impl extends AbstractHashMessage {
- public Impl(String key) {
- super(key);
- }
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/selector/HashCodeSelectorTestCase.java b/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/selector/HashCodeSelectorTestCase.java
deleted file mode 100644
index 8f669e791..000000000
--- a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/selector/HashCodeSelectorTestCase.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.skywalking.apm.collector.actor.selector;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.skywalking.apm.collector.actor.WorkerRef;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-/**
- * @author pengys5
- */
-public class HashCodeSelectorTestCase {
-
- @Test
- public void testSelect() {
- List members = new ArrayList<>();
- WorkerRef workerRef_1 = mock(WorkerRef.class);
- WorkerRef workerRef_2 = mock(WorkerRef.class);
- WorkerRef workerRef_3 = mock(WorkerRef.class);
-
- members.add(workerRef_1);
- members.add(workerRef_2);
- members.add(workerRef_3);
-
- AbstractHashMessage message_1 = mock(AbstractHashMessage.class);
- when(message_1.getHashCode()).thenReturn(9);
-
- AbstractHashMessage message_2 = mock(AbstractHashMessage.class);
- when(message_2.getHashCode()).thenReturn(10);
-
- AbstractHashMessage message_3 = mock(AbstractHashMessage.class);
- when(message_3.getHashCode()).thenReturn(11);
-
- HashCodeSelector selector = new HashCodeSelector();
-
- WorkerRef select_1 = selector.select(members, message_1);
- Assert.assertEquals(workerRef_1.hashCode(), select_1.hashCode());
-
- WorkerRef select_2 = selector.select(members, message_2);
- Assert.assertEquals(workerRef_2.hashCode(), select_2.hashCode());
-
- WorkerRef select_3 = selector.select(members, message_3);
- Assert.assertEquals(workerRef_3.hashCode(), select_3.hashCode());
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void testSelectError() {
- HashCodeSelector selector = new HashCodeSelector();
- selector.select(null, new Object());
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/selector/RollingSelectorTestCase.java b/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/selector/RollingSelectorTestCase.java
deleted file mode 100644
index 442f46730..000000000
--- a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/actor/selector/RollingSelectorTestCase.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.skywalking.apm.collector.actor.selector;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.skywalking.apm.collector.actor.WorkerRef;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.powermock.api.mockito.PowerMockito.mock;
-
-/**
- * @author pengys5
- */
-public class RollingSelectorTestCase {
-
- @Test
- public void testSelect() {
- List members = new ArrayList<>();
- WorkerRef workerRef_1 = mock(WorkerRef.class);
- WorkerRef workerRef_2 = mock(WorkerRef.class);
- WorkerRef workerRef_3 = mock(WorkerRef.class);
-
- members.add(workerRef_1);
- members.add(workerRef_2);
- members.add(workerRef_3);
-
- Object message = new Object();
-
- RollingSelector selector = new RollingSelector();
-
- WorkerRef selected_1 = selector.select(members, message);
- Assert.assertEquals(workerRef_2.hashCode(), selected_1.hashCode());
-
- WorkerRef selected_2 = selector.select(members, message);
- Assert.assertEquals(workerRef_3.hashCode(), selected_2.hashCode());
-
- WorkerRef selected_3 = selector.select(members, message);
- Assert.assertEquals(workerRef_1.hashCode(), selected_3.hashCode());
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/config/ConfigInitializerTestCase.java b/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/config/ConfigInitializerTestCase.java
deleted file mode 100644
index 88f99a623..000000000
--- a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/config/ConfigInitializerTestCase.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.skywalking.apm.collector.config;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.skywalking.apm.collector.cluster.ClusterConfig;
-
-/**
- * @author pengys5
- */
-public class ConfigInitializerTestCase {
-
- @Before
- public void clear() {
- System.clearProperty("cluster.current.HOSTNAME");
- System.clearProperty("cluster.current.PORT");
- System.clearProperty("cluster.current.ROLES");
- System.clearProperty("cluster.SEED_NODES");
- }
-
- @Test
- public void testInitialize() throws Exception {
- ConfigInitializer.INSTANCE.initialize();
-
- Assert.assertEquals("127.0.0.1", ClusterConfig.Cluster.Current.HOSTNAME);
- Assert.assertEquals("1000", ClusterConfig.Cluster.Current.PORT);
- Assert.assertEquals("WorkersListener", ClusterConfig.Cluster.Current.ROLES);
- Assert.assertEquals("127.0.0.1:1000", ClusterConfig.Cluster.SEED_NODES);
- }
-
- @Test
- public void testInitializeWithCli() throws Exception {
- System.setProperty("cluster.current.HOSTNAME", "127.0.0.2");
- System.setProperty("cluster.current.PORT", "1001");
- System.setProperty("cluster.current.ROLES", "Test1, Test2");
- System.setProperty("cluster.SEED_NODES", "127.0.0.1:1000, 127.0.0.1:1001");
-
- ConfigInitializer.INSTANCE.initialize();
-
- Assert.assertEquals("127.0.0.2", ClusterConfig.Cluster.Current.HOSTNAME);
- Assert.assertEquals("1001", ClusterConfig.Cluster.Current.PORT);
- Assert.assertEquals("Test1, Test2", ClusterConfig.Cluster.Current.ROLES);
- Assert.assertEquals("127.0.0.1:1000, 127.0.0.1:1001", ClusterConfig.Cluster.SEED_NODES);
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/log/MockLog.java b/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/log/MockLog.java
deleted file mode 100644
index ba71fd0ca..000000000
--- a/apm-collector/apm-collector-cluster/src/test/java/org/skywalking/apm/collector/log/MockLog.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.skywalking.apm.collector.log;
-
-import org.apache.logging.log4j.Logger;
-import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-
-/**
- * @author pengys5
- */
-public class MockLog {
-
- public Logger mockito() {
- LogManager logManager = PowerMockito.mock(LogManager.class);
- Logger logger = Mockito.mock(Logger.class);
- Mockito.when(logManager.getFormatterLogger(Mockito.any())).thenReturn(logger);
- return logger;
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/test/resources/META-INF/services/org.skywalking.apm.collector.actor.AbstractClusterWorkerProvider b/apm-collector/apm-collector-cluster/src/test/resources/META-INF/services/org.skywalking.apm.collector.actor.AbstractClusterWorkerProvider
deleted file mode 100644
index e69de29bb..000000000
diff --git a/apm-collector/apm-collector-cluster/src/test/resources/META-INF/services/org.skywalking.apm.collector.actor.AbstractLocalWorkerProvider b/apm-collector/apm-collector-cluster/src/test/resources/META-INF/services/org.skywalking.apm.collector.actor.AbstractLocalWorkerProvider
deleted file mode 100644
index e69de29bb..000000000
diff --git a/apm-collector/apm-collector-cluster/src/test/resources/META-INF/services/org.skywalking.apm.collector.config.ConfigProvider b/apm-collector/apm-collector-cluster/src/test/resources/META-INF/services/org.skywalking.apm.collector.config.ConfigProvider
deleted file mode 100644
index fd524035e..000000000
--- a/apm-collector/apm-collector-cluster/src/test/resources/META-INF/services/org.skywalking.apm.collector.config.ConfigProvider
+++ /dev/null
@@ -1 +0,0 @@
-org.skywalking.apm.collector.cluster.ClusterConfigProvider
\ No newline at end of file
diff --git a/apm-collector/apm-collector-cluster/src/test/resources/collector.config b/apm-collector/apm-collector-cluster/src/test/resources/collector.config
deleted file mode 100644
index 9f0ea3fbd..000000000
--- a/apm-collector/apm-collector-cluster/src/test/resources/collector.config
+++ /dev/null
@@ -1,11 +0,0 @@
-cluster.current.hostname=127.0.0.1
-cluster.current.port=1000
-cluster.current.roles=WorkersListener
-cluster.seed_nodes=127.0.0.1:1000
-
-es.cluster.name=CollectorDBCluster
-es.cluster.nodes=127.0.0.1:9300
-es.cluster.transport.sniffer=true
-
-es.index.shards.number=2
-es.index.replicas.number=0
\ No newline at end of file
diff --git a/apm-collector/apm-collector-cluster/src/test/resources/log4j2.xml b/apm-collector/apm-collector-cluster/src/test/resources/log4j2.xml
deleted file mode 100644
index cc2fe771e..000000000
--- a/apm-collector/apm-collector-cluster/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerModuleDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/agentstream/AgentStreamModuleDefine.java
similarity index 63%
rename from apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerModuleDefine.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/agentstream/AgentStreamModuleDefine.java
index 2e67e51be..e564c258a 100644
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerModuleDefine.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/agentstream/AgentStreamModuleDefine.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.core.worker;
+package org.skywalking.apm.collector.core.agentstream;
import java.util.Map;
import org.skywalking.apm.collector.core.client.Client;
@@ -7,17 +7,17 @@ import org.skywalking.apm.collector.core.cluster.ClusterDataInitializer;
import org.skywalking.apm.collector.core.cluster.ClusterModuleContext;
import org.skywalking.apm.collector.core.config.ConfigParseException;
import org.skywalking.apm.collector.core.framework.DataInitializer;
+import org.skywalking.apm.collector.core.framework.DefineException;
import org.skywalking.apm.collector.core.module.ModuleDefine;
-import org.skywalking.apm.collector.core.module.ModuleException;
import org.skywalking.apm.collector.core.server.Server;
import org.skywalking.apm.collector.core.server.ServerException;
/**
* @author pengys5
*/
-public abstract class WorkerModuleDefine extends ModuleDefine {
+public abstract class AgentStreamModuleDefine extends ModuleDefine {
- @Override public final void initialize(Map config) throws ModuleException, ClientException {
+ @Override public final void initialize(Map config) throws DefineException, ClientException {
try {
configParser().parse(config);
Server server = server();
@@ -26,15 +26,15 @@ public abstract class WorkerModuleDefine extends ModuleDefine {
String key = ClusterDataInitializer.BASE_CATALOG + "." + name();
ClusterModuleContext.writer.write(key, registration().buildValue());
} catch (ConfigParseException | ServerException e) {
- throw new WorkerModuleException(e.getMessage(), e);
+ throw new AgentStreamModuleException(e.getMessage(), e);
}
}
- @Override public final Client createClient() {
- throw new UnsupportedOperationException();
+ @Override protected final DataInitializer dataInitializer() {
+ throw new UnsupportedOperationException("");
}
- @Override public final DataInitializer dataInitializer() {
- throw new UnsupportedOperationException();
+ @Override protected final Client createClient() {
+ throw new UnsupportedOperationException("");
}
}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/agentstream/AgentStreamModuleException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/agentstream/AgentStreamModuleException.java
new file mode 100644
index 000000000..11380f6b4
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/agentstream/AgentStreamModuleException.java
@@ -0,0 +1,16 @@
+package org.skywalking.apm.collector.core.agentstream;
+
+import org.skywalking.apm.collector.core.module.ModuleException;
+
+/**
+ * @author pengys5
+ */
+public class AgentStreamModuleException extends ModuleException{
+ public AgentStreamModuleException(String message) {
+ super(message);
+ }
+
+ public AgentStreamModuleException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleContext.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleContext.java
index 6525dbdd0..980873d4e 100644
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleContext.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleContext.java
@@ -5,4 +5,6 @@ package org.skywalking.apm.collector.core.cluster;
*/
public class ClusterModuleContext {
public static ClusterModuleRegistrationWriter writer;
+
+ public static ClusterModuleRegistrationReader reader;
}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleDefine.java
index cd232a76c..42e4016c3 100644
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleDefine.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cluster/ClusterModuleDefine.java
@@ -39,4 +39,6 @@ public abstract class ClusterModuleDefine extends ModuleDefine {
}
protected abstract ClusterModuleRegistrationWriter registrationWriter();
+
+ protected abstract ClusterModuleRegistrationReader registrationReader();
}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/CollectorStarter.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/CollectorStarter.java
index 9de01cf38..44534172d 100644
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/CollectorStarter.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/CollectorStarter.java
@@ -7,7 +7,10 @@ import org.skywalking.apm.collector.core.module.ModuleConfigLoader;
import org.skywalking.apm.collector.core.module.ModuleDefine;
import org.skywalking.apm.collector.core.module.ModuleDefineLoader;
import org.skywalking.apm.collector.core.module.ModuleGroup;
+import org.skywalking.apm.collector.core.module.ModuleGroupDefine;
+import org.skywalking.apm.collector.core.module.ModuleGroupDefineLoader;
import org.skywalking.apm.collector.core.module.ModuleInstallerAdapter;
+import org.skywalking.apm.collector.core.remote.SerializedDefineLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -19,12 +22,19 @@ public class CollectorStarter implements Starter {
private final Logger logger = LoggerFactory.getLogger(CollectorStarter.class);
@Override public void start() throws ConfigException, DefineException, ClientException {
+ Context context = new Context();
ModuleConfigLoader configLoader = new ModuleConfigLoader();
Map configuration = configLoader.load();
+ SerializedDefineLoader serializedDefineLoader = new SerializedDefineLoader();
+ serializedDefineLoader.load();
+
ModuleDefineLoader defineLoader = new ModuleDefineLoader();
Map> moduleDefineMap = defineLoader.load();
+ ModuleGroupDefineLoader groupDefineLoader = new ModuleGroupDefineLoader();
+ Map moduleGroupDefineMap = groupDefineLoader.load();
+
ModuleInstallerAdapter moduleInstallerAdapter = new ModuleInstallerAdapter(ModuleGroup.Cluster);
moduleInstallerAdapter.install(configuration.get(ModuleGroup.Cluster.name().toLowerCase()), moduleDefineMap.get(ModuleGroup.Cluster.name().toLowerCase()));
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Context.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Context.java
new file mode 100644
index 000000000..db34bb29a
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/framework/Context.java
@@ -0,0 +1,7 @@
+package org.skywalking.apm.collector.core.framework;
+
+/**
+ * @author pengys5
+ */
+public class Context {
+}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefine.java
index 63ef4d819..1ead094ea 100644
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefine.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefine.java
@@ -1,7 +1,6 @@
package org.skywalking.apm.collector.core.module;
import org.skywalking.apm.collector.core.client.Client;
-import org.skywalking.apm.collector.core.client.ClientConfig;
import org.skywalking.apm.collector.core.framework.DataInitializer;
import org.skywalking.apm.collector.core.framework.Define;
import org.skywalking.apm.collector.core.server.Server;
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefineLoader.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefineLoader.java
index 031ab022d..407bc13ae 100644
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefineLoader.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleDefineLoader.java
@@ -19,10 +19,10 @@ public class ModuleDefineLoader implements Loader> moduleDefineMap = new LinkedHashMap<>();
ModuleDefinitionFile definitionFile = new ModuleDefinitionFile();
- logger.info("definition file name: {}", definitionFile.fileName());
+ logger.info("module definition file name: {}", definitionFile.fileName());
DefinitionLoader definitionLoader = DefinitionLoader.load(ModuleDefine.class, definitionFile);
for (ModuleDefine moduleDefine : definitionLoader) {
- logger.info("loaded module class: {}", moduleDefine.getClass().getName());
+ logger.info("loaded module definition class: {}", moduleDefine.getClass().getName());
String groupName = moduleDefine.group().name().toLowerCase();
if (!moduleDefineMap.containsKey(groupName)) {
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroup.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroup.java
index bcf3ab250..31d9e4aed 100644
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroup.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroup.java
@@ -4,5 +4,5 @@ package org.skywalking.apm.collector.core.module;
* @author pengys5
*/
public enum ModuleGroup {
- Cluster, Worker
+ Cluster, Queue, AgentStream
}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefine.java
new file mode 100644
index 000000000..8bca7831e
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefine.java
@@ -0,0 +1,10 @@
+package org.skywalking.apm.collector.core.module;
+
+/**
+ * @author pengys5
+ */
+public interface ModuleGroupDefine {
+ String name();
+
+ ModuleInstallMode mode();
+}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefineFile.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefineFile.java
new file mode 100644
index 000000000..e0c407a16
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefineFile.java
@@ -0,0 +1,12 @@
+package org.skywalking.apm.collector.core.module;
+
+import org.skywalking.apm.collector.core.framework.DefinitionFile;
+
+/**
+ * @author pengys5
+ */
+public class ModuleGroupDefineFile extends DefinitionFile {
+ @Override protected String fileName() {
+ return "group.define";
+ }
+}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefineLoader.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefineLoader.java
new file mode 100644
index 000000000..6f4cb58aa
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleGroupDefineLoader.java
@@ -0,0 +1,32 @@
+package org.skywalking.apm.collector.core.module;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import org.skywalking.apm.collector.core.config.ConfigException;
+import org.skywalking.apm.collector.core.framework.Loader;
+import org.skywalking.apm.collector.core.util.DefinitionLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author pengys5
+ */
+public class ModuleGroupDefineLoader implements Loader> {
+
+ private final Logger logger = LoggerFactory.getLogger(ModuleGroupDefineLoader.class);
+
+ @Override public Map load() throws ConfigException {
+ Map moduleGroupDefineMap = new LinkedHashMap<>();
+
+ ModuleGroupDefineFile definitionFile = new ModuleGroupDefineFile();
+ logger.info("module group definition file name: {}", definitionFile.fileName());
+ DefinitionLoader definitionLoader = DefinitionLoader.load(ModuleGroupDefine.class, definitionFile);
+ for (ModuleGroupDefine moduleGroupDefine : definitionLoader) {
+ logger.info("loaded group module definition class: {}", moduleGroupDefine.getClass().getName());
+
+ String groupName = moduleGroupDefine.name().toLowerCase();
+ moduleGroupDefineMap.put(groupName, moduleGroupDefine);
+ }
+ return moduleGroupDefineMap;
+ }
+}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleInstallMode.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleInstallMode.java
new file mode 100644
index 000000000..3b2976797
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleInstallMode.java
@@ -0,0 +1,8 @@
+package org.skywalking.apm.collector.core.module;
+
+/**
+ * @author pengys5
+ */
+public enum ModuleInstallMode {
+ Single, Multiple
+}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/Creator.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/Creator.java
new file mode 100644
index 000000000..c2da5c469
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/Creator.java
@@ -0,0 +1,10 @@
+package org.skywalking.apm.collector.core.queue;
+
+import org.skywalking.apm.collector.core.worker.AbstractLocalAsyncWorker;
+
+/**
+ * @author pengys5
+ */
+public interface Creator {
+ QueueEventHandler create(int queueSize, AbstractLocalAsyncWorker localAsyncWorker);
+}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/queue/DaemonThreadFactory.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/DaemonThreadFactory.java
similarity index 85%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/queue/DaemonThreadFactory.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/DaemonThreadFactory.java
index a0e3fecef..c984ce87a 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/queue/DaemonThreadFactory.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/DaemonThreadFactory.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.queue;
+package org.skywalking.apm.collector.core.queue;
import java.util.concurrent.ThreadFactory;
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/queue/EndOfBatchCommand.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/EndOfBatchCommand.java
similarity index 56%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/queue/EndOfBatchCommand.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/EndOfBatchCommand.java
index b28acbd40..040957874 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/queue/EndOfBatchCommand.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/EndOfBatchCommand.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.queue;
+package org.skywalking.apm.collector.core.queue;
/**
* @author pengys5
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/queue/MessageHolder.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/MessageHolder.java
similarity index 85%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/queue/MessageHolder.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/MessageHolder.java
index c79f49176..a78139270 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/queue/MessageHolder.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/MessageHolder.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.queue;
+package org.skywalking.apm.collector.core.queue;
/**
* @author pengys5
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueEventHandler.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueEventHandler.java
new file mode 100644
index 000000000..d1c56681f
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueEventHandler.java
@@ -0,0 +1,8 @@
+package org.skywalking.apm.collector.core.queue;
+
+/**
+ * @author pengys5
+ */
+public interface QueueEventHandler {
+ void tell(Object message);
+}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueModuleContext.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueModuleContext.java
new file mode 100644
index 000000000..a1bf50f61
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueModuleContext.java
@@ -0,0 +1,8 @@
+package org.skywalking.apm.collector.core.queue;
+
+/**
+ * @author pengys5
+ */
+public class QueueModuleContext {
+ public static Creator creator;
+}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueModuleDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueModuleDefine.java
new file mode 100644
index 000000000..9b6bd447f
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/queue/QueueModuleDefine.java
@@ -0,0 +1,33 @@
+package org.skywalking.apm.collector.core.queue;
+
+import org.skywalking.apm.collector.core.client.Client;
+import org.skywalking.apm.collector.core.framework.DataInitializer;
+import org.skywalking.apm.collector.core.module.ModuleConfigParser;
+import org.skywalking.apm.collector.core.module.ModuleDefine;
+import org.skywalking.apm.collector.core.module.ModuleRegistration;
+import org.skywalking.apm.collector.core.server.Server;
+
+/**
+ * @author pengys5
+ */
+public abstract class QueueModuleDefine extends ModuleDefine {
+ @Override protected final ModuleConfigParser configParser() {
+ throw new UnsupportedOperationException("");
+ }
+
+ @Override protected final Client createClient() {
+ throw new UnsupportedOperationException("");
+ }
+
+ @Override protected final DataInitializer dataInitializer() {
+ throw new UnsupportedOperationException("");
+ }
+
+ @Override protected final ModuleRegistration registration() {
+ throw new UnsupportedOperationException("");
+ }
+
+ @Override protected final Server server() {
+ throw new UnsupportedOperationException("");
+ }
+}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/Remote.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/Remote.java
new file mode 100644
index 000000000..5e406e009
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/Remote.java
@@ -0,0 +1,8 @@
+package org.skywalking.apm.collector.core.remote;
+
+/**
+ * @author pengys5
+ */
+public interface Remote {
+ void call(Object message);
+}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/RemoteModuleDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/RemoteModuleDefine.java
new file mode 100644
index 000000000..b8e57b5a7
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/RemoteModuleDefine.java
@@ -0,0 +1,9 @@
+package org.skywalking.apm.collector.core.remote;
+
+import org.skywalking.apm.collector.core.module.ModuleDefine;
+
+/**
+ * @author pengys5
+ */
+public abstract class RemoteModuleDefine extends ModuleDefine {
+}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/SerializedDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/SerializedDefine.java
new file mode 100644
index 000000000..bafafd87e
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/SerializedDefine.java
@@ -0,0 +1,10 @@
+package org.skywalking.apm.collector.core.remote;
+
+/**
+ * @author pengys5
+ */
+public interface SerializedDefine {
+ int ID();
+
+ Class clazz();
+}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/SerializedDefineLoader.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/SerializedDefineLoader.java
new file mode 100644
index 000000000..c07386260
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/SerializedDefineLoader.java
@@ -0,0 +1,33 @@
+package org.skywalking.apm.collector.core.remote;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import org.skywalking.apm.collector.core.config.ConfigException;
+import org.skywalking.apm.collector.core.framework.Loader;
+import org.skywalking.apm.collector.core.module.ModuleGroupDefineLoader;
+import org.skywalking.apm.collector.core.util.DefinitionLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author pengys5
+ */
+public class SerializedDefineLoader implements Loader> {
+
+ private final Logger logger = LoggerFactory.getLogger(ModuleGroupDefineLoader.class);
+
+ @Override public Map load() throws ConfigException {
+ Map serializedDefineMap = new LinkedHashMap<>();
+ SerializedDefinitionFile definitionFile = new SerializedDefinitionFile();
+ logger.info("serialized definition file name: {}", definitionFile.fileName());
+
+ DefinitionLoader definitionLoader = DefinitionLoader.load(SerializedDefine.class, definitionFile);
+
+ int id = 1;
+ for (SerializedDefine serializedDefine : definitionLoader) {
+ logger.info("loaded serialized definition class: {}", serializedDefine.getClass().getName());
+ serializedDefineMap.put(id, serializedDefine);
+ }
+ return serializedDefineMap;
+ }
+}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/SerializedDefinitionFile.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/SerializedDefinitionFile.java
new file mode 100644
index 000000000..a8ee1988a
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/remote/SerializedDefinitionFile.java
@@ -0,0 +1,12 @@
+package org.skywalking.apm.collector.core.remote;
+
+import org.skywalking.apm.collector.core.framework.DefinitionFile;
+
+/**
+ * @author pengys5
+ */
+public class SerializedDefinitionFile extends DefinitionFile {
+ @Override protected String fileName() {
+ return "serialized.define";
+ }
+}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractClusterWorker.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractClusterWorker.java
new file mode 100644
index 000000000..56cfc50f4
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractClusterWorker.java
@@ -0,0 +1,47 @@
+package org.skywalking.apm.collector.core.worker;
+
+/**
+ * The AbstractClusterWorker implementations represent workers,
+ * which receive remote messages.
+ *
+ * Usually, the implementations are doing persistent, or aggregate works.
+ *
+ * @author pengys5
+ * @since v3.0-2017
+ */
+public abstract class AbstractClusterWorker extends AbstractWorker {
+
+ /**
+ * Construct an AbstractClusterWorker with the worker role and context.
+ *
+ * @param role If multi-workers are for load balance, they should be more likely called worker instance. Meaning,
+ * each worker have multi instances.
+ * @param clusterContext See {@link ClusterWorkerContext}
+ * @param selfContext See {@link LocalWorkerContext}
+ */
+ protected AbstractClusterWorker(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
+ super(role, clusterContext, selfContext);
+ }
+
+ /**
+ * This method use for message producer to call for send message.
+ *
+ * @param message The persistence data or metric data.
+ * @throws Exception The Exception happen in {@link #onWork(Object)}
+ */
+ final public void allocateJob(Object message) throws WorkerInvokeException {
+ try {
+ onWork(message);
+ } catch (WorkerException e) {
+ throw new WorkerInvokeException(e.getMessage(), e.getCause());
+ }
+ }
+
+ /**
+ * This method use for message receiver to analyse message.
+ *
+ * @param message Cast the message object to a expect subclass.
+ * @throws Exception Don't handle the exception, throw it.
+ */
+ protected abstract void onWork(Object message) throws WorkerException;
+}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractClusterWorkerProvider.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractClusterWorkerProvider.java
similarity index 66%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractClusterWorkerProvider.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractClusterWorkerProvider.java
index 940d996bc..519689182 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractClusterWorkerProvider.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractClusterWorkerProvider.java
@@ -1,8 +1,4 @@
-package org.skywalking.apm.collector.actor;
-
-import akka.actor.ActorRef;
-import akka.actor.Props;
-import org.skywalking.apm.collector.rpc.RPCAddress;
+package org.skywalking.apm.collector.core.worker;
/**
* The AbstractClusterWorkerProvider implementations represent providers,
@@ -21,10 +17,6 @@ public abstract class AbstractClusterWorkerProviderAbstractLocalAsyncWorker implementations represent workers,
+ * which receive local asynchronous message.
+ *
+ * @author pengys5
+ * @since v3.0-2017
+ */
+public abstract class AbstractLocalAsyncWorker extends AbstractLocalWorker {
+
+ /**
+ * Construct an AbstractLocalAsyncWorker with the worker role and context.
+ *
+ * @param role The responsibility of worker in cluster, more than one workers can have same responsibility which use
+ * to provide load balancing ability.
+ * @param clusterContext See {@link ClusterWorkerContext}
+ * @param selfContext See {@link LocalWorkerContext}
+ */
+ public AbstractLocalAsyncWorker(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
+ super(role, clusterContext, selfContext);
+ }
+
+ /**
+ * The asynchronous worker always use to persistence data into db, this is the end of the streaming,
+ * so usually no need to create the next worker instance at the time of this worker instance create.
+ *
+ * @throws ProviderNotFoundException When worker provider not found, it will be throw this exception.
+ */
+ @Override
+ public void preStart() throws ProviderNotFoundException {
+ }
+
+ /**
+ * Receive message
+ *
+ * @param message The persistence data or metric data.
+ * @throws WorkerException The Exception happen in {@link #onWork(Object)}
+ */
+ final public void allocateJob(Object message) throws WorkerException {
+ onWork(message);
+ }
+
+ /**
+ * The data process logic in this method.
+ *
+ * @param message Cast the message object to a expect subclass.
+ * @throws WorkerException Don't handle the exception, throw it.
+ */
+ protected abstract void onWork(Object message) throws WorkerException;
+}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalAsyncWorkerProvider.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalAsyncWorkerProvider.java
new file mode 100644
index 000000000..6259e1ab7
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalAsyncWorkerProvider.java
@@ -0,0 +1,28 @@
+package org.skywalking.apm.collector.core.worker;
+
+import org.skywalking.apm.collector.core.queue.QueueEventHandler;
+import org.skywalking.apm.collector.core.queue.QueueModuleContext;
+
+/**
+ * @author pengys5
+ */
+public abstract class AbstractLocalAsyncWorkerProvider extends AbstractLocalWorkerProvider {
+
+ public abstract int queueSize();
+
+ @Override final public WorkerRef onCreate(
+ LocalWorkerContext localContext) throws ProviderNotFoundException {
+ T localAsyncWorker = workerInstance(getClusterContext());
+ localAsyncWorker.preStart();
+
+ QueueEventHandler queueEventHandler = QueueModuleContext.creator.create(queueSize(), localAsyncWorker);
+
+ LocalAsyncWorkerRef workerRef = new LocalAsyncWorkerRef(role(), queueEventHandler);
+
+ if (localContext != null) {
+ localContext.put(workerRef);
+ }
+
+ return workerRef;
+ }
+}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalSyncWorker.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalSyncWorker.java
similarity index 96%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalSyncWorker.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalSyncWorker.java
index b24df3702..0638c4556 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalSyncWorker.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalSyncWorker.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
/**
* The AbstractLocalSyncWorker defines workers who receive data from jvm inside call and response in real
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalSyncWorkerProvider.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalSyncWorkerProvider.java
similarity index 92%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalSyncWorkerProvider.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalSyncWorkerProvider.java
index a88873194..056b724f6 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalSyncWorkerProvider.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalSyncWorkerProvider.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
/**
* @author pengys5
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalWorker.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalWorker.java
similarity index 84%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalWorker.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalWorker.java
index 002e8f359..f370cdac2 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalWorker.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalWorker.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
/**
* @author pengys5
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalWorkerProvider.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalWorkerProvider.java
similarity index 74%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalWorkerProvider.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalWorkerProvider.java
index 81c11b249..1f7116be4 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractLocalWorkerProvider.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractLocalWorkerProvider.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
/**
* @author pengys5
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractWorker.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractWorker.java
similarity index 67%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractWorker.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractWorker.java
index 42fe7d916..cdfc839c7 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractWorker.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractWorker.java
@@ -1,15 +1,10 @@
-package org.skywalking.apm.collector.actor;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+package org.skywalking.apm.collector.core.worker;
/**
* @author pengys5
*/
public abstract class AbstractWorker {
- private final Logger logger;
-
private final LocalWorkerContext selfContext;
private final Role role;
@@ -20,11 +15,6 @@ public abstract class AbstractWorker {
this.role = role;
this.clusterContext = clusterContext;
this.selfContext = selfContext;
- this.logger = LogManager.getFormatterLogger(role.roleName());
- }
-
- final public Logger logger() {
- return logger;
}
public abstract void preStart() throws ProviderNotFoundException;
@@ -44,8 +34,4 @@ public abstract class AbstractWorker {
final public static AbstractWorker noOwner() {
return null;
}
-
- final protected void saveException(Exception e) {
- logger().error(e);
- }
}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractWorkerProvider.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractWorkerProvider.java
similarity index 95%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractWorkerProvider.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractWorkerProvider.java
index 28ff22252..bc87c19e4 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/AbstractWorkerProvider.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/AbstractWorkerProvider.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
/**
* @author pengys5
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/ClusterWorkerContext.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/ClusterWorkerContext.java
similarity index 65%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/ClusterWorkerContext.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/ClusterWorkerContext.java
index 5260d6fd0..ebd29da62 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/ClusterWorkerContext.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/ClusterWorkerContext.java
@@ -1,29 +1,17 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
-import akka.actor.ActorSystem;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.rpc.RPCAddressContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author pengys5
*/
public class ClusterWorkerContext extends WorkerContext {
- private Logger logger = LogManager.getFormatterLogger(ClusterWorkerContext.class);
+ private final Logger logger = LoggerFactory.getLogger(ClusterWorkerContext.class);
- private final ActorSystem akkaSystem;
private Map providers = new ConcurrentHashMap<>();
- private RPCAddressContext rpcContext = new RPCAddressContext();
-
- public ClusterWorkerContext(ActorSystem akkaSystem) {
- this.akkaSystem = akkaSystem;
- }
-
- public ActorSystem getAkkaSystem() {
- return akkaSystem;
- }
@Override
public AbstractWorkerProvider findProvider(Role role) throws ProviderNotFoundException {
@@ -44,8 +32,4 @@ public class ClusterWorkerContext extends WorkerContext {
providers.put(provider.role().roleName(), provider);
}
}
-
- public RPCAddressContext getRpcContext() {
- return rpcContext;
- }
}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/ClusterWorkerRef.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/ClusterWorkerRef.java
new file mode 100644
index 000000000..dc2243f3a
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/ClusterWorkerRef.java
@@ -0,0 +1,19 @@
+package org.skywalking.apm.collector.core.worker;
+
+/**
+ * @author pengys5
+ */
+public class ClusterWorkerRef extends WorkerRef {
+
+ private AbstractClusterWorker clusterWorker;
+
+ public ClusterWorkerRef(Role role, AbstractClusterWorker clusterWorker) {
+ super(role);
+ this.clusterWorker = clusterWorker;
+ }
+
+ @Override
+ public void tell(Object message) throws WorkerInvokeException {
+ clusterWorker.allocateJob(message);
+ }
+}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/ClusterWorkerRefCounter.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/ClusterWorkerRefCounter.java
similarity index 91%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/ClusterWorkerRefCounter.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/ClusterWorkerRefCounter.java
index e495fef03..c82d3953d 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/ClusterWorkerRefCounter.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/ClusterWorkerRefCounter.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/Context.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/Context.java
similarity index 85%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/Context.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/Context.java
index 52d5c5e77..7fdbab6a0 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/Context.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/Context.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
/**
* @author pengys5
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/LocalAsyncWorkerRef.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/LocalAsyncWorkerRef.java
new file mode 100644
index 000000000..84a3000fb
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/LocalAsyncWorkerRef.java
@@ -0,0 +1,21 @@
+package org.skywalking.apm.collector.core.worker;
+
+import org.skywalking.apm.collector.core.queue.QueueEventHandler;
+
+/**
+ * @author pengys5
+ */
+public class LocalAsyncWorkerRef extends WorkerRef {
+
+ private QueueEventHandler queueEventHandler;
+
+ public LocalAsyncWorkerRef(Role role, QueueEventHandler queueEventHandler) {
+ super(role);
+ this.queueEventHandler = queueEventHandler;
+ }
+
+ @Override
+ public void tell(Object message) throws WorkerInvokeException {
+ queueEventHandler.tell(message);
+ }
+}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/LocalSyncWorkerRef.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/LocalSyncWorkerRef.java
similarity index 92%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/LocalSyncWorkerRef.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/LocalSyncWorkerRef.java
index 45562ca1a..9eb502dc8 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/LocalSyncWorkerRef.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/LocalSyncWorkerRef.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
/**
* @author pengys5
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/LocalWorkerContext.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/LocalWorkerContext.java
similarity index 87%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/LocalWorkerContext.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/LocalWorkerContext.java
index cfec772fa..3d70bbb56 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/LocalWorkerContext.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/LocalWorkerContext.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
/**
* @author pengys5
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/LookUp.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/LookUp.java
similarity index 79%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/LookUp.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/LookUp.java
index 082a7ca94..4a94fc2f8 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/LookUp.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/LookUp.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
/**
* @author pengys5
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/Provider.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/Provider.java
similarity index 73%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/Provider.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/Provider.java
index 3f5caf157..d9ccf9769 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/Provider.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/Provider.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
/**
* @author pengys5
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/ProviderNotFoundException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/ProviderNotFoundException.java
similarity index 74%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/ProviderNotFoundException.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/ProviderNotFoundException.java
index 63162d2c0..0f44a778f 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/ProviderNotFoundException.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/ProviderNotFoundException.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
public class ProviderNotFoundException extends Exception {
public ProviderNotFoundException(String message) {
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/Role.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/Role.java
new file mode 100644
index 000000000..8c59ff0ac
--- /dev/null
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/Role.java
@@ -0,0 +1,13 @@
+package org.skywalking.apm.collector.core.worker;
+
+import org.skywalking.apm.collector.core.worker.selector.WorkerSelector;
+
+/**
+ * @author pengys5
+ */
+public interface Role {
+
+ String roleName();
+
+ WorkerSelector workerSelector();
+}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/UsedRoleNameException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/UsedRoleNameException.java
similarity index 73%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/UsedRoleNameException.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/UsedRoleNameException.java
index def2f8b5c..df2629a23 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/UsedRoleNameException.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/UsedRoleNameException.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
public class UsedRoleNameException extends Exception {
public UsedRoleNameException(String message) {
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerContext.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerContext.java
similarity index 96%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerContext.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerContext.java
index 48b44270f..78ff5e231 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerContext.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerContext.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
import java.util.ArrayList;
import java.util.List;
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerException.java
similarity index 87%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerException.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerException.java
index c02527526..b0bd12310 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerException.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerException.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
/**
* Defines a general exception a worker can throw when it
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerInvokeException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerInvokeException.java
similarity index 88%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerInvokeException.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerInvokeException.java
index 021dbec0f..03f5de06f 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerInvokeException.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerInvokeException.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
/**
* This exception is raised when worker fails to process job during "call" or "ask"
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerModuleException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerModuleException.java
deleted file mode 100644
index 339968f61..000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerModuleException.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.skywalking.apm.collector.core.worker;
-
-import org.skywalking.apm.collector.core.module.ModuleException;
-
-/**
- * @author pengys5
- */
-public class WorkerModuleException extends ModuleException {
-
- public WorkerModuleException(String message) {
- super(message);
- }
-
- public WorkerModuleException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerNotFoundException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerNotFoundException.java
similarity index 74%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerNotFoundException.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerNotFoundException.java
index 35db9b5ef..6c6fc9b2c 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerNotFoundException.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerNotFoundException.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
public class WorkerNotFoundException extends WorkerException {
public WorkerNotFoundException(String message) {
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerRef.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerRef.java
similarity index 85%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerRef.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerRef.java
index d38436f17..28268d0b7 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerRef.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerRef.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
/**
* @author pengys5
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerRefs.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerRefs.java
similarity index 78%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerRefs.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerRefs.java
index 1f4d4f55f..8708bec21 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/WorkerRefs.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/WorkerRefs.java
@@ -1,16 +1,16 @@
-package org.skywalking.apm.collector.actor;
+package org.skywalking.apm.collector.core.worker;
import java.util.List;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
+import org.skywalking.apm.collector.core.worker.selector.WorkerSelector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author pengys5
*/
public class WorkerRefs {
- private Logger logger = LogManager.getFormatterLogger(WorkerRefs.class);
+ private final Logger logger = LoggerFactory.getLogger(WorkerRefs.class);
private List workerRefs;
private WorkerSelector workerSelector;
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/selector/AbstractHashMessage.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/AbstractHashMessage.java
similarity index 89%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/selector/AbstractHashMessage.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/AbstractHashMessage.java
index d535e173a..7d13191d9 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/selector/AbstractHashMessage.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/AbstractHashMessage.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor.selector;
+package org.skywalking.apm.collector.core.worker.selector;
/**
* The AbstractHashMessage implementations represent aggregate message,
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/selector/HashCodeSelector.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/HashCodeSelector.java
similarity index 95%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/selector/HashCodeSelector.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/HashCodeSelector.java
index 5323b3727..458ee1a97 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/selector/HashCodeSelector.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/HashCodeSelector.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor.selector;
+package org.skywalking.apm.collector.core.worker.selector;
import org.skywalking.apm.collector.actor.AbstractWorker;
import org.skywalking.apm.collector.actor.WorkerRef;
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/selector/RollingSelector.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/RollingSelector.java
similarity index 94%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/selector/RollingSelector.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/RollingSelector.java
index 6926bb5e0..a7f106b15 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/selector/RollingSelector.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/RollingSelector.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.actor.selector;
+package org.skywalking.apm.collector.core.worker.selector;
import org.skywalking.apm.collector.actor.AbstractWorker;
import org.skywalking.apm.collector.actor.WorkerRef;
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/selector/WorkerSelector.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/WorkerSelector.java
similarity index 74%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/selector/WorkerSelector.java
rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/WorkerSelector.java
index 4c18a4d71..6013ac22e 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/actor/selector/WorkerSelector.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/worker/selector/WorkerSelector.java
@@ -1,9 +1,7 @@
-package org.skywalking.apm.collector.actor.selector;
-
-import org.skywalking.apm.collector.actor.AbstractWorker;
-import org.skywalking.apm.collector.actor.WorkerRef;
+package org.skywalking.apm.collector.core.worker.selector;
import java.util.List;
+import org.skywalking.apm.collector.core.worker.WorkerRef;
/**
* The WorkerSelector should be implemented by any class whose instances
@@ -20,7 +18,7 @@ public interface WorkerSelector {
* select a {@link WorkerRef} from a {@link WorkerRef} list.
*
* @param members given {@link WorkerRef} list, which size is greater than 0;
- * @param message the {@link AbstractWorker} is going to send.
+ * @param message the {@link org.skywalking.apm.collector.core.worker.AbstractWorker} is going to send.
* @return the selected {@link WorkerRef}
*/
T select(List members, Object message);
diff --git a/apm-collector/apm-collector-queue/datacarrier-queue/pom.xml b/apm-collector/apm-collector-discovery/pom.xml
similarity index 79%
rename from apm-collector/apm-collector-queue/datacarrier-queue/pom.xml
rename to apm-collector/apm-collector-discovery/pom.xml
index f6bc40abb..5aba21592 100644
--- a/apm-collector/apm-collector-queue/datacarrier-queue/pom.xml
+++ b/apm-collector/apm-collector-discovery/pom.xml
@@ -3,12 +3,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- apm-collector-queue
+ apm-collector
org.skywalking
3.2-2017
4.0.0
- datacarrier-queue
+ apm-collector-discovery
jar
\ No newline at end of file
diff --git a/apm-collector/apm-collector-discovery/src/main/java/org/skywalking/apm/collector/discovery/DiscoveryJettyModuleDefine.java b/apm-collector/apm-collector-discovery/src/main/java/org/skywalking/apm/collector/discovery/DiscoveryJettyModuleDefine.java
new file mode 100644
index 000000000..3d696fa9e
--- /dev/null
+++ b/apm-collector/apm-collector-discovery/src/main/java/org/skywalking/apm/collector/discovery/DiscoveryJettyModuleDefine.java
@@ -0,0 +1,7 @@
+package org.skywalking.apm.collector.discovery;
+
+/**
+ * @author pengys5
+ */
+public class DiscoveryJettyModuleDefine {
+}
diff --git a/apm-collector/apm-collector-discovery/src/main/resources/META-INF/defines/module.define b/apm-collector/apm-collector-discovery/src/main/resources/META-INF/defines/module.define
new file mode 100644
index 000000000..427dbc6e4
--- /dev/null
+++ b/apm-collector/apm-collector-discovery/src/main/resources/META-INF/defines/module.define
@@ -0,0 +1 @@
+org.skywalking.apm.collector.discovery.DiscoveryJettyModuleDefine
\ No newline at end of file
diff --git a/apm-collector/apm-collector-queue/disruptor-queue/pom.xml b/apm-collector/apm-collector-queue/disruptor-queue/pom.xml
deleted file mode 100644
index e55ae5df0..000000000
--- a/apm-collector/apm-collector-queue/disruptor-queue/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- apm-collector-queue
- org.skywalking
- 3.2-2017
-
- 4.0.0
-
- disruptor-queue
- jar
-
-
-
- com.lmax
- disruptor
- 3.3.6
-
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-queue/pom.xml b/apm-collector/apm-collector-queue/pom.xml
index e403002c9..3aceb5d14 100644
--- a/apm-collector/apm-collector-queue/pom.xml
+++ b/apm-collector/apm-collector-queue/pom.xml
@@ -10,11 +10,7 @@
4.0.0
apm-collector-queue
- pom
-
- disruptor-queue
- datacarrier-queue
-
+ jar
@@ -22,5 +18,10 @@
apm-collector-core
${project.version}
+
+ com.lmax
+ disruptor
+ 3.3.6
+
\ No newline at end of file
diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/DataCarrierCreator.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/DataCarrierCreator.java
new file mode 100644
index 000000000..2402b83f4
--- /dev/null
+++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/DataCarrierCreator.java
@@ -0,0 +1,15 @@
+package org.skywalking.apm.collector.queue.datacarrier;
+
+import org.skywalking.apm.collector.core.queue.Creator;
+import org.skywalking.apm.collector.core.queue.QueueEventHandler;
+import org.skywalking.apm.collector.core.worker.AbstractLocalAsyncWorker;
+
+/**
+ * @author pengys5
+ */
+public class DataCarrierCreator implements Creator {
+
+ @Override public QueueEventHandler create(int queueSize, AbstractLocalAsyncWorker localAsyncWorker) {
+ return null;
+ }
+}
diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/QueueDataCarrierModuleDefine.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/QueueDataCarrierModuleDefine.java
new file mode 100644
index 000000000..1902143e1
--- /dev/null
+++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/datacarrier/QueueDataCarrierModuleDefine.java
@@ -0,0 +1,30 @@
+package org.skywalking.apm.collector.queue.datacarrier;
+
+import java.util.Map;
+import org.skywalking.apm.collector.core.client.ClientException;
+import org.skywalking.apm.collector.core.framework.DefineException;
+import org.skywalking.apm.collector.core.module.ModuleGroup;
+import org.skywalking.apm.collector.core.queue.QueueModuleContext;
+import org.skywalking.apm.collector.core.queue.QueueModuleDefine;
+
+/**
+ * @author pengys5
+ */
+public class QueueDataCarrierModuleDefine extends QueueModuleDefine {
+
+ @Override protected ModuleGroup group() {
+ return ModuleGroup.Queue;
+ }
+
+ @Override public String name() {
+ return "data_carrier";
+ }
+
+ @Override public boolean defaultModule() {
+ return true;
+ }
+
+ @Override public final void initialize(Map config) throws DefineException, ClientException {
+ QueueModuleContext.creator = new DataCarrierCreator();
+ }
+}
diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorCreator.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorCreator.java
new file mode 100644
index 000000000..8be095b26
--- /dev/null
+++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorCreator.java
@@ -0,0 +1,35 @@
+package org.skywalking.apm.collector.queue.disruptor;
+
+import com.lmax.disruptor.RingBuffer;
+import com.lmax.disruptor.dsl.Disruptor;
+import org.skywalking.apm.collector.core.queue.Creator;
+import org.skywalking.apm.collector.core.queue.DaemonThreadFactory;
+import org.skywalking.apm.collector.core.queue.MessageHolder;
+import org.skywalking.apm.collector.core.queue.QueueEventHandler;
+import org.skywalking.apm.collector.core.worker.AbstractLocalAsyncWorker;
+
+/**
+ * @author pengys5
+ */
+public class DisruptorCreator implements Creator {
+
+ public QueueEventHandler create(int queueSize, AbstractLocalAsyncWorker localAsyncWorker) {
+ // Specify the size of the ring buffer, must be power of 2.
+ if (!((((queueSize - 1) & queueSize) == 0) && queueSize != 0)) {
+ throw new IllegalArgumentException("queue size must be power of 2");
+ }
+
+ // Construct the Disruptor
+ Disruptor disruptor = new Disruptor(MessageHolderFactory.INSTANCE, queueSize, DaemonThreadFactory.INSTANCE);
+
+ RingBuffer ringBuffer = disruptor.getRingBuffer();
+ DisruptorEventHandler eventHandler = new DisruptorEventHandler(ringBuffer, localAsyncWorker);
+
+ // Connect the handler
+ disruptor.handleEventsWith(eventHandler);
+
+ // Start the Disruptor, starts all threads running
+ disruptor.start();
+ return eventHandler;
+ }
+}
diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorEventHandler.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorEventHandler.java
new file mode 100644
index 000000000..34090fa08
--- /dev/null
+++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorEventHandler.java
@@ -0,0 +1,63 @@
+package org.skywalking.apm.collector.queue.disruptor;
+
+import com.lmax.disruptor.EventHandler;
+import com.lmax.disruptor.RingBuffer;
+import org.skywalking.apm.collector.core.queue.EndOfBatchCommand;
+import org.skywalking.apm.collector.core.queue.MessageHolder;
+import org.skywalking.apm.collector.core.queue.QueueEventHandler;
+import org.skywalking.apm.collector.core.worker.AbstractLocalAsyncWorker;
+import org.skywalking.apm.collector.core.worker.WorkerException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author pengys5
+ */
+public class DisruptorEventHandler implements EventHandler, QueueEventHandler {
+
+ private final Logger logger = LoggerFactory.getLogger(DisruptorEventHandler.class);
+
+ private RingBuffer ringBuffer;
+ private AbstractLocalAsyncWorker asyncWorker;
+
+ DisruptorEventHandler(RingBuffer ringBuffer, AbstractLocalAsyncWorker asyncWorker) {
+ this.ringBuffer = ringBuffer;
+ this.asyncWorker = asyncWorker;
+ }
+
+ /**
+ * Receive the message from disruptor, when message in disruptor is empty, then send the cached data
+ * to the next workers.
+ *
+ * @param event published to the {@link RingBuffer}
+ * @param sequence of the event being processed
+ * @param endOfBatch flag to indicate if this is the last event in a batch from the {@link RingBuffer}
+ */
+ public void onEvent(MessageHolder event, long sequence, boolean endOfBatch) {
+ try {
+ Object message = event.getMessage();
+ event.reset();
+
+ asyncWorker.allocateJob(message);
+ if (endOfBatch) {
+ asyncWorker.allocateJob(new EndOfBatchCommand());
+ }
+ } catch (WorkerException e) {
+ logger.error(e.getMessage(), e);
+ }
+ }
+
+ /**
+ * Push the message into disruptor ring buffer.
+ *
+ * @param message of the data to process.
+ */
+ public void tell(Object message) {
+ long sequence = ringBuffer.next();
+ try {
+ ringBuffer.get(sequence).setMessage(message);
+ } finally {
+ ringBuffer.publish(sequence);
+ }
+ }
+}
diff --git a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/queue/MessageHolderFactory.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/MessageHolderFactory.java
similarity index 72%
rename from apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/queue/MessageHolderFactory.java
rename to apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/MessageHolderFactory.java
index 867cc5be4..d0cef7ab8 100644
--- a/apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/queue/MessageHolderFactory.java
+++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/MessageHolderFactory.java
@@ -1,6 +1,7 @@
-package org.skywalking.apm.collector.queue;
+package org.skywalking.apm.collector.queue.disruptor;
import com.lmax.disruptor.EventFactory;
+import org.skywalking.apm.collector.core.queue.MessageHolder;
/**
* @author pengys5
diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/QueueDisruptorConfigParser.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/QueueDisruptorConfigParser.java
new file mode 100644
index 000000000..d1e52b4f9
--- /dev/null
+++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/QueueDisruptorConfigParser.java
@@ -0,0 +1,13 @@
+package org.skywalking.apm.collector.queue.disruptor;
+
+import java.util.Map;
+import org.skywalking.apm.collector.core.config.ConfigParseException;
+import org.skywalking.apm.collector.core.module.ModuleConfigParser;
+
+/**
+ * @author pengys5
+ */
+public class QueueDisruptorConfigParser implements ModuleConfigParser {
+ @Override public void parse(Map config) throws ConfigParseException {
+ }
+}
diff --git a/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/QueueDisruptorModuleDefine.java b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/QueueDisruptorModuleDefine.java
new file mode 100644
index 000000000..9b6d48ae0
--- /dev/null
+++ b/apm-collector/apm-collector-queue/src/main/java/org/skywalking/apm/collector/queue/disruptor/QueueDisruptorModuleDefine.java
@@ -0,0 +1,30 @@
+package org.skywalking.apm.collector.queue.disruptor;
+
+import java.util.Map;
+import org.skywalking.apm.collector.core.client.ClientException;
+import org.skywalking.apm.collector.core.framework.DefineException;
+import org.skywalking.apm.collector.core.module.ModuleGroup;
+import org.skywalking.apm.collector.core.queue.QueueModuleContext;
+import org.skywalking.apm.collector.core.queue.QueueModuleDefine;
+
+/**
+ * @author pengys5
+ */
+public class QueueDisruptorModuleDefine extends QueueModuleDefine {
+
+ @Override protected ModuleGroup group() {
+ return ModuleGroup.Queue;
+ }
+
+ @Override public String name() {
+ return "disruptor";
+ }
+
+ @Override public boolean defaultModule() {
+ return true;
+ }
+
+ @Override public final void initialize(Map config) throws DefineException, ClientException {
+ QueueModuleContext.creator = new DisruptorCreator();
+ }
+}
diff --git a/apm-collector/apm-collector-queue/src/main/resources/META-INF/defines/module.define b/apm-collector/apm-collector-queue/src/main/resources/META-INF/defines/module.define
new file mode 100644
index 000000000..bf98f6742
--- /dev/null
+++ b/apm-collector/apm-collector-queue/src/main/resources/META-INF/defines/module.define
@@ -0,0 +1,2 @@
+org.skywalking.apm.collector.queue.disruptor.QueueDisruptorModuleDefine
+org.skywalking.apm.collector.queue.datacarrier.QueueDataCarrierModuleDefine
\ No newline at end of file
diff --git a/apm-collector/apm-collector-remote/pom.xml b/apm-collector/apm-collector-remote/pom.xml
new file mode 100644
index 000000000..8ca0b6141
--- /dev/null
+++ b/apm-collector/apm-collector-remote/pom.xml
@@ -0,0 +1,113 @@
+
+
+
+ apm-collector
+ org.skywalking
+ 3.2-2017
+
+ 4.0.0
+
+ apm-collector-remote
+ jar
+
+
+ UTF-8
+ 1.4.0
+ 4.1.12.Final
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ io.grpc
+ grpc-netty
+ ${grpc.version}
+
+
+ io.netty
+ netty-codec-http2
+
+
+ io.netty
+ netty-handler-proxy
+
+
+
+
+ io.grpc
+ grpc-protobuf
+ ${grpc.version}
+
+
+ io.grpc
+ grpc-stub
+ ${grpc.version}
+
+
+ io.netty
+ netty-codec-http2
+ ${netty.version}
+
+
+ io.netty
+ netty-handler-proxy
+ ${netty.version}
+
+
+
+
+
+
+ kr.motd.maven
+ os-maven-plugin
+ 1.4.1.Final
+
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 2.4.3
+
+ ${project.build.sourceEncoding}
+
+
+
+ org.xolstice.maven.plugins
+ protobuf-maven-plugin
+ 0.5.0
+
+
+ com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
+
+ grpc-java
+ io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}
+
+
+
+
+
+ compile
+ compile-custom
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apm-collector/apm-collector-remote/src/main/java/org/skywalking/apm/collector/remote/grpc/RemoteGRPCModuleDefine.java b/apm-collector/apm-collector-remote/src/main/java/org/skywalking/apm/collector/remote/grpc/RemoteGRPCModuleDefine.java
new file mode 100644
index 000000000..30b74e893
--- /dev/null
+++ b/apm-collector/apm-collector-remote/src/main/java/org/skywalking/apm/collector/remote/grpc/RemoteGRPCModuleDefine.java
@@ -0,0 +1,53 @@
+package org.skywalking.apm.collector.remote.grpc;
+
+import java.util.Map;
+import org.skywalking.apm.collector.core.client.Client;
+import org.skywalking.apm.collector.core.client.ClientException;
+import org.skywalking.apm.collector.core.framework.DataInitializer;
+import org.skywalking.apm.collector.core.framework.DefineException;
+import org.skywalking.apm.collector.core.module.ModuleConfigParser;
+import org.skywalking.apm.collector.core.module.ModuleGroup;
+import org.skywalking.apm.collector.core.module.ModuleRegistration;
+import org.skywalking.apm.collector.core.remote.RemoteModuleDefine;
+import org.skywalking.apm.collector.core.server.Server;
+
+/**
+ * @author pengys5
+ */
+public class RemoteGRPCModuleDefine extends RemoteModuleDefine {
+ @Override protected ModuleGroup group() {
+ return ModuleGroup.Queue;
+ }
+
+ @Override public boolean defaultModule() {
+ return false;
+ }
+
+ @Override protected ModuleConfigParser configParser() {
+ return null;
+ }
+
+ @Override protected Client createClient() {
+ return null;
+ }
+
+ @Override protected Server server() {
+ return null;
+ }
+
+ @Override protected DataInitializer dataInitializer() {
+ return null;
+ }
+
+ @Override protected ModuleRegistration registration() {
+ return null;
+ }
+
+ @Override public void initialize(Map config) throws DefineException, ClientException {
+
+ }
+
+ @Override public String name() {
+ return null;
+ }
+}
diff --git a/apm-collector/apm-collector-remote/src/main/proto/RemoteCommonService.proto b/apm-collector/apm-collector-remote/src/main/proto/RemoteCommonService.proto
new file mode 100644
index 000000000..ae1da50f0
--- /dev/null
+++ b/apm-collector/apm-collector-remote/src/main/proto/RemoteCommonService.proto
@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "org.skywalking.apm.collector.remote.grpc.proto";
+
+service RemoteCommonService {
+ rpc call (Message) returns (Empty) {
+ }
+}
+
+message Message {
+ string workerRole = 1;
+ int32 objectId = 2;
+ bytes objectBytes = 3; // the byte array of data object
+}
+
+message Empty {
+}
\ No newline at end of file
diff --git a/apm-collector/apm-collector-server/google-rpc-server/pom.xml b/apm-collector/apm-collector-server/google-rpc-server/pom.xml
deleted file mode 100644
index 3f3faff1f..000000000
--- a/apm-collector/apm-collector-server/google-rpc-server/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- apm-collector-server
- org.skywalking
- 3.2-2017
-
- 4.0.0
-
- google-rpc-server
- jar
-
-
-
- org.skywalking
- apm-network
- ${project.version}
-
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-server/jetty-server/pom.xml b/apm-collector/apm-collector-server/jetty-server/pom.xml
deleted file mode 100644
index ee78f518e..000000000
--- a/apm-collector/apm-collector-server/jetty-server/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- apm-collector-server
- org.skywalking
- 3.2-2017
-
- 4.0.0
-
- jetty-server
- jar
-
-
- 9.4.2.v20170220
-
-
-
-
- org.eclipse.jetty
- jetty-server
- ${jetty.version}
-
-
- org.eclipse.jetty
- jetty-servlet
- ${jetty.version}
-
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-server/pom.xml b/apm-collector/apm-collector-server/pom.xml
index 52c0f4ac5..449bae0f4 100644
--- a/apm-collector/apm-collector-server/pom.xml
+++ b/apm-collector/apm-collector-server/pom.xml
@@ -10,17 +10,32 @@
4.0.0
apm-collector-server
- pom
-
- google-rpc-server
- jetty-server
-
+ jar
+
+
+ 9.4.2.v20170220
+
+
+ org.skywalking
+ apm-network
+ ${project.version}
+
org.skywalking
apm-collector-core
${project.version}
+
+ org.eclipse.jetty
+ jetty-server
+ ${jetty.version}
+
+
+ org.eclipse.jetty
+ jetty-servlet
+ ${jetty.version}
+
\ No newline at end of file
diff --git a/apm-collector/apm-collector-server/google-rpc-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServer.java b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServer.java
similarity index 100%
rename from apm-collector/apm-collector-server/google-rpc-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServer.java
rename to apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServer.java
diff --git a/apm-collector/apm-collector-server/google-rpc-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServerException.java b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServerException.java
similarity index 100%
rename from apm-collector/apm-collector-server/google-rpc-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServerException.java
rename to apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServerException.java
diff --git a/apm-collector/apm-collector-server/jetty-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServer.java b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServer.java
similarity index 100%
rename from apm-collector/apm-collector-server/jetty-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServer.java
rename to apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServer.java
diff --git a/apm-collector/apm-collector-server/jetty-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServerException.java b/apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServerException.java
similarity index 100%
rename from apm-collector/apm-collector-server/jetty-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServerException.java
rename to apm-collector/apm-collector-server/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServerException.java
diff --git a/apm-collector/apm-collector-worker-new/apm-collector-worker-ui/pom.xml b/apm-collector/apm-collector-ui/pom.xml
similarity index 78%
rename from apm-collector/apm-collector-worker-new/apm-collector-worker-ui/pom.xml
rename to apm-collector/apm-collector-ui/pom.xml
index d3b6cb57e..6ece91dd8 100644
--- a/apm-collector/apm-collector-worker-new/apm-collector-worker-ui/pom.xml
+++ b/apm-collector/apm-collector-ui/pom.xml
@@ -3,12 +3,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- apm-collector-worker-new
+ apm-collector
org.skywalking
3.2-2017
4.0.0
- apm-collector-worker-ui
+ apm-collector-ui
jar
\ No newline at end of file
diff --git a/apm-collector/apm-collector-worker-new/apm-collector-worker-agent/pom.xml b/apm-collector/apm-collector-worker-new/apm-collector-worker-agent/pom.xml
deleted file mode 100644
index 7cb621ec5..000000000
--- a/apm-collector/apm-collector-worker-new/apm-collector-worker-agent/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- apm-collector-worker-new
- org.skywalking
- 3.2-2017
-
- 4.0.0
-
- apm-collector-worker-agent
- jar
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-worker-new/apm-collector-worker-agent/src/main/java/org/skywalking/apm/collector/worker/agent/WorkerAgentConfig.java b/apm-collector/apm-collector-worker-new/apm-collector-worker-agent/src/main/java/org/skywalking/apm/collector/worker/agent/WorkerAgentConfig.java
deleted file mode 100644
index 5acf0b40a..000000000
--- a/apm-collector/apm-collector-worker-new/apm-collector-worker-agent/src/main/java/org/skywalking/apm/collector/worker/agent/WorkerAgentConfig.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.skywalking.apm.collector.worker.agent;
-
-/**
- * @author pengys5
- */
-public class WorkerAgentConfig {
- public static String HOST;
- public static int PORT;
-}
diff --git a/apm-collector/apm-collector-worker-new/apm-collector-worker-agent/src/main/java/org/skywalking/apm/collector/worker/agent/WorkerAgentModuleDefine.java b/apm-collector/apm-collector-worker-new/apm-collector-worker-agent/src/main/java/org/skywalking/apm/collector/worker/agent/WorkerAgentModuleDefine.java
deleted file mode 100644
index f2bf5491a..000000000
--- a/apm-collector/apm-collector-worker-new/apm-collector-worker-agent/src/main/java/org/skywalking/apm/collector/worker/agent/WorkerAgentModuleDefine.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.skywalking.apm.collector.worker.agent;
-
-import org.skywalking.apm.collector.core.module.ModuleConfigParser;
-import org.skywalking.apm.collector.core.module.ModuleGroup;
-import org.skywalking.apm.collector.core.module.ModuleRegistration;
-import org.skywalking.apm.collector.core.server.Server;
-import org.skywalking.apm.collector.core.worker.WorkerModuleDefine;
-import org.skywalking.apm.collector.server.grpc.GRPCServer;
-
-/**
- * @author pengys5
- */
-public class WorkerAgentModuleDefine extends WorkerModuleDefine {
-
- @Override public ModuleGroup group() {
- return ModuleGroup.Worker;
- }
-
- @Override public String name() {
- return "agent";
- }
-
- @Override public boolean defaultModule() {
- return true;
- }
-
- @Override public ModuleConfigParser configParser() {
- return new WorkerAgentConfigParser();
- }
-
- @Override public Server server() {
- return new GRPCServer(WorkerAgentConfig.HOST, WorkerAgentConfig.PORT);
- }
-
- @Override protected ModuleRegistration registration() {
- return new WorkerAgentModuleRegistration();
- }
-}
diff --git a/apm-collector/apm-collector-worker-new/apm-collector-worker-agent/src/main/java/org/skywalking/apm/collector/worker/agent/WorkerAgentModuleRegistration.java b/apm-collector/apm-collector-worker-new/apm-collector-worker-agent/src/main/java/org/skywalking/apm/collector/worker/agent/WorkerAgentModuleRegistration.java
deleted file mode 100644
index 1c4b6bf14..000000000
--- a/apm-collector/apm-collector-worker-new/apm-collector-worker-agent/src/main/java/org/skywalking/apm/collector/worker/agent/WorkerAgentModuleRegistration.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.skywalking.apm.collector.worker.agent;
-
-import org.skywalking.apm.collector.core.module.ModuleRegistration;
-
-/**
- * @author pengys5
- */
-public class WorkerAgentModuleRegistration extends ModuleRegistration {
-
- @Override public Value buildValue() {
- return new Value(WorkerAgentConfig.HOST, WorkerAgentConfig.PORT, null);
- }
-}
diff --git a/apm-collector/apm-collector-worker-new/apm-collector-worker-agent/src/main/resources/META-INF/defines/module.define b/apm-collector/apm-collector-worker-new/apm-collector-worker-agent/src/main/resources/META-INF/defines/module.define
deleted file mode 100644
index adf3437a4..000000000
--- a/apm-collector/apm-collector-worker-new/apm-collector-worker-agent/src/main/resources/META-INF/defines/module.define
+++ /dev/null
@@ -1 +0,0 @@
-org.skywalking.apm.collector.worker.agent.WorkerAgentModuleDefine
\ No newline at end of file
diff --git a/apm-collector/apm-collector-worker-new/apm-collector-worker-impl/pom.xml b/apm-collector/apm-collector-worker-new/apm-collector-worker-impl/pom.xml
deleted file mode 100644
index 6b53ce9f4..000000000
--- a/apm-collector/apm-collector-worker-new/apm-collector-worker-impl/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
- apm-collector-worker-new
- org.skywalking
- 3.2-2017
-
- 4.0.0
-
- apm-collector-worker-impl
- jar
-
-
-
- org.skywalking
- cluster-standalone
- ${project.version}
-
-
- org.skywalking
- cluster-zookeeper
- ${project.version}
-
-
- org.skywalking
- cluster-redis
- ${project.version}
-
-
- org.skywalking
- apm-collector-worker-agent
- ${project.version}
-
-
- org.skywalking
- apm-collector-worker-ui
- ${project.version}
-
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-worker-new/apm-collector-worker-impl/src/main/resources/application.yml b/apm-collector/apm-collector-worker-new/apm-collector-worker-impl/src/main/resources/application.yml
deleted file mode 100644
index 35cb4b000..000000000
--- a/apm-collector/apm-collector-worker-new/apm-collector-worker-impl/src/main/resources/application.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-cluster:
-# zookeeper:
-# hostPort: localhost:2181
-# sessionTimeout: 1000
-# redis:
-# host: localhost
-# port: 6379
-worker:
- ui:
- host: localhost
- port: 12800
-
diff --git a/apm-collector/apm-collector-worker-new/apm-collector-worker-ui/src/main/java/org/skywalking/apm/collector/worker/ui/WorkerUIConfigParser.java b/apm-collector/apm-collector-worker-new/apm-collector-worker-ui/src/main/java/org/skywalking/apm/collector/worker/ui/WorkerUIConfigParser.java
deleted file mode 100644
index 38344125f..000000000
--- a/apm-collector/apm-collector-worker-new/apm-collector-worker-ui/src/main/java/org/skywalking/apm/collector/worker/ui/WorkerUIConfigParser.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.skywalking.apm.collector.worker.ui;
-
-import java.util.Map;
-import org.skywalking.apm.collector.core.config.ConfigParseException;
-import org.skywalking.apm.collector.core.module.ModuleConfigParser;
-import org.skywalking.apm.collector.core.util.StringUtils;
-
-/**
- * @author pengys5
- */
-public class WorkerUIConfigParser implements ModuleConfigParser {
-
- private final String HOST = "host";
- private final String PORT = "port";
- private final String CONTEXT_PATH = "context_path";
-
- @Override public void parse(Map config) throws ConfigParseException {
- if (StringUtils.isEmpty(config.get(HOST))) {
- throw new ConfigParseException("HOST must be require");
- }
- WorkerUIConfig.HOST = (String)config.get(HOST);
-
- if (StringUtils.isEmpty(config.get(PORT))) {
- throw new ConfigParseException("");
- }
- WorkerUIConfig.PORT = (Integer)config.get(PORT);
- WorkerUIConfig.CONTEXT_PATH = "/";
-
- if (!StringUtils.isEmpty(config.get(CONTEXT_PATH))) {
- WorkerUIConfig.CONTEXT_PATH = (String)config.get(CONTEXT_PATH);
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker-new/apm-collector-worker-ui/src/main/java/org/skywalking/apm/collector/worker/ui/WorkerUIModuleDefine.java b/apm-collector/apm-collector-worker-new/apm-collector-worker-ui/src/main/java/org/skywalking/apm/collector/worker/ui/WorkerUIModuleDefine.java
deleted file mode 100644
index 93d39dec6..000000000
--- a/apm-collector/apm-collector-worker-new/apm-collector-worker-ui/src/main/java/org/skywalking/apm/collector/worker/ui/WorkerUIModuleDefine.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.skywalking.apm.collector.worker.ui;
-
-import org.skywalking.apm.collector.core.module.ModuleConfigParser;
-import org.skywalking.apm.collector.core.module.ModuleGroup;
-import org.skywalking.apm.collector.core.module.ModuleRegistration;
-import org.skywalking.apm.collector.core.server.Server;
-import org.skywalking.apm.collector.core.worker.WorkerModuleDefine;
-import org.skywalking.apm.collector.server.jetty.JettyServer;
-
-/**
- * @author pengys5
- */
-public class WorkerUIModuleDefine extends WorkerModuleDefine {
-
- @Override public ModuleGroup group() {
- return ModuleGroup.Worker;
- }
-
- @Override public String name() {
- return "ui";
- }
-
- @Override public boolean defaultModule() {
- return true;
- }
-
- @Override public ModuleConfigParser configParser() {
- return new WorkerUIConfigParser();
- }
-
- @Override public Server server() {
- return new JettyServer(WorkerUIConfig.HOST, WorkerUIConfig.PORT, WorkerUIConfig.CONTEXT_PATH);
- }
-
- @Override protected ModuleRegistration registration() {
- return new WorkerUIModuleRegistration();
- }
-}
diff --git a/apm-collector/apm-collector-worker-new/apm-collector-worker-ui/src/main/java/org/skywalking/apm/collector/worker/ui/WorkerUIModuleRegistration.java b/apm-collector/apm-collector-worker-new/apm-collector-worker-ui/src/main/java/org/skywalking/apm/collector/worker/ui/WorkerUIModuleRegistration.java
deleted file mode 100644
index b9b40adaa..000000000
--- a/apm-collector/apm-collector-worker-new/apm-collector-worker-ui/src/main/java/org/skywalking/apm/collector/worker/ui/WorkerUIModuleRegistration.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.skywalking.apm.collector.worker.ui;
-
-import com.google.gson.JsonObject;
-import org.skywalking.apm.collector.core.module.ModuleRegistration;
-
-/**
- * @author pengys5
- */
-public class WorkerUIModuleRegistration extends ModuleRegistration {
-
- @Override public Value buildValue() {
- JsonObject data = new JsonObject();
- data.addProperty("context_path", WorkerUIConfig.CONTEXT_PATH);
- return new Value(WorkerUIConfig.HOST, WorkerUIConfig.PORT, data);
- }
-}
diff --git a/apm-collector/apm-collector-worker-new/apm-collector-worker-ui/src/main/resources/META-INF/defines/module.define b/apm-collector/apm-collector-worker-new/apm-collector-worker-ui/src/main/resources/META-INF/defines/module.define
deleted file mode 100644
index 4518d0c8b..000000000
--- a/apm-collector/apm-collector-worker-new/apm-collector-worker-ui/src/main/resources/META-INF/defines/module.define
+++ /dev/null
@@ -1 +0,0 @@
-org.skywalking.apm.collector.worker.ui.WorkerUIModuleDefine
\ No newline at end of file
diff --git a/apm-collector/apm-collector-worker/bin/collector-service.bat b/apm-collector/apm-collector-worker/bin/collector-service.bat
deleted file mode 100644
index ab1bef7c2..000000000
--- a/apm-collector/apm-collector-worker/bin/collector-service.bat
+++ /dev/null
@@ -1,23 +0,0 @@
-@echo off
-
-setlocal
-set COLLECOTR_PROCESS_TITLE=Skywalking-Collector
-set COLLECTOR_BASE_PATH=%~dp0%..
-set COLLECTOR_RUNTIME_OPTIONS="-Xms256M -Xmx512M"
-
-set CLASSPATH=%COLLECTOR_BASE_PATH%\config;
-SET CLASSPATH=%COLLECTOR_BASE_PATH%\libs\*;%CLASSPATH%
-
-if defined JAVA_HOME (
- set _EXECJAVA="%JAVA_HOME:"=%"\bin\java
-)
-
-if not defined JAVA_HOME (
- echo "JAVA_HOME not set."
- set _EXECJAVA=java
-)
-
-start /MIN "%COLLECOTR_PROCESS_TITLE%" %_EXECJAVA% "%COLLECTOR_RUNTIME_OPTIONS%" -cp "%CLASSPATH%" org.skywalking.apm.collector.worker.CollectorBootStartUp &
-echo Collector started successfully!
-
-endlocal
diff --git a/apm-collector/apm-collector-worker/bin/collector-service.sh b/apm-collector/apm-collector-worker/bin/collector-service.sh
deleted file mode 100644
index 7b0eef465..000000000
--- a/apm-collector/apm-collector-worker/bin/collector-service.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-
-PRG="$0"
-PRGDIR=`dirname "$PRG"`
-[ -z "$COLLECTOR_HOME" ] && COLLECTOR_HOME=`cd "$PRGDIR/.." >/dev/null; pwd`
-
-COLLECTOR_LOGS_DIR="${COLLECTOR_HOME}/logs"
-JAVA_OPTS=" -Xms256M -Xmx512M"
-
-if [ ! -d "${COLLECTOR_HOME}/logs" ]; then
- mkdir -p "${COLLECTOR_LOGS_DIR}"
-fi
-
-_RUNJAVA=${JAVA_HOME}/bin/java
-[ -z "$JAVA_HOME" ] && _RUNJAVA=`java`
-
-CLASSPATH="$COLLECTOR_HOME/config:$CLASSPATH"
-for i in "$COLLECTOR_HOME"/libs/*.jar
-do
- CLASSPATH="$i:$CLASSPATH"
-done
-
-echo "Starting collector...."
-eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} -classpath $CLASSPATH org.skywalking.apm.collector.worker.CollectorBootStartUp \
- 2>${COLLECTOR_LOGS_DIR}/collector.log 1> /dev/null &"
-
-retval=$?
-pid=$!
-FAIL_MSG="Collector started failure!"
-SUCCESS_MSG="Collector started successfully!"
-[ ${retval} -eq 0 ] || (echo ${FAIL_MSG}; exit ${retval})
-sleep 1
-if ! ps -p ${pid} > /dev/null ; then
- echo ${FAIL_MSG}
- exit 1
-fi
-echo ${SUCCESS_MSG}
diff --git a/apm-collector/apm-collector-worker/bin/startup.bat b/apm-collector/apm-collector-worker/bin/startup.bat
deleted file mode 100644
index d2e3f015f..000000000
--- a/apm-collector/apm-collector-worker/bin/startup.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-
-setlocal
-call "%~dp0"\collector-service.bat start
-endlocal
diff --git a/apm-collector/apm-collector-worker/bin/startup.sh b/apm-collector/apm-collector-worker/bin/startup.sh
deleted file mode 100644
index a5486fb57..000000000
--- a/apm-collector/apm-collector-worker/bin/startup.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-PRG="$0"
-PRGDIR=`dirname "$PRG"`
-EXECUTABLE=collector-service.sh
-
-exec "$PRGDIR"/"$EXECUTABLE" start
diff --git a/apm-collector/apm-collector-worker/docker/Dockerfile b/apm-collector/apm-collector-worker/docker/Dockerfile
deleted file mode 100644
index a69641df8..000000000
--- a/apm-collector/apm-collector-worker/docker/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM openjdk:8-jdk
-
-ENV CLUSTER_CURRENT_HOST_NAME=127.0.0.1 \
- CLUSTER_CURRENT_PORT=1000 \
- CLUSTER_CURRENT_ROLES=WorkersListener \
- CLUSTER_SEED_NODES=127.0.0.1:1000,127.0.0.1:1001 \
- ES_CLUSTER_NAME=CollectorDBCluster \
- ES_CLUSTER_NODES=127.0.0.1:9300 \
- ES_INDEX_SHARDS_NUMBER=2 \
- ES_INDEX_REPLICAS_NUMBER=0 \
- HTTP_HOST_NAME=127.0.0.1 \
- HTTP_PORT=12800
-
-ADD skywalking-collector.tar.gz /usr/local
-COPY startup.sh /usr/local/skywalking-collector/bin
-COPY collector.config /usr/local/skywalking-collector/config
-COPY log4j2.xml /usr/local/skywalking-collector/config
-ADD docker-entrypoint.sh /
-RUN chmod +x /docker-entrypoint.sh && chmod +x /usr/local/skywalking-collector/bin/startup.sh
-
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["/usr/local/skywalking-collector/bin/startup.sh"]
diff --git a/apm-collector/apm-collector-worker/docker/collector.config b/apm-collector/apm-collector-worker/docker/collector.config
deleted file mode 100644
index d0cb0628d..000000000
--- a/apm-collector/apm-collector-worker/docker/collector.config
+++ /dev/null
@@ -1,46 +0,0 @@
-#"hostname" and "port" are used to receive internal messages from other nodes of cluster。
-# Hostname can be either hostname or IP address.
-cluster.current.hostname = {CLUSTER_CURRENT_HOST_NAME}
-# Listening port.
-cluster.current.port = {CLUSTER_CURRENT_PORT}
-
-# In this version, all members have same roles, and everyone of them is listening the status of others.
-#The routers do not send message to nodes, which is unreachable, caused by network trouble, jvm crash or any other reasons.
-cluster.current.roles={CLUSTER_CURRENT_ROLES}
-
-#Initial contact points of the cluster, e.g. seed_nodes = 127.0.0.1:11800, 127.0.0.1:11801.
-#The nodes to join automatically at startup.
-#When setting akka configuration, it will be change.
-#like: ["akka.tcp://system@127.0.0.1:11800", "akka.tcp://system@127.0.0.1:11801"].
-#This is akka configuration, see: http://doc.akka.io/docs/akka/2.4/general/configuration.html
-cluster.seed_nodes={CLUSTER_SEED_NODES}
-
-#elasticsearch configuration, see cluster.name in "config/elasticsearch.yml"
-es.cluster.name = {ES_CLUSTER_NAME}
-es.cluster.transport.sniffer = true
-
-# The elasticsearch nodes of cluster, separated by comma, e.g. nodes=ip:port, ip:port
-es.cluster.nodes={ES_CLUSTER_NODES}
-
-#Initialized mode of elasticsearch index, default is auto.
-#Options: auto, forced, manual
-#auto: create index when it doesn't exist.
-# forced: delete and create.
-# manual: do nothing.
-es.index.initialize.mode=auto
-# Config of shards or replicas in Elasticsearch.
-es.index.shards.number=2
-es.index.replicas.number=0
-
-# "hostname", "port" and "contextPath" are used to provide HTTP RESTful services.
-# RESTful services include "receive segment" and "webui query services".
-http.hostname={HTTP_HOST_NAME}
-http.port={HTTP_PORT}
-# Web context path
-http.contextPath=/
-
-# Cache size of analysis worker. The value determines whether sending to next worker and clear, or not.
-cache.analysis.size=1024
-# Cache size of persistence worker. The value determines whether save data and clear, or not.
-cache.persistence.size=4096
-
diff --git a/apm-collector/apm-collector-worker/docker/docker-entrypoint.sh b/apm-collector/apm-collector-worker/docker/docker-entrypoint.sh
deleted file mode 100644
index f00f5e52d..000000000
--- a/apm-collector/apm-collector-worker/docker/docker-entrypoint.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-echo "replace CLUSTER_CURRENT_HOST_NAME with $CLUSTER_CURRENT_HOST_NAME"
-eval sed -i -e 's/\{CLUSTER_CURRENT_HOST_NAME\}/$CLUSTER_CURRENT_HOST_NAME/' /usr/local/skywalking-collector/config/collector.config
-
-echo "replace CLUSTER_CURRENT_PORT with $CLUSTER_CURRENT_PORT"
-eval sed -i -e 's/\{CLUSTER_CURRENT_PORT\}/$CLUSTER_CURRENT_PORT/' /usr/local/skywalking-collector/config/collector.config
-
-echo "replace CLUSTER_CURRENT_ROLES with $CLUSTER_CURRENT_ROLES"
-eval sed -i -e 's/\{CLUSTER_CURRENT_ROLES\}/$CLUSTER_CURRENT_ROLES/' /usr/local/skywalking-collector/config/collector.config
-
-echo "replace CLUSTER_SEED_NODES with $CLUSTER_SEED_NODES"
-eval sed -i -e 's/\{CLUSTER_SEED_NODES\}/$CLUSTER_SEED_NODES/' /usr/local/skywalking-collector/config/collector.config
-
-echo "replace ES_CLUSTER_NAME with $ES_CLUSTER_NAME"
-eval sed -i -e 's/\{ES_CLUSTER_NAME\}/$ES_CLUSTER_NAME/' /usr/local/skywalking-collector/config/collector.config
-
-echo "replcae ES_CLUSTER_NODES with $ES_CLUSTER_NODES"
-eval sed -i -e 's/\{ES_CLUSTER_NODES\}/$ES_CLUSTER_NODES/' /usr/local/skywalking-collector/config/collector.config
-
-echo "replace HTTP_HOST_NAME with $HTTP_HOST_NAME"
-eval sed -i -e 's/\{HTTP_HOST_NAME\}/$HTTP_HOST_NAME/' /usr/local/skywalking-collector/config/collector.config
-
-echo "replace HTTP_PORT with $HTTP_PORT"
-eval sed -i -e 's/\{HTTP_PORT\}/$HTTP_PORT/' /usr/local/skywalking-collector/config/collector.config
-
-exec "$@"
diff --git a/apm-collector/apm-collector-worker/docker/log4j2.xml b/apm-collector/apm-collector-worker/docker/log4j2.xml
deleted file mode 100644
index 128a7864e..000000000
--- a/apm-collector/apm-collector-worker/docker/log4j2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apm-collector/apm-collector-worker/docker/startup.sh b/apm-collector/apm-collector-worker/docker/startup.sh
deleted file mode 100644
index 634bbbfa0..000000000
--- a/apm-collector/apm-collector-worker/docker/startup.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-PRG="$0"
-PRGDIR=`dirname "$PRG"`
-[ -z "$COLLECTOR_HOME" ] && COLLECTOR_HOME=`cd "$PRGDIR/.." >/dev/null; pwd`
-
-COLLECTOR_LOGS_DIR="${COLLECTOR_HOME}/logs"
-JAVA_OPTS=" -Xms256M -Xmx512M"
-
-if [ ! -d "${COLLECTOR_HOME}/logs" ]; then
- mkdir -p "${COLLECTOR_LOGS_DIR}"
-fi
-
-_RUNJAVA=${JAVA_HOME}/bin/java
-[ -z "$JAVA_HOME" ] && _RUNJAVA=`java`
-
-CLASSPATH="$COLLECTOR_HOME/config:$CLASSPATH"
-for i in "$COLLECTOR_HOME"/libs/*.jar
-do
- CLASSPATH="$i:$CLASSPATH"
-done
-
-echo "Starting collector...."
-$_RUNJAVA ${JAVA_OPTS} -classpath $CLASSPATH org.skywalking.apm.collector.worker.CollectorBootStartUp
diff --git a/apm-collector/apm-collector-worker/pom.xml b/apm-collector/apm-collector-worker/pom.xml
deleted file mode 100644
index d4d90d94b..000000000
--- a/apm-collector/apm-collector-worker/pom.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
- apm-collector
- org.skywalking
- 3.2-2017
-
- 4.0.0
-
- apm-collector-worker
- jar
-
-
- 9.4.2.v20170220
- org.skywalking.apm.collector.worker.CollectorBootStartUp
- skywalking/${artifactId}
- ${version}
-
-
-
-
- org.skywalking
- apm-collector-cluster
- ${project.version}
-
-
- org.skywalking
- apm-network
- ${project.version}
-
-
- org.eclipse.jetty
- jetty-server
- ${jetty.version}
-
-
- org.eclipse.jetty
- jetty-servlet
- ${jetty.version}
-
-
- org.elasticsearch.client
- transport
- 5.4.3
-
-
- org.skywalking
- apm-sniffer-mock
- ${project.version}
- test
-
-
-
-
- skywalking-collector
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 2.3.2
-
-
- *.xml
- *.config
-
-
-
- ${main.class}
-
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
-
-
- assembly
- package
-
- single
-
-
-
- src/main/assembly/assembly.xml
-
-
-
-
-
-
- com.spotify
- docker-maven-plugin
- ${docker.plugin.version}
-
- false
- ${docker.image.name}
-
- ${docker.image.version}
-
- ${project.basedir}/docker
-
-
- /
- ${project.build.directory}
- ${build.finalName}.tar.gz
-
-
-
-
-
-
-
diff --git a/apm-collector/apm-collector-worker/src/main/assembly/assembly.xml b/apm-collector/apm-collector-worker/src/main/assembly/assembly.xml
deleted file mode 100644
index 0f66648d1..000000000
--- a/apm-collector/apm-collector-worker/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
- tar.gz
- zip
-
-
-
- /libs
- runtime
-
-
-
-
- ${project.basedir}/bin
- /bin
-
- *.sh
- *.bat
-
- 0755
-
-
- src/main/resources
-
- collector.config
- log4j2.xml
-
- /config
-
-
- ${project.build.directory}
- /libs
-
- ${build.finalName}.jar
-
-
-
-
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/AnalysisMember.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/AnalysisMember.java
deleted file mode 100644
index af12d97eb..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/AnalysisMember.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import org.skywalking.apm.collector.actor.AbstractLocalAsyncWorker;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.queue.EndOfBatchCommand;
-import org.skywalking.apm.collector.worker.config.CacheSizeConfig;
-
-/**
- * @author pengys5
- */
-public abstract class AnalysisMember extends AbstractLocalAsyncWorker {
-
- AnalysisMember(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- private int messageNum;
-
- public abstract void analyse(Object message);
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- super.preStart();
- }
-
- @Override final public void onWork(Object message) {
- if (message instanceof EndOfBatchCommand) {
- aggregation();
- } else {
- messageNum++;
- analyse(message);
-
- if (messageNum >= CacheSizeConfig.Cache.Analysis.SIZE) {
- aggregation();
- messageNum = 0;
- }
- }
- }
-
- protected abstract void aggregation();
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/CollectorBootStartUp.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/CollectorBootStartUp.java
deleted file mode 100644
index e78075319..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/CollectorBootStartUp.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.CollectorSystem;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.worker.grpcserver.GRPCServer;
-import org.skywalking.apm.collector.worker.httpserver.HttpServer;
-import org.skywalking.apm.collector.worker.storage.EsClient;
-import org.skywalking.apm.collector.worker.storage.IndexCreator;
-import org.skywalking.apm.collector.worker.storage.PersistenceTimer;
-
-/**
- * @author pengys5
- */
-public class CollectorBootStartUp {
- private static final Logger logger = LogManager.getFormatterLogger(CollectorBootStartUp.class);
-
- public static void main(String[] args) throws Exception {
- logger.info("collector system starting....");
- CollectorSystem collectorSystem = new CollectorSystem();
- collectorSystem.boot();
- EsClient.INSTANCE.boot();
- IndexCreator.INSTANCE.create();
- PersistenceTimer.INSTANCE.boot();
- HttpServer.INSTANCE.boot((ClusterWorkerContext) collectorSystem.getClusterContext());
- GRPCServer.INSTANCE.boot((ClusterWorkerContext) collectorSystem.getClusterContext());
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/Const.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/Const.java
deleted file mode 100644
index f984a2131..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/Const.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-/**
- * @author pengys5
- */
-public class Const {
- public static final String ID_SPLIT = "..-..";
- public static final String IDS_SPLIT = "\\.\\.-\\.\\.";
- public static final String PEERS_FRONT_SPLIT = "[";
- public static final String PEERS_BEHIND_SPLIT = "]";
- public static final String USER_CODE = "User";
- public static final String RESULT = "result";
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/JoinAndSplitAnalysisMember.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/JoinAndSplitAnalysisMember.java
deleted file mode 100644
index 6d9f11a3c..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/JoinAndSplitAnalysisMember.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.worker.storage.JoinAndSplitAnalysisData;
-
-/**
- * @author pengys5
- */
-public abstract class JoinAndSplitAnalysisMember extends AnalysisMember {
- private JoinAndSplitAnalysisData joinAndSplitAnalysisData;
-
- public JoinAndSplitAnalysisMember(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- joinAndSplitAnalysisData = new JoinAndSplitAnalysisData();
- }
-
- private JoinAndSplitAnalysisData getJoinAndSplitAnalysisData() {
- return joinAndSplitAnalysisData;
- }
-
- final protected void set(String id, String attributeName, String value) {
- getJoinAndSplitAnalysisData().getOrCreate(id).set(attributeName, value);
- }
-
- @Override final protected void aggregation() {
- getJoinAndSplitAnalysisData().asMap().forEach((key, value) -> {
- try {
- aggWorkRefs().tell(value);
- } catch (WorkerInvokeException e) {
- logger().error(e.getMessage(), e);
- }
- });
- getJoinAndSplitAnalysisData().asMap().clear();
- }
-
- protected abstract WorkerRefs aggWorkRefs();
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/JoinAndSplitPersistenceMember.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/JoinAndSplitPersistenceMember.java
deleted file mode 100644
index 983246d89..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/JoinAndSplitPersistenceMember.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import java.util.List;
-import java.util.Map;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.client.Client;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.worker.storage.EsClient;
-import org.skywalking.apm.collector.worker.storage.JoinAndSplitData;
-import org.skywalking.apm.collector.worker.storage.JoinAndSplitPersistenceData;
-
-/**
- * @author pengys5
- */
-public abstract class JoinAndSplitPersistenceMember extends PersistenceMember {
-
- private Logger logger = LogManager.getFormatterLogger(JoinAndSplitPersistenceMember.class);
-
- protected JoinAndSplitPersistenceMember(Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public JoinAndSplitPersistenceData initializeData() {
- return new JoinAndSplitPersistenceData();
- }
-
- @Override final public void analyse(Object message) {
- if (message instanceof JoinAndSplitData) {
- JoinAndSplitData joinAndSplitData = (JoinAndSplitData)message;
- JoinAndSplitPersistenceData data = getPersistenceData();
- data.hold();
- data.getOrCreate(joinAndSplitData.getId()).merge(joinAndSplitData);
- data.release();
- } else {
- logger.error("unhandled message, message instance must JoinAndSplitData, but is %s", message.getClass().toString());
- }
- }
-
- @Override final protected void prepareIndex(List builderList) {
- Map lastData = getPersistenceData().getLast().asMap();
- extractData(lastData);
-
- Client client = EsClient.INSTANCE.getClient();
- lastData.forEach((key, value) -> {
- IndexRequestBuilder builder = client.prepareIndex(esIndex(), esType(), key).setSource(value.asMap());
- builderList.add(builder);
- });
- lastData.clear();
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/MetricAnalysisMember.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/MetricAnalysisMember.java
deleted file mode 100644
index 67c33bc27..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/MetricAnalysisMember.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.worker.storage.MetricAnalysisData;
-
-/**
- * @author pengys5
- */
-public abstract class MetricAnalysisMember extends AnalysisMember {
- private MetricAnalysisData metricAnalysisData = new MetricAnalysisData();
-
- public MetricAnalysisMember(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- final protected void set(String id, String metricName, Long value) {
- getMetricAnalysisData().getOrCreate(id).set(metricName, value);
- }
-
- private MetricAnalysisData getMetricAnalysisData() {
- return metricAnalysisData;
- }
-
- @Override final protected void aggregation() {
- getMetricAnalysisData().asMap().forEach((key, value) -> {
- try {
- aggWorkRefs().tell(value);
- } catch (Exception e) {
- e.printStackTrace();
- }
- });
- getMetricAnalysisData().asMap().clear();
- }
-
- protected abstract WorkerRefs aggWorkRefs();
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/MetricPersistenceMember.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/MetricPersistenceMember.java
deleted file mode 100644
index 684517531..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/MetricPersistenceMember.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import java.util.List;
-import java.util.Map;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.client.Client;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.worker.storage.EsClient;
-import org.skywalking.apm.collector.worker.storage.MetricData;
-import org.skywalking.apm.collector.worker.storage.MetricPersistenceData;
-
-/**
- * @author pengys5
- */
-public abstract class MetricPersistenceMember extends PersistenceMember {
-
- private Logger logger = LogManager.getFormatterLogger(MetricPersistenceMember.class);
-
- public MetricPersistenceMember(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public MetricPersistenceData initializeData() {
- return new MetricPersistenceData();
- }
-
- @Override final public void analyse(Object message) {
- if (message instanceof MetricData) {
- MetricData metricData = (MetricData)message;
- MetricPersistenceData data = getPersistenceData();
- data.hold();
- data.getOrCreate(metricData.getId()).merge(metricData);
- data.release();
- } else {
- logger.error("unhandled message, message instance must MetricData, but is %s", message.getClass().toString());
- }
- }
-
- @Override final protected void prepareIndex(List builderList) {
- Map lastData = getPersistenceData().getLast().asMap();
- extractData(lastData);
-
- Client client = EsClient.INSTANCE.getClient();
- lastData.forEach((key, value) -> {
- IndexRequestBuilder builder = client.prepareIndex(esIndex(), esType(), key).setSource(value.asMap());
- builderList.add(builder);
- });
- lastData.clear();
- }
-}
\ No newline at end of file
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/PersistenceMember.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/PersistenceMember.java
deleted file mode 100644
index 7d1de9514..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/PersistenceMember.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.action.get.GetResponse;
-import org.elasticsearch.action.get.MultiGetItemResponse;
-import org.elasticsearch.action.get.MultiGetRequestBuilder;
-import org.elasticsearch.action.get.MultiGetResponse;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.client.Client;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.worker.storage.Data;
-import org.skywalking.apm.collector.worker.storage.EsClient;
-import org.skywalking.apm.collector.worker.storage.FlushAndSwitch;
-import org.skywalking.apm.collector.worker.storage.PersistenceData;
-import org.skywalking.apm.collector.worker.storage.Window;
-
-/**
- * @author pengys5
- */
-public abstract class PersistenceMember extends AbstractLocalSyncWorker {
-
- private Logger logger = LogManager.getFormatterLogger(PersistenceMember.class);
-
- public PersistenceMember(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- persistenceData = initializeData();
- }
-
- private T persistenceData;
-
- public abstract T initializeData();
-
- protected T getPersistenceData() {
- return persistenceData;
- }
-
- public abstract String esIndex();
-
- public abstract String esType();
-
- public abstract void analyse(Object message);
-
- @Override final public void preStart() throws ProviderNotFoundException {
-
- }
-
- @Override
- protected void onWork(Object request, Object response) throws WorkerException {
- if (request instanceof FlushAndSwitch) {
- persistenceData.switchPointer();
- while (persistenceData.getLast().isHolding()) {
- try {
- Thread.sleep(10);
- } catch (InterruptedException e) {
- throw new WorkerException(e.getMessage(), e);
- }
- }
-
- if (response instanceof LinkedList) {
- prepareIndex((LinkedList)response);
- } else {
- logger.error("unhandled response, response instance must LinkedList, but is %s", response.getClass().toString());
- }
-
- } else {
- analyse(request);
- }
- }
-
- private MultiGetResponse searchFromEs(Map dataMap) {
- Client client = EsClient.INSTANCE.getClient();
- MultiGetRequestBuilder multiGetRequestBuilder = client.prepareMultiGet();
-
- HasDataFlag flag = new HasDataFlag();
- dataMap.forEach((key, value) -> {
- multiGetRequestBuilder.add(esIndex(), esType(), value.getId());
- flag.doTagHasData();
- });
-
- if (flag.isHasData()) {
- return multiGetRequestBuilder.get();
- } else {
- return null;
- }
- }
-
- final void extractData(Map dataMap) {
- MultiGetResponse multiGetResponse = searchFromEs(dataMap);
- if (multiGetResponse != null) {
- for (MultiGetItemResponse itemResponse : multiGetResponse) {
- GetResponse response = itemResponse.getResponse();
- if (response != null && response.isExists()) {
- if (dataMap.containsKey(response.getId())) {
- dataMap.get(response.getId()).merge(response.getSource());
- }
- }
- }
- }
- }
-
- protected abstract void prepareIndex(List builderList);
-
- class HasDataFlag {
- private boolean hasData;
-
- HasDataFlag() {
- hasData = false;
- }
-
- boolean isHasData() {
- return hasData;
- }
-
- void doTagHasData() {
- this.hasData = true;
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/RecordAnalysisMember.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/RecordAnalysisMember.java
deleted file mode 100644
index 072572d86..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/RecordAnalysisMember.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import com.google.gson.JsonObject;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.worker.storage.RecordAnalysisData;
-
-/**
- * @author pengys5
- */
-public abstract class RecordAnalysisMember extends AnalysisMember {
-
- private Logger logger = LogManager.getFormatterLogger(RecordAnalysisMember.class);
-
- private RecordAnalysisData recordAnalysisData = new RecordAnalysisData();
-
- public RecordAnalysisMember(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- final public void set(String id, JsonObject record) {
- getRecordAnalysisData().getOrCreate(id).set(record);
- }
-
- private RecordAnalysisData getRecordAnalysisData() {
- return recordAnalysisData;
- }
-
- @Override final protected void aggregation() {
- getRecordAnalysisData().asMap().forEach((key, value) -> {
- try {
- aggWorkRefs().tell(value);
- } catch (WorkerInvokeException e) {
- logger.error(e.getMessage(), e);
- }
- });
- getRecordAnalysisData().asMap().clear();
- }
-
- protected abstract WorkerRefs aggWorkRefs();
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/RecordPersistenceMember.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/RecordPersistenceMember.java
deleted file mode 100644
index b27003251..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/RecordPersistenceMember.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import java.util.List;
-import java.util.Map;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.client.Client;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.worker.storage.EsClient;
-import org.skywalking.apm.collector.worker.storage.RecordData;
-import org.skywalking.apm.collector.worker.storage.RecordPersistenceData;
-
-/**
- * @author pengys5
- */
-public abstract class RecordPersistenceMember extends PersistenceMember {
-
- public RecordPersistenceMember(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override final public RecordPersistenceData initializeData() {
- return new RecordPersistenceData();
- }
-
- @Override
- public void analyse(Object message) {
- if (message instanceof RecordData) {
- RecordData recordData = (RecordData)message;
- logger().debug("set: id: %s, data: %s", recordData.getId(), recordData.get());
- RecordPersistenceData data = getPersistenceData();
- data.hold();
- data.getOrCreate(recordData.getId()).set(recordData.get());
- data.release();
- } else {
- logger().error("message unhandled");
- }
- }
-
- @Override final protected void prepareIndex(List builderList) {
- Map lastData = getPersistenceData().getLast().asMap();
- extractData(lastData);
-
- Client client = EsClient.INSTANCE.getClient();
- lastData.forEach((key, value) -> {
- IndexRequestBuilder builder = client.prepareIndex(esIndex(), esType(), key).setSource(value.get().toString());
- builderList.add(builder);
- });
- lastData.clear();
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/TimeSlice.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/TimeSlice.java
deleted file mode 100644
index e1fed1ab5..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/TimeSlice.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-/**
- * @author pengys5
- */
-public abstract class TimeSlice {
- private String sliceType;
- private long startTime;
- private long endTime;
-
- public TimeSlice(String sliceType, long startTime, long endTime) {
- this.startTime = startTime;
- this.endTime = endTime;
- this.sliceType = sliceType;
- }
-
- public String getSliceType() {
- return sliceType;
- }
-
- public long getStartTime() {
- return startTime;
- }
-
- public long getEndTime() {
- return endTime;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/CacheSizeConfig.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/CacheSizeConfig.java
deleted file mode 100644
index c682905b0..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/CacheSizeConfig.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.skywalking.apm.collector.worker.config;
-
-/**
- * @author pengys5
- */
-public class CacheSizeConfig {
-
- public static class Cache {
- public static class Analysis {
- public static int SIZE = 1024;
- }
-
- public static class Persistence {
- public static int SIZE = 5000;
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/CacheSizeConfigProvider.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/CacheSizeConfigProvider.java
deleted file mode 100644
index 4c9b0f411..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/CacheSizeConfigProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.skywalking.apm.collector.worker.config;
-
-import org.skywalking.apm.collector.config.ConfigProvider;
-
-/**
- * @author pengys5
- */
-public class CacheSizeConfigProvider implements ConfigProvider {
-
- @Override
- public Class configClass() {
- return CacheSizeConfig.class;
- }
-
- @Override
- public void cliArgs() {
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/EsConfig.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/EsConfig.java
deleted file mode 100644
index 6025d16ec..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/EsConfig.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.skywalking.apm.collector.worker.config;
-
-/**
- * @author pengys5
- */
-public class EsConfig {
-
- public static class Es {
- public static class Cluster {
- public static String NAME = "";
- public static String NODES = "";
-
- public static class Transport {
- public static String SNIFFER = "";
- }
- }
-
- public static class Persistence {
- public static class Timer {
- public static Integer VALUE = 3;
- }
- }
-
- public static class Index {
-
- public static class Initialize {
- public static IndexInitMode MODE;
- }
-
- public static class Shards {
- public static String NUMBER = "";
- }
-
- public static class Replicas {
- public static String NUMBER = "";
- }
-
- public static class RefreshInterval {
- public static class GlobalTraceIndex {
- public static Integer VALUE = 1;
- }
-
- public static class NodeCompIndex {
- public static Integer VALUE = 1;
- }
-
- public static class NodeMappingIndex {
- public static Integer VALUE = 1;
- }
-
- public static class NodeRefIndex {
- public static Integer VALUE = 1;
- }
-
- public static class NodeRefResSumIndex {
- public static Integer VALUE = 1;
- }
-
- public static class SegmentCostIndex {
- public static Integer VALUE = 10;
- }
-
- public static class SegmentExceptionIndex {
- public static Integer VALUE = 10;
- }
-
- public static class SegmentIndex {
- public static Integer VALUE = 10;
- }
- }
- }
- }
-
- public enum IndexInitMode {
- AUTO,
- FORCED,
- MANUAL
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/EsConfigProvider.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/EsConfigProvider.java
deleted file mode 100644
index 47e1f150e..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/EsConfigProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.skywalking.apm.collector.worker.config;
-
-import org.skywalking.apm.util.StringUtil;
-import org.skywalking.apm.collector.config.ConfigProvider;
-
-/**
- * @author pengys5
- */
-public class EsConfigProvider implements ConfigProvider {
-
- @Override
- public Class configClass() {
- return EsConfig.class;
- }
-
- @Override
- public void cliArgs() {
- if (!StringUtil.isEmpty(System.getProperty("es.cluster.NAME"))) {
- EsConfig.Es.Cluster.NAME = System.getProperty("es.cluster.NAME");
- }
- if (!StringUtil.isEmpty(System.getProperty("es.cluster.NODES"))) {
- EsConfig.Es.Cluster.NODES = System.getProperty("es.cluster.NODES");
- }
- if (!StringUtil.isEmpty(System.getProperty("es.cluster.transport.SNIFFER"))) {
- EsConfig.Es.Cluster.Transport.SNIFFER = System.getProperty("es.cluster.transport.SNIFFER");
- }
-
- if (!StringUtil.isEmpty(System.getProperty("es.index.shards.NUMBER"))) {
- EsConfig.Es.Index.Shards.NUMBER = System.getProperty("es.index.shards.NUMBER");
- }
- if (!StringUtil.isEmpty(System.getProperty("es.index.replicas.NUMBER"))) {
- EsConfig.Es.Index.Replicas.NUMBER = System.getProperty("es.index.replicas.NUMBER");
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/GRPCConfig.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/GRPCConfig.java
deleted file mode 100644
index 55133999e..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/GRPCConfig.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.skywalking.apm.collector.worker.config;
-
-/**
- * @author pengys5
- */
-public class GRPCConfig {
-
- public static class GRPC {
- public static String HOSTNAME = "";
- public static String PORT = "";
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/GRPCConfigProvider.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/GRPCConfigProvider.java
deleted file mode 100644
index 5b59f21c1..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/GRPCConfigProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.skywalking.apm.collector.worker.config;
-
-import org.skywalking.apm.collector.config.ConfigProvider;
-import org.skywalking.apm.util.StringUtil;
-
-/**
- * @author pengys5
- */
-public class GRPCConfigProvider implements ConfigProvider {
-
- @Override public Class configClass() {
- return GRPCConfig.class;
- }
-
- @Override public void cliArgs() {
- if (!StringUtil.isEmpty(System.getProperty("grpc.HOSTNAME"))) {
- GRPCConfig.GRPC.HOSTNAME = System.getProperty("grpc.HOSTNAME");
- }
- if (!StringUtil.isEmpty(System.getProperty("grpc.PORT"))) {
- GRPCConfig.GRPC.PORT = System.getProperty("grpc.PORT");
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/HttpConfig.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/HttpConfig.java
deleted file mode 100644
index dce2ea0a6..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/HttpConfig.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.skywalking.apm.collector.worker.config;
-
-/**
- * @author pengys5
- */
-public class HttpConfig {
-
- public static class Http {
- public static String HOSTNAME = "";
- public static String PORT = "";
- public static String CONTEXTPATH = "";
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/HttpConfigProvider.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/HttpConfigProvider.java
deleted file mode 100644
index 1bf719bc1..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/HttpConfigProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.skywalking.apm.collector.worker.config;
-
-import org.skywalking.apm.util.StringUtil;
-import org.skywalking.apm.collector.config.ConfigProvider;
-
-/**
- * @author pengys5
- */
-public class HttpConfigProvider implements ConfigProvider {
-
- @Override
- public Class configClass() {
- return HttpConfig.class;
- }
-
- @Override
- public void cliArgs() {
- if (!StringUtil.isEmpty(System.getProperty("http.HOSTNAME"))) {
- HttpConfig.Http.HOSTNAME = System.getProperty("http.HOSTNAME");
- }
- if (!StringUtil.isEmpty(System.getProperty("http.PORT"))) {
- HttpConfig.Http.PORT = System.getProperty("http.PORT");
- }
- if (!StringUtil.isEmpty(System.getProperty("http.CONTEXTPATH"))) {
- HttpConfig.Http.CONTEXTPATH = System.getProperty("http.CONTEXTPATH");
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/WorkerConfig.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/WorkerConfig.java
deleted file mode 100644
index 95d4e1fdb..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/WorkerConfig.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.skywalking.apm.collector.worker.config;
-
-/**
- * @author pengys5
- */
-public class WorkerConfig {
-
- public static class WorkerNum {
- public static class GRPC {
- public static class GRPCAddressRegister {
- public static int VALUE = 1;
- }
- }
-
- public static class Node {
- public static class NodeCompAgg {
- public static int VALUE = 2;
- }
-
- public static class NodeMappingDayAgg {
- public static int VALUE = 2;
- }
-
- public static class NodeMappingHourAgg {
- public static int VALUE = 2;
- }
-
- public static class NodeMappingMinuteAgg {
- public static int VALUE = 2;
- }
- }
-
- public static class NodeRef {
- public static class NodeRefDayAgg {
- public static int VALUE = 2;
- }
-
- public static class NodeRefHourAgg {
- public static int VALUE = 2;
- }
-
- public static class NodeRefMinuteAgg {
- public static int VALUE = 2;
- }
-
- public static class NodeRefResSumDayAgg {
- public static int VALUE = 2;
- }
-
- public static class NodeRefResSumHourAgg {
- public static int VALUE = 2;
- }
-
- public static class NodeRefResSumMinuteAgg {
- public static int VALUE = 2;
- }
- }
-
- public static class GlobalTrace {
- public static class GlobalTraceAgg {
- public static int VALUE = 2;
- }
- }
- }
-
- public static class Queue {
- public static class GlobalTrace {
- public static class GlobalTraceAnalysis {
- public static int SIZE = 1024;
- }
- }
-
- public static class Segment {
- public static class SegmentAnalysis {
- public static int SIZE = 1024;
- }
-
- public static class SegmentCostAnalysis {
- public static int SIZE = 4096;
- }
-
- public static class SegmentExceptionAnalysis {
- public static int SIZE = 4096;
- }
- }
-
- public static class Node {
- public static class NodeCompAnalysis {
- public static int SIZE = 1024;
- }
-
- public static class NodeMappingDayAnalysis {
- public static int SIZE = 1024;
- }
-
- public static class NodeMappingHourAnalysis {
- public static int SIZE = 1024;
- }
-
- public static class NodeMappingMinuteAnalysis {
- public static int SIZE = 1024;
- }
- }
-
- public static class NodeRef {
- public static class NodeRefDayAnalysis {
- public static int SIZE = 1024;
- }
-
- public static class NodeRefHourAnalysis {
- public static int SIZE = 1024;
- }
-
- public static class NodeRefMinuteAnalysis {
- public static int SIZE = 1024;
- }
-
- public static class NodeRefResSumDayAnalysis {
- public static int SIZE = 1024;
- }
-
- public static class NodeRefResSumHourAnalysis {
- public static int SIZE = 1024;
- }
-
- public static class NodeRefResSumMinuteAnalysis {
- public static int SIZE = 1024;
- }
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/WorkerConfigProvider.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/WorkerConfigProvider.java
deleted file mode 100644
index a317b8c8c..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/config/WorkerConfigProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.skywalking.apm.collector.worker.config;
-
-import org.skywalking.apm.collector.config.ConfigProvider;
-
-/**
- * @author pengys5
- */
-public class WorkerConfigProvider implements ConfigProvider {
-
- @Override
- public Class configClass() {
- return WorkerConfig.class;
- }
-
- @Override
- public void cliArgs() {
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/discovery/InstanceDiscoveryServiceImpl.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/discovery/InstanceDiscoveryServiceImpl.java
deleted file mode 100644
index 64d8ecd2f..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/discovery/InstanceDiscoveryServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.skywalking.apm.collector.worker.discovery;
-
-import io.grpc.stub.StreamObserver;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.worker.grpcserver.WorkerCaller;
-import org.skywalking.apm.network.proto.ApplicationInstance;
-import org.skywalking.apm.network.proto.ApplicationInstanceMapping;
-import org.skywalking.apm.network.proto.Downstream;
-import org.skywalking.apm.network.proto.InstanceDiscoveryServiceGrpc;
-
-/**
- * @author pengys5
- */
-public class InstanceDiscoveryServiceImpl extends InstanceDiscoveryServiceGrpc.InstanceDiscoveryServiceImplBase implements WorkerCaller {
-
- @Override public void preStart() throws ProviderNotFoundException {
- }
-
- @Override public void inject(ClusterWorkerContext clusterWorkerContext) {
- }
-
- @Override
- public void register(ApplicationInstance request, StreamObserver responseObserver) {
- super.register(request, responseObserver);
- }
-
- @Override
- public void registerRecover(ApplicationInstanceMapping request, StreamObserver responseObserver) {
- super.registerRecover(request, responseObserver);
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/discovery/ServiceNameDisCoveryServiceImpl.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/discovery/ServiceNameDisCoveryServiceImpl.java
deleted file mode 100644
index 3e8d96ba4..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/discovery/ServiceNameDisCoveryServiceImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.skywalking.apm.collector.worker.discovery;
-
-import io.grpc.stub.StreamObserver;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.worker.grpcserver.WorkerCaller;
-import org.skywalking.apm.network.proto.ServiceNameCollection;
-import org.skywalking.apm.network.proto.ServiceNameDiscoveryServiceGrpc;
-import org.skywalking.apm.network.proto.ServiceNameMappingCollection;
-
-/**
- * @author pengys5
- */
-public class ServiceNameDisCoveryServiceImpl extends ServiceNameDiscoveryServiceGrpc.ServiceNameDiscoveryServiceImplBase implements WorkerCaller {
- @Override public void preStart() throws ProviderNotFoundException {
- }
-
- @Override public void inject(ClusterWorkerContext clusterWorkerContext) {
- }
-
- @Override public void discovery(ServiceNameCollection request,
- StreamObserver responseObserver) {
- super.discovery(request, responseObserver);
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/GlobalTraceGetWithGlobalId.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/GlobalTraceGetWithGlobalId.java
deleted file mode 100644
index 3c13ec3c3..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/GlobalTraceGetWithGlobalId.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.skywalking.apm.collector.worker.globaltrace;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import java.util.Arrays;
-import java.util.Map;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.globaltrace.persistence.GlobalTraceSearchWithGlobalId;
-import org.skywalking.apm.collector.worker.httpserver.AbstractGet;
-import org.skywalking.apm.collector.worker.httpserver.AbstractGetProvider;
-import org.skywalking.apm.collector.worker.httpserver.ArgumentsParseException;
-import org.skywalking.apm.collector.worker.tools.ParameterTools;
-
-/**
- * @author pengys5
- */
-public class GlobalTraceGetWithGlobalId extends AbstractGet {
-
- private Logger logger = LogManager.getFormatterLogger(GlobalTraceGetWithGlobalId.class);
-
- GlobalTraceGetWithGlobalId(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override protected Class responseClass() {
- return JsonObject.class;
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(GlobalTraceSearchWithGlobalId.WorkerRole.INSTANCE).create(this);
- }
-
- @Override protected void onReceive(Map parameter,
- JsonElement response) throws ArgumentsParseException, WorkerInvokeException, WorkerNotFoundException {
- if (!parameter.containsKey("globalId")) {
- throw new IllegalArgumentException("the request parameter must contains globalId");
- }
-
- if (logger.isDebugEnabled()) {
- logger.debug("globalId: %s", Arrays.toString(parameter.get("globalId")));
- }
-
- String globalId = ParameterTools.INSTANCE.toString(parameter, "globalId");
-
- getSelfContext().lookup(GlobalTraceSearchWithGlobalId.WorkerRole.INSTANCE).ask(globalId, response);
- }
-
- public static class Factory extends AbstractGetProvider {
- @Override
- public Role role() {
- return WorkerRole.INSTANCE;
- }
-
- @Override
- public GlobalTraceGetWithGlobalId workerInstance(ClusterWorkerContext clusterContext) {
- return new GlobalTraceGetWithGlobalId(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public String servletPath() {
- return "/globalTrace/globalId";
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return GlobalTraceGetWithGlobalId.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/GlobalTraceIndex.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/GlobalTraceIndex.java
deleted file mode 100644
index b3775c441..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/GlobalTraceIndex.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.skywalking.apm.collector.worker.globaltrace;
-
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.skywalking.apm.collector.worker.config.EsConfig;
-import org.skywalking.apm.collector.worker.storage.AbstractIndex;
-
-import java.io.IOException;
-
-/**
- * @author pengys5
- */
-public class GlobalTraceIndex extends AbstractIndex {
-
- public static final String INDEX = "global_trace_idx";
- public static final String SUB_SEG_IDS = "subSegIds";
-
- @Override
- public String index() {
- return INDEX;
- }
-
- @Override
- public boolean isRecord() {
- return true;
- }
-
- @Override
- public int refreshInterval() {
- return EsConfig.Es.Index.RefreshInterval.GlobalTraceIndex.VALUE;
- }
-
- @Override
- public XContentBuilder createMappingBuilder() throws IOException {
- XContentBuilder mappingBuilder = XContentFactory.jsonBuilder()
- .startObject()
- .startObject("properties")
- .startObject(SUB_SEG_IDS)
- .field("type", "keyword")
- .endObject()
- .endObject()
- .endObject();
- return mappingBuilder;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/analysis/GlobalTraceAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/analysis/GlobalTraceAnalysis.java
deleted file mode 100644
index c3ee83e28..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/analysis/GlobalTraceAnalysis.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.skywalking.apm.collector.worker.globaltrace.analysis;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.JoinAndSplitAnalysisMember;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.globaltrace.GlobalTraceIndex;
-import org.skywalking.apm.collector.worker.globaltrace.persistence.GlobalTraceAgg;
-import org.skywalking.apm.collector.worker.segment.SegmentReceiver;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-
-/**
- * @author pengys5
- */
-public class GlobalTraceAnalysis extends JoinAndSplitAnalysisMember {
-
- private Logger logger = LogManager.getFormatterLogger(GlobalTraceAnalysis.class);
-
- GlobalTraceAnalysis(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void analyse(Object message) {
- if (message instanceof SegmentReceiver.SegmentWithTimeSlice) {
- SegmentReceiver.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentReceiver.SegmentWithTimeSlice)message;
- TraceSegmentObject segment = segmentWithTimeSlice.getSegment();
- String subSegmentId = segment.getTraceSegmentId();
-
- segmentWithTimeSlice.getGlobalTraceIds().forEach(globalTraceId -> {
- set(globalTraceId, GlobalTraceIndex.SUB_SEG_IDS, subSegmentId);
- });
- } else {
- logger.error("unhandled message, message instance must SegmentReceiver.SegmentWithTimeSlice, but is %s", message.getClass().toString());
- }
- }
-
- @Override
- protected WorkerRefs aggWorkRefs() {
- try {
- return getClusterContext().lookup(GlobalTraceAgg.Role.INSTANCE);
- } catch (WorkerNotFoundException e) {
- logger.error("The role of %s worker not found", GlobalTraceAgg.Role.INSTANCE.roleName());
- }
- return null;
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public GlobalTraceAnalysis workerInstance(ClusterWorkerContext clusterContext) {
- return new GlobalTraceAnalysis(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int queueSize() {
- return WorkerConfig.Queue.GlobalTrace.GlobalTraceAnalysis.SIZE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return GlobalTraceAnalysis.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/persistence/GlobalTraceAgg.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/persistence/GlobalTraceAgg.java
deleted file mode 100644
index 3b519dbeb..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/persistence/GlobalTraceAgg.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.skywalking.apm.collector.worker.globaltrace.persistence;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.*;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.storage.JoinAndSplitData;
-
-/**
- * @author pengys5
- */
-public class GlobalTraceAgg extends AbstractClusterWorker {
-
- private Logger logger = LogManager.getFormatterLogger(GlobalTraceAgg.class);
-
- GlobalTraceAgg(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(GlobalTraceSave.Role.INSTANCE).create(this);
- }
-
- @Override
- protected void onWork(Object message) throws WorkerException {
- if (message instanceof JoinAndSplitData) {
- getSelfContext().lookup(GlobalTraceSave.Role.INSTANCE).tell(message);
- } else {
- logger.error("unhandled message, message instance must JoinAndSplitData, but is %s", message.getClass().toString());
- }
- }
-
- public static class Factory extends AbstractClusterWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public GlobalTraceAgg workerInstance(ClusterWorkerContext clusterContext) {
- return new GlobalTraceAgg(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int workerNum() {
- return WorkerConfig.WorkerNum.GlobalTrace.GlobalTraceAgg.VALUE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return GlobalTraceAgg.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/persistence/GlobalTraceSave.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/persistence/GlobalTraceSave.java
deleted file mode 100644
index c7f923235..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/persistence/GlobalTraceSave.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.skywalking.apm.collector.worker.globaltrace.persistence;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.JoinAndSplitPersistenceMember;
-import org.skywalking.apm.collector.worker.globaltrace.GlobalTraceIndex;
-import org.skywalking.apm.collector.worker.storage.PersistenceWorkerListener;
-
-/**
- * @author pengys5
- */
-public class GlobalTraceSave extends JoinAndSplitPersistenceMember {
-
- GlobalTraceSave(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public String esIndex() {
- return GlobalTraceIndex.INDEX;
- }
-
- @Override
- public String esType() {
- return GlobalTraceIndex.TYPE_RECORD;
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public GlobalTraceSave workerInstance(ClusterWorkerContext clusterContext) {
- GlobalTraceSave worker = new GlobalTraceSave(role(), clusterContext, new LocalWorkerContext());
- PersistenceWorkerListener.INSTANCE.register(worker);
- return worker;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return GlobalTraceSave.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalId.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalId.java
deleted file mode 100644
index ee76a8925..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalId.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package org.skywalking.apm.collector.worker.globaltrace.persistence;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.action.get.GetResponse;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.globaltrace.GlobalTraceIndex;
-import org.skywalking.apm.collector.worker.segment.SegmentIndex;
-import org.skywalking.apm.collector.worker.segment.entity.SegmentDeserialize;
-import org.skywalking.apm.collector.worker.segment.entity.SpanView;
-import org.skywalking.apm.collector.worker.storage.GetResponseFromEs;
-import org.skywalking.apm.collector.worker.storage.JoinAndSplitData;
-import org.skywalking.apm.collector.worker.tools.CollectionTools;
-import org.skywalking.apm.network.proto.SpanObject;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-import org.skywalking.apm.network.proto.TraceSegmentReference;
-import org.skywalking.apm.util.StringUtil;
-
-/**
- * @author pengys5
- */
-public class GlobalTraceSearchWithGlobalId extends AbstractLocalSyncWorker {
-
- private Logger logger = LogManager.getFormatterLogger(this.getClass());
-
- private Gson gson = new Gson();
-
- public GlobalTraceSearchWithGlobalId(Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- protected void onWork(Object request, Object response) throws WorkerException {
- if (request instanceof String) {
- String globalId = (String)request;
- String globalTraceData = GetResponseFromEs.INSTANCE.get(GlobalTraceIndex.INDEX, GlobalTraceIndex.TYPE_RECORD, globalId).getSourceAsString();
- JsonObject globalTraceObj = gson.fromJson(globalTraceData, JsonObject.class);
- logger.debug("globalTraceObj: %s", globalTraceObj);
-
- String subSegIdsStr = globalTraceObj.get(GlobalTraceIndex.SUB_SEG_IDS).getAsString();
- String[] subSegIds = subSegIdsStr.split(JoinAndSplitData.SPLIT);
-
- List spanViewList = new ArrayList<>();
- for (String subSegId : subSegIds) {
- logger.debug("subSegId: %s", subSegId);
- GetResponse getResponse = GetResponseFromEs.INSTANCE.get(SegmentIndex.INDEX, SegmentIndex.TYPE_RECORD, subSegId);
- String segmentObjBlob = (String)getResponse.getSource().get(SegmentIndex.SEGMENT_OBJ_BLOB);
-
- TraceSegmentObject segment = SegmentDeserialize.INSTANCE.deserializeSingle(segmentObjBlob);
- String segmentId = segment.getTraceSegmentId();
- List refsList = segment.getRefsList();
-
- for (SpanObject span : segment.getSpansList()) {
- logger.debug(span.getOperationName());
- spansDataBuild(span, segment.getTraceSegmentId(), segmentId, spanViewList, refsList);
- }
- }
-
- JsonObject responseObj = (JsonObject)response;
- responseObj.addProperty("result", buildTree(spanViewList));
- } else {
- logger.error("unhandled message, message instance must String, but is %s", request.getClass().toString());
- }
- }
-
- private String buildTree(List spanViewList) {
- SpanView rootSpan = findRoot(spanViewList);
- assert rootSpan != null;
- findChild(rootSpan, spanViewList, rootSpan.getStartTime());
-
- List viewList = new ArrayList<>();
- viewList.add(rootSpan);
-
- Gson gson = new Gson();
- return gson.toJson(viewList);
- }
-
- private SpanView findRoot(List spanViewList) {
- for (SpanView spanView : spanViewList) {
- if (StringUtil.isEmpty(spanView.getParentSpanSegId())) {
- spanView.setRelativeStartTime(0);
- spanView.setParentSpanSegId("-1");
- return spanView;
- }
- }
- return null;
- }
-
- private void findChild(SpanView parentSpan, List spanViewList, long rootStartTime) {
- String spanSegId = parentSpan.getSpanSegId();
- logger.debug("findChild spanSegId: %s", spanSegId);
-
- List childSpanSort = sortChildSpan(spanViewList, spanSegId);
- for (SpanView spanView : childSpanSort) {
- spanView.setRelativeStartTime(spanView.getStartTime() - rootStartTime);
- parentSpan.addChild(spanView);
- findChild(spanView, spanViewList, rootStartTime);
- }
- }
-
- private List sortChildSpan(List spanViewList, String parentSpanId) {
- List tempList = new ArrayList<>();
-
- for (SpanView spanView : spanViewList) {
- if (parentSpanId.equals(spanView.getParentSpanSegId())) {
- tempList.add(spanView);
- }
- }
-
- Collections.sort(tempList);
- return tempList;
- }
-
- private void spansDataBuild(SpanObject span, String appCode, String segmentId, List spanViewList,
- List refsList) {
- int spanId = span.getSpanId();
- String spanSegId = segmentId + "--" + String.valueOf(spanId);
-
- SpanView spanView = new SpanView();
- spanView.setSpanId(spanId);
- spanView.setSegId(segmentId);
- spanView.setSpanSegId(spanSegId);
- spanView.setStartTime(span.getStartTime());
- spanView.setOperationName(span.getOperationName());
- spanView.setAppCode(appCode);
- long cost = span.getEndTime() - span.getStartTime();
- if (cost == 0) {
- spanView.setCost(1);
- } else {
- spanView.setCost(cost);
- }
-
- if (spanId == 0) {
- if (CollectionTools.isNotEmpty(refsList)) {
- if (refsList.size() > 1) {
- throw new UnsupportedOperationException("not support batch call");
- } else {
- TraceSegmentReference segmentRef = refsList.get(0);
- int parentSpanId = segmentRef.getParentSpanId();
- String parentSegId = segmentRef.getParentTraceSegmentId();
-
- String parentSpanSegId = parentSegId + "--" + String.valueOf(parentSpanId);
- spanView.setParentSpanSegId(parentSpanSegId);
- }
- }
- } else {
- int parentSpanId = span.getParentSpanId();
- String parentSpanSegId = segmentId + "--" + String.valueOf(parentSpanId);
- spanView.setParentSpanSegId(parentSpanSegId);
- }
-
- spanViewList.add(spanView);
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return WorkerRole.INSTANCE;
- }
-
- @Override
- public GlobalTraceSearchWithGlobalId workerInstance(ClusterWorkerContext clusterContext) {
- return new GlobalTraceSearchWithGlobalId(role(), clusterContext, new LocalWorkerContext());
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return GlobalTraceSearchWithGlobalId.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/AbstractReceiver.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/AbstractReceiver.java
deleted file mode 100644
index f48d8b13d..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/AbstractReceiver.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.skywalking.apm.collector.worker.grpcserver;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.worker.httpserver.ArgumentsParseException;
-
-/**
- * @author pengys5
- */
-public abstract class AbstractReceiver extends AbstractLocalSyncWorker {
-
- public AbstractReceiver(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- final @Override protected void onWork(Object request, Object response) throws WorkerException {
- onReceive(request);
- }
-
- protected abstract void onReceive(
- Object request) throws ArgumentsParseException, WorkerInvokeException, WorkerNotFoundException;
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/AbstractReceiverProvider.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/AbstractReceiverProvider.java
deleted file mode 100644
index f4ecba238..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/AbstractReceiverProvider.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.skywalking.apm.collector.worker.grpcserver;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-
-/**
- * @author pengys5
- */
-public abstract class AbstractReceiverProvider extends AbstractLocalSyncWorkerProvider {
-
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/GRPCAddressGet.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/GRPCAddressGet.java
deleted file mode 100644
index b09eca632..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/GRPCAddressGet.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.skywalking.apm.collector.worker.grpcserver;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import java.util.Map;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.httpserver.AbstractGet;
-import org.skywalking.apm.collector.worker.httpserver.AbstractGetProvider;
-import org.skywalking.apm.collector.worker.httpserver.ArgumentsParseException;
-
-/**
- * @author pengys5
- */
-public class GRPCAddressGet extends AbstractGet {
-
- protected GRPCAddressGet(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override protected Class responseClass() {
- return JsonArray.class;
- }
-
- @Override protected void onReceive(Map parameter,
- JsonElement response) throws ArgumentsParseException, WorkerInvokeException, WorkerNotFoundException {
- ((ClusterWorkerContext)getClusterContext()).getRpcContext().rpcAddressCollection().forEach(rpcAddress -> {
- ((JsonArray)response).add(rpcAddress.getAddress() + ":" + rpcAddress.getPort());
- });
- }
-
- public static class Factory extends AbstractGetProvider {
- public static Factory INSTANCE = new Factory();
-
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public GRPCAddressGet workerInstance(ClusterWorkerContext clusterContext) {
- return new GRPCAddressGet(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public String servletPath() {
- return "/grpc/addresses";
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return GRPCAddressGet.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/GRPCAddressRegister.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/GRPCAddressRegister.java
deleted file mode 100644
index e23e446b2..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/GRPCAddressRegister.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.skywalking.apm.collector.worker.grpcserver;
-
-import org.skywalking.apm.collector.actor.AbstractClusterWorker;
-import org.skywalking.apm.collector.actor.AbstractClusterWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.rpc.RPCAddress;
-import org.skywalking.apm.collector.worker.config.GRPCConfig;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-
-/**
- * @author pengys5
- */
-public class GRPCAddressRegister extends AbstractClusterWorker {
-
- GRPCAddressRegister(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override public void preStart() throws ProviderNotFoundException {
-
- }
-
- @Override protected void onWork(Object message) throws WorkerException {
- }
-
- public static class Factory extends AbstractClusterWorkerProvider {
- public static Factory INSTANCE = new Factory();
-
- @Override
- public GRPCAddressRegister.Role role() {
- return Role.INSTANCE;
- }
-
- @Override public int workerNum() {
- return WorkerConfig.WorkerNum.GRPC.GRPCAddressRegister.VALUE;
- }
-
- @Override public RPCAddress config() {
- return new RPCAddress(GRPCConfig.GRPC.HOSTNAME, Integer.valueOf(GRPCConfig.GRPC.PORT));
- }
-
- @Override public GRPCAddressRegister workerInstance(ClusterWorkerContext clusterContext) {
- return new GRPCAddressRegister(role(), clusterContext, new LocalWorkerContext());
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return GRPCAddressRegister.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/GRPCServer.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/GRPCServer.java
deleted file mode 100644
index 7ccdc2838..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/GRPCServer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.skywalking.apm.collector.worker.grpcserver;
-
-import io.grpc.Server;
-import io.grpc.netty.NettyServerBuilder;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.worker.config.GRPCConfig;
-
-/**
- * @author pengys5
- */
-public enum GRPCServer {
- INSTANCE;
-
- private Logger logger = LogManager.getFormatterLogger(GRPCServer.class);
-
- private Server server;
-
- public void boot(ClusterWorkerContext clusterContext) throws Exception {
- start(clusterContext);
- blockUntilShutdown();
- }
-
- private void start(ClusterWorkerContext clusterContext) throws Exception {
- int port = Integer.valueOf(GRPCConfig.GRPC.PORT);
- NettyServerBuilder nettyServerBuilder = NettyServerBuilder.forPort(port);
- ServicesCreator.INSTANCE.boot(nettyServerBuilder, clusterContext);
- server = nettyServerBuilder.build().start();
- logger.info("Server started, listening on " + port);
- }
-
- /**
- * Await termination on the main thread since the grpc library uses daemon threads.
- */
- private void blockUntilShutdown() throws InterruptedException {
- if (server != null) {
- server.awaitTermination();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/ServicesCreator.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/ServicesCreator.java
deleted file mode 100644
index 6ca0e0092..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/ServicesCreator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.skywalking.apm.collector.worker.grpcserver;
-
-import io.grpc.BindableService;
-import io.grpc.netty.NettyServerBuilder;
-import java.util.ServiceLoader;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-
-/**
- * @author pengys5
- */
-public enum ServicesCreator {
- INSTANCE;
-
- private Logger logger = LogManager.getFormatterLogger(ServicesCreator.class);
-
- public void boot(NettyServerBuilder nettyServerBuilder,
- ClusterWorkerContext clusterContext) throws IllegalArgumentException, ProviderNotFoundException {
- ServiceLoader grpcServiceLoader = java.util.ServiceLoader.load(BindableService.class);
- for (BindableService service : grpcServiceLoader) {
- logger.info("add grpc service %s into netty server builder ", service.getClass().getSimpleName());
- nettyServerBuilder.addService(service);
- ((WorkerCaller)service).inject(clusterContext);
- ((WorkerCaller)service).preStart();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/WorkerCaller.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/WorkerCaller.java
deleted file mode 100644
index ecfad1c31..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/grpcserver/WorkerCaller.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.skywalking.apm.collector.worker.grpcserver;
-
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-
-/**
- * @author pengys5
- */
-public interface WorkerCaller {
- void preStart() throws ProviderNotFoundException;
-
- void inject(ClusterWorkerContext clusterWorkerContext);
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractGet.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractGet.java
deleted file mode 100644
index bd707236b..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractGet.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.skywalking.apm.collector.worker.httpserver;
-
-import com.google.gson.JsonElement;
-import java.io.IOException;
-import java.util.Map;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalSyncWorkerRef;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-
-/**
- * The AbstractGet implementations represent workers, which called by the server to allow a servlet to
- * handle a GET request.
- *
- * verride the {@link #onReceive(Map, JsonElement)} method to support a search service.
- *
- * @author pengys5
- * @since v3.0-2017
- */
-public abstract class AbstractGet extends AbstractServlet {
-
- protected AbstractGet(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- /**
- * Forbid the subclasses override this method.
- *
- * @param parameter {@link Object} data structure of the map
- * @param response {@link Object} is a out parameter
- * @throws Exception
- */
- @Override final protected void onWork(Object parameter,
- Object response) throws ArgumentsParseException, WorkerInvokeException, WorkerNotFoundException {
- super.onWork(parameter, response);
- }
-
- static class GetWithHttpServlet extends HttpServlet {
-
- private Logger logger = LogManager.getFormatterLogger(GetWithHttpServlet.class);
-
- private final LocalSyncWorkerRef ownerWorkerRef;
-
- GetWithHttpServlet(LocalSyncWorkerRef ownerWorkerRef) {
- this.ownerWorkerRef = ownerWorkerRef;
- }
-
- /**
- * Override the {@link HttpServlet#doGet(HttpServletRequest, HttpServletResponse)} method, receive the parameter
- * from request then send parameter to the owner worker.
- *
- * @param request an {@link HttpServletRequest} object that contains the request the client has made of the
- * servlet
- * @param response an {@link HttpServletResponse} object that contains the response the servlet sends to the
- * client
- * @throws ServletException if the request for the GET could not be handled
- * @throws IOException if an input or output error is detected when the servlet handles the GET request
- */
- @Override final protected void doGet(HttpServletRequest request,
- HttpServletResponse response) throws ServletException, IOException {
- try {
- Map parameter = request.getParameterMap();
- ownerWorkerRef.ask(parameter, response);
- } catch (Exception e) {
- logger.error(e, e);
- }
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractGetProvider.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractGetProvider.java
deleted file mode 100644
index 6b34c0857..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractGetProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.skywalking.apm.collector.worker.httpserver;
-
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.AbstractWorker;
-import org.skywalking.apm.collector.actor.LocalSyncWorkerRef;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-
-/**
- * The AbstractGetProvider implementations represent providers, which use to create {@link AbstractGet}
- * worker instances.
- *
- * @author pengys5
- * @since v3.0-2017
- */
-public abstract class AbstractGetProvider extends AbstractLocalSyncWorkerProvider {
-
- public abstract String servletPath();
-
- /**
- * Create worker instance, http servlet and set the worker reference into servlet.
- *
- * @param context use to create a mapping between url and worker.
- * @throws IllegalArgumentException
- * @throws ProviderNotFoundException
- */
- final protected void create(
- ServletContextHandler context) throws IllegalArgumentException, ProviderNotFoundException {
- LocalSyncWorkerRef workerRef = (LocalSyncWorkerRef)super.create(AbstractWorker.noOwner());
- AbstractGet.GetWithHttpServlet getWithHttpServlet = new AbstractGet.GetWithHttpServlet(workerRef);
- context.addServlet(new ServletHolder(getWithHttpServlet), servletPath());
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractPost.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractPost.java
deleted file mode 100644
index 2cc428d51..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractPost.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.skywalking.apm.collector.worker.httpserver;
-
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import java.util.Map;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalSyncWorkerRef;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-
-/**
- * The AbstractGet implementations represent workers, which called by the server to allow a servlet to
- * handle a POST request.
- *
- * verride the {@link #onReceive(Map, JsonObject)} method to support a search service.
- *
- * @author pengys5
- * @since v3.0-2017
- */
-public abstract class AbstractPost extends AbstractServlet {
-
- public AbstractPost(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- /**
- * Add final modifier to avoid the subclass override this method.
- *
- * @param parameter {@link Object} data structure of the map
- * @param response {@link Object} is a out parameter
- * @throws ArgumentsParseException if the key could not contains in parameter
- * @throws WorkerInvokeException if any error is detected when call(or ask) worker
- * @throws WorkerNotFoundException if the worker reference could not found in context.
- */
- @Override final protected void onWork(Object parameter,
- Object response) throws ArgumentsParseException, WorkerInvokeException, WorkerNotFoundException {
- super.onWork(parameter, response);
- }
-
- static class PostWithHttpServlet extends HttpServlet {
-
- private Logger logger = LogManager.getFormatterLogger(PostWithHttpServlet.class);
-
- private final LocalSyncWorkerRef ownerWorkerRef;
-
- PostWithHttpServlet(LocalSyncWorkerRef ownerWorkerRef) {
- this.ownerWorkerRef = ownerWorkerRef;
- }
-
- /**
- * Override the {@link HttpServlet#doPost(HttpServletRequest, HttpServletResponse)} method, receive the
- * parameter from request then send parameter to the owner worker.
- *
- * @param request an {@link HttpServletRequest} object that contains the request the client has made of the
- * servlet
- * @param response {@link HttpServletResponse} object that contains the response the servlet sends to the
- * client
- * @throws ServletException if the request for the POST could not be handled
- * @throws IOException if an input or output error is detected when the servlet handles the request
- */
- @Override final protected void doPost(HttpServletRequest request,
- HttpServletResponse response) throws ServletException, IOException {
- try {
- Map parameter = request.getParameterMap();
- ownerWorkerRef.ask(parameter, response);
- } catch (Exception e) {
- logger.error(e, e);
- }
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractPostProvider.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractPostProvider.java
deleted file mode 100644
index 8a2b7b52d..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractPostProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.skywalking.apm.collector.worker.httpserver;
-
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.AbstractWorker;
-import org.skywalking.apm.collector.actor.LocalSyncWorkerRef;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-
-/**
- * The AbstractPostProvider implementations represent providers, which use to create {@link AbstractPost}
- * worker instances.
- *
- * @author pengys5
- * @since v3.0-2017
- */
-public abstract class AbstractPostProvider extends AbstractLocalSyncWorkerProvider {
-
- public abstract String servletPath();
-
- /**
- * Create worker instance, http servlet and set the worker reference into servlet.
- *
- * @param context use to create a mapping between url and worker.
- * @throws IllegalArgumentException
- * @throws ProviderNotFoundException
- */
- final protected void create(
- ServletContextHandler context) throws IllegalArgumentException, ProviderNotFoundException {
- LocalSyncWorkerRef workerRef = (LocalSyncWorkerRef)super.create(AbstractWorker.noOwner());
- AbstractPost.PostWithHttpServlet postWithHttpServlet = new AbstractPost.PostWithHttpServlet(workerRef);
- context.addServlet(new ServletHolder(postWithHttpServlet), servletPath());
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractServlet.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractServlet.java
deleted file mode 100644
index c51036cac..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractServlet.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.skywalking.apm.collector.worker.httpserver;
-
-import com.google.gson.JsonElement;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-
-/**
- * The AbstractServlet implementations represent workers, which called by the server to allow a servlet to
- * handle a request at least one method, e.g. doGet, doPost, doPut, doDelete.
- * Provide default {@link #onWork(Object, Object)} implementation, support the data structure of the map from a http
- * call.
- *
- * @author pengys5
- * @since v3.1-2017
- */
-public abstract class AbstractServlet extends AbstractLocalSyncWorker {
-
- private Logger logger = LogManager.getFormatterLogger(AbstractServlet.class);
-
- public AbstractServlet(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- protected abstract Class responseClass();
-
- /**
- * Override this method to implementing business logic.
- *
- * @param parameter {@link Object} data structure of the map
- * @param response {@link Object} is a out parameter
- * @throws ArgumentsParseException if the key could not contains in parameter
- * @throws WorkerInvokeException if any error is detected when call(or ask) worker
- * @throws WorkerNotFoundException if the worker reference could not found in context.
- */
- @Override protected void onWork(Object parameter,
- Object response) throws ArgumentsParseException, WorkerInvokeException, WorkerNotFoundException {
- try {
- JsonElement resJson = responseClass().newInstance();
- onReceive((Map)parameter, resJson);
- onSuccessResponse((HttpServletResponse)response, resJson);
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- } catch (InstantiationException e) {
- logger.error(e.getMessage(), e);
- } catch (IllegalAccessException e) {
- logger.error(e.getMessage(), e);
- }
- }
-
- /**
- * Override this method to implementing business logic.
- *
- * @param parameter {@link Map}, get the request parameter by key.
- * @param response {@link JsonElement}, set the response data as json object.
- * @throws ArgumentsParseException if the key could not contains in parameter
- * @throws WorkerInvokeException if any error is detected when call(or ask) worker
- * @throws WorkerNotFoundException if the worker reference could not found in context.
- */
- protected abstract void onReceive(Map parameter,
- JsonElement response) throws ArgumentsParseException, WorkerInvokeException, WorkerNotFoundException;
-
- /**
- * Set the worker response and the success status into the servlet response object
- *
- * @param response {@link HttpServletResponse} object that contains the response the servlet reply to the client
- * @param resJson {@link JsonElement} that contains the response from worker
- * @throws IOException if any error is detected when the servlet handles the response.
- */
- protected void onSuccessResponse(HttpServletResponse response, JsonElement resJson) throws IOException {
- reply(response, resJson, HttpServletResponse.SC_OK);
- }
-
- /**
- * Reply the error message and server error code to client.
- *
- * @param exception a {@link Exception} when the worker handles the request
- * @param response {@link HttpServletResponse} object that contains the response the servlet reply to the client
- */
- protected void onErrorResponse(Exception exception, HttpServletResponse response) {
- response.setHeader("reason", exception.getMessage());
- try {
- reply(response, responseClass().newInstance(), HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- } catch (IllegalAccessException e) {
- logger.error(e.getMessage(), e);
- } catch (InstantiationException e) {
- logger.error(e.getMessage(), e);
- }
- }
-
- /**
- * Build the response head and body
- *
- * @param response {@link HttpServletResponse} object that contains the response the servlet reply to the client
- * @param resJson {@link JsonElement} that contains the response from worker
- * @param status http status code
- * @throws IOException if an input or output error is detected when the servlet handles the response
- */
- private void reply(HttpServletResponse response, JsonElement resJson, int status) throws IOException {
- response.setContentType("text/json");
- response.setCharacterEncoding("utf-8");
- response.setStatus(status);
-
- PrintWriter out = response.getWriter();
- out.print(resJson);
- out.flush();
- out.close();
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractStreamPost.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractStreamPost.java
deleted file mode 100644
index c762d7803..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractStreamPost.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.skywalking.apm.collector.worker.httpserver;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.Map;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalSyncWorkerRef;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-
-/**
- * The AbstractStreamPost implementations represent workers, which called by the server to allow a servlet
- * to handle a post request and get post the data by {@link BufferedReader}.
- *
- * verride the {@link #onReceive(BufferedReader, JsonObject)} method to deserialize the json construct data by buffer
- * reader.
- *
- * @author pengys5
- * @since v3.1-2017
- */
-public abstract class AbstractStreamPost extends AbstractServlet {
-
- public AbstractStreamPost(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- /**
- * Call the {@link #onReceive(BufferedReader, JsonObject)} method, build response data to writer if success or build
- * error response data to writer if detected exception.
- *
- * @param reader {@link BufferedReader} json construct
- * @param response {@link Object} is a out parameter
- * @throws ArgumentsParseException if the key could not contains in parameter
- * @throws WorkerInvokeException if any error is detected when call(or ask) worker
- * @throws WorkerNotFoundException if the worker reference could not found in context.
- */
- @Override final protected void onWork(Object reader,
- Object response) throws ArgumentsParseException, WorkerInvokeException, WorkerNotFoundException {
- JsonObject resJson = new JsonObject();
- try {
- onReceive((BufferedReader)reader, resJson);
- onSuccessResponse((HttpServletResponse)response, resJson);
- } catch (Exception e) {
- onErrorResponse(e, (HttpServletResponse)response);
- }
- }
-
- /**
- * Override the default implementation, forbidden to call this method.
- *
- * @param parameter {@link Map}, get the request parameter by key.
- * @param response {@link JsonElement}, set the response data as json object.
- * @throws ArgumentsParseException if the key could not contains in parameter
- * @throws WorkerInvokeException if any error is detected when call(or ask) worker
- * @throws WorkerNotFoundException if the worker reference could not found in context.
- */
- @Override final protected void onReceive(Map parameter,
- JsonElement response) throws ArgumentsParseException, WorkerInvokeException, WorkerNotFoundException {
- throw new WorkerInvokeException("Use the other method with buffer reader parameter");
- }
-
- /**
- * Override this method to implementing business logic.
- *
- * @param reader {@link BufferedReader} json construct
- * @param response {@link Object} is a out parameter
- * @throws ArgumentsParseException if the key could not contains in parameter
- * @throws WorkerInvokeException if any error is detected when call(or ask) worker
- * @throws WorkerNotFoundException if the worker reference could not found in context.
- */
- protected abstract void onReceive(BufferedReader reader,
- JsonObject response) throws ArgumentsParseException, WorkerInvokeException, WorkerNotFoundException;
-
- static class StreamPostWithHttpServlet extends HttpServlet {
-
- private Logger logger = LogManager.getFormatterLogger(AbstractPost.PostWithHttpServlet.class);
-
- private final LocalSyncWorkerRef ownerWorkerRef;
-
- StreamPostWithHttpServlet(LocalSyncWorkerRef ownerWorkerRef) {
- this.ownerWorkerRef = ownerWorkerRef;
- }
-
- /**
- * Override the {@link HttpServlet#doPost(HttpServletRequest, HttpServletResponse)} method, receive the
- * buffer from request then send buffer to the owner worker.
- *
- * @param request an {@link HttpServletRequest} object that contains the request the client has made of the
- * servlet
- * @param response {@link HttpServletResponse} object that contains the response the servlet sends to the
- * client
- * @throws ServletException if the request for the POST could not be handled
- * @throws IOException if an input or output error is detected when the servlet handles the request
- */
- @Override final protected void doPost(HttpServletRequest request,
- HttpServletResponse response) throws ServletException, IOException {
- try {
- BufferedReader reader = request.getReader();
- ownerWorkerRef.ask(reader, response);
- } catch (Exception e) {
- logger.error(e, e);
- }
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractStreamPostProvider.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractStreamPostProvider.java
deleted file mode 100644
index d2c6af40c..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/AbstractStreamPostProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.skywalking.apm.collector.worker.httpserver;
-
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.AbstractWorker;
-import org.skywalking.apm.collector.actor.LocalSyncWorkerRef;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-
-/**
- * The AbstractStreamPostProvider implementations represent providers, which use to create {@link
- * AbstractStreamPost} worker instances.
- *
- * @author pengys5
- * @since v3.1-2017
- */
-public abstract class AbstractStreamPostProvider extends AbstractLocalSyncWorkerProvider {
-
- public abstract String servletPath();
-
- /**
- * Create worker instance, http servlet and set the worker reference into servlet.
- *
- * @param context use to create a mapping between url and worker.
- * @throws IllegalArgumentException
- * @throws ProviderNotFoundException
- */
- final protected void create(
- ServletContextHandler context) throws IllegalArgumentException, ProviderNotFoundException {
- LocalSyncWorkerRef workerRef = (LocalSyncWorkerRef)super.create(AbstractWorker.noOwner());
- AbstractStreamPost.StreamPostWithHttpServlet postWithHttpServlet = new AbstractStreamPost.StreamPostWithHttpServlet(workerRef);
- context.addServlet(new ServletHolder(postWithHttpServlet), servletPath());
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/ArgumentsParseException.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/ArgumentsParseException.java
deleted file mode 100644
index 6b2d2a1f2..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/ArgumentsParseException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.skywalking.apm.collector.worker.httpserver;
-
-import org.skywalking.apm.collector.actor.WorkerException;
-
-/**
- * This exception is raised when can't find the required argument or data type conversion fails from request.
- *
- * @author pengys5
- * @since v3.1-2017
- */
-public class ArgumentsParseException extends WorkerException {
-
- public ArgumentsParseException(String message) {
- super(message);
- }
-
- public ArgumentsParseException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/HttpServer.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/HttpServer.java
deleted file mode 100644
index 00212e117..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/HttpServer.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.skywalking.apm.collector.worker.httpserver;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.worker.config.HttpConfig;
-
-import java.net.InetSocketAddress;
-
-/**
- * @author pengys5
- */
-public enum HttpServer {
- INSTANCE;
-
- private Logger logger = LogManager.getFormatterLogger(HttpServer.class);
-
- public void boot(ClusterWorkerContext clusterContext) throws Exception {
- Server server = new Server(new InetSocketAddress(HttpConfig.Http.HOSTNAME, Integer.valueOf(HttpConfig.Http.PORT)));
-
- String contextPath = HttpConfig.Http.CONTEXTPATH;
- ServletContextHandler servletContextHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
- servletContextHandler.setContextPath(contextPath);
- logger.info("http server root context path: %s", contextPath);
-
- ServletsCreator.INSTANCE.boot(servletContextHandler, clusterContext);
-
- server.setHandler(servletContextHandler);
- server.start();
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/ServletsCreator.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/ServletsCreator.java
deleted file mode 100644
index b79124de1..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/httpserver/ServletsCreator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.skywalking.apm.collector.worker.httpserver;
-
-import java.util.ServiceLoader;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-
-/**
- * The ServletsCreator is a servlet workers starter. Use SPI to create the instances implement {@link
- * AbstractGetProvider}, {@link AbstractPostProvider}, {@link AbstractStreamPostProvider}.
- *
- * @author pengys5
- * @since v3.1-2017
- */
-public enum ServletsCreator {
- INSTANCE;
-
- private Logger logger = LogManager.getFormatterLogger(ServletsCreator.class);
-
- /**
- * Use SPI to find the servlet workers provider then use the provider to create worker instances.
- *
- * @param servletContextHandler add a mapping between url and worker.
- * @param clusterContext the context contains remote worker reference.
- * @throws IllegalArgumentException
- * @throws ProviderNotFoundException
- */
- public void boot(ServletContextHandler servletContextHandler,
- ClusterWorkerContext clusterContext) throws IllegalArgumentException, ProviderNotFoundException {
- ServiceLoader postServletLoader = java.util.ServiceLoader.load(AbstractPostProvider.class);
- for (AbstractPostProvider provider : postServletLoader) {
- provider.setClusterContext(clusterContext);
- provider.create(servletContextHandler);
- logger.info("add post servlet mapping path: %s ", provider.servletPath());
- }
-
- ServiceLoader streamPostServletLoader = java.util.ServiceLoader.load(AbstractStreamPostProvider.class);
- for (AbstractStreamPostProvider provider : streamPostServletLoader) {
- provider.setClusterContext(clusterContext);
- provider.create(servletContextHandler);
- logger.info("add stream post servlet mapping path: %s ", provider.servletPath());
- }
-
- ServiceLoader getServletLoader = java.util.ServiceLoader.load(AbstractGetProvider.class);
- for (AbstractGetProvider provider : getServletLoader) {
- provider.setClusterContext(clusterContext);
- provider.create(servletContextHandler);
- logger.info("add get servlet mapping path: %s ", provider.servletPath());
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/NodeCompIndex.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/NodeCompIndex.java
deleted file mode 100644
index af8d1517e..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/NodeCompIndex.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.skywalking.apm.collector.worker.node;
-
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.skywalking.apm.collector.worker.config.EsConfig;
-import org.skywalking.apm.collector.worker.storage.AbstractIndex;
-
-import java.io.IOException;
-
-/**
- * @author pengys5
- */
-public class NodeCompIndex extends AbstractIndex {
-
- public static final String INDEX = "node_comp_idx";
- public static final String NAME = "name";
- public static final String PEERS = "peers";
-
- @Override
- public String index() {
- return INDEX;
- }
-
- @Override
- public boolean isRecord() {
- return false;
- }
-
- @Override
- public int refreshInterval() {
- return EsConfig.Es.Index.RefreshInterval.NodeCompIndex.VALUE;
- }
-
- @Override
- public XContentBuilder createMappingBuilder() throws IOException {
- XContentBuilder mappingBuilder = XContentFactory.jsonBuilder()
- .startObject()
- .startObject("properties")
- .startObject(NAME)
- .field("type", "keyword")
- .endObject()
- .startObject(PEERS)
- .field("type", "keyword")
- .endObject()
- .startObject(AGG_COLUMN)
- .field("type", "keyword")
- .endObject()
- .endObject()
- .endObject();
- return mappingBuilder;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/NodeMappingIndex.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/NodeMappingIndex.java
deleted file mode 100644
index cb4c291d7..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/NodeMappingIndex.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.skywalking.apm.collector.worker.node;
-
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.skywalking.apm.collector.worker.config.EsConfig;
-import org.skywalking.apm.collector.worker.storage.AbstractIndex;
-
-import java.io.IOException;
-
-/**
- * @author pengys5
- */
-public class NodeMappingIndex extends AbstractIndex {
-
- public static final String INDEX = "node_mapping_idx";
- public static final String CODE = "code";
- public static final String PEERS = "peers";
-
- @Override
- public String index() {
- return INDEX;
- }
-
- @Override
- public boolean isRecord() {
- return false;
- }
-
- @Override
- public int refreshInterval() {
- return EsConfig.Es.Index.RefreshInterval.NodeMappingIndex.VALUE;
- }
-
- @Override
- public XContentBuilder createMappingBuilder() throws IOException {
- XContentBuilder mappingBuilder = XContentFactory.jsonBuilder()
- .startObject()
- .startObject("properties")
- .startObject(CODE)
- .field("type", "string")
- .field("index", "not_analyzed")
- .endObject()
- .startObject(PEERS)
- .field("type", "string")
- .field("index", "not_analyzed")
- .endObject()
- .startObject(AGG_COLUMN)
- .field("type", "string")
- .field("index", "not_analyzed")
- .endObject()
- .startObject(TIME_SLICE)
- .field("type", "long")
- .field("index", "not_analyzed")
- .endObject()
- .endObject()
- .endObject();
- return mappingBuilder;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/AbstractNodeCompAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/AbstractNodeCompAnalysis.java
deleted file mode 100644
index 60065a023..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/AbstractNodeCompAnalysis.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.skywalking.apm.collector.worker.node.analysis;
-
-import com.google.gson.JsonObject;
-import java.util.List;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.worker.RecordAnalysisMember;
-import org.skywalking.apm.collector.worker.node.NodeCompIndex;
-import org.skywalking.apm.collector.worker.tools.CollectionTools;
-import org.skywalking.apm.collector.worker.tools.SpanPeersTools;
-import org.skywalking.apm.network.proto.SpanObject;
-import org.skywalking.apm.network.proto.SpanType;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-
-/**
- * @author pengys5
- */
-abstract class AbstractNodeCompAnalysis extends RecordAnalysisMember {
-
- private Logger logger = LogManager.getFormatterLogger(AbstractNodeCompAnalysis.class);
-
- AbstractNodeCompAnalysis(Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- final void analyseSpans(TraceSegmentObject segment) {
- List spanList = segment.getSpansList();
- logger.debug("node analysis span isNotEmpty %s", CollectionTools.isNotEmpty(spanList));
-
- if (CollectionTools.isNotEmpty(spanList)) {
- logger.debug("node analysis span list SIZE: %s", spanList.size());
- for (SpanObject span : spanList) {
- if (SpanType.Exit.equals(span.getSpanType())) {
- int peers = SpanPeersTools.INSTANCE.getPeers(span);
-
- JsonObject compJsonObj = new JsonObject();
- compJsonObj.addProperty(NodeCompIndex.PEERS, peers);
- compJsonObj.addProperty(NodeCompIndex.NAME, span.getComponent());
-
- set(String.valueOf(peers), compJsonObj);
- } else if (SpanType.Entry.equals(span.getSpanType()) && span.getParentSpanId() == -1) {
- int peers = segment.getApplicationId();
-
- JsonObject compJsonObj = new JsonObject();
- compJsonObj.addProperty(NodeCompIndex.PEERS, peers);
- compJsonObj.addProperty(NodeCompIndex.NAME, span.getComponent());
-
- set(String.valueOf(peers), compJsonObj);
- }
- }
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/AbstractNodeMappingAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/AbstractNodeMappingAnalysis.java
deleted file mode 100644
index 23521ffc8..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/AbstractNodeMappingAnalysis.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.skywalking.apm.collector.worker.node.analysis;
-
-import com.google.gson.JsonObject;
-import java.util.List;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.worker.Const;
-import org.skywalking.apm.collector.worker.RecordAnalysisMember;
-import org.skywalking.apm.collector.worker.node.NodeMappingIndex;
-import org.skywalking.apm.collector.worker.tools.CollectionTools;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-import org.skywalking.apm.network.proto.TraceSegmentReference;
-
-/**
- * @author pengys5
- */
-abstract class AbstractNodeMappingAnalysis extends RecordAnalysisMember {
-
- private Logger logger = LogManager.getFormatterLogger(AbstractNodeMappingAnalysis.class);
-
- AbstractNodeMappingAnalysis(Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- final void analyseRefs(TraceSegmentObject segment, long timeSlice) {
- List segmentRefList = segment.getRefsList();
- logger.debug("node mapping analysis refs isNotEmpty %s", CollectionTools.isNotEmpty(segmentRefList));
-
- if (CollectionTools.isNotEmpty(segmentRefList)) {
- logger.debug("node mapping analysis refs list SIZE: %s", segmentRefList.size());
- for (TraceSegmentReference segmentRef : segmentRefList) {
- String peers = Const.PEERS_FRONT_SPLIT + segmentRef.getNetworkAddress() + Const.PEERS_BEHIND_SPLIT;
- int code = segment.getApplicationId();
-
- JsonObject nodeMappingJsonObj = new JsonObject();
- nodeMappingJsonObj.addProperty(NodeMappingIndex.CODE, code);
- nodeMappingJsonObj.addProperty(NodeMappingIndex.PEERS, peers);
- nodeMappingJsonObj.addProperty(NodeMappingIndex.TIME_SLICE, timeSlice);
-
- String id = timeSlice + Const.ID_SPLIT + code + Const.ID_SPLIT + peers;
- set(id, nodeMappingJsonObj);
- }
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/NodeCompAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/NodeCompAnalysis.java
deleted file mode 100644
index 356303cff..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/NodeCompAnalysis.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.skywalking.apm.collector.worker.node.analysis;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.node.persistence.NodeCompAgg;
-import org.skywalking.apm.collector.worker.segment.SegmentReceiver;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-
-/**
- * @author pengys5
- */
-public class NodeCompAnalysis extends AbstractNodeCompAnalysis {
-
- private Logger logger = LogManager.getFormatterLogger(NodeCompAnalysis.class);
-
- NodeCompAnalysis(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void analyse(Object message) {
- if (message instanceof SegmentReceiver.SegmentWithTimeSlice) {
- SegmentReceiver.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentReceiver.SegmentWithTimeSlice)message;
- TraceSegmentObject segment = segmentWithTimeSlice.getSegment();
- analyseSpans(segment);
- } else {
- logger.error("unhandled message, message instance must SegmentReceiver.SegmentWithTimeSlice, but is %s", message.getClass().toString());
- }
- }
-
- @Override
- protected WorkerRefs aggWorkRefs() {
- try {
- return getClusterContext().lookup(NodeCompAgg.Role.INSTANCE);
- } catch (WorkerNotFoundException e) {
- logger.error("The role of %s worker not found", NodeCompAgg.Role.INSTANCE.roleName());
- }
- return null;
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeCompAnalysis workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeCompAnalysis(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int queueSize() {
- return WorkerConfig.Queue.Node.NodeCompAnalysis.SIZE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeCompAnalysis.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/NodeMappingDayAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/NodeMappingDayAnalysis.java
deleted file mode 100644
index 750f470a4..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/NodeMappingDayAnalysis.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.skywalking.apm.collector.worker.node.analysis;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.node.persistence.NodeMappingDayAgg;
-import org.skywalking.apm.collector.worker.segment.SegmentReceiver;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-
-/**
- * @author pengys5
- */
-public class NodeMappingDayAnalysis extends AbstractNodeMappingAnalysis {
-
- private Logger logger = LogManager.getFormatterLogger(NodeMappingDayAnalysis.class);
-
- public NodeMappingDayAnalysis(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void analyse(Object message) {
- if (message instanceof SegmentReceiver.SegmentWithTimeSlice) {
- SegmentReceiver.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentReceiver.SegmentWithTimeSlice)message;
- TraceSegmentObject segment = segmentWithTimeSlice.getSegment();
- analyseRefs(segment, segmentWithTimeSlice.getDay());
- } else {
- logger.error("unhandled message, message instance must SegmentReceiver.SegmentWithTimeSlice, but is %s", message.getClass().toString());
- }
- }
-
- @Override
- protected WorkerRefs aggWorkRefs() {
- try {
- return getClusterContext().lookup(NodeMappingDayAgg.Role.INSTANCE);
- } catch (WorkerNotFoundException e) {
- logger.error("The role of %s worker not found", NodeMappingDayAgg.Role.INSTANCE.roleName());
- }
- return null;
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeMappingDayAnalysis workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeMappingDayAnalysis(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int queueSize() {
- return WorkerConfig.Queue.Node.NodeMappingDayAnalysis.SIZE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeMappingDayAnalysis.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/NodeMappingHourAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/NodeMappingHourAnalysis.java
deleted file mode 100644
index 2274a8388..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/NodeMappingHourAnalysis.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.skywalking.apm.collector.worker.node.analysis;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.node.persistence.NodeMappingHourAgg;
-import org.skywalking.apm.collector.worker.segment.SegmentReceiver;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-
-/**
- * @author pengys5
- */
-public class NodeMappingHourAnalysis extends AbstractNodeMappingAnalysis {
-
- private Logger logger = LogManager.getFormatterLogger(NodeMappingHourAnalysis.class);
-
- NodeMappingHourAnalysis(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void analyse(Object message) {
- if (message instanceof SegmentReceiver.SegmentWithTimeSlice) {
- SegmentReceiver.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentReceiver.SegmentWithTimeSlice)message;
- TraceSegmentObject segment = segmentWithTimeSlice.getSegment();
- analyseRefs(segment, segmentWithTimeSlice.getHour());
- } else {
- logger.error("unhandled message, message instance must SegmentReceiver.SegmentWithTimeSlice, but is %s", message.getClass().toString());
- }
- }
-
- @Override
- protected WorkerRefs aggWorkRefs() {
- try {
- return getClusterContext().lookup(NodeMappingHourAgg.Role.INSTANCE);
- } catch (WorkerNotFoundException e) {
- logger.error("The role of %s worker not found", NodeMappingHourAgg.Role.INSTANCE.roleName());
- }
- return null;
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeMappingHourAnalysis workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeMappingHourAnalysis(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int queueSize() {
- return WorkerConfig.Queue.Node.NodeMappingHourAnalysis.SIZE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeMappingHourAnalysis.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/NodeMappingMinuteAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/NodeMappingMinuteAnalysis.java
deleted file mode 100644
index bf0351116..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/analysis/NodeMappingMinuteAnalysis.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.skywalking.apm.collector.worker.node.analysis;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.node.persistence.NodeMappingMinuteAgg;
-import org.skywalking.apm.collector.worker.segment.SegmentReceiver;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-
-/**
- * @author pengys5
- */
-public class NodeMappingMinuteAnalysis extends AbstractNodeMappingAnalysis {
-
- private Logger logger = LogManager.getFormatterLogger(NodeMappingMinuteAnalysis.class);
-
- NodeMappingMinuteAnalysis(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void analyse(Object message) {
- if (message instanceof SegmentReceiver.SegmentWithTimeSlice) {
- SegmentReceiver.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentReceiver.SegmentWithTimeSlice)message;
- TraceSegmentObject segment = segmentWithTimeSlice.getSegment();
- analyseRefs(segment, segmentWithTimeSlice.getMinute());
- } else {
- logger.error("unhandled message, message instance must SegmentReceiver.SegmentWithTimeSlice, but is %s", message.getClass().toString());
- }
- }
-
- @Override
- protected WorkerRefs aggWorkRefs() {
- try {
- return getClusterContext().lookup(NodeMappingMinuteAgg.Role.INSTANCE);
- } catch (WorkerNotFoundException e) {
- logger.error("The role of %s worker not found", NodeMappingMinuteAgg.Role.INSTANCE.roleName());
- }
- return null;
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeMappingMinuteAnalysis workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeMappingMinuteAnalysis(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int queueSize() {
- return WorkerConfig.Queue.Node.NodeMappingMinuteAnalysis.SIZE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeMappingMinuteAnalysis.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeCompAgg.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeCompAgg.java
deleted file mode 100644
index a73052a8f..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeCompAgg.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.skywalking.apm.collector.worker.node.persistence;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractClusterWorker;
-import org.skywalking.apm.collector.actor.AbstractClusterWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.storage.RecordData;
-
-/**
- * @author pengys5
- */
-public class NodeCompAgg extends AbstractClusterWorker {
-
- private Logger logger = LogManager.getFormatterLogger(NodeCompAgg.class);
-
- NodeCompAgg(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(NodeCompSave.Role.INSTANCE).create(this);
- }
-
- @Override
- protected void onWork(Object message) throws WorkerException {
- if (message instanceof RecordData) {
- getSelfContext().lookup(NodeCompSave.Role.INSTANCE).tell(message);
- } else {
- logger.error("unhandled message, message instance must RecordData, but is %s", message.getClass().toString());
- }
- }
-
- public static class Factory extends AbstractClusterWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeCompAgg workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeCompAgg(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int workerNum() {
- return WorkerConfig.WorkerNum.Node.NodeCompAgg.VALUE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeCompAgg.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeCompLoad.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeCompLoad.java
deleted file mode 100644
index 7414b362a..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeCompLoad.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.skywalking.apm.collector.worker.node.persistence;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.SearchType;
-import org.elasticsearch.search.SearchHit;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.node.NodeCompIndex;
-import org.skywalking.apm.collector.worker.storage.EsClient;
-
-/**
- * @author pengys5
- */
-public class NodeCompLoad extends AbstractLocalSyncWorker {
-
- private Logger logger = LogManager.getFormatterLogger(NodeCompLoad.class);
-
- NodeCompLoad(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void onWork(Object request, Object response) throws WorkerException {
- SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(NodeCompIndex.INDEX);
- searchRequestBuilder.setTypes(NodeCompIndex.TYPE_RECORD);
- searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
- searchRequestBuilder.setSize(100);
- SearchResponse searchResponse = searchRequestBuilder.execute().actionGet();
-
- SearchHit[] searchHits = searchResponse.getHits().getHits();
-
- JsonArray nodeCompArray = new JsonArray();
- for (SearchHit searchHit : searchHits) {
- JsonObject nodeCompObj = new JsonObject();
- nodeCompObj.addProperty(NodeCompIndex.NAME, (String)searchHit.getSource().get(NodeCompIndex.NAME));
- nodeCompObj.addProperty(NodeCompIndex.PEERS, (String)searchHit.getSource().get(NodeCompIndex.PEERS));
- nodeCompArray.add(nodeCompObj);
- logger.debug("node: %s", nodeCompObj.toString());
- }
-
- JsonObject resJsonObj = (JsonObject)response;
- resJsonObj.add("result", nodeCompArray);
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return WorkerRole.INSTANCE;
- }
-
- @Override
- public NodeCompLoad workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeCompLoad(role(), clusterContext, new LocalWorkerContext());
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeCompLoad.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeCompSave.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeCompSave.java
deleted file mode 100644
index 7dbcdfdad..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeCompSave.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.skywalking.apm.collector.worker.node.persistence;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.RecordPersistenceMember;
-import org.skywalking.apm.collector.worker.node.NodeCompIndex;
-import org.skywalking.apm.collector.worker.storage.PersistenceWorkerListener;
-
-/**
- * @author pengys5
- */
-public class NodeCompSave extends RecordPersistenceMember {
-
- NodeCompSave(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public String esIndex() {
- return NodeCompIndex.INDEX;
- }
-
- @Override
- public String esType() {
- return NodeCompIndex.TYPE_RECORD;
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeCompSave workerInstance(ClusterWorkerContext clusterContext) {
- NodeCompSave worker = new NodeCompSave(role(), clusterContext, new LocalWorkerContext());
- PersistenceWorkerListener.INSTANCE.register(worker);
- return worker;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeCompSave.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingDayAgg.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingDayAgg.java
deleted file mode 100644
index f94101054..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingDayAgg.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.skywalking.apm.collector.worker.node.persistence;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractClusterWorker;
-import org.skywalking.apm.collector.actor.AbstractClusterWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.storage.RecordData;
-
-/**
- * @author pengys5
- */
-public class NodeMappingDayAgg extends AbstractClusterWorker {
-
- private Logger logger = LogManager.getFormatterLogger(NodeMappingDayAgg.class);
-
- NodeMappingDayAgg(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(NodeMappingDaySave.Role.INSTANCE).create(this);
- }
-
- @Override
- protected void onWork(Object message) throws WorkerException {
- if (message instanceof RecordData) {
- getSelfContext().lookup(NodeMappingDaySave.Role.INSTANCE).tell(message);
- } else {
- logger.error("unhandled message, message instance must RecordData, but is %s", message.getClass().toString());
- }
- }
-
- public static class Factory extends AbstractClusterWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeMappingDayAgg workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeMappingDayAgg(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int workerNum() {
- return WorkerConfig.WorkerNum.Node.NodeMappingDayAgg.VALUE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeMappingDayAgg.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingDaySave.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingDaySave.java
deleted file mode 100644
index 6d6a2bbc3..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingDaySave.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.skywalking.apm.collector.worker.node.persistence;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.RecordPersistenceMember;
-import org.skywalking.apm.collector.worker.node.NodeMappingIndex;
-import org.skywalking.apm.collector.worker.storage.PersistenceWorkerListener;
-
-/**
- * @author pengys5
- */
-public class NodeMappingDaySave extends RecordPersistenceMember {
-
- NodeMappingDaySave(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public String esIndex() {
- return NodeMappingIndex.INDEX;
- }
-
- @Override
- public String esType() {
- return NodeMappingIndex.TYPE_DAY;
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeMappingDaySave workerInstance(ClusterWorkerContext clusterContext) {
- NodeMappingDaySave worker = new NodeMappingDaySave(role(), clusterContext, new LocalWorkerContext());
- PersistenceWorkerListener.INSTANCE.register(worker);
- return worker;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeMappingDaySave.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingHourAgg.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingHourAgg.java
deleted file mode 100644
index 74d43b2fd..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingHourAgg.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.skywalking.apm.collector.worker.node.persistence;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractClusterWorker;
-import org.skywalking.apm.collector.actor.AbstractClusterWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.storage.RecordData;
-
-/**
- * @author pengys5
- */
-public class NodeMappingHourAgg extends AbstractClusterWorker {
-
- private Logger logger = LogManager.getFormatterLogger(NodeMappingHourAgg.class);
-
- NodeMappingHourAgg(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(NodeMappingHourSave.Role.INSTANCE).create(this);
- }
-
- @Override
- protected void onWork(Object message) throws WorkerException {
- if (message instanceof RecordData) {
- getSelfContext().lookup(NodeMappingHourSave.Role.INSTANCE).tell(message);
- } else {
- logger.error("unhandled message, message instance must RecordData, but is %s", message.getClass().toString());
- }
- }
-
- public static class Factory extends AbstractClusterWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeMappingHourAgg workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeMappingHourAgg(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int workerNum() {
- return WorkerConfig.WorkerNum.Node.NodeMappingHourAgg.VALUE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeMappingHourAgg.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingHourSave.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingHourSave.java
deleted file mode 100644
index 4aaad9083..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingHourSave.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.skywalking.apm.collector.worker.node.persistence;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.RecordPersistenceMember;
-import org.skywalking.apm.collector.worker.node.NodeMappingIndex;
-import org.skywalking.apm.collector.worker.storage.PersistenceWorkerListener;
-
-/**
- * @author pengys5
- */
-public class NodeMappingHourSave extends RecordPersistenceMember {
-
- NodeMappingHourSave(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public String esIndex() {
- return NodeMappingIndex.INDEX;
- }
-
- @Override
- public String esType() {
- return NodeMappingIndex.TYPE_HOUR;
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeMappingHourSave workerInstance(ClusterWorkerContext clusterContext) {
- NodeMappingHourSave worker = new NodeMappingHourSave(role(), clusterContext, new LocalWorkerContext());
- PersistenceWorkerListener.INSTANCE.register(worker);
- return worker;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeMappingHourSave.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingMinuteAgg.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingMinuteAgg.java
deleted file mode 100644
index d8f6e58e1..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingMinuteAgg.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.skywalking.apm.collector.worker.node.persistence;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.*;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.storage.RecordData;
-
-/**
- * @author pengys5
- */
-public class NodeMappingMinuteAgg extends AbstractClusterWorker {
-
- private Logger logger = LogManager.getFormatterLogger(NodeMappingMinuteAgg.class);
-
- NodeMappingMinuteAgg(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(NodeMappingMinuteSave.Role.INSTANCE).create(this);
- }
-
- @Override
- protected void onWork(Object message) throws WorkerException {
- if (message instanceof RecordData) {
- getSelfContext().lookup(NodeMappingMinuteSave.Role.INSTANCE).tell(message);
- } else {
- logger.error("unhandled message, message instance must RecordData, but is %s", message.getClass().toString());
- }
- }
-
- public static class Factory extends AbstractClusterWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeMappingMinuteAgg workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeMappingMinuteAgg(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int workerNum() {
- return WorkerConfig.WorkerNum.Node.NodeMappingMinuteAgg.VALUE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeMappingMinuteAgg.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingMinuteSave.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingMinuteSave.java
deleted file mode 100644
index 48d7bf520..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingMinuteSave.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.skywalking.apm.collector.worker.node.persistence;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.RecordPersistenceMember;
-import org.skywalking.apm.collector.worker.node.NodeMappingIndex;
-import org.skywalking.apm.collector.worker.storage.PersistenceWorkerListener;
-
-/**
- * @author pengys5
- */
-public class NodeMappingMinuteSave extends RecordPersistenceMember {
-
- NodeMappingMinuteSave(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public String esIndex() {
- return NodeMappingIndex.INDEX;
- }
-
- @Override
- public String esType() {
- return NodeMappingIndex.TYPE_MINUTE;
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeMappingMinuteSave workerInstance(ClusterWorkerContext clusterContext) {
- NodeMappingMinuteSave worker = new NodeMappingMinuteSave(role(), clusterContext, new LocalWorkerContext());
- PersistenceWorkerListener.INSTANCE.register(worker);
- return worker;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeMappingMinuteSave.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingSearchWithTimeSlice.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingSearchWithTimeSlice.java
deleted file mode 100644
index 343de3671..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/node/persistence/NodeMappingSearchWithTimeSlice.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.skywalking.apm.collector.worker.node.persistence;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.SearchType;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.Const;
-import org.skywalking.apm.collector.worker.TimeSlice;
-import org.skywalking.apm.collector.worker.node.NodeMappingIndex;
-import org.skywalking.apm.collector.worker.storage.EsClient;
-
-/**
- * @author pengys5
- */
-public class NodeMappingSearchWithTimeSlice extends AbstractLocalSyncWorker {
-
- private Logger logger = LogManager.getFormatterLogger(NodeMappingSearchWithTimeSlice.class);
-
- NodeMappingSearchWithTimeSlice(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void onWork(Object request, Object response) throws WorkerException {
- if (request instanceof RequestEntity) {
- RequestEntity search = (RequestEntity)request;
-
- SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(NodeMappingIndex.INDEX);
- searchRequestBuilder.setTypes(search.getSliceType());
- searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
- searchRequestBuilder.setQuery(QueryBuilders.rangeQuery(NodeMappingIndex.TIME_SLICE).gte(search.getStartTime()).lte(search.getEndTime()));
- searchRequestBuilder.setSize(0);
-
- searchRequestBuilder.addAggregation(AggregationBuilders.terms(NodeMappingIndex.AGG_COLUMN).field(NodeMappingIndex.AGG_COLUMN).size(100));
- SearchResponse searchResponse = searchRequestBuilder.execute().actionGet();
-
- Terms genders = searchResponse.getAggregations().get(NodeMappingIndex.AGG_COLUMN);
-
- JsonArray nodeMappingArray = new JsonArray();
- for (Terms.Bucket entry : genders.getBuckets()) {
- String aggId = entry.getKeyAsString();
- String[] aggIds = aggId.split(Const.IDS_SPLIT);
- String code = aggIds[0];
- String peers = aggIds[1];
-
- JsonObject nodeMappingObj = new JsonObject();
- nodeMappingObj.addProperty(NodeMappingIndex.CODE, code);
- nodeMappingObj.addProperty(NodeMappingIndex.PEERS, peers);
- nodeMappingArray.add(nodeMappingObj);
- }
- logger.debug("node mapping data: %s", nodeMappingArray.toString());
-
- JsonObject resJsonObj = (JsonObject)response;
- resJsonObj.add(Const.RESULT, nodeMappingArray);
- } else {
- logger.error("unhandled message, message instance must NodeMappingSearchWithTimeSlice.RequestEntity, but is %s", request.getClass().toString());
- }
- }
-
- public static class RequestEntity extends TimeSlice {
- public RequestEntity(String sliceType, long startTime, long endTime) {
- super(sliceType, startTime, endTime);
- }
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return WorkerRole.INSTANCE;
- }
-
- @Override
- public NodeMappingSearchWithTimeSlice workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeMappingSearchWithTimeSlice(role(), clusterContext, new LocalWorkerContext());
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeMappingSearchWithTimeSlice.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/NodeRefIndex.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/NodeRefIndex.java
deleted file mode 100644
index 9d8b23dd4..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/NodeRefIndex.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef;
-
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.skywalking.apm.collector.worker.config.EsConfig;
-import org.skywalking.apm.collector.worker.storage.AbstractIndex;
-
-import java.io.IOException;
-
-/**
- * @author pengys5
- */
-public class NodeRefIndex extends AbstractIndex {
- public static final String INDEX = "node_ref_idx";
- public static final String FRONT = "front";
- public static final String FRONT_IS_REAL_CODE = "frontIsRealCode";
- public static final String BEHIND = "behind";
- public static final String BEHIND_IS_REAL_CODE = "behindIsRealCode";
-
- @Override
- public String index() {
- return INDEX;
- }
-
- @Override
- public boolean isRecord() {
- return false;
- }
-
- @Override
- public int refreshInterval() {
- return EsConfig.Es.Index.RefreshInterval.NodeRefIndex.VALUE;
- }
-
- @Override
- public XContentBuilder createMappingBuilder() throws IOException {
- XContentBuilder mappingBuilder = XContentFactory.jsonBuilder()
- .startObject()
- .startObject("properties")
- .startObject(FRONT)
- .field("type", "keyword")
- .endObject()
- .startObject(FRONT_IS_REAL_CODE)
- .field("type", "boolean")
- .field("index", "not_analyzed")
- .endObject()
- .startObject(BEHIND)
- .field("type", "keyword")
- .endObject()
- .startObject(BEHIND_IS_REAL_CODE)
- .field("type", "boolean")
- .field("index", "not_analyzed")
- .endObject()
- .startObject(AGG_COLUMN)
- .field("type", "keyword")
- .endObject()
- .startObject(TIME_SLICE)
- .field("type", "long")
- .field("index", "not_analyzed")
- .endObject()
- .endObject()
- .endObject();
- return mappingBuilder;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/NodeRefResSumGetGroupWithTimeSlice.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/NodeRefResSumGetGroupWithTimeSlice.java
deleted file mode 100644
index 30b5e797a..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/NodeRefResSumGetGroupWithTimeSlice.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import java.util.Arrays;
-import java.util.Map;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.httpserver.AbstractGet;
-import org.skywalking.apm.collector.worker.httpserver.AbstractGetProvider;
-import org.skywalking.apm.collector.worker.httpserver.ArgumentsParseException;
-import org.skywalking.apm.collector.worker.noderef.persistence.NodeRefResSumGroupWithTimeSlice;
-import org.skywalking.apm.collector.worker.tools.ParameterTools;
-
-/**
- * @author pengys5
- */
-public class NodeRefResSumGetGroupWithTimeSlice extends AbstractGet {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefResSumGetGroupWithTimeSlice.class);
-
- NodeRefResSumGetGroupWithTimeSlice(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override protected Class responseClass() {
- return JsonObject.class;
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(NodeRefResSumGroupWithTimeSlice.WorkerRole.INSTANCE).create(this);
- }
-
- @Override protected void onReceive(Map parameter,
- JsonElement response) throws ArgumentsParseException, WorkerInvokeException, WorkerNotFoundException {
- if (!parameter.containsKey("startTime") || !parameter.containsKey("endTime") || !parameter.containsKey("timeSliceType")) {
- throw new ArgumentsParseException("the request parameter must contains startTime,endTime,timeSliceType");
- }
-
- if (logger.isDebugEnabled()) {
- logger.debug("startTime: %s, endTime: %s, timeSliceType: %s", Arrays.toString(parameter.get("startTime")),
- Arrays.toString(parameter.get("endTime")), Arrays.toString(parameter.get("timeSliceType")));
- }
-
- long startTime;
- try {
- startTime = Long.valueOf(ParameterTools.INSTANCE.toString(parameter, "startTime"));
- } catch (NumberFormatException e) {
- throw new ArgumentsParseException("the request parameter startTime must be a long");
- }
-
- long endTime;
- try {
- endTime = Long.valueOf(ParameterTools.INSTANCE.toString(parameter, "endTime"));
- } catch (NumberFormatException e) {
- throw new ArgumentsParseException("the request parameter endTime must be a long");
- }
-
- NodeRefResSumGroupWithTimeSlice.RequestEntity requestEntity;
- requestEntity = new NodeRefResSumGroupWithTimeSlice.RequestEntity(ParameterTools.INSTANCE.toString(parameter, "timeSliceType"), startTime, endTime);
- getSelfContext().lookup(NodeRefResSumGroupWithTimeSlice.WorkerRole.INSTANCE).ask(requestEntity, response);
- }
-
- public static class Factory extends AbstractGetProvider {
- @Override
- public Role role() {
- return WorkerRole.INSTANCE;
- }
-
- @Override
- public NodeRefResSumGetGroupWithTimeSlice workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefResSumGetGroupWithTimeSlice(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public String servletPath() {
- return "/nodeRef/resSum/groupTimeSlice";
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefResSumGetGroupWithTimeSlice.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/NodeRefResSumIndex.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/NodeRefResSumIndex.java
deleted file mode 100644
index 6740614eb..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/NodeRefResSumIndex.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef;
-
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.skywalking.apm.collector.worker.config.EsConfig;
-import org.skywalking.apm.collector.worker.storage.AbstractIndex;
-
-import java.io.IOException;
-
-/**
- * @author pengys5
- */
-public class NodeRefResSumIndex extends AbstractIndex {
- public static final String INDEX = "node_ref_res_sum_idx";
- public static final String ONE_SECOND_LESS = "oneSecondLess";
- public static final String THREE_SECOND_LESS = "threeSecondLess";
- public static final String FIVE_SECOND_LESS = "fiveSecondLess";
- public static final String FIVE_SECOND_GREATER = "fiveSecondGreater";
- public static final String ERROR = "error";
- public static final String SUMMARY = "summary";
-
- @Override
- public String index() {
- return INDEX;
- }
-
- @Override
- public boolean isRecord() {
- return false;
- }
-
- @Override
- public int refreshInterval() {
- return EsConfig.Es.Index.RefreshInterval.NodeRefResSumIndex.VALUE;
- }
-
- @Override
- public XContentBuilder createMappingBuilder() throws IOException {
- XContentBuilder mappingBuilder = XContentFactory.jsonBuilder()
- .startObject()
- .startObject("properties")
- .startObject(ONE_SECOND_LESS)
- .field("type", "long")
- .field("index", "not_analyzed")
- .endObject()
- .startObject(THREE_SECOND_LESS)
- .field("type", "long")
- .field("index", "not_analyzed")
- .endObject()
- .startObject(FIVE_SECOND_LESS)
- .field("type", "long")
- .field("index", "not_analyzed")
- .endObject()
- .startObject(FIVE_SECOND_GREATER)
- .field("type", "long")
- .field("index", "not_analyzed")
- .endObject()
- .startObject(ERROR)
- .field("type", "long")
- .field("index", "not_analyzed")
- .endObject()
- .startObject(SUMMARY)
- .field("type", "long")
- .field("index", "not_analyzed")
- .endObject()
- .startObject(AGG_COLUMN)
- .field("type", "keyword")
- .endObject()
- .startObject(TIME_SLICE)
- .field("type", "long")
- .field("index", "not_analyzed")
- .endObject()
- .endObject()
- .endObject();
- return mappingBuilder;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/AbstractNodeRefAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/AbstractNodeRefAnalysis.java
deleted file mode 100644
index 3251ef251..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/AbstractNodeRefAnalysis.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.analysis;
-
-import com.google.gson.JsonObject;
-import java.util.List;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.worker.Const;
-import org.skywalking.apm.collector.worker.RecordAnalysisMember;
-import org.skywalking.apm.collector.worker.noderef.NodeRefIndex;
-import org.skywalking.apm.collector.worker.tools.CollectionTools;
-import org.skywalking.apm.collector.worker.tools.SpanPeersTools;
-import org.skywalking.apm.network.proto.SpanObject;
-import org.skywalking.apm.network.proto.SpanType;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-
-/**
- * @author pengys5
- */
-abstract class AbstractNodeRefAnalysis extends RecordAnalysisMember {
-
- private Logger logger = LogManager.getFormatterLogger(AbstractNodeRefAnalysis.class);
-
- AbstractNodeRefAnalysis(Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- final void analyseNodeRef(TraceSegmentObject segment, long timeSlice, long minute, long hour, long day,
- int second) {
- List spanList = segment.getSpansList();
- if (CollectionTools.isNotEmpty(spanList)) {
- for (SpanObject span : spanList) {
- JsonObject dataJsonObj = new JsonObject();
- dataJsonObj.addProperty(NodeRefIndex.TIME_SLICE, timeSlice);
- dataJsonObj.addProperty(NodeRefIndex.FRONT_IS_REAL_CODE, true);
- dataJsonObj.addProperty(NodeRefIndex.BEHIND_IS_REAL_CODE, true);
-
- if (SpanType.Exit.equals(span.getSpanType())) {
- int front = segment.getApplicationId();
- dataJsonObj.addProperty(NodeRefIndex.FRONT, front);
-
- int behind = SpanPeersTools.INSTANCE.getPeers(span);
- dataJsonObj.addProperty(NodeRefIndex.BEHIND, behind);
- dataJsonObj.addProperty(NodeRefIndex.BEHIND_IS_REAL_CODE, false);
-
- String id = timeSlice + Const.ID_SPLIT + front + Const.ID_SPLIT + behind;
- logger.debug("dag node ref: %s", dataJsonObj.toString());
- set(id, dataJsonObj);
- buildNodeRefResRecordData(id, span, minute, hour, day, second);
- } else if (SpanType.Entry.equals(span.getSpanType())) {
- if (span.getParentSpanId() == -1 && segment.getRefsCount() == 0) {
- int behind = segment.getApplicationId();
- dataJsonObj.addProperty(NodeRefIndex.BEHIND, behind);
-
- String front = Const.USER_CODE;
- dataJsonObj.addProperty(NodeRefIndex.FRONT, front);
-
- String id = timeSlice + Const.ID_SPLIT + front + Const.ID_SPLIT + behind;
- set(id, dataJsonObj);
- buildNodeRefResRecordData(id, span, minute, hour, day, second);
- }
- }
- }
- }
- }
-
- private void buildNodeRefResRecordData(String nodeRefId, SpanObject span, long minute, long hour, long day,
- int second) {
- AbstractNodeRefResSumAnalysis.NodeRefResRecord refResRecord = new AbstractNodeRefResSumAnalysis.NodeRefResRecord(minute, hour, day, second);
- refResRecord.setStartTime(span.getStartTime());
- refResRecord.setEndTime(span.getEndTime());
- refResRecord.setNodeRefId(nodeRefId);
- refResRecord.setError(span.getIsError());
- sendToResSumAnalysis(refResRecord);
- }
-
- protected abstract void sendToResSumAnalysis(
- AbstractNodeRefResSumAnalysis.NodeRefResRecord refResRecord);
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/AbstractNodeRefResSumAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/AbstractNodeRefResSumAnalysis.java
deleted file mode 100644
index 6525eec0f..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/AbstractNodeRefResSumAnalysis.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.analysis;
-
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.worker.MetricAnalysisMember;
-import org.skywalking.apm.collector.worker.noderef.NodeRefResSumIndex;
-import org.skywalking.apm.collector.worker.storage.AbstractTimeSlice;
-
-/**
- * @author pengys5
- */
-abstract class AbstractNodeRefResSumAnalysis extends MetricAnalysisMember {
-
- AbstractNodeRefResSumAnalysis(Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- final void analyseResSum(NodeRefResRecord nodeRefRes) {
- long startTime = nodeRefRes.startTime;
- long endTime = nodeRefRes.endTime;
- boolean isError = nodeRefRes.isError;
- long cost = endTime - startTime;
-
- set(nodeRefRes.nodeRefId, NodeRefResSumIndex.ONE_SECOND_LESS, 0L);
- set(nodeRefRes.nodeRefId, NodeRefResSumIndex.THREE_SECOND_LESS, 0L);
- set(nodeRefRes.nodeRefId, NodeRefResSumIndex.FIVE_SECOND_LESS, 0L);
- set(nodeRefRes.nodeRefId, NodeRefResSumIndex.FIVE_SECOND_GREATER, 0L);
- set(nodeRefRes.nodeRefId, NodeRefResSumIndex.ERROR, 0L);
- if (cost <= 1000 && !isError) {
- set(nodeRefRes.nodeRefId, NodeRefResSumIndex.ONE_SECOND_LESS, 1L);
- } else if (1000 < cost && cost <= 3000 && !isError) {
- set(nodeRefRes.nodeRefId, NodeRefResSumIndex.THREE_SECOND_LESS, 1L);
- } else if (3000 < cost && cost <= 5000 && !isError) {
- set(nodeRefRes.nodeRefId, NodeRefResSumIndex.FIVE_SECOND_LESS, 1L);
- } else if (5000 < cost && !isError) {
- set(nodeRefRes.nodeRefId, NodeRefResSumIndex.FIVE_SECOND_GREATER, 1L);
- } else {
- set(nodeRefRes.nodeRefId, NodeRefResSumIndex.ERROR, 1L);
- }
- set(nodeRefRes.nodeRefId, NodeRefResSumIndex.SUMMARY, 1L);
- }
-
- public static class NodeRefResRecord extends AbstractTimeSlice {
- private String nodeRefId;
- private long startTime;
- private long endTime;
- private Boolean isError;
-
- NodeRefResRecord(long minute, long hour, long day, int second) {
- super(minute, hour, day, second);
- }
-
- void setNodeRefId(String nodeRefId) {
- this.nodeRefId = nodeRefId;
- }
-
- void setStartTime(long startTime) {
- this.startTime = startTime;
- }
-
- void setEndTime(long endTime) {
- this.endTime = endTime;
- }
-
- void setError(Boolean error) {
- isError = error;
- }
-
- String getNodeRefId() {
- return nodeRefId;
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefDayAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefDayAnalysis.java
deleted file mode 100644
index cfe84bcf0..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefDayAnalysis.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.analysis;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.noderef.persistence.NodeRefDayAgg;
-import org.skywalking.apm.collector.worker.segment.SegmentReceiver;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-
-/**
- * @author pengys5
- */
-public class NodeRefDayAnalysis extends AbstractNodeRefAnalysis {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefDayAnalysis.class);
-
- protected NodeRefDayAnalysis(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- super.preStart();
- getClusterContext().findProvider(NodeRefResSumDayAnalysis.Role.INSTANCE).create(this);
- }
-
- @Override
- public void analyse(Object message) {
- if (message instanceof SegmentReceiver.SegmentWithTimeSlice) {
- SegmentReceiver.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentReceiver.SegmentWithTimeSlice)message;
- TraceSegmentObject segment = segmentWithTimeSlice.getSegment();
-
- long minute = segmentWithTimeSlice.getMinute();
- long hour = segmentWithTimeSlice.getHour();
- long day = segmentWithTimeSlice.getDay();
- int second = segmentWithTimeSlice.getSecond();
- analyseNodeRef(segment, segmentWithTimeSlice.getDay(), minute, hour, day, second);
- } else {
- logger.error("unhandled message, message instance must SegmentReceiver.SegmentWithTimeSlice, but is %s", message.getClass().toString());
- }
- }
-
- @Override
- protected void sendToResSumAnalysis(AbstractNodeRefResSumAnalysis.NodeRefResRecord refResRecord) {
- try {
- getSelfContext().lookup(NodeRefResSumDayAnalysis.Role.INSTANCE).tell(refResRecord);
- } catch (WorkerInvokeException | WorkerNotFoundException e) {
- logger.error(e.getMessage(), e);
- }
- }
-
- @Override
- protected WorkerRefs aggWorkRefs() {
- try {
- return getClusterContext().lookup(NodeRefDayAgg.Role.INSTANCE);
- } catch (WorkerNotFoundException e) {
- logger.error("The role of %s worker not found", NodeRefDayAgg.Role.INSTANCE.roleName());
- }
- return null;
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefDayAnalysis workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefDayAnalysis(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int queueSize() {
- return WorkerConfig.Queue.NodeRef.NodeRefDayAnalysis.SIZE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefDayAnalysis.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefHourAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefHourAnalysis.java
deleted file mode 100644
index 336081d60..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefHourAnalysis.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.analysis;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.noderef.persistence.NodeRefHourAgg;
-import org.skywalking.apm.collector.worker.segment.SegmentReceiver;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-
-/**
- * @author pengys5
- */
-public class NodeRefHourAnalysis extends AbstractNodeRefAnalysis {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefHourAnalysis.class);
-
- protected NodeRefHourAnalysis(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- super.preStart();
- getClusterContext().findProvider(NodeRefResSumHourAnalysis.Role.INSTANCE).create(this);
- }
-
- @Override
- public void analyse(Object message) {
- if (message instanceof SegmentReceiver.SegmentWithTimeSlice) {
- SegmentReceiver.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentReceiver.SegmentWithTimeSlice)message;
- TraceSegmentObject segment = segmentWithTimeSlice.getSegment();
-
- long minute = segmentWithTimeSlice.getMinute();
- long hour = segmentWithTimeSlice.getHour();
- long day = segmentWithTimeSlice.getDay();
- int second = segmentWithTimeSlice.getSecond();
- analyseNodeRef(segment, segmentWithTimeSlice.getHour(), minute, hour, day, second);
- } else {
- logger.error("unhandled message, message instance must SegmentReceiver.SegmentWithTimeSlice, but is %s", message.getClass().toString());
- }
- }
-
- @Override
- protected void sendToResSumAnalysis(AbstractNodeRefResSumAnalysis.NodeRefResRecord refResRecord) {
- try {
- getSelfContext().lookup(NodeRefResSumHourAnalysis.Role.INSTANCE).tell(refResRecord);
- } catch (WorkerInvokeException | WorkerNotFoundException e) {
- logger.error(e.getMessage(), e);
- }
- }
-
- @Override
- protected WorkerRefs aggWorkRefs() {
- try {
- return getClusterContext().lookup(NodeRefHourAgg.Role.INSTANCE);
- } catch (WorkerNotFoundException e) {
- logger.error("The role of %s worker not found", NodeRefHourAgg.Role.INSTANCE.roleName());
- }
- return null;
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefHourAnalysis workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefHourAnalysis(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int queueSize() {
- return WorkerConfig.Queue.NodeRef.NodeRefHourAnalysis.SIZE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefHourAnalysis.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefMinuteAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefMinuteAnalysis.java
deleted file mode 100644
index eb9822a0b..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefMinuteAnalysis.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.analysis;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.noderef.persistence.NodeRefMinuteAgg;
-import org.skywalking.apm.collector.worker.segment.SegmentReceiver;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-
-/**
- * @author pengys5
- */
-public class NodeRefMinuteAnalysis extends AbstractNodeRefAnalysis {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefMinuteAnalysis.class);
-
- protected NodeRefMinuteAnalysis(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- super.preStart();
- getClusterContext().findProvider(NodeRefResSumMinuteAnalysis.Role.INSTANCE).create(this);
- }
-
- @Override
- public void analyse(Object message) {
- if (message instanceof SegmentReceiver.SegmentWithTimeSlice) {
- SegmentReceiver.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentReceiver.SegmentWithTimeSlice)message;
- TraceSegmentObject segment = segmentWithTimeSlice.getSegment();
- long minute = segmentWithTimeSlice.getMinute();
- long hour = segmentWithTimeSlice.getHour();
- long day = segmentWithTimeSlice.getDay();
- int second = segmentWithTimeSlice.getSecond();
- analyseNodeRef(segment, segmentWithTimeSlice.getMinute(), minute, hour, day, second);
- } else {
- logger.error("unhandled message, message instance must SegmentReceiver.SegmentWithTimeSlice, but is %s", message.getClass().toString());
- }
- }
-
- @Override
- protected void sendToResSumAnalysis(AbstractNodeRefResSumAnalysis.NodeRefResRecord refResRecord) {
- try {
- getSelfContext().lookup(NodeRefResSumMinuteAnalysis.Role.INSTANCE).tell(refResRecord);
- } catch (WorkerInvokeException | WorkerNotFoundException e) {
- logger.error(e.getMessage(), e);
- }
- }
-
- @Override
- protected WorkerRefs aggWorkRefs() {
- try {
- return getClusterContext().lookup(NodeRefMinuteAgg.Role.INSTANCE);
- } catch (WorkerNotFoundException e) {
- logger.error("The role of %s worker not found", NodeRefMinuteAgg.Role.INSTANCE.roleName());
- }
- return null;
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefMinuteAnalysis workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefMinuteAnalysis(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int queueSize() {
- return WorkerConfig.Queue.NodeRef.NodeRefMinuteAnalysis.SIZE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefMinuteAnalysis.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefResSumDayAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefResSumDayAnalysis.java
deleted file mode 100644
index 7f4c8ccc3..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefResSumDayAnalysis.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.analysis;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.noderef.persistence.NodeRefResSumDayAgg;
-
-/**
- * @author pengys5
- */
-public class NodeRefResSumDayAnalysis extends AbstractNodeRefResSumAnalysis {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefResSumDayAnalysis.class);
-
- NodeRefResSumDayAnalysis(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void analyse(Object message) {
- if (message instanceof NodeRefResRecord) {
- NodeRefResRecord refResRecord = (NodeRefResRecord)message;
- analyseResSum(refResRecord);
- } else {
- logger.error("unhandled message, message instance must NodeRefResRecord, but is %s", message.getClass().toString());
- }
- }
-
- @Override
- protected WorkerRefs aggWorkRefs() {
- try {
- return getClusterContext().lookup(NodeRefResSumDayAgg.Role.INSTANCE);
- } catch (WorkerNotFoundException e) {
- logger.error("The role of %s worker not found", NodeRefResSumDayAgg.Role.INSTANCE.roleName());
- }
- return null;
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefResSumDayAnalysis workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefResSumDayAnalysis(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int queueSize() {
- return WorkerConfig.Queue.NodeRef.NodeRefResSumDayAnalysis.SIZE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefResSumDayAnalysis.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefResSumHourAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefResSumHourAnalysis.java
deleted file mode 100644
index 2b32b8c51..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefResSumHourAnalysis.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.analysis;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.noderef.persistence.NodeRefResSumHourAgg;
-
-/**
- * @author pengys5
- */
-public class NodeRefResSumHourAnalysis extends AbstractNodeRefResSumAnalysis {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefResSumHourAnalysis.class);
-
- NodeRefResSumHourAnalysis(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void analyse(Object message) {
- if (message instanceof NodeRefResRecord) {
- NodeRefResRecord refResRecord = (NodeRefResRecord)message;
- analyseResSum(refResRecord);
- } else {
- logger.error("unhandled message, message instance must NodeRefResRecord, but is %s", message.getClass().toString());
- }
- }
-
- @Override
- protected WorkerRefs aggWorkRefs() {
- try {
- return getClusterContext().lookup(NodeRefResSumHourAgg.Role.INSTANCE);
- } catch (WorkerNotFoundException e) {
- logger.error("The role of %s worker not found", NodeRefResSumHourAgg.Role.INSTANCE.roleName());
- }
- return null;
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefResSumHourAnalysis workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefResSumHourAnalysis(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int queueSize() {
- return WorkerConfig.Queue.NodeRef.NodeRefResSumHourAnalysis.SIZE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefResSumHourAnalysis.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysis.java
deleted file mode 100644
index f7af17697..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysis.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.analysis;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.noderef.persistence.NodeRefResSumMinuteAgg;
-
-/**
- * @author pengys5
- */
-public class NodeRefResSumMinuteAnalysis extends AbstractNodeRefResSumAnalysis {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefResSumMinuteAnalysis.class);
-
- NodeRefResSumMinuteAnalysis(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void analyse(Object message) {
- if (message instanceof NodeRefResRecord) {
- NodeRefResRecord refResRecord = (NodeRefResRecord)message;
- analyseResSum(refResRecord);
- } else {
- logger.error("unhandled message, message instance must NodeRefResRecord, but is %s", message.getClass().toString());
- }
- }
-
- @Override
- protected WorkerRefs aggWorkRefs() {
- try {
- return getClusterContext().lookup(NodeRefResSumMinuteAgg.Role.INSTANCE);
- } catch (WorkerNotFoundException e) {
- logger.error("The role of %s worker not found", NodeRefResSumMinuteAgg.Role.INSTANCE.roleName());
- }
- return null;
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefResSumMinuteAnalysis workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefResSumMinuteAnalysis(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int queueSize() {
- return WorkerConfig.Queue.NodeRef.NodeRefResSumMinuteAnalysis.SIZE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefResSumMinuteAnalysis.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefDayAgg.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefDayAgg.java
deleted file mode 100644
index 69c2bc298..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefDayAgg.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.persistence;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractClusterWorker;
-import org.skywalking.apm.collector.actor.AbstractClusterWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.storage.RecordData;
-
-/**
- * @author pengys5
- */
-public class NodeRefDayAgg extends AbstractClusterWorker {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefDayAgg.class);
-
- NodeRefDayAgg(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(NodeRefDaySave.Role.INSTANCE).create(this);
- }
-
- @Override
- protected void onWork(Object message) throws WorkerException {
- if (message instanceof RecordData) {
- getSelfContext().lookup(NodeRefDaySave.Role.INSTANCE).tell(message);
- } else {
- logger.error("unhandled message, message instance must RecordData, but is %s", message.getClass().toString());
- }
- }
-
- public static class Factory extends AbstractClusterWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefDayAgg workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefDayAgg(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int workerNum() {
- return WorkerConfig.WorkerNum.NodeRef.NodeRefDayAgg.VALUE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefDayAgg.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefDaySave.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefDaySave.java
deleted file mode 100644
index 33daea9e8..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefDaySave.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.persistence;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.RecordPersistenceMember;
-import org.skywalking.apm.collector.worker.noderef.NodeRefIndex;
-import org.skywalking.apm.collector.worker.storage.PersistenceWorkerListener;
-
-/**
- * @author pengys5
- */
-public class NodeRefDaySave extends RecordPersistenceMember {
-
- NodeRefDaySave(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public String esIndex() {
- return NodeRefIndex.INDEX;
- }
-
- @Override
- public String esType() {
- return NodeRefIndex.TYPE_DAY;
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefDaySave workerInstance(ClusterWorkerContext clusterContext) {
- NodeRefDaySave worker = new NodeRefDaySave(role(), clusterContext, new LocalWorkerContext());
- PersistenceWorkerListener.INSTANCE.register(worker);
- return worker;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefDaySave.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefHourAgg.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefHourAgg.java
deleted file mode 100644
index 0196a8c7a..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefHourAgg.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.persistence;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractClusterWorker;
-import org.skywalking.apm.collector.actor.AbstractClusterWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.storage.RecordData;
-
-/**
- * @author pengys5
- */
-public class NodeRefHourAgg extends AbstractClusterWorker {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefHourAgg.class);
-
- NodeRefHourAgg(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(NodeRefHourSave.Role.INSTANCE).create(this);
- }
-
- @Override
- protected void onWork(Object message) throws WorkerException {
- if (message instanceof RecordData) {
- getSelfContext().lookup(NodeRefHourSave.Role.INSTANCE).tell(message);
- } else {
- logger.error("unhandled message, message instance must RecordData, but is %s", message.getClass().toString());
- }
- }
-
- public static class Factory extends AbstractClusterWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefHourAgg workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefHourAgg(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int workerNum() {
- return WorkerConfig.WorkerNum.NodeRef.NodeRefHourAgg.VALUE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefHourAgg.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefHourSave.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefHourSave.java
deleted file mode 100644
index 35fdd2ea7..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefHourSave.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.persistence;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.RecordPersistenceMember;
-import org.skywalking.apm.collector.worker.noderef.NodeRefIndex;
-import org.skywalking.apm.collector.worker.storage.PersistenceWorkerListener;
-
-/**
- * @author pengys5
- */
-public class NodeRefHourSave extends RecordPersistenceMember {
-
- NodeRefHourSave(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public String esIndex() {
- return NodeRefIndex.INDEX;
- }
-
- @Override
- public String esType() {
- return NodeRefIndex.TYPE_HOUR;
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefHourSave workerInstance(ClusterWorkerContext clusterContext) {
- NodeRefHourSave worker = new NodeRefHourSave(role(), clusterContext, new LocalWorkerContext());
- PersistenceWorkerListener.INSTANCE.register(worker);
- return worker;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefHourSave.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefMinuteAgg.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefMinuteAgg.java
deleted file mode 100644
index 7dae8e0e3..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefMinuteAgg.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.persistence;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractClusterWorker;
-import org.skywalking.apm.collector.actor.AbstractClusterWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.storage.RecordData;
-
-/**
- * @author pengys5
- */
-public class NodeRefMinuteAgg extends AbstractClusterWorker {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefMinuteAgg.class);
-
- NodeRefMinuteAgg(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(NodeRefMinuteSave.Role.INSTANCE).create(this);
- }
-
- @Override
- protected void onWork(Object message) throws WorkerException {
- if (message instanceof RecordData) {
- getSelfContext().lookup(NodeRefMinuteSave.Role.INSTANCE).tell(message);
- } else {
- logger.error("unhandled message, message instance must RecordData, but is %s", message.getClass().toString());
- }
- }
-
- public static class Factory extends AbstractClusterWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefMinuteAgg workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefMinuteAgg(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int workerNum() {
- return WorkerConfig.WorkerNum.NodeRef.NodeRefMinuteAgg.VALUE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefMinuteAgg.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefMinuteSave.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefMinuteSave.java
deleted file mode 100644
index 236f8d410..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefMinuteSave.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.persistence;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.RecordPersistenceMember;
-import org.skywalking.apm.collector.worker.noderef.NodeRefIndex;
-import org.skywalking.apm.collector.worker.storage.PersistenceWorkerListener;
-
-/**
- * @author pengys5
- */
-public class NodeRefMinuteSave extends RecordPersistenceMember {
-
- NodeRefMinuteSave(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public String esIndex() {
- return NodeRefIndex.INDEX;
- }
-
- @Override
- public String esType() {
- return NodeRefIndex.TYPE_MINUTE;
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefMinuteSave workerInstance(ClusterWorkerContext clusterContext) {
- NodeRefMinuteSave worker = new NodeRefMinuteSave(role(), clusterContext, new LocalWorkerContext());
- PersistenceWorkerListener.INSTANCE.register(worker);
- return worker;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefMinuteSave.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumDayAgg.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumDayAgg.java
deleted file mode 100644
index 1e9c5cd0a..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumDayAgg.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.persistence;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractClusterWorker;
-import org.skywalking.apm.collector.actor.AbstractClusterWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.storage.MetricData;
-
-/**
- * @author pengys5
- */
-public class NodeRefResSumDayAgg extends AbstractClusterWorker {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefResSumDayAgg.class);
-
- NodeRefResSumDayAgg(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(NodeRefResSumDaySave.Role.INSTANCE).create(this);
- }
-
- @Override
- protected void onWork(Object message) throws WorkerException {
- if (message instanceof MetricData) {
- getSelfContext().lookup(NodeRefResSumDaySave.Role.INSTANCE).tell(message);
- } else {
- logger.error("unhandled message, message instance must MetricData, but is %s", message.getClass().toString());
- }
- }
-
- public static class Factory extends AbstractClusterWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefResSumDayAgg workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefResSumDayAgg(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int workerNum() {
- return WorkerConfig.WorkerNum.NodeRef.NodeRefResSumDayAgg.VALUE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefResSumDayAgg.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumDaySave.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumDaySave.java
deleted file mode 100644
index 43bb87321..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumDaySave.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.persistence;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.MetricPersistenceMember;
-import org.skywalking.apm.collector.worker.noderef.NodeRefResSumIndex;
-import org.skywalking.apm.collector.worker.storage.PersistenceWorkerListener;
-
-/**
- * @author pengys5
- */
-public class NodeRefResSumDaySave extends MetricPersistenceMember {
-
- NodeRefResSumDaySave(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public String esIndex() {
- return NodeRefResSumIndex.INDEX;
- }
-
- @Override
- public String esType() {
- return NodeRefResSumIndex.TYPE_DAY;
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefResSumDaySave workerInstance(ClusterWorkerContext clusterContext) {
- NodeRefResSumDaySave worker = new NodeRefResSumDaySave(role(), clusterContext, new LocalWorkerContext());
- PersistenceWorkerListener.INSTANCE.register(worker);
- return worker;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefResSumDaySave.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumGroupWithTimeSlice.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumGroupWithTimeSlice.java
deleted file mode 100644
index 40ce53334..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumGroupWithTimeSlice.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.persistence;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.SearchType;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.Sum;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.TimeSlice;
-import org.skywalking.apm.collector.worker.noderef.NodeRefResSumIndex;
-import org.skywalking.apm.collector.worker.storage.EsClient;
-
-/**
- * @author pengys5
- */
-public class NodeRefResSumGroupWithTimeSlice extends AbstractLocalSyncWorker {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefResSumGroupWithTimeSlice.class);
-
- NodeRefResSumGroupWithTimeSlice(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void onWork(Object request, Object response) throws WorkerException {
- if (request instanceof RequestEntity) {
- RequestEntity search = (RequestEntity)request;
-
- SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(NodeRefResSumIndex.INDEX);
- searchRequestBuilder.setTypes(search.getSliceType());
- searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
- searchRequestBuilder.setQuery(QueryBuilders.rangeQuery(NodeRefResSumIndex.TIME_SLICE).gte(search.getStartTime()).lte(search.getEndTime()));
- searchRequestBuilder.setSize(0);
-
- TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms(NodeRefResSumIndex.TIME_SLICE).field(NodeRefResSumIndex.TIME_SLICE);
- aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.ONE_SECOND_LESS).field(NodeRefResSumIndex.ONE_SECOND_LESS));
- aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.THREE_SECOND_LESS).field(NodeRefResSumIndex.THREE_SECOND_LESS));
- aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.FIVE_SECOND_LESS).field(NodeRefResSumIndex.FIVE_SECOND_LESS));
- aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.FIVE_SECOND_GREATER).field(NodeRefResSumIndex.FIVE_SECOND_GREATER));
- aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.ERROR).field(NodeRefResSumIndex.ERROR));
- aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.SUMMARY).field(NodeRefResSumIndex.SUMMARY));
-
- searchRequestBuilder.addAggregation(aggregationBuilder);
-
- SearchResponse searchResponse = searchRequestBuilder.execute().actionGet();
-
- JsonArray nodeRefResSumArray = new JsonArray();
- Terms aggTerms = searchResponse.getAggregations().get(NodeRefResSumIndex.TIME_SLICE);
- for (Terms.Bucket bucket : aggTerms.getBuckets()) {
- String aggId = String.valueOf(bucket.getKey());
- Sum oneSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.ONE_SECOND_LESS);
- Sum threeSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.THREE_SECOND_LESS);
- Sum fiveSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.FIVE_SECOND_LESS);
- Sum fiveSecondGreater = bucket.getAggregations().get(NodeRefResSumIndex.FIVE_SECOND_GREATER);
- Sum error = bucket.getAggregations().get(NodeRefResSumIndex.ERROR);
- Sum summary = bucket.getAggregations().get(NodeRefResSumIndex.SUMMARY);
- logger.debug("aggId: %s, oneSecondLess: %s, threeSecondLess: %s, fiveSecondLess: %s, fiveSecondGreater: %s, error: %s, summary: %s", aggId,
- oneSecondLess.getValue(), threeSecondLess.getValue(), fiveSecondLess.getValue(), fiveSecondGreater.getValue(), error.getValue(), summary.getValue());
-
- JsonObject nodeRefResSumObj = new JsonObject();
- nodeRefResSumObj.addProperty(NodeRefResSumIndex.TIME_SLICE, aggId);
- nodeRefResSumObj.addProperty(NodeRefResSumIndex.ONE_SECOND_LESS, oneSecondLess.getValue());
- nodeRefResSumObj.addProperty(NodeRefResSumIndex.THREE_SECOND_LESS, threeSecondLess.getValue());
- nodeRefResSumObj.addProperty(NodeRefResSumIndex.FIVE_SECOND_LESS, fiveSecondLess.getValue());
- nodeRefResSumObj.addProperty(NodeRefResSumIndex.FIVE_SECOND_GREATER, fiveSecondGreater.getValue());
- nodeRefResSumObj.addProperty(NodeRefResSumIndex.ERROR, error.getValue());
- nodeRefResSumObj.addProperty(NodeRefResSumIndex.SUMMARY, summary.getValue());
- nodeRefResSumArray.add(nodeRefResSumObj);
- }
-
- JsonObject resJsonObj = (JsonObject)response;
- resJsonObj.add("result", nodeRefResSumArray);
- } else {
- logger.error("unhandled message, message instance must NodeRefResSumGroupWithTimeSlice.RequestEntity, but is %s", request.getClass().toString());
- }
- }
-
- public static class RequestEntity extends TimeSlice {
- public RequestEntity(String sliceType, long startTime, long endTime) {
- super(sliceType, startTime, endTime);
- }
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return WorkerRole.INSTANCE;
- }
-
- @Override
- public NodeRefResSumGroupWithTimeSlice workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefResSumGroupWithTimeSlice(role(), clusterContext, new LocalWorkerContext());
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefResSumGroupWithTimeSlice.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumHourAgg.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumHourAgg.java
deleted file mode 100644
index 15b054d08..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumHourAgg.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.persistence;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractClusterWorker;
-import org.skywalking.apm.collector.actor.AbstractClusterWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.storage.MetricData;
-
-/**
- * @author pengys5
- */
-public class NodeRefResSumHourAgg extends AbstractClusterWorker {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefResSumHourAgg.class);
-
- NodeRefResSumHourAgg(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(NodeRefResSumHourSave.Role.INSTANCE).create(this);
- }
-
- @Override
- protected void onWork(Object message) throws WorkerException {
- if (message instanceof MetricData) {
- getSelfContext().lookup(NodeRefResSumHourSave.Role.INSTANCE).tell(message);
- } else {
- logger.error("unhandled message, message instance must MetricData, but is %s", message.getClass().toString());
- }
- }
-
- public static class Factory extends AbstractClusterWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefResSumHourAgg workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefResSumHourAgg(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int workerNum() {
- return WorkerConfig.WorkerNum.NodeRef.NodeRefResSumHourAgg.VALUE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefResSumHourAgg.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumHourSave.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumHourSave.java
deleted file mode 100644
index 3e55477a6..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumHourSave.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.persistence;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.MetricPersistenceMember;
-import org.skywalking.apm.collector.worker.noderef.NodeRefResSumIndex;
-import org.skywalking.apm.collector.worker.storage.PersistenceWorkerListener;
-
-/**
- * @author pengys5
- */
-public class NodeRefResSumHourSave extends MetricPersistenceMember {
-
- NodeRefResSumHourSave(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public String esIndex() {
- return NodeRefResSumIndex.INDEX;
- }
-
- @Override
- public String esType() {
- return NodeRefResSumIndex.TYPE_HOUR;
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefResSumHourSave workerInstance(ClusterWorkerContext clusterContext) {
- NodeRefResSumHourSave worker = new NodeRefResSumHourSave(role(), clusterContext, new LocalWorkerContext());
- PersistenceWorkerListener.INSTANCE.register(worker);
- return worker;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefResSumHourSave.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumMinuteAgg.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumMinuteAgg.java
deleted file mode 100644
index 44411cad4..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumMinuteAgg.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.persistence;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractClusterWorker;
-import org.skywalking.apm.collector.actor.AbstractClusterWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.storage.MetricData;
-
-/**
- * @author pengys5
- */
-public class NodeRefResSumMinuteAgg extends AbstractClusterWorker {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefResSumMinuteAgg.class);
-
- NodeRefResSumMinuteAgg(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(NodeRefResSumMinuteSave.Role.INSTANCE).create(this);
- }
-
- @Override
- protected void onWork(Object message) throws WorkerException {
- if (message instanceof MetricData) {
- getSelfContext().lookup(NodeRefResSumMinuteSave.Role.INSTANCE).tell(message);
- } else {
- logger.error("unhandled message, message instance must MetricData, but is %s", message.getClass().toString());
- }
- }
-
- public static class Factory extends AbstractClusterWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefResSumMinuteAgg workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefResSumMinuteAgg(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int workerNum() {
- return WorkerConfig.WorkerNum.NodeRef.NodeRefResSumMinuteAgg.VALUE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefResSumMinuteAgg.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumMinuteSave.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumMinuteSave.java
deleted file mode 100644
index 9a1fd2409..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumMinuteSave.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.persistence;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.selector.HashCodeSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.MetricPersistenceMember;
-import org.skywalking.apm.collector.worker.noderef.NodeRefResSumIndex;
-import org.skywalking.apm.collector.worker.storage.PersistenceWorkerListener;
-
-/**
- * @author pengys5
- */
-public class NodeRefResSumMinuteSave extends MetricPersistenceMember {
-
- NodeRefResSumMinuteSave(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public String esIndex() {
- return NodeRefResSumIndex.INDEX;
- }
-
- @Override
- public String esType() {
- return NodeRefResSumIndex.TYPE_MINUTE;
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public NodeRefResSumMinuteSave workerInstance(ClusterWorkerContext clusterContext) {
- NodeRefResSumMinuteSave worker = new NodeRefResSumMinuteSave(role(), clusterContext, new LocalWorkerContext());
- PersistenceWorkerListener.INSTANCE.register(worker);
- return worker;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefResSumMinuteSave.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new HashCodeSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumSearchWithTimeSlice.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumSearchWithTimeSlice.java
deleted file mode 100644
index 9a3adeaee..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefResSumSearchWithTimeSlice.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.persistence;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.SearchType;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.Sum;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.Const;
-import org.skywalking.apm.collector.worker.TimeSlice;
-import org.skywalking.apm.collector.worker.noderef.NodeRefResSumIndex;
-import org.skywalking.apm.collector.worker.storage.EsClient;
-
-/**
- * @author pengys5
- */
-public class NodeRefResSumSearchWithTimeSlice extends AbstractLocalSyncWorker {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefResSumSearchWithTimeSlice.class);
-
- NodeRefResSumSearchWithTimeSlice(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void onWork(Object request, Object response) throws WorkerException {
- if (request instanceof RequestEntity) {
- RequestEntity search = (RequestEntity)request;
-
- SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(NodeRefResSumIndex.INDEX);
- searchRequestBuilder.setTypes(search.getSliceType());
- searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
- searchRequestBuilder.setQuery(QueryBuilders.rangeQuery(NodeRefResSumIndex.TIME_SLICE).gte(search.getStartTime()).lte(search.getEndTime()));
- searchRequestBuilder.setSize(0);
-
- TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms(NodeRefResSumIndex.AGG_COLUMN).field(NodeRefResSumIndex.AGG_COLUMN);
- aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.ONE_SECOND_LESS).field(NodeRefResSumIndex.ONE_SECOND_LESS));
- aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.THREE_SECOND_LESS).field(NodeRefResSumIndex.THREE_SECOND_LESS));
- aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.FIVE_SECOND_LESS).field(NodeRefResSumIndex.FIVE_SECOND_LESS));
- aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.FIVE_SECOND_GREATER).field(NodeRefResSumIndex.FIVE_SECOND_GREATER));
- aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.ERROR).field(NodeRefResSumIndex.ERROR));
- aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.SUMMARY).field(NodeRefResSumIndex.SUMMARY));
-
- searchRequestBuilder.addAggregation(aggregationBuilder);
-
- SearchResponse searchResponse = searchRequestBuilder.execute().actionGet();
-
- JsonArray nodeRefResSumArray = new JsonArray();
- Terms aggTerms = searchResponse.getAggregations().get(NodeRefResSumIndex.AGG_COLUMN);
- for (Terms.Bucket bucket : aggTerms.getBuckets()) {
- String aggId = String.valueOf(bucket.getKey());
- Sum oneSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.ONE_SECOND_LESS);
- Sum threeSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.THREE_SECOND_LESS);
- Sum fiveSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.FIVE_SECOND_LESS);
- Sum fiveSecondGreater = bucket.getAggregations().get(NodeRefResSumIndex.FIVE_SECOND_GREATER);
- Sum error = bucket.getAggregations().get(NodeRefResSumIndex.ERROR);
- Sum summary = bucket.getAggregations().get(NodeRefResSumIndex.SUMMARY);
- logger.debug("aggId: %s, oneSecondLess: %s, threeSecondLess: %s, fiveSecondLess: %s, fiveSecondGreater: %s, error: %s, summary: %s", aggId,
- oneSecondLess.getValue(), threeSecondLess.getValue(), fiveSecondLess.getValue(), fiveSecondGreater.getValue(), error.getValue(), summary.getValue());
-
- JsonObject nodeRefResSumObj = new JsonObject();
- String[] ids = aggId.split(Const.IDS_SPLIT);
- String front = ids[0];
- String behind = ids[1];
-
- nodeRefResSumObj.addProperty("front", front);
- nodeRefResSumObj.addProperty("behind", behind);
-
- nodeRefResSumObj.addProperty(NodeRefResSumIndex.ONE_SECOND_LESS, oneSecondLess.getValue());
- nodeRefResSumObj.addProperty(NodeRefResSumIndex.THREE_SECOND_LESS, threeSecondLess.getValue());
- nodeRefResSumObj.addProperty(NodeRefResSumIndex.FIVE_SECOND_LESS, fiveSecondLess.getValue());
- nodeRefResSumObj.addProperty(NodeRefResSumIndex.FIVE_SECOND_GREATER, fiveSecondGreater.getValue());
- nodeRefResSumObj.addProperty(NodeRefResSumIndex.ERROR, error.getValue());
- nodeRefResSumObj.addProperty(NodeRefResSumIndex.SUMMARY, summary.getValue());
- nodeRefResSumArray.add(nodeRefResSumObj);
- }
-
- JsonObject resJsonObj = (JsonObject)response;
- resJsonObj.add("result", nodeRefResSumArray);
- } else {
- logger.error("unhandled message, message instance must NodeRefResSumSearchWithTimeSlice.RequestEntity, but is %s", request.getClass().toString());
- }
- }
-
- public static class RequestEntity extends TimeSlice {
- public RequestEntity(String sliceType, long startTime, long endTime) {
- super(sliceType, startTime, endTime);
- }
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return WorkerRole.INSTANCE;
- }
-
- @Override
- public NodeRefResSumSearchWithTimeSlice workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefResSumSearchWithTimeSlice(role(), clusterContext, new LocalWorkerContext());
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefResSumSearchWithTimeSlice.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefSearchWithTimeSlice.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefSearchWithTimeSlice.java
deleted file mode 100644
index 2c803882c..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/noderef/persistence/NodeRefSearchWithTimeSlice.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.skywalking.apm.collector.worker.noderef.persistence;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.SearchType;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.Const;
-import org.skywalking.apm.collector.worker.TimeSlice;
-import org.skywalking.apm.collector.worker.noderef.NodeRefIndex;
-import org.skywalking.apm.collector.worker.storage.EsClient;
-
-/**
- * @author pengys5
- */
-public class NodeRefSearchWithTimeSlice extends AbstractLocalSyncWorker {
-
- private Logger logger = LogManager.getFormatterLogger(NodeRefSearchWithTimeSlice.class);
-
- NodeRefSearchWithTimeSlice(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void onWork(Object request, Object response) throws WorkerException {
- if (request instanceof RequestEntity) {
- RequestEntity search = (RequestEntity)request;
-
- SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(NodeRefIndex.INDEX);
- searchRequestBuilder.setTypes(search.getSliceType());
- searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
- searchRequestBuilder.setQuery(QueryBuilders.rangeQuery(NodeRefIndex.TIME_SLICE).gte(search.getStartTime()).lte(search.getEndTime()));
- searchRequestBuilder.setSize(0);
-
- searchRequestBuilder.addAggregation(AggregationBuilders.terms(NodeRefIndex.AGG_COLUMN).field(NodeRefIndex.AGG_COLUMN).size(100));
-
- SearchResponse searchResponse = searchRequestBuilder.execute().actionGet();
-
- Terms genders = searchResponse.getAggregations().get(NodeRefIndex.AGG_COLUMN);
-
- JsonArray nodeRefArray = new JsonArray();
- for (Terms.Bucket entry : genders.getBuckets()) {
- String aggId = entry.getKeyAsString();
- String[] aggIds = aggId.split(Const.IDS_SPLIT);
- String front = aggIds[0];
- String behind = aggIds[1];
-
- JsonObject nodeRefObj = new JsonObject();
- nodeRefObj.addProperty(NodeRefIndex.FRONT, front);
- nodeRefObj.addProperty(NodeRefIndex.BEHIND, behind);
- nodeRefArray.add(nodeRefObj);
- }
- logger.debug("node ref data: %s", nodeRefArray.toString());
-
- JsonObject resJsonObj = (JsonObject)response;
- resJsonObj.add("result", nodeRefArray);
- } else {
- logger.error("unhandled message, message instance must NodeRefSearchWithTimeSlice.RequestEntity, but is %s", request.getClass().toString());
- }
- }
-
- public static class RequestEntity extends TimeSlice {
- public RequestEntity(String sliceType, long startTime, long endTime) {
- super(sliceType, startTime, endTime);
- }
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return WorkerRole.INSTANCE;
- }
-
- @Override
- public NodeRefSearchWithTimeSlice workerInstance(ClusterWorkerContext clusterContext) {
- return new NodeRefSearchWithTimeSlice(role(), clusterContext, new LocalWorkerContext());
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return NodeRefSearchWithTimeSlice.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/register/ApplicationRegisterServiceImpl.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/register/ApplicationRegisterServiceImpl.java
deleted file mode 100644
index ec06f7676..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/register/ApplicationRegisterServiceImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.skywalking.apm.collector.worker.register;
-
-import io.grpc.stub.StreamObserver;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractWorker;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRef;
-import org.skywalking.apm.collector.worker.grpcserver.WorkerCaller;
-import org.skywalking.apm.collector.worker.segment.SegmentReceiver;
-import org.skywalking.apm.network.proto.Application;
-import org.skywalking.apm.network.proto.ApplicationMapping;
-import org.skywalking.apm.network.proto.ApplicationRegisterServiceGrpc;
-
-/**
- * @author pengys5
- */
-public class ApplicationRegisterServiceImpl extends ApplicationRegisterServiceGrpc.ApplicationRegisterServiceImplBase implements WorkerCaller {
-
- private Logger logger = LogManager.getFormatterLogger(ApplicationRegisterServiceImpl.class);
-
- private ClusterWorkerContext clusterWorkerContext;
- private WorkerRef segmentReceiverWorkRef;
-
- @Override public void preStart() throws ProviderNotFoundException {
- segmentReceiverWorkRef = clusterWorkerContext.findProvider(SegmentReceiver.WorkerRole.INSTANCE).create(AbstractWorker.noOwner());
-
- }
-
- @Override public void inject(ClusterWorkerContext clusterWorkerContext) {
- this.clusterWorkerContext = clusterWorkerContext;
- }
-
- @Override public void register(Application request, StreamObserver responseObserver) {
-
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentCostIndex.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentCostIndex.java
deleted file mode 100644
index 87e879cea..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentCostIndex.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.skywalking.apm.collector.worker.segment;
-
-import java.io.IOException;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.skywalking.apm.collector.worker.config.EsConfig;
-import org.skywalking.apm.collector.worker.storage.AbstractIndex;
-
-/**
- * @author pengys5
- */
-public class SegmentCostIndex extends AbstractIndex {
-
- public static final String INDEX = "segment_cost_idx";
- public static final String SEG_ID = "segId";
- public static final String START_TIME = "startTime";
- public static final String END_TIME = "endTime";
- public static final String GLOBAL_TRACE_ID = "globalTraceId";
- public static final String OPERATION_NAME = "operationName";
- public static final String COST = "cost";
-
- @Override
- public String index() {
- return INDEX;
- }
-
- @Override
- public boolean isRecord() {
- return true;
- }
-
- @Override
- public int refreshInterval() {
- return EsConfig.Es.Index.RefreshInterval.SegmentCostIndex.VALUE;
- }
-
- @Override
- public XContentBuilder createMappingBuilder() throws IOException {
- return XContentFactory.jsonBuilder()
- .startObject()
- .startObject("properties")
- .startObject(SEG_ID)
- .field("type", "keyword")
- .endObject()
- .startObject(START_TIME)
- .field("type", "long")
- .field("index", "not_analyzed")
- .endObject()
- .startObject(END_TIME)
- .field("type", "long")
- .field("index", "not_analyzed")
- .endObject()
- .startObject(GLOBAL_TRACE_ID)
- .field("type", "keyword")
- .endObject()
- .startObject(OPERATION_NAME)
- .field("type", "text")
- .endObject()
- .startObject(COST)
- .field("type", "long")
- .field("index", "not_analyzed")
- .endObject()
- .endObject()
- .endObject();
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentExceptionIndex.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentExceptionIndex.java
deleted file mode 100644
index 9cd9def54..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentExceptionIndex.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.skywalking.apm.collector.worker.segment;
-
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.skywalking.apm.collector.worker.config.EsConfig;
-import org.skywalking.apm.collector.worker.storage.AbstractIndex;
-
-import java.io.IOException;
-
-/**
- * @author pengys5
- */
-public class SegmentExceptionIndex extends AbstractIndex {
- public static final String INDEX = "segment_exp_idx";
- public static final String SEG_ID = "segId";
- public static final String IS_ERROR = "isError";
- public static final String ERROR_KIND = "errorKind";
-
- @Override
- public String index() {
- return INDEX;
- }
-
- @Override
- public boolean isRecord() {
- return true;
- }
-
- @Override
- public int refreshInterval() {
- return EsConfig.Es.Index.RefreshInterval.SegmentExceptionIndex.VALUE;
- }
-
- @Override
- public XContentBuilder createMappingBuilder() throws IOException {
- XContentBuilder mappingBuilder = XContentFactory.jsonBuilder()
- .startObject()
- .startObject("properties")
- .startObject(SEG_ID)
- .field("type", "keyword")
- .endObject()
- .startObject(IS_ERROR)
- .field("type", "boolean")
- .field("index", "not_analyzed")
- .endObject()
- .startObject(ERROR_KIND)
- .field("type", "keyword")
- .endObject()
- .endObject()
- .endObject();
- return mappingBuilder;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentIndex.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentIndex.java
deleted file mode 100644
index f2917da81..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentIndex.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.skywalking.apm.collector.worker.segment;
-
-import java.io.IOException;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.skywalking.apm.collector.worker.config.EsConfig;
-import org.skywalking.apm.collector.worker.storage.AbstractIndex;
-
-/**
- * @author pengys5
- */
-public class SegmentIndex extends AbstractIndex {
-
- public static final String INDEX = "segment_idx";
- public static final String TRACE_SEGMENT_ID = "traceSegmentId";
- public static final String SEGMENT_OBJ_BLOB = "segmentObjBlob";
-
- @Override
- public String index() {
- return INDEX;
- }
-
- @Override
- public boolean isRecord() {
- return true;
- }
-
- @Override
- public int refreshInterval() {
- return EsConfig.Es.Index.RefreshInterval.SegmentIndex.VALUE;
- }
-
- @Override
- public XContentBuilder createMappingBuilder() throws IOException {
- return XContentFactory.jsonBuilder()
- .startObject()
- .startObject("properties")
- .startObject(TRACE_SEGMENT_ID)
- .field("type", "keyword")
- .endObject()
- .startObject(TYPE_MINUTE)
- .field("type", "long")
- .endObject()
- .startObject(TYPE_HOUR)
- .field("type", "long")
- .endObject()
- .startObject(TYPE_DAY)
- .field("type", "long")
- .endObject()
- .startObject(SEGMENT_OBJ_BLOB)
- .field("type", "binary")
- .endObject()
- .endObject()
- .endObject();
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentReceiver.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentReceiver.java
deleted file mode 100644
index d1199de08..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentReceiver.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package org.skywalking.apm.collector.worker.segment;
-
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
-import java.util.List;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.globaltrace.analysis.GlobalTraceAnalysis;
-import org.skywalking.apm.collector.worker.grpcserver.AbstractReceiver;
-import org.skywalking.apm.collector.worker.httpserver.ArgumentsParseException;
-import org.skywalking.apm.collector.worker.node.analysis.NodeCompAnalysis;
-import org.skywalking.apm.collector.worker.node.analysis.NodeMappingDayAnalysis;
-import org.skywalking.apm.collector.worker.node.analysis.NodeMappingHourAnalysis;
-import org.skywalking.apm.collector.worker.node.analysis.NodeMappingMinuteAnalysis;
-import org.skywalking.apm.collector.worker.noderef.analysis.NodeRefDayAnalysis;
-import org.skywalking.apm.collector.worker.noderef.analysis.NodeRefHourAnalysis;
-import org.skywalking.apm.collector.worker.noderef.analysis.NodeRefMinuteAnalysis;
-import org.skywalking.apm.collector.worker.segment.analysis.SegmentAnalysis;
-import org.skywalking.apm.collector.worker.segment.analysis.SegmentCostAnalysis;
-import org.skywalking.apm.collector.worker.segment.analysis.SegmentExceptionAnalysis;
-import org.skywalking.apm.collector.worker.segment.entity.SegmentAndBase64;
-import org.skywalking.apm.collector.worker.storage.AbstractTimeSlice;
-import org.skywalking.apm.collector.worker.tools.DateTools;
-import org.skywalking.apm.network.proto.SpanObject;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-import org.skywalking.apm.network.proto.UpstreamSegment;
-import org.skywalking.apm.util.StringUtil;
-
-/**
- * @author pengys5
- */
-public class SegmentReceiver extends AbstractReceiver {
- private static final Logger logger = LogManager.getFormatterLogger(SegmentReceiver.class);
-
- public SegmentReceiver(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(GlobalTraceAnalysis.Role.INSTANCE).create(this);
-
- getClusterContext().findProvider(SegmentAnalysis.Role.INSTANCE).create(this);
- getClusterContext().findProvider(SegmentCostAnalysis.Role.INSTANCE).create(this);
- getClusterContext().findProvider(SegmentExceptionAnalysis.Role.INSTANCE).create(this);
-
- getClusterContext().findProvider(NodeRefMinuteAnalysis.Role.INSTANCE).create(this);
- getClusterContext().findProvider(NodeRefHourAnalysis.Role.INSTANCE).create(this);
- getClusterContext().findProvider(NodeRefDayAnalysis.Role.INSTANCE).create(this);
-
- getClusterContext().findProvider(NodeCompAnalysis.Role.INSTANCE).create(this);
-
- getClusterContext().findProvider(NodeMappingDayAnalysis.Role.INSTANCE).create(this);
- getClusterContext().findProvider(NodeMappingHourAnalysis.Role.INSTANCE).create(this);
- getClusterContext().findProvider(NodeMappingMinuteAnalysis.Role.INSTANCE).create(this);
- }
-
- /**
- * Read segment's buffer from buffer reader by stream mode. when finish read one segment then send to analysis.
- * This method in there, so post servlet just can receive segments data.
- */
- @Override protected void onReceive(
- Object request) throws ArgumentsParseException, WorkerInvokeException, WorkerNotFoundException {
- if (request instanceof UpstreamSegment) {
- UpstreamSegment upstreamSegment = (UpstreamSegment)request;
- ByteString segmentByte = upstreamSegment.getSegment();
- List globalTraceIds = upstreamSegment.getGlobalTraceIdsList();
-
- String segmentBase64 = new String(Base64.encodeBase64(segmentByte.toByteArray()));
-
- TraceSegmentObject segment;
- try {
- segment = TraceSegmentObject.parseFrom(segmentByte);
- } catch (InvalidProtocolBufferException e) {
- throw new ArgumentsParseException(e.getMessage(), e);
- }
- tellWorkers(new SegmentAndBase64(segment, segmentBase64), globalTraceIds);
- }
- }
-
- private void tellWorkers(
- SegmentAndBase64 segmentAndBase64,
- List globalTraceIds) throws WorkerNotFoundException, WorkerInvokeException {
- TraceSegmentObject segment = segmentAndBase64.getObject();
- try {
- validateData(segment);
- } catch (ArgumentsParseException e) {
- logger.error(e.getMessage(), e);
- return;
- }
-
- logger.debug("receive message instanceof TraceSegment, traceSegmentId is %s", segment.getTraceSegmentId());
- SpanObject firstSpan = segment.getSpans(segment.getSpansCount() - 1);
-
- long minuteSlice = DateTools.getMinuteSlice(firstSpan.getStartTime());
- long hourSlice = DateTools.getHourSlice(firstSpan.getStartTime());
- long daySlice = DateTools.getDaySlice(firstSpan.getStartTime());
- int second = DateTools.getSecond(firstSpan.getStartTime());
- logger.debug("minuteSlice: %s, hourSlice: %s, daySlice: %s, second:%s", minuteSlice, hourSlice, daySlice, second);
-
- SegmentWithTimeSlice segmentWithTimeSlice = new SegmentWithTimeSlice(segment, globalTraceIds, minuteSlice, hourSlice, daySlice, second);
- getSelfContext().lookup(SegmentAnalysis.Role.INSTANCE).tell(segmentAndBase64);
-
- getSelfContext().lookup(SegmentCostAnalysis.Role.INSTANCE).tell(segmentWithTimeSlice);
- getSelfContext().lookup(GlobalTraceAnalysis.Role.INSTANCE).tell(segmentWithTimeSlice);
- getSelfContext().lookup(SegmentExceptionAnalysis.Role.INSTANCE).tell(segmentWithTimeSlice);
-
- getSelfContext().lookup(NodeCompAnalysis.Role.INSTANCE).tell(segmentWithTimeSlice);
-
- tellNodeRef(segmentWithTimeSlice);
- tellNodeMapping(segmentWithTimeSlice);
- }
-
- private void tellNodeRef(
- SegmentWithTimeSlice segmentWithTimeSlice) throws WorkerNotFoundException, WorkerInvokeException {
- getSelfContext().lookup(NodeRefMinuteAnalysis.Role.INSTANCE).tell(segmentWithTimeSlice);
- getSelfContext().lookup(NodeRefHourAnalysis.Role.INSTANCE).tell(segmentWithTimeSlice);
- getSelfContext().lookup(NodeRefDayAnalysis.Role.INSTANCE).tell(segmentWithTimeSlice);
- }
-
- private void tellNodeMapping(
- SegmentWithTimeSlice segmentWithTimeSlice) throws WorkerNotFoundException, WorkerInvokeException {
- getSelfContext().lookup(NodeMappingMinuteAnalysis.Role.INSTANCE).tell(segmentWithTimeSlice);
- getSelfContext().lookup(NodeMappingHourAnalysis.Role.INSTANCE).tell(segmentWithTimeSlice);
- getSelfContext().lookup(NodeMappingDayAnalysis.Role.INSTANCE).tell(segmentWithTimeSlice);
- }
-
- private void validateData(TraceSegmentObject segment) throws ArgumentsParseException {
- if (StringUtil.isEmpty(segment.getTraceSegmentId())) {
- throw new ArgumentsParseException("traceSegmentId required");
- }
- if (segment.getSpansCount() < 1) {
- throw new ArgumentsParseException("must contain at least one span");
- }
- SpanObject firstSpan = segment.getSpans(segment.getSpansCount() - 1);
- if (firstSpan.getSpanId() != 0 && firstSpan.getParentSpanId() != -1) {
- throw new ArgumentsParseException("first span id must equals 0 and parent span id must equals -1");
- }
- if (0 == firstSpan.getStartTime()) {
- throw new ArgumentsParseException("startTime required");
- }
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return WorkerRole.INSTANCE;
- }
-
- @Override
- public SegmentReceiver workerInstance(ClusterWorkerContext clusterContext) {
- return new SegmentReceiver(role(), clusterContext, new LocalWorkerContext());
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return SegmentReceiver.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-
- public static class SegmentWithTimeSlice extends AbstractTimeSlice {
- private final TraceSegmentObject segment;
-
- private final List globalTraceIds;
-
- public SegmentWithTimeSlice(TraceSegmentObject segment, List globalTraceIds, long minute, long hour,
- long day, int second) {
- super(minute, hour, day, second);
- this.segment = segment;
- this.globalTraceIds = globalTraceIds;
- }
-
- public TraceSegmentObject getSegment() {
- return segment;
- }
-
- public List getGlobalTraceIds() {
- return globalTraceIds;
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentTopGet.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentTopGet.java
deleted file mode 100644
index 9896b59c6..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/SegmentTopGet.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.skywalking.apm.collector.worker.segment;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import java.util.Arrays;
-import java.util.Map;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.httpserver.AbstractGet;
-import org.skywalking.apm.collector.worker.httpserver.AbstractGetProvider;
-import org.skywalking.apm.collector.worker.httpserver.ArgumentsParseException;
-import org.skywalking.apm.collector.worker.segment.persistence.SegmentTopSearch;
-import org.skywalking.apm.collector.worker.tools.ParameterTools;
-
-/**
- * @author pengys5
- */
-public class SegmentTopGet extends AbstractGet {
-
- private Logger logger = LogManager.getFormatterLogger(SegmentTopGet.class);
-
- SegmentTopGet(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override protected Class responseClass() {
- return JsonObject.class;
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(SegmentTopSearch.WorkerRole.INSTANCE).create(this);
- }
-
- @Override protected void onReceive(Map parameter,
- JsonElement response) throws ArgumentsParseException, WorkerInvokeException, WorkerNotFoundException {
- if (!parameter.containsKey("startTime") || !parameter.containsKey("endTime") || !parameter.containsKey("from") || !parameter.containsKey("limit")) {
- throw new ArgumentsParseException("the request parameter must contains startTime, endTime, from, limit");
- }
-
- if (logger.isDebugEnabled()) {
- logger.debug("startTime: %s, endTime: %s, from: %s", Arrays.toString(parameter.get("startTime")),
- Arrays.toString(parameter.get("endTime")), Arrays.toString(parameter.get("from")));
- }
-
- long startTime;
- try {
- startTime = Long.valueOf(ParameterTools.INSTANCE.toString(parameter, "startTime"));
- } catch (NumberFormatException e) {
- throw new ArgumentsParseException("the request parameter startTime must be a long");
- }
-
- long endTime;
- try {
- endTime = Long.valueOf(ParameterTools.INSTANCE.toString(parameter, "endTime"));
- } catch (NumberFormatException e) {
- throw new ArgumentsParseException("the request parameter endTime must be a long");
- }
-
- int from;
- try {
- from = Integer.valueOf(ParameterTools.INSTANCE.toString(parameter, "from"));
- } catch (NumberFormatException e) {
- throw new ArgumentsParseException("the request parameter from must be an integer");
- }
-
- int limit;
- try {
- limit = Integer.valueOf(ParameterTools.INSTANCE.toString(parameter, "limit"));
- } catch (NumberFormatException e) {
- throw new ArgumentsParseException("the request parameter from must be an integer");
- }
-
- int minCost = -1;
- if (parameter.containsKey("minCost")) {
- minCost = Integer.valueOf(ParameterTools.INSTANCE.toString(parameter, "minCost"));
- }
- int maxCost = -1;
- if (parameter.containsKey("maxCost")) {
- maxCost = Integer.valueOf(ParameterTools.INSTANCE.toString(parameter, "maxCost"));
- }
-
- String globalTraceId = null;
- if (parameter.containsKey("globalTraceId")) {
- globalTraceId = ParameterTools.INSTANCE.toString(parameter, "globalTraceId");
- }
-
- String operationName = null;
- if (parameter.containsKey("operationName")) {
- operationName = ParameterTools.INSTANCE.toString(parameter, "operationName");
- }
-
- SegmentTopSearch.RequestEntity requestEntity;
- requestEntity = new SegmentTopSearch.RequestEntity(from, limit, startTime, endTime, globalTraceId, operationName);
- requestEntity.setMinCost(minCost);
- requestEntity.setMaxCost(maxCost);
- getSelfContext().lookup(SegmentTopSearch.WorkerRole.INSTANCE).ask(requestEntity, response);
- }
-
- public static class Factory extends AbstractGetProvider {
- @Override
- public Role role() {
- return WorkerRole.INSTANCE;
- }
-
- @Override
- public SegmentTopGet workerInstance(ClusterWorkerContext clusterContext) {
- return new SegmentTopGet(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public String servletPath() {
- return "/segments/top";
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return SegmentTopGet.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/analysis/SegmentAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/analysis/SegmentAnalysis.java
deleted file mode 100644
index ffc568d04..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/analysis/SegmentAnalysis.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.skywalking.apm.collector.worker.segment.analysis;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.RecordAnalysisMember;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.segment.entity.SegmentAndBase64;
-import org.skywalking.apm.collector.worker.segment.persistence.SegmentSave;
-
-/**
- * @author pengys5
- */
-public class SegmentAnalysis extends RecordAnalysisMember {
-
- private Logger logger = LogManager.getFormatterLogger(SegmentAnalysis.class);
-
- SegmentAnalysis(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(SegmentSave.Role.INSTANCE).create(this);
- }
-
- @Override
- public void analyse(Object message) {
- if (message instanceof SegmentAndBase64) {
- SegmentAndBase64 segmentAndBase64 = (SegmentAndBase64)message;
-
- try {
- getSelfContext().lookup(SegmentSave.Role.INSTANCE).tell(segmentAndBase64);
- } catch (WorkerInvokeException | WorkerNotFoundException e) {
- e.printStackTrace();
- logger.error(e.getMessage(), e);
- }
- } else {
- logger.error("unhandled message, message instance must Segment, but is %s", message.getClass().toString());
- }
- }
-
- @Override
- protected WorkerRefs aggWorkRefs() {
- return null;
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- @Override
- public Role role() {
- return SegmentAnalysis.Role.INSTANCE;
- }
-
- @Override
- public SegmentAnalysis workerInstance(ClusterWorkerContext clusterContext) {
- return new SegmentAnalysis(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int queueSize() {
- return WorkerConfig.Queue.Segment.SegmentAnalysis.SIZE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return SegmentAnalysis.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/analysis/SegmentCostAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/analysis/SegmentCostAnalysis.java
deleted file mode 100644
index 72161f8a2..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/analysis/SegmentCostAnalysis.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.skywalking.apm.collector.worker.segment.analysis;
-
-import com.google.gson.JsonObject;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.RecordAnalysisMember;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.segment.SegmentCostIndex;
-import org.skywalking.apm.collector.worker.segment.SegmentReceiver;
-import org.skywalking.apm.collector.worker.segment.persistence.SegmentCostSave;
-import org.skywalking.apm.collector.worker.tools.CollectionTools;
-import org.skywalking.apm.network.proto.SpanObject;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-
-/**
- * @author pengys5
- */
-public class SegmentCostAnalysis extends RecordAnalysisMember {
-
- private Logger logger = LogManager.getFormatterLogger(SegmentCostAnalysis.class);
-
- SegmentCostAnalysis(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(SegmentCostSave.Role.INSTANCE).create(this);
- }
-
- @Override
- public void analyse(Object message) {
- if (message instanceof SegmentReceiver.SegmentWithTimeSlice) {
- SegmentReceiver.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentReceiver.SegmentWithTimeSlice)message;
- TraceSegmentObject segment = segmentWithTimeSlice.getSegment();
-
- if (CollectionTools.isNotEmpty(segment.getSpansList())) {
- for (SpanObject span : segment.getSpansList()) {
- if (span.getParentSpanId() == -1) {
- for (String globalTraceId : segmentWithTimeSlice.getGlobalTraceIds()) {
- segment.getGlobalTraceIdsList();
- JsonObject dataJsonObj = new JsonObject();
- dataJsonObj.addProperty(SegmentCostIndex.SEG_ID, segment.getTraceSegmentId());
- dataJsonObj.addProperty(SegmentCostIndex.START_TIME, span.getStartTime());
- dataJsonObj.addProperty(SegmentCostIndex.END_TIME, span.getEndTime());
- dataJsonObj.addProperty(SegmentCostIndex.GLOBAL_TRACE_ID, globalTraceId);
- dataJsonObj.addProperty(SegmentCostIndex.OPERATION_NAME, span.getOperationName());
- dataJsonObj.addProperty(SegmentCostIndex.TIME_SLICE, segmentWithTimeSlice.getMinute());
-
- long startTime = span.getStartTime();
- long endTime = span.getEndTime();
- long cost = endTime - startTime;
- if (cost == 0) {
- cost = 1;
- }
- dataJsonObj.addProperty(SegmentCostIndex.COST, cost);
- set(segment.getTraceSegmentId(), dataJsonObj);
- }
- }
- }
- }
- } else {
- logger.error("unhandled message, message instance must SegmentReceiver.SegmentWithTimeSlice, but is %s", message.getClass().toString());
- }
- }
-
- @Override
- protected WorkerRefs aggWorkRefs() {
- try {
- return getSelfContext().lookup(SegmentCostSave.Role.INSTANCE);
- } catch (WorkerNotFoundException e) {
- logger.error("The role of %s worker not found", SegmentCostSave.Role.INSTANCE.roleName());
- }
- return null;
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- @Override
- public Role role() {
- return SegmentCostAnalysis.Role.INSTANCE;
- }
-
- @Override
- public SegmentCostAnalysis workerInstance(ClusterWorkerContext clusterContext) {
- return new SegmentCostAnalysis(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int queueSize() {
- return WorkerConfig.Queue.Segment.SegmentCostAnalysis.SIZE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return SegmentCostAnalysis.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/analysis/SegmentExceptionAnalysis.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/analysis/SegmentExceptionAnalysis.java
deleted file mode 100644
index 09df42fdd..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/analysis/SegmentExceptionAnalysis.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.skywalking.apm.collector.worker.segment.analysis;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import java.util.List;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.RecordAnalysisMember;
-import org.skywalking.apm.collector.worker.config.WorkerConfig;
-import org.skywalking.apm.collector.worker.segment.SegmentExceptionIndex;
-import org.skywalking.apm.collector.worker.segment.SegmentReceiver;
-import org.skywalking.apm.collector.worker.segment.persistence.SegmentExceptionSave;
-import org.skywalking.apm.collector.worker.tools.CollectionTools;
-import org.skywalking.apm.network.proto.LogMessage;
-import org.skywalking.apm.network.proto.SpanObject;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-
-/**
- * @author pengys5
- */
-public class SegmentExceptionAnalysis extends RecordAnalysisMember {
-
- private Logger logger = LogManager.getFormatterLogger(SegmentExceptionAnalysis.class);
-
- SegmentExceptionAnalysis(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(SegmentExceptionSave.Role.INSTANCE).create(this);
- }
-
- @Override
- public void analyse(Object message) {
- if (message instanceof SegmentReceiver.SegmentWithTimeSlice) {
- SegmentReceiver.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentReceiver.SegmentWithTimeSlice)message;
- TraceSegmentObject segment = segmentWithTimeSlice.getSegment();
-
- if (CollectionTools.isNotEmpty(segment.getSpansList())) {
- for (SpanObject span : segment.getSpansList()) {
- boolean isError = span.getIsError();
-
- JsonObject dataJsonObj = new JsonObject();
- dataJsonObj.addProperty(SegmentExceptionIndex.IS_ERROR, isError);
- dataJsonObj.addProperty(SegmentExceptionIndex.SEG_ID, segment.getTraceSegmentId());
-
- JsonArray errorKind = new JsonArray();
- if (isError) {
- List logMessages = span.getLogsList();
- for (LogMessage logMessage : logMessages) {
-// if (logMessage.getFields().containsKey("error.kind")) {
-// errorKind.add(String.valueOf(logData.getFields().get("error.kind")));
-// }
- }
- }
- dataJsonObj.add(SegmentExceptionIndex.ERROR_KIND, errorKind);
- set(segment.getTraceSegmentId(), dataJsonObj);
- }
- }
- } else {
- logger.error("unhandled message, message instance must SegmentReceiver.SegmentWithTimeSlice, but is %s", message.getClass().toString());
- }
- }
-
- @Override
- protected WorkerRefs aggWorkRefs() {
- try {
- return getSelfContext().lookup(SegmentExceptionSave.Role.INSTANCE);
- } catch (WorkerNotFoundException e) {
- logger.error("The role of %s worker not found", SegmentExceptionSave.Role.INSTANCE.roleName());
- }
- return null;
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- @Override
- public Role role() {
- return SegmentExceptionAnalysis.Role.INSTANCE;
- }
-
- @Override
- public SegmentExceptionAnalysis workerInstance(ClusterWorkerContext clusterContext) {
- return new SegmentExceptionAnalysis(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public int queueSize() {
- return WorkerConfig.Queue.Segment.SegmentExceptionAnalysis.SIZE;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return SegmentExceptionAnalysis.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/entity/SegmentAndBase64.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/entity/SegmentAndBase64.java
deleted file mode 100644
index 38e4ac7b4..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/entity/SegmentAndBase64.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.skywalking.apm.collector.worker.segment.entity;
-
-import com.google.gson.JsonObject;
-import org.skywalking.apm.collector.worker.segment.SegmentIndex;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-
-/**
- * @author pengys5
- */
-public class SegmentAndBase64 {
-
- private final TraceSegmentObject object;
- private final String base64;
-
- public SegmentAndBase64(TraceSegmentObject object, String base64) {
- this.object = object;
- this.base64 = base64;
- }
-
- public TraceSegmentObject getObject() {
- return object;
- }
-
- public String getBase64() {
- return base64;
- }
-
- public String getSegmentJsonStr() {
- JsonObject segmentJson = new JsonObject();
- segmentJson.addProperty(SegmentIndex.TRACE_SEGMENT_ID, object.getTraceSegmentId());
- segmentJson.addProperty(SegmentIndex.SEGMENT_OBJ_BLOB, base64);
- return segmentJson.toString();
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/entity/SegmentDeserialize.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/entity/SegmentDeserialize.java
deleted file mode 100644
index b9c64f05b..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/entity/SegmentDeserialize.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.skywalking.apm.collector.worker.segment.entity;
-
-import com.sun.org.apache.xml.internal.security.utils.Base64;
-import java.io.IOException;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-
-/**
- * The SegmentDeserialize provides single segment json string deserialize and segment array file
- * deserialize.
- *
- * @author pengys5
- * @since v3.0-2017
- */
-public enum SegmentDeserialize {
- INSTANCE;
-
- private final Logger logger = LogManager.getFormatterLogger(SegmentDeserialize.class);
-
- /**
- * Segment object binary value as a base64 encoded string deserialize.
- *
- * @param segmentObjBlob , to be a binary value as a base64 encoded string
- * @return an {@link TraceSegmentObject}
- */
- public TraceSegmentObject deserializeSingle(String segmentObjBlob) {
- try {
- byte[] decode = Base64.decode(segmentObjBlob);
- return TraceSegmentObject.parseFrom(decode);
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- }
- return null;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/entity/SpanView.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/entity/SpanView.java
deleted file mode 100644
index 0d7f965ad..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/entity/SpanView.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.skywalking.apm.collector.worker.segment.entity;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author pengys5
- */
-public class SpanView implements Comparable {
-
- private int spanId;
- private String segId;
- private String appCode;
- private String spanSegId;
- private String parentSpanSegId;
- private long startTime;
- private long relativeStartTime;
- private long cost;
- private String operationName;
- private Set childSpans;
-
- public SpanView() {
- childSpans = new HashSet<>();
- }
-
- public int getSpanId() {
- return spanId;
- }
-
- public void setSpanId(int spanId) {
- this.spanId = spanId;
- }
-
- public String getSegId() {
- return segId;
- }
-
- public void setSegId(String segId) {
- this.segId = segId;
- }
-
- public String getAppCode() {
- return appCode;
- }
-
- public void setAppCode(String appCode) {
- this.appCode = appCode;
- }
-
- public String getSpanSegId() {
- return spanSegId;
- }
-
- public void setSpanSegId(String spanSegId) {
- this.spanSegId = spanSegId;
- }
-
- public String getParentSpanSegId() {
- return parentSpanSegId;
- }
-
- public long getStartTime() {
- return startTime;
- }
-
- public void setStartTime(long startTime) {
- this.startTime = startTime;
- }
-
- public void setParentSpanSegId(String parentSpanSegId) {
- this.parentSpanSegId = parentSpanSegId;
- }
-
- public long getRelativeStartTime() {
- return relativeStartTime;
- }
-
- public void setRelativeStartTime(long relativeStartTime) {
- this.relativeStartTime = relativeStartTime;
- }
-
- public long getCost() {
- return cost;
- }
-
- public void setCost(long cost) {
- this.cost = cost;
- }
-
- public String getOperationName() {
- return operationName;
- }
-
- public void setOperationName(String operationName) {
- this.operationName = operationName;
- }
-
- public void addChild(SpanView childSpan) {
- childSpans.add(childSpan);
- }
-
- @Override
- public int compareTo(SpanView o) {
- return Long.valueOf(this.startTime - o.getStartTime()).intValue();
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/persistence/SegmentCostSave.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/persistence/SegmentCostSave.java
deleted file mode 100644
index d39845d5f..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/persistence/SegmentCostSave.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.skywalking.apm.collector.worker.segment.persistence;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.RecordPersistenceMember;
-import org.skywalking.apm.collector.worker.segment.SegmentCostIndex;
-import org.skywalking.apm.collector.worker.storage.PersistenceWorkerListener;
-
-/**
- * @author pengys5
- */
-public class SegmentCostSave extends RecordPersistenceMember {
- @Override
- public String esIndex() {
- return SegmentCostIndex.INDEX;
- }
-
- @Override
- public String esType() {
- return SegmentCostIndex.TYPE_RECORD;
- }
-
- protected SegmentCostSave(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public SegmentCostSave workerInstance(ClusterWorkerContext clusterContext) {
- SegmentCostSave worker = new SegmentCostSave(role(), clusterContext, new LocalWorkerContext());
- PersistenceWorkerListener.INSTANCE.register(worker);
- return worker;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return SegmentCostSave.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/persistence/SegmentExceptionSave.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/persistence/SegmentExceptionSave.java
deleted file mode 100644
index 3b6887d44..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/persistence/SegmentExceptionSave.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.skywalking.apm.collector.worker.segment.persistence;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.RecordPersistenceMember;
-import org.skywalking.apm.collector.worker.segment.SegmentExceptionIndex;
-import org.skywalking.apm.collector.worker.storage.AbstractIndex;
-import org.skywalking.apm.collector.worker.storage.PersistenceWorkerListener;
-
-/**
- * @author pengys5
- */
-public class SegmentExceptionSave extends RecordPersistenceMember {
- @Override
- public String esIndex() {
- return SegmentExceptionIndex.INDEX;
- }
-
- @Override
- public String esType() {
- return AbstractIndex.TYPE_RECORD;
- }
-
- protected SegmentExceptionSave(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public SegmentExceptionSave workerInstance(ClusterWorkerContext clusterContext) {
- SegmentExceptionSave worker = new SegmentExceptionSave(role(), clusterContext, new LocalWorkerContext());
- PersistenceWorkerListener.INSTANCE.register(worker);
- return worker;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return SegmentExceptionSave.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/persistence/SegmentExceptionWithSegId.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/persistence/SegmentExceptionWithSegId.java
deleted file mode 100644
index 4dacc6b03..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/persistence/SegmentExceptionWithSegId.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.skywalking.apm.collector.worker.segment.persistence;
-
-import com.google.gson.JsonObject;
-import org.elasticsearch.action.get.GetResponse;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.segment.SegmentExceptionIndex;
-import org.skywalking.apm.collector.worker.storage.EsClient;
-
-/**
- * @author pengys5
- */
-public class SegmentExceptionWithSegId extends AbstractLocalSyncWorker {
-
- private SegmentExceptionWithSegId(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- protected void onWork(Object request, Object response) throws WorkerException {
- if (request instanceof RequestEntity) {
- RequestEntity search = (RequestEntity)request;
-
- GetResponse getResponse = EsClient.INSTANCE.getClient().prepareGet(SegmentExceptionIndex.INDEX, SegmentExceptionIndex.TYPE_RECORD, search.segId).get();
-
- JsonObject dataJson = new JsonObject();
- dataJson.addProperty(SegmentExceptionIndex.SEG_ID, (String)getResponse.getSource().get(SegmentExceptionIndex.SEG_ID));
- dataJson.addProperty(SegmentExceptionIndex.IS_ERROR, (Boolean)getResponse.getSource().get(SegmentExceptionIndex.IS_ERROR));
-
- JsonObject resJsonObj = (JsonObject)response;
- resJsonObj.add("result", dataJson);
- }
- }
-
- public static class RequestEntity {
- private String segId;
-
- public RequestEntity(String segId) {
- this.segId = segId;
- }
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return WorkerRole.INSTANCE;
- }
-
- @Override
- public SegmentExceptionWithSegId workerInstance(ClusterWorkerContext clusterContext) {
- return new SegmentExceptionWithSegId(role(), clusterContext, new LocalWorkerContext());
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return SegmentExceptionWithSegId.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/persistence/SegmentSave.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/persistence/SegmentSave.java
deleted file mode 100644
index a74072fed..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/persistence/SegmentSave.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.skywalking.apm.collector.worker.segment.persistence;
-
-import com.google.gson.JsonObject;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.client.Client;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.PersistenceMember;
-import org.skywalking.apm.collector.worker.config.CacheSizeConfig;
-import org.skywalking.apm.collector.worker.segment.SegmentIndex;
-import org.skywalking.apm.collector.worker.segment.entity.SegmentAndBase64;
-import org.skywalking.apm.collector.worker.storage.AbstractIndex;
-import org.skywalking.apm.collector.worker.storage.EsClient;
-import org.skywalking.apm.collector.worker.storage.PersistenceWorkerListener;
-import org.skywalking.apm.collector.worker.storage.SegmentData;
-import org.skywalking.apm.collector.worker.storage.SegmentPersistenceData;
-
-/**
- * @author pengys5
- */
-public class SegmentSave extends PersistenceMember {
-
- @Override
- public String esIndex() {
- return SegmentIndex.INDEX;
- }
-
- @Override
- public String esType() {
- return AbstractIndex.TYPE_RECORD;
- }
-
- public SegmentSave(org.skywalking.apm.collector.actor.Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public SegmentPersistenceData initializeData() {
- return new SegmentPersistenceData();
- }
-
- @Override final public void analyse(Object message) {
- if (message instanceof SegmentAndBase64) {
- SegmentAndBase64 segmentAndBase64 = (SegmentAndBase64)message;
- SegmentPersistenceData data = getPersistenceData();
- data.hold();
- data.getOrCreate(segmentAndBase64.getObject().getTraceSegmentId()).setSegmentStr(segmentAndBase64.getSegmentJsonStr());
- if (data.size() >= CacheSizeConfig.Cache.Persistence.SIZE) {
- persistence(data.asMap());
- }
- data.release();
- } else {
- logger().error("unhandled message, message instance must Segment, but is %s", message.getClass().toString());
- }
- }
-
- private void persistence(Map dataMap) {
- List builderList = new LinkedList<>();
- Client client = EsClient.INSTANCE.getClient();
- dataMap.forEach((key, value) -> {
- IndexRequestBuilder builder = client.prepareIndex(esIndex(), esType(), key).setSource(value.getSegmentStr());
- builderList.add(builder);
- });
- EsClient.INSTANCE.bulk(builderList);
- dataMap.clear();
- }
-
- @Override final protected void prepareIndex(List builderList) {
- Map lastData = getPersistenceData().getLast().asMap();
-
- Client client = EsClient.INSTANCE.getClient();
- lastData.forEach((key, value) -> {
- IndexRequestBuilder builder = client.prepareIndex(esIndex(), esType(), key).setSource(value.getSegmentStr());
- builderList.add(builder);
- });
- lastData.clear();
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return Role.INSTANCE;
- }
-
- @Override
- public SegmentSave workerInstance(ClusterWorkerContext clusterContext) {
- SegmentSave worker = new SegmentSave(role(), clusterContext, new LocalWorkerContext());
- PersistenceWorkerListener.INSTANCE.register(worker);
- return worker;
- }
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return SegmentSave.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/persistence/SegmentTopSearch.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/persistence/SegmentTopSearch.java
deleted file mode 100644
index 00d1631a3..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/segment/persistence/SegmentTopSearch.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package org.skywalking.apm.collector.worker.segment.persistence;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import java.util.List;
-import org.elasticsearch.action.get.GetResponse;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.SearchType;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.sort.SortOrder;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.segment.SegmentCostIndex;
-import org.skywalking.apm.collector.worker.segment.SegmentExceptionIndex;
-import org.skywalking.apm.collector.worker.segment.SegmentIndex;
-import org.skywalking.apm.collector.worker.segment.entity.SegmentDeserialize;
-import org.skywalking.apm.collector.worker.storage.EsClient;
-import org.skywalking.apm.collector.worker.tools.CollectionTools;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-import org.skywalking.apm.util.StringUtil;
-
-/**
- * @author pengys5
- */
-public class SegmentTopSearch extends AbstractLocalSyncWorker {
-
- private SegmentTopSearch(Role role, ClusterWorkerContext clusterContext,
- LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(SegmentExceptionWithSegId.WorkerRole.INSTANCE).create(this);
- }
-
- @Override
- protected void onWork(Object request, Object response) throws WorkerException {
- if (request instanceof RequestEntity) {
- RequestEntity search = (RequestEntity)request;
-
- SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(SegmentCostIndex.INDEX);
- searchRequestBuilder.setTypes(SegmentCostIndex.TYPE_RECORD);
- searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
- BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
- searchRequestBuilder.setQuery(boolQueryBuilder);
- List mustQueryList = boolQueryBuilder.must();
-
- mustQueryList.add(QueryBuilders.rangeQuery(SegmentCostIndex.TIME_SLICE).gte(search.startTime).lte(search.endTime));
- if (search.minCost != -1 || search.maxCost != -1) {
- RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(SegmentCostIndex.COST);
- if (search.minCost != -1) {
- rangeQueryBuilder.gte(search.minCost);
- }
- if (search.maxCost != -1) {
- rangeQueryBuilder.lte(search.maxCost);
- }
- boolQueryBuilder.must().add(rangeQueryBuilder);
- }
- if (!StringUtil.isEmpty(search.operationName)) {
- mustQueryList.add(QueryBuilders.matchQuery(SegmentCostIndex.OPERATION_NAME, search.operationName));
- }
- if (!StringUtil.isEmpty(search.globalTraceId)) {
- mustQueryList.add(QueryBuilders.matchQuery(SegmentCostIndex.GLOBAL_TRACE_ID, search.globalTraceId));
- }
-
- searchRequestBuilder.addSort(SegmentCostIndex.COST, SortOrder.DESC);
- searchRequestBuilder.setSize(search.limit);
- searchRequestBuilder.setFrom(search.from);
-
- SearchResponse searchResponse = searchRequestBuilder.execute().actionGet();
-
- JsonObject topSegPaging = new JsonObject();
- topSegPaging.addProperty("recordsTotal", searchResponse.getHits().totalHits());
-
- JsonArray topSegArray = new JsonArray();
- topSegPaging.add("data", topSegArray);
-
- int num = search.from;
- for (SearchHit searchHit : searchResponse.getHits().getHits()) {
- JsonObject topSegmentJson = new JsonObject();
- topSegmentJson.addProperty("num", num);
- String segId = (String)searchHit.getSource().get(SegmentCostIndex.SEG_ID);
- topSegmentJson.addProperty(SegmentCostIndex.SEG_ID, segId);
- topSegmentJson.addProperty(SegmentCostIndex.START_TIME, (Number)searchHit.getSource().get(SegmentCostIndex.START_TIME));
- if (searchHit.getSource().containsKey(SegmentCostIndex.END_TIME)) {
- topSegmentJson.addProperty(SegmentCostIndex.END_TIME, (Number)searchHit.getSource().get(SegmentCostIndex.END_TIME));
- }
-
- topSegmentJson.addProperty(SegmentCostIndex.OPERATION_NAME, (String)searchHit.getSource().get(SegmentCostIndex.OPERATION_NAME));
- topSegmentJson.addProperty(SegmentCostIndex.COST, (Number)searchHit.getSource().get(SegmentCostIndex.COST));
-
- GetResponse getResponse = EsClient.INSTANCE.getClient().prepareGet(SegmentIndex.INDEX, SegmentIndex.TYPE_RECORD, segId).get();
- String segmentObjBlob = (String)getResponse.getSource().get(SegmentIndex.SEGMENT_OBJ_BLOB);
-
- TraceSegmentObject segment = SegmentDeserialize.INSTANCE.deserializeSingle(segmentObjBlob);
- List distributedTraceIdList = segment.getGlobalTraceIdsList();
-
- JsonArray distributedTraceIdArray = new JsonArray();
- if (CollectionTools.isNotEmpty(distributedTraceIdList)) {
- for (String distributedTraceId : distributedTraceIdList) {
- distributedTraceIdArray.add(distributedTraceId);
- }
- }
- topSegmentJson.add("traceIds", distributedTraceIdArray);
-
- boolean isError = false;
- JsonObject resJsonObj = new JsonObject();
- getSelfContext().lookup(SegmentExceptionWithSegId.WorkerRole.INSTANCE).ask(new SegmentExceptionWithSegId.RequestEntity(segId), resJsonObj);
- if (resJsonObj.has("result")) {
- JsonObject segExJson = resJsonObj.get("result").getAsJsonObject();
- if (segExJson.has(SegmentExceptionIndex.IS_ERROR)) {
- isError = segExJson.get(SegmentExceptionIndex.IS_ERROR).getAsBoolean();
- }
- }
- topSegmentJson.addProperty(SegmentExceptionIndex.IS_ERROR, isError);
-
- num++;
- topSegArray.add(topSegmentJson);
- }
-
- JsonObject resJsonObj = (JsonObject)response;
- resJsonObj.add("result", topSegPaging);
- }
- }
-
- public static class RequestEntity {
- private int from;
- private int limit;
- private long startTime;
- private long endTime;
- private int minCost;
- private int maxCost;
- private String globalTraceId;
- private String operationName;
-
- public RequestEntity(int from, int limit, long startTime, long endTime, String globalTraceId,
- String operationName) {
- this.from = from;
- this.limit = limit;
- this.startTime = startTime;
- this.endTime = endTime;
- this.globalTraceId = globalTraceId;
- this.operationName = operationName;
- }
-
- public void setMinCost(int minCost) {
- this.minCost = minCost;
- }
-
- public void setMaxCost(int maxCost) {
- this.maxCost = maxCost;
- }
-
- public int getFrom() {
- return from;
- }
-
- public int getLimit() {
- return limit;
- }
-
- public long getStartTime() {
- return startTime;
- }
-
- public long getEndTime() {
- return endTime;
- }
-
- public int getMinCost() {
- return minCost;
- }
-
- public int getMaxCost() {
- return maxCost;
- }
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return WorkerRole.INSTANCE;
- }
-
- @Override
- public SegmentTopSearch workerInstance(ClusterWorkerContext clusterContext) {
- return new SegmentTopSearch(role(), clusterContext, new LocalWorkerContext());
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return SegmentTopSearch.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/span/SpanGetWithId.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/span/SpanGetWithId.java
deleted file mode 100644
index 0e41c43b4..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/span/SpanGetWithId.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.skywalking.apm.collector.worker.span;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import java.util.Arrays;
-import java.util.Map;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.httpserver.AbstractGet;
-import org.skywalking.apm.collector.worker.httpserver.AbstractGetProvider;
-import org.skywalking.apm.collector.worker.httpserver.ArgumentsParseException;
-import org.skywalking.apm.collector.worker.span.persistence.SpanSearchWithId;
-import org.skywalking.apm.collector.worker.tools.ParameterTools;
-
-/**
- * @author pengys5
- */
-public class SpanGetWithId extends AbstractGet {
-
- private Logger logger = LogManager.getFormatterLogger(SpanGetWithId.class);
-
- SpanGetWithId(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override protected Class responseClass() {
- return JsonObject.class;
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(SpanSearchWithId.WorkerRole.INSTANCE).create(this);
- }
-
- @Override protected void onReceive(Map parameter,
- JsonElement response) throws ArgumentsParseException, WorkerInvokeException, WorkerNotFoundException {
- if (!parameter.containsKey("segId") || !parameter.containsKey("spanId")) {
- throw new ArgumentsParseException("the request parameter must contains segId, spanId");
- }
-
- if (logger.isDebugEnabled()) {
- logger.debug("segId: %s, spanId: %s", Arrays.toString(parameter.get("segId")), Arrays.toString(parameter.get("spanId")));
- }
-
- String segId = ParameterTools.INSTANCE.toString(parameter, "segId");
- String spanId = ParameterTools.INSTANCE.toString(parameter, "spanId");
-
- SpanSearchWithId.RequestEntity requestEntity = new SpanSearchWithId.RequestEntity(segId, spanId);
- getSelfContext().lookup(SpanSearchWithId.WorkerRole.INSTANCE).ask(requestEntity, response);
- }
-
- public static class Factory extends AbstractGetProvider {
- @Override
- public Role role() {
- return WorkerRole.INSTANCE;
- }
-
- @Override
- public SpanGetWithId workerInstance(ClusterWorkerContext clusterContext) {
- return new SpanGetWithId(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public String servletPath() {
- return "/span/spanId";
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return SpanGetWithId.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/span/persistence/SpanSearchWithId.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/span/persistence/SpanSearchWithId.java
deleted file mode 100644
index d62ab7907..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/span/persistence/SpanSearchWithId.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.skywalking.apm.collector.worker.span.persistence;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import java.util.List;
-import org.elasticsearch.action.get.GetResponse;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorkerProvider;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.Const;
-import org.skywalking.apm.collector.worker.segment.SegmentIndex;
-import org.skywalking.apm.collector.worker.segment.entity.SegmentDeserialize;
-import org.skywalking.apm.collector.worker.storage.GetResponseFromEs;
-import org.skywalking.apm.network.proto.SpanObject;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-
-/**
- * @author pengys5
- */
-public class SpanSearchWithId extends AbstractLocalSyncWorker {
-
- private Gson gson = new Gson();
-
- SpanSearchWithId(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- protected void onWork(Object request, Object response) throws WorkerException {
- if (request instanceof RequestEntity) {
- RequestEntity search = (RequestEntity)request;
- GetResponse getResponse = GetResponseFromEs.INSTANCE.get(SegmentIndex.INDEX, SegmentIndex.TYPE_RECORD, search.segId);
- String segmentObjBlob = (String)getResponse.getSource().get(SegmentIndex.SEGMENT_OBJ_BLOB);
-
- TraceSegmentObject segment = SegmentDeserialize.INSTANCE.deserializeSingle(segmentObjBlob);
- List spanList = segment.getSpansList();
-
- getResponse.getSource();
- JsonObject dataJson = new JsonObject();
-
- for (SpanObject span : spanList) {
- if (String.valueOf(span.getSpanId()).equals(search.spanId)) {
- String spanJsonStr = gson.toJson(span);
- dataJson = gson.fromJson(spanJsonStr, JsonObject.class);
- }
- }
-
- JsonObject resJsonObj = (JsonObject)response;
- resJsonObj.add(Const.RESULT, dataJson);
- }
- }
-
- public static class RequestEntity {
- private String segId;
- private String spanId;
-
- public RequestEntity(String segId, String spanId) {
- this.segId = segId;
- this.spanId = spanId;
- }
-
- public String getSegId() {
- return segId;
- }
-
- public String getSpanId() {
- return spanId;
- }
- }
-
- public static class Factory extends AbstractLocalSyncWorkerProvider {
- @Override
- public Role role() {
- return WorkerRole.INSTANCE;
- }
-
- @Override
- public SpanSearchWithId workerInstance(ClusterWorkerContext clusterContext) {
- return new SpanSearchWithId(role(), clusterContext, new LocalWorkerContext());
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return SpanSearchWithId.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/AbstractIndex.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/AbstractIndex.java
deleted file mode 100644
index 6e2eba69f..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/AbstractIndex.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
-import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
-import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
-import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
-import org.elasticsearch.client.IndicesAdminClient;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.index.IndexNotFoundException;
-import org.skywalking.apm.collector.worker.config.EsConfig;
-
-import java.io.IOException;
-
-/**
- * @author pengys5
- */
-public abstract class AbstractIndex {
- private static final Logger logger = LogManager.getFormatterLogger(AbstractIndex.class);
-
- public static final String TYPE_MINUTE = "minute";
- public static final String TYPE_HOUR = "hour";
- public static final String TYPE_DAY = "day";
- public static final String TYPE_RECORD = "record";
- public static final String AGG_COLUMN = "aggId";
- public static final String TIME_SLICE = "timeSlice";
-
- final XContentBuilder createSettingBuilder() throws IOException {
- return XContentFactory.jsonBuilder()
- .startObject()
- .field("index.number_of_shards", EsConfig.Es.Index.Shards.NUMBER)
- .field("index.number_of_replicas", EsConfig.Es.Index.Replicas.NUMBER)
- .field("index.refresh_interval", String.valueOf(refreshInterval()) + "s")
- .endObject();
- }
-
- public abstract int refreshInterval();
-
- public abstract boolean isRecord();
-
- public abstract XContentBuilder createMappingBuilder() throws IOException;
-
- final void createIndex() {
- // settings
- String settingSource = "";
-
- // mapping
- XContentBuilder mappingBuilder = null;
- try {
- XContentBuilder settingsBuilder = createSettingBuilder();
-
- settingSource = settingsBuilder.string();
-
- mappingBuilder = createMappingBuilder();
- logger.info("mapping builder str: %s", mappingBuilder.string());
- } catch (Exception e) {
- logger.error("create %s index mapping builder error", index());
- }
- Settings settings = Settings.builder().loadFromSource(settingSource).build();
- IndicesAdminClient client = EsClient.INSTANCE.getClient().admin().indices();
-
- if (isRecord()) {
- CreateIndexResponse response = client.prepareCreate(index()).setSettings(settings).addMapping(TYPE_RECORD, mappingBuilder).get();
- logger.info("create %s index with type of %s finished, isAcknowledged: %s", index(), TYPE_RECORD, response.isAcknowledged());
- } else {
- CreateIndexResponse response = client.prepareCreate(index()).setSettings(settings).addMapping(TYPE_MINUTE, mappingBuilder).get();
- logger.info("create %s index with type of %s finished, isAcknowledged: %s", index(), TYPE_MINUTE, response.isAcknowledged());
- PutMappingResponse putMappingResponse = client.preparePutMapping(index()).setType(TYPE_HOUR).setSource(mappingBuilder).get();
- logger.info("create %s index with type of %s finished, isAcknowledged: %s", index(), TYPE_HOUR, putMappingResponse.isAcknowledged());
- putMappingResponse = client.preparePutMapping(index()).setType(TYPE_DAY).setSource(mappingBuilder).get();
- logger.info("create %s index with type of %s finished, isAcknowledged: %s", index(), TYPE_DAY, putMappingResponse.isAcknowledged());
- }
- }
-
- final boolean deleteIndex() {
- IndicesAdminClient client = EsClient.INSTANCE.getClient().admin().indices();
- try {
- DeleteIndexResponse response = client.prepareDelete(index()).get();
- logger.info("delete %s index finished, isAcknowledged: %s", index(), response.isAcknowledged());
- return response.isAcknowledged();
- } catch (IndexNotFoundException e) {
- logger.info("%s index not found", index());
- }
- return false;
- }
-
- final boolean isExists() {
- IndicesAdminClient client = EsClient.INSTANCE.getClient().admin().indices();
- IndicesExistsResponse response = client.prepareExists(index()).get();
- return response.isExists();
- }
-
- public abstract String index();
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/AbstractTimeSlice.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/AbstractTimeSlice.java
deleted file mode 100644
index 2dce8f3b4..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/AbstractTimeSlice.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-/**
- * @author pengys5
- */
-public abstract class AbstractTimeSlice {
- private final long minute;
- private final long hour;
- private final long day;
- private final int second;
-
- public AbstractTimeSlice(long minute, long hour, long day, int second) {
- this.minute = minute;
- this.hour = hour;
- this.day = day;
- this.second = second;
- }
-
- public long getMinute() {
- return minute;
- }
-
- public long getHour() {
- return hour;
- }
-
- public long getDay() {
- return day;
- }
-
- public int getSecond() {
- return second;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/Data.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/Data.java
deleted file mode 100644
index be6164c1a..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/Data.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import java.util.Map;
-
-/**
- * @author pengys5
- */
-public interface Data {
- String getId();
-
- void merge(Map dbData);
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/EsClient.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/EsClient.java
deleted file mode 100644
index 00370a32f..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/EsClient.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
-import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.transport.InetSocketTransportAddress;
-import org.elasticsearch.transport.client.PreBuiltTransportClient;
-import org.skywalking.apm.collector.worker.config.EsConfig;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author pengys5
- */
-public enum EsClient {
- INSTANCE;
-
- private Logger logger = LogManager.getFormatterLogger(EsClient.class);
-
- private Client client;
-
- public void boot() throws UnknownHostException {
- Settings settings = Settings.builder()
- .put("cluster.name", EsConfig.Es.Cluster.NAME)
- .put("client.transport.sniff", EsConfig.Es.Cluster.Transport.SNIFFER)
- .build();
-
- client = new PreBuiltTransportClient(settings);
-
- List pairsList = parseClusterNodes(EsConfig.Es.Cluster.NODES);
- for (AddressPairs pairs : pairsList) {
- ((PreBuiltTransportClient) client).addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(pairs.ip), pairs.port));
- }
- }
-
- public Client getClient() {
- return client;
- }
-
- public void indexRefresh(String... indexName) {
- RefreshResponse response = client.admin().indices().refresh(new RefreshRequest(indexName)).actionGet();
- if (response.getShardFailures().length == response.getTotalShards()) {
- logger.error("All elasticsearch shard index refresh failure, reason: %s", Arrays.toString(response.getShardFailures()));
- } else if (response.getShardFailures().length > 0) {
- logger.error("In parts of elasticsearch shard index refresh failure, reason: %s", Arrays.toString(response.getShardFailures()));
- }
- logger.info("elasticsearch index refresh success");
- }
-
- private List parseClusterNodes(String nodes) {
- List pairsList = new ArrayList<>();
- logger.info("es NODES: %s", nodes);
- String[] nodesSplit = nodes.split(",");
- for (int i = 0; i < nodesSplit.length; i++) {
- String node = nodesSplit[i];
- String ip = node.split(":")[0];
- String port = node.split(":")[1];
- pairsList.add(new AddressPairs(ip, Integer.valueOf(port)));
- }
-
- return pairsList;
- }
-
- class AddressPairs {
- private String ip;
- private Integer port;
-
- public AddressPairs(String ip, Integer port) {
- this.ip = ip;
- this.port = port;
- }
- }
-
- public void bulk(List dataList) {
- Client client = EsClient.INSTANCE.getClient();
- BulkRequestBuilder bulkRequest = client.prepareBulk();
-
- logger.info("bulk data size: %s", dataList.size());
- if (dataList.size() > 0) {
- for (IndexRequestBuilder builder : dataList) {
- bulkRequest.add(builder);
- }
-
- BulkResponse bulkResponse = bulkRequest.execute().actionGet();
- if (bulkResponse.hasFailures()) {
- logger.error(bulkResponse.buildFailureMessage());
- }
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/FlushAndSwitch.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/FlushAndSwitch.java
deleted file mode 100644
index 0c52f38db..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/FlushAndSwitch.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-/**
- * @author pengys5
- */
-public class FlushAndSwitch {
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/GetResponseFromEs.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/GetResponseFromEs.java
deleted file mode 100644
index 2e579c773..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/GetResponseFromEs.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import org.elasticsearch.action.get.GetResponse;
-
-/**
- * @author pengys5
- */
-public enum GetResponseFromEs {
- INSTANCE;
-
- public GetResponse get(String index, String type, String id) {
- return EsClient.INSTANCE.getClient().prepareGet(index, type, id).get();
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/IndexCreator.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/IndexCreator.java
deleted file mode 100644
index 30a6b84d6..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/IndexCreator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.worker.config.EsConfig;
-
-import java.util.HashSet;
-import java.util.ServiceLoader;
-import java.util.Set;
-
-/**
- * @author pengys5
- */
-public enum IndexCreator {
- INSTANCE;
-
- private Logger logger = LogManager.getFormatterLogger(IndexCreator.class);
-
- public void create() {
- if (!EsConfig.IndexInitMode.MANUAL.equals(EsConfig.Es.Index.Initialize.MODE)) {
- Set indexSet = loadIndex();
- for (AbstractIndex index : indexSet) {
- boolean isExists = index.isExists();
- if (isExists) {
- if (EsConfig.IndexInitMode.FORCED.equals(EsConfig.Es.Index.Initialize.MODE)) {
- index.deleteIndex();
- index.createIndex();
- }
- } else {
- index.createIndex();
- }
- }
- }
- }
-
- private Set loadIndex() {
- Set indexSet = new HashSet<>();
- ServiceLoader indexServiceLoader = ServiceLoader.load(AbstractIndex.class);
- for (AbstractIndex index : indexServiceLoader) {
- logger.info("index NAME: %s", index.index());
- indexSet.add(index);
- }
- return indexSet;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/JoinAndSplitAnalysisData.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/JoinAndSplitAnalysisData.java
deleted file mode 100644
index 9defa2df1..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/JoinAndSplitAnalysisData.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * @author pengys5
- */
-public class JoinAndSplitAnalysisData {
-
- private WindowData windowData = new WindowData(new LinkedHashMap());
-
- public JoinAndSplitData getOrCreate(String id) {
- if (!windowData.containsKey(id)) {
- windowData.put(id, new JoinAndSplitData(id));
- }
- return windowData.get(id);
- }
-
- public Map asMap() {
- return windowData.asMap();
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/JoinAndSplitData.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/JoinAndSplitData.java
deleted file mode 100644
index 7082b732d..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/JoinAndSplitData.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import org.skywalking.apm.collector.actor.selector.AbstractHashMessage;
-
-import java.util.*;
-
-/**
- * @author pengys5
- */
-public class JoinAndSplitData extends AbstractHashMessage implements Data {
-
- public static final String SPLIT = ",";
-
- private String id;
-
- private Map> data = new HashMap<>();
-
- public JoinAndSplitData(String key) {
- super(key);
- this.id = key;
- }
-
- public String getId() {
- return id;
- }
-
- public void set(String attributeName, String value) {
- if (!data.containsKey(attributeName)) {
- data.put(attributeName, new HashSet<>());
- }
- data.get(attributeName).add(value);
- }
-
- public void merge(JoinAndSplitData source) {
- source.data.forEach((attributeName, valueSet) -> valueSet.forEach(value -> set(attributeName, value)));
- }
-
- public void merge(Map source) {
- source.forEach((column, dbValue) -> {
- if (!AbstractIndex.TIME_SLICE.equals(column) && !AbstractIndex.AGG_COLUMN.equals(column)) {
- String[] dbValues = String.valueOf(dbValue).split(SPLIT);
- for (String value : dbValues) {
- set(column, value);
- }
- }
- });
- }
-
- public Map asMap() {
- Map source = new HashMap<>();
- data.forEach((attributeName, valueSet) -> {
- Iterator iterator = valueSet.iterator();
- StringBuilder builder = new StringBuilder();
-
- int i = 0;
-
- while (iterator.hasNext()) {
- if (i == 0) {
- builder.append(iterator.next());
- } else {
- builder.append(SPLIT).append(iterator.next());
- }
- i++;
- }
- source.put(attributeName, builder.toString());
- });
-
- return source;
- }
-}
\ No newline at end of file
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/JoinAndSplitPersistenceData.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/JoinAndSplitPersistenceData.java
deleted file mode 100644
index 8acf13347..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/JoinAndSplitPersistenceData.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-/**
- * @author pengys5
- */
-public class JoinAndSplitPersistenceData extends Window implements PersistenceData {
-
- private WindowData lockedWindowData;
-
- public JoinAndSplitData getOrCreate(String id) {
- if (!lockedWindowData.containsKey(id)) {
- lockedWindowData.put(id, new JoinAndSplitData(id));
- }
- return lockedWindowData.get(id);
- }
-
- public void hold() {
- lockedWindowData = getCurrentAndHold();
- }
-
- public void release() {
- lockedWindowData.release();
- lockedWindowData = null;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/MetricAnalysisData.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/MetricAnalysisData.java
deleted file mode 100644
index 1f5cf3a82..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/MetricAnalysisData.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * @author pengys5
- */
-public class MetricAnalysisData {
-
- private WindowData windowData = new WindowData(new LinkedHashMap());
-
- public MetricData getOrCreate(String id) {
- if (!windowData.containsKey(id)) {
- windowData.put(id, new MetricData(id));
- }
- return windowData.get(id);
- }
-
- public Map asMap() {
- return windowData.asMap();
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/MetricData.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/MetricData.java
deleted file mode 100644
index 3be5e78bf..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/MetricData.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import org.skywalking.apm.collector.actor.selector.AbstractHashMessage;
-import org.skywalking.apm.collector.worker.Const;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * @author pengys5
- */
-public class MetricData extends AbstractHashMessage implements Data {
-
- private String id;
- private Map data;
-
- public MetricData(String id) {
- super(id);
- this.id = id;
- data = new LinkedHashMap<>();
-
- String[] ids = id.split(Const.IDS_SPLIT);
- String slice = ids[0];
- StringBuilder aggId = new StringBuilder();
- for (int i = 1; i < ids.length; i++) {
- if (i == 1) aggId = new StringBuilder(ids[i]);
- else aggId.append(Const.ID_SPLIT).append(ids[i]);
- }
-
- data.put(AbstractIndex.TIME_SLICE, Long.valueOf(slice));
- data.put(AbstractIndex.AGG_COLUMN, aggId.toString());
- }
-
- public void set(String metricName, Long value) {
- long valueAdd = value;
- if (this.data.containsKey(metricName) && !AbstractIndex.TIME_SLICE.equals(metricName)
- && !AbstractIndex.AGG_COLUMN.equals(metricName)) {
- valueAdd += (Long) this.data.get(metricName);
- }
- this.data.put(metricName, valueAdd);
- }
-
- public void merge(MetricData source) {
- for (Map.Entry entry : source.data.entrySet()) {
- if (!AbstractIndex.TIME_SLICE.equals(entry.getKey())
- && !AbstractIndex.AGG_COLUMN.equals(entry.getKey())) {
- set(entry.getKey(), (Long) entry.getValue());
- }
- }
- }
-
- @Override
- public void merge(Map source) {
- for (Map.Entry entry : source.entrySet()) {
- if (!AbstractIndex.TIME_SLICE.equals(entry.getKey())
- && !AbstractIndex.AGG_COLUMN.equals(entry.getKey())) {
- long dbValue = ((Number) entry.getValue()).longValue();
- set(entry.getKey(), dbValue);
- }
- }
- }
-
- @Override
- public String getId() {
- return id;
- }
-
- public Map asMap() {
- return data;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/MetricPersistenceData.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/MetricPersistenceData.java
deleted file mode 100644
index ef2cbd7cd..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/MetricPersistenceData.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-/**
- * @author pengys5
- */
-public class MetricPersistenceData extends Window implements PersistenceData {
-
- private WindowData lockedWindowData;
-
- public MetricData getOrCreate(String id) {
- if (!lockedWindowData.containsKey(id)) {
- lockedWindowData.put(id, new MetricData(id));
- }
- return lockedWindowData.get(id);
- }
-
- public void hold() {
- lockedWindowData = getCurrentAndHold();
- }
-
- public void release() {
- lockedWindowData.release();
- lockedWindowData = null;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/PersistenceData.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/PersistenceData.java
deleted file mode 100644
index 73592aa6f..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/PersistenceData.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-/**
- * @author pengys5
- */
-public interface PersistenceData {
-
- T getOrCreate(String id);
-
- void release();
-
- void hold();
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/PersistenceTimer.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/PersistenceTimer.java
deleted file mode 100644
index 5f4d6bffa..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/PersistenceTimer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.message.StringFormattedMessage;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-import org.skywalking.apm.collector.worker.config.EsConfig;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @author pengys5
- */
-public enum PersistenceTimer {
- INSTANCE;
-
- private Logger logger = LogManager.getFormatterLogger(PersistenceTimer.class);
-
- public void boot() {
- logger.info("persistence timer start");
- final long timeInterval = EsConfig.Es.Persistence.Timer.VALUE * 1000;
-
- Runnable runnable = () -> {
- while (true) {
- try {
- extractDataAndSave();
- Thread.sleep(timeInterval);
- } catch (Throwable e) {
- logger.error(e, e);
- }
- }
- };
- Thread persistenceThread = new Thread(runnable);
- persistenceThread.setName("timerPersistence");
- persistenceThread.start();
- }
-
- private void extractDataAndSave() {
- List dataList = new LinkedList<>();
-
- List workers = PersistenceWorkerListener.INSTANCE.getWorkers();
- for (AbstractLocalSyncWorker worker : workers) {
- logger.info("worker role name: %s", worker.getRole().roleName());
- try {
- worker.allocateJob(new FlushAndSwitch(), dataList);
- } catch (Exception e) {
- logger.error(new StringFormattedMessage("flush persistence worker data error, worker role name: %s", worker.getRole().roleName()), e);
- }
- }
- EsClient.INSTANCE.bulk(dataList);
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/PersistenceWorkerListener.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/PersistenceWorkerListener.java
deleted file mode 100644
index 70669f0b2..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/PersistenceWorkerListener.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import org.skywalking.apm.collector.actor.AbstractLocalSyncWorker;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @author pengys5
- */
-public enum PersistenceWorkerListener {
- INSTANCE;
-
- private List workers = new LinkedList<>();
-
- public void register(AbstractLocalSyncWorker worker) {
- workers.add(worker);
- }
-
- public List getWorkers() {
- return workers;
- }
-
- public void reset() {
- workers.clear();
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/RecordAnalysisData.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/RecordAnalysisData.java
deleted file mode 100644
index c13ae7881..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/RecordAnalysisData.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * @author pengys5
- */
-public class RecordAnalysisData {
-
- private WindowData windowData = new WindowData(new LinkedHashMap());
-
- public RecordData getOrCreate(String id) {
- if (!windowData.containsKey(id)) {
- windowData.put(id, new RecordData(id));
- }
- return windowData.get(id);
- }
-
- public Map asMap() {
- return windowData.asMap();
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/RecordData.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/RecordData.java
deleted file mode 100644
index ea65af3d4..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/RecordData.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import com.google.gson.JsonObject;
-import org.skywalking.apm.collector.actor.selector.AbstractHashMessage;
-import org.skywalking.apm.collector.worker.Const;
-
-import java.util.Map;
-
-/**
- * @author pengys5
- */
-public class RecordData extends AbstractHashMessage implements Data {
-
- private String id;
- private String aggId;
- private JsonObject data;
-
- public RecordData(String id) {
- super(id);
- this.id = id;
- String[] ids = this.id.split(Const.IDS_SPLIT);
- for (int i = 1; i < ids.length; i++) {
- if (i == 1) {
- this.aggId = ids[i];
- } else {
- this.aggId += Const.ID_SPLIT + ids[i];
- }
- }
- data = new JsonObject();
- }
-
- public String getId() {
- return id;
- }
-
- public JsonObject get() {
- data.addProperty(AbstractIndex.AGG_COLUMN, this.aggId);
- return data;
- }
-
- public void set(JsonObject record) {
- this.data = record;
- }
-
- @Override
- public void merge(Map source) {
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/RecordPersistenceData.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/RecordPersistenceData.java
deleted file mode 100644
index 617312afb..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/RecordPersistenceData.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-/**
- * @author pengys5
- */
-public class RecordPersistenceData extends Window implements PersistenceData {
-
- private WindowData lockedWindowData;
-
- public RecordData getOrCreate(String id) {
- if (!lockedWindowData.containsKey(id)) {
- lockedWindowData.put(id, new RecordData(id));
- }
- return lockedWindowData.get(id);
- }
-
- public void hold() {
- lockedWindowData = getCurrentAndHold();
- }
-
- public void release() {
- lockedWindowData.release();
- lockedWindowData = null;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/SegmentData.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/SegmentData.java
deleted file mode 100644
index 2cd9ab11d..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/SegmentData.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import java.util.Map;
-
-/**
- * @author pengys5
- */
-public class SegmentData implements Data {
-
- private String id;
- private String segmentStr;
-
- public SegmentData(String id) {
- this.id = id;
- }
-
- public String getId() {
- return id;
- }
-
- @Override
- public void merge(Map source) {
- }
-
- public String getSegmentStr() {
- return segmentStr;
- }
-
- public void setSegmentStr(String segmentStr) {
- this.segmentStr = segmentStr;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/SegmentPersistenceData.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/SegmentPersistenceData.java
deleted file mode 100644
index 4ec045e96..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/SegmentPersistenceData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import java.util.Map;
-
-/**
- * @author pengys5
- */
-public class SegmentPersistenceData extends Window implements PersistenceData {
-
- private WindowData lockedWindowData;
-
- public SegmentData getOrCreate(String id) {
- if (!lockedWindowData.containsKey(id)) {
- lockedWindowData.put(id, new SegmentData(id));
- }
- return lockedWindowData.get(id);
- }
-
- public void hold() {
- lockedWindowData = getCurrentAndHold();
- }
-
- public void release() {
- lockedWindowData.release();
- lockedWindowData = null;
- }
-
- public int size() {
- return lockedWindowData.size();
- }
-
- public Map asMap() {
- return lockedWindowData.asMap();
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/Window.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/Window.java
deleted file mode 100644
index 3dfe0551c..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/Window.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import java.util.HashMap;
-
-/**
- * @author pengys5
- */
-public abstract class Window {
-
- private WindowData pointer;
-
- private WindowData windowDataA;
- private WindowData windowDataB;
-
- public Window() {
- windowDataA = new WindowData(new HashMap<>());
- windowDataB = new WindowData(new HashMap<>());
- pointer = windowDataA;
- }
-
- public void switchPointer() {
- if (pointer == windowDataA) {
- pointer = windowDataB;
- } else {
- pointer = windowDataA;
- }
- }
-
- protected WindowData getCurrentAndHold() {
- if (pointer == windowDataA) {
- windowDataA.hold();
- return windowDataA;
- } else {
- windowDataB.hold();
- return windowDataB;
- }
- }
-
- public WindowData getLast() {
- if (pointer == windowDataA) {
- return windowDataB;
- } else {
- return windowDataA;
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/WindowData.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/WindowData.java
deleted file mode 100644
index ec123ee92..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/storage/WindowData.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.skywalking.apm.collector.worker.storage;
-
-import java.util.Map;
-
-/**
- * @author pengys5
- */
-public class WindowData {
- private Map data;
- private volatile boolean isHold;
-
- WindowData(Map data) {
- this.data = data;
- this.isHold = false;
- }
-
- public void release() {
- isHold = false;
- }
-
- public void hold() {
- isHold = true;
- }
-
- public boolean isHolding() {
- return isHold;
- }
-
- public boolean containsKey(String key) {
- return data.containsKey(key);
- }
-
- public void put(String key, T value) {
- data.put(key, value);
- }
-
- public T get(String key) {
- return data.get(key);
- }
-
- public int size() {
- return data.size();
- }
-
- public void clear() {
- data.clear();
- }
-
- public Map asMap() {
- return data;
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/CollectionTools.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/CollectionTools.java
deleted file mode 100644
index 5fab5ea8d..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/CollectionTools.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.skywalking.apm.collector.worker.tools;
-
-import java.util.List;
-
-/**
- * @author pengys5
- */
-public class CollectionTools {
-
- public static boolean isEmpty(List list) {
- return list == null || list.size() == 0;
- }
-
- public static boolean isNotEmpty(List list) {
- return !isEmpty(list);
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/DateTools.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/DateTools.java
deleted file mode 100644
index e270debcc..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/DateTools.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.skywalking.apm.collector.worker.tools;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.TimeZone;
-
-/**
- * @author pengys5
- */
-public class DateTools {
- private static final SimpleDateFormat DAY_DATE_FORMAT = new SimpleDateFormat("yyyyMMdd");
- private static final SimpleDateFormat HOUR_DATE_FORMAT = new SimpleDateFormat("yyyyMMddHH");
- private static final SimpleDateFormat MINUTE_DATE_FORMAT = new SimpleDateFormat("yyyyMMddHHmm");
-
- public static int getSecond(long time) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(time);
- return calendar.get(Calendar.SECOND);
- }
-
- public static long getMinuteSlice(long time) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(time);
- String timeStr = MINUTE_DATE_FORMAT.format(calendar.getTime());
- return Long.valueOf(timeStr);
- }
-
- public static long getHourSlice(long time) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(time);
- String timeStr = HOUR_DATE_FORMAT.format(calendar.getTime()) + "00";
- return Long.valueOf(timeStr);
- }
-
- public static long getDaySlice(long time) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(time);
- String timeStr = DAY_DATE_FORMAT.format(calendar.getTime()) + "0000";
- return Long.valueOf(timeStr);
- }
-
- public static long changeToUTCSlice(long timeSlice) {
- String timeSliceStr = String.valueOf(timeSlice);
-
- if (TimeZone.getDefault().getID().equals("GMT+08:00") || timeSliceStr.endsWith("0000")) {
- return timeSlice;
- } else {
- return timeSlice - 800;
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/ParameterTools.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/ParameterTools.java
deleted file mode 100644
index fad83f6cb..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/ParameterTools.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.skywalking.apm.collector.worker.tools;
-
-import java.util.Map;
-
-/**
- * @author pengys5
- */
-public enum ParameterTools {
- INSTANCE;
-
- public String toString(Map request, String key) {
- if (request.get(key) != null) {
- return request.get(key)[0];
- } else {
- return "";
- }
- }
-
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/SpanPeersTools.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/SpanPeersTools.java
deleted file mode 100644
index e48cb2106..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tools/SpanPeersTools.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.skywalking.apm.collector.worker.tools;
-
-import org.skywalking.apm.network.proto.SpanObject;
-
-/**
- * @author pengys5
- */
-public enum SpanPeersTools {
- INSTANCE;
-
- public int getPeers(SpanObject span) {
- if (span.getPeerId() == 0) {
- return 0; //TODO exchange peer to peer id
- } else {
- return span.getPeerId();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tracedag/TraceDagDataBuilder.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tracedag/TraceDagDataBuilder.java
deleted file mode 100644
index ed616bd5c..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tracedag/TraceDagDataBuilder.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package org.skywalking.apm.collector.worker.tracedag;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.worker.Const;
-import org.skywalking.apm.collector.worker.node.NodeCompIndex;
-import org.skywalking.apm.collector.worker.node.NodeMappingIndex;
-import org.skywalking.apm.collector.worker.noderef.NodeRefIndex;
-
-/**
- * @author pengys5
- */
-public class TraceDagDataBuilder {
-
- private Logger logger = LogManager.getFormatterLogger(TraceDagDataBuilder.class);
-
- private Integer nodeId = new Integer(-1);
- private Map mappingMap = new HashMap<>();
- private Map nodeCompMap = new HashMap<>();
- private Map resSumMap = new HashMap<>();
- private Map nodeIdMap = new HashMap<>();
- private JsonArray pointArray = new JsonArray();
- private JsonArray lineArray = new JsonArray();
-
- public JsonObject build(JsonArray nodeCompArray, JsonArray nodesMappingArray, JsonArray nodeRefsArray,
- JsonArray resSumArray) {
- changeMapping2Map(nodesMappingArray);
- changeNodeComp2Map(nodeCompArray);
- resSumMerge(resSumArray);
-
- for (int i = 0; i < nodeRefsArray.size(); i++) {
- JsonObject nodeRefJsonObj = nodeRefsArray.get(i).getAsJsonObject();
- String front = nodeRefJsonObj.get(NodeRefIndex.FRONT).getAsString();
- String behind = nodeRefJsonObj.get(NodeRefIndex.BEHIND).getAsString();
-
- String behindCode = findRealCode(behind);
- logger.debug("behind: %s, behindCode: %s", behind, behindCode);
-
- JsonObject lineJsonObj = new JsonObject();
- lineJsonObj.addProperty("from", findOrCreateNode(front));
- lineJsonObj.addProperty("to", findOrCreateNode(behindCode));
- lineJsonObj.addProperty("resSum", resSumMap.get(front + Const.ID_SPLIT + behindCode));
-
- lineArray.add(lineJsonObj);
- logger.debug("line: %s", lineJsonObj);
- }
-
- JsonObject dagJsonObj = new JsonObject();
- dagJsonObj.add("nodes", pointArray);
- dagJsonObj.add("nodeRefs", lineArray);
- return dagJsonObj;
- }
-
- private Integer findOrCreateNode(String peers) {
- if (nodeIdMap.containsKey(peers) && !peers.equals(Const.USER_CODE)) {
- return nodeIdMap.get(peers);
- } else {
- nodeId++;
- JsonObject nodeJsonObj = new JsonObject();
- nodeJsonObj.addProperty("id", nodeId);
- nodeJsonObj.addProperty("peer", peers);
- if (peers.equals(Const.USER_CODE)) {
- nodeJsonObj.addProperty("component", Const.USER_CODE);
- } else {
- nodeJsonObj.addProperty("component", nodeCompMap.get(peers));
- }
- pointArray.add(nodeJsonObj);
-
- nodeIdMap.put(peers, nodeId);
- logger.debug("node: %s", nodeJsonObj);
- }
- return nodeId;
- }
-
- private void changeMapping2Map(JsonArray nodesMappingArray) {
- for (int i = 0; i < nodesMappingArray.size(); i++) {
- JsonObject nodesMappingJsonObj = nodesMappingArray.get(i).getAsJsonObject();
- String code = nodesMappingJsonObj.get(NodeMappingIndex.CODE).getAsString();
- String peers = nodesMappingJsonObj.get(NodeMappingIndex.PEERS).getAsString();
- mappingMap.put(peers, code);
- }
- }
-
- private void changeNodeComp2Map(JsonArray nodeCompArray) {
- for (int i = 0; i < nodeCompArray.size(); i++) {
- JsonObject nodesJsonObj = nodeCompArray.get(i).getAsJsonObject();
- logger.debug(nodesJsonObj);
- String component = nodesJsonObj.get(NodeCompIndex.NAME).getAsString();
- String peers = nodesJsonObj.get(NodeCompIndex.PEERS).getAsString();
- nodeCompMap.put(peers, component);
- }
- }
-
- private String findRealCode(String peers) {
- if (mappingMap.containsKey(peers)) {
- return mappingMap.get(peers);
- } else {
- return peers;
- }
- }
-
- private void resSumMerge(JsonArray resSumArray) {
- for (int i = 0; i < resSumArray.size(); i++) {
- JsonObject resSumJsonObj = resSumArray.get(i).getAsJsonObject();
- String front = resSumJsonObj.get("front").getAsString();
- String behind = resSumJsonObj.get("behind").getAsString();
- Long summary = resSumJsonObj.get("summary").getAsLong();
-
- if (mappingMap.containsKey(behind)) {
- behind = mappingMap.get(behind);
- }
-
- String id = front + Const.ID_SPLIT + behind;
- if (resSumMap.containsKey(id)) {
- resSumMap.put(id, summary + resSumMap.get(id));
- } else {
- resSumMap.put(id, summary);
- }
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tracedag/TraceDagGetWithTimeSlice.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tracedag/TraceDagGetWithTimeSlice.java
deleted file mode 100644
index cecffbebe..000000000
--- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tracedag/TraceDagGetWithTimeSlice.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.skywalking.apm.collector.worker.tracedag;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import java.util.Arrays;
-import java.util.Map;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.Role;
-import org.skywalking.apm.collector.actor.WorkerInvokeException;
-import org.skywalking.apm.collector.actor.WorkerNotFoundException;
-import org.skywalking.apm.collector.actor.selector.RollingSelector;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-import org.skywalking.apm.collector.worker.Const;
-import org.skywalking.apm.collector.worker.httpserver.AbstractGet;
-import org.skywalking.apm.collector.worker.httpserver.AbstractGetProvider;
-import org.skywalking.apm.collector.worker.httpserver.ArgumentsParseException;
-import org.skywalking.apm.collector.worker.node.persistence.NodeCompLoad;
-import org.skywalking.apm.collector.worker.node.persistence.NodeMappingSearchWithTimeSlice;
-import org.skywalking.apm.collector.worker.noderef.persistence.NodeRefResSumSearchWithTimeSlice;
-import org.skywalking.apm.collector.worker.noderef.persistence.NodeRefSearchWithTimeSlice;
-import org.skywalking.apm.collector.worker.tools.ParameterTools;
-
-/**
- * @author pengys5
- */
-public class TraceDagGetWithTimeSlice extends AbstractGet {
-
- private Logger logger = LogManager.getFormatterLogger(TraceDagGetWithTimeSlice.class);
-
- TraceDagGetWithTimeSlice(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override protected Class responseClass() {
- return JsonObject.class;
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- getClusterContext().findProvider(NodeCompLoad.WorkerRole.INSTANCE).create(this);
- getClusterContext().findProvider(NodeMappingSearchWithTimeSlice.WorkerRole.INSTANCE).create(this);
- getClusterContext().findProvider(NodeRefSearchWithTimeSlice.WorkerRole.INSTANCE).create(this);
- getClusterContext().findProvider(NodeRefResSumSearchWithTimeSlice.WorkerRole.INSTANCE).create(this);
- }
-
- @Override protected void onReceive(Map parameter,
- JsonElement response) throws ArgumentsParseException, WorkerInvokeException, WorkerNotFoundException {
- if (!parameter.containsKey("startTime") || !parameter.containsKey("endTime") || !parameter.containsKey("timeSliceType")) {
- throw new ArgumentsParseException("the request parameter must contains startTime,endTime,timeSliceType");
- }
-
- if (logger.isDebugEnabled()) {
- logger.debug("startTime: %s, endTime: %s, timeSliceType: %s", Arrays.toString(parameter.get("startTime")),
- Arrays.toString(parameter.get("endTime")), Arrays.toString(parameter.get("timeSliceType")));
- }
-
- long startTime;
- try {
- startTime = Long.valueOf(ParameterTools.INSTANCE.toString(parameter, "startTime"));
- } catch (NumberFormatException e) {
- throw new ArgumentsParseException("the request parameter startTime must be a long");
- }
-
- long endTime;
- try {
- endTime = Long.valueOf(ParameterTools.INSTANCE.toString(parameter, "endTime"));
- } catch (NumberFormatException e) {
- throw new ArgumentsParseException("the request parameter endTime must be a long");
- }
-
- String timeSliceType = ParameterTools.INSTANCE.toString(parameter, "timeSliceType");
-
- JsonObject compResponse = getNewResponse();
- getSelfContext().lookup(NodeCompLoad.WorkerRole.INSTANCE).ask(null, compResponse);
-
- JsonObject nodeMappingResponse = getNewResponse();
- NodeMappingSearchWithTimeSlice.RequestEntity nodeMappingEntity = new NodeMappingSearchWithTimeSlice.RequestEntity(timeSliceType, startTime, endTime);
- getSelfContext().lookup(NodeMappingSearchWithTimeSlice.WorkerRole.INSTANCE).ask(nodeMappingEntity, nodeMappingResponse);
-
- JsonObject nodeRefResponse = getNewResponse();
- NodeRefSearchWithTimeSlice.RequestEntity nodeReftEntity = new NodeRefSearchWithTimeSlice.RequestEntity(timeSliceType, startTime, endTime);
- getSelfContext().lookup(NodeRefSearchWithTimeSlice.WorkerRole.INSTANCE).ask(nodeReftEntity, nodeRefResponse);
-
- JsonObject resSumResponse = getNewResponse();
- NodeRefResSumSearchWithTimeSlice.RequestEntity resSumEntity = new NodeRefResSumSearchWithTimeSlice.RequestEntity(timeSliceType, startTime, endTime);
- getSelfContext().lookup(NodeRefResSumSearchWithTimeSlice.WorkerRole.INSTANCE).ask(resSumEntity, resSumResponse);
-
- JsonObject result = getBuilder().build(compResponse.get(Const.RESULT).getAsJsonArray(), nodeMappingResponse.get(Const.RESULT).getAsJsonArray(),
- nodeRefResponse.get(Const.RESULT).getAsJsonArray(), resSumResponse.get(Const.RESULT).getAsJsonArray());
-
- ((JsonObject)response).add(Const.RESULT, result);
- }
-
- private JsonObject getNewResponse() {
- JsonObject response = new JsonObject();
- return response;
- }
-
- private TraceDagDataBuilder getBuilder() {
- TraceDagDataBuilder builder = new TraceDagDataBuilder();
- return builder;
- }
-
- public static class Factory extends AbstractGetProvider {
-
- public static Factory INSTANCE = new Factory();
-
- @Override
- public Role role() {
- return WorkerRole.INSTANCE;
- }
-
- @Override
- public TraceDagGetWithTimeSlice workerInstance(ClusterWorkerContext clusterContext) {
- return new TraceDagGetWithTimeSlice(role(), clusterContext, new LocalWorkerContext());
- }
-
- @Override
- public String servletPath() {
- return "/traceDag/timeSlice";
- }
- }
-
- public enum WorkerRole implements Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return TraceDagGetWithTimeSlice.class.getSimpleName();
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return new RollingSelector();
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/io.grpc.BindableService b/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/io.grpc.BindableService
deleted file mode 100644
index 1f128953f..000000000
--- a/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/io.grpc.BindableService
+++ /dev/null
@@ -1 +0,0 @@
-org.skywalking.apm.collector.worker.segment.TraceSegmentServiceImpl
\ No newline at end of file
diff --git a/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.actor.AbstractClusterWorkerProvider b/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.actor.AbstractClusterWorkerProvider
deleted file mode 100644
index 40be71f4d..000000000
--- a/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.actor.AbstractClusterWorkerProvider
+++ /dev/null
@@ -1,16 +0,0 @@
-org.skywalking.apm.collector.worker.grpcserver.GRPCAddressRegister$Factory
-org.skywalking.apm.collector.worker.globaltrace.persistence.GlobalTraceAgg$Factory
-
-org.skywalking.apm.collector.worker.noderef.persistence.NodeRefDayAgg$Factory
-org.skywalking.apm.collector.worker.noderef.persistence.NodeRefHourAgg$Factory
-org.skywalking.apm.collector.worker.noderef.persistence.NodeRefMinuteAgg$Factory
-
-org.skywalking.apm.collector.worker.noderef.persistence.NodeRefResSumDayAgg$Factory
-org.skywalking.apm.collector.worker.noderef.persistence.NodeRefResSumHourAgg$Factory
-org.skywalking.apm.collector.worker.noderef.persistence.NodeRefResSumMinuteAgg$Factory
-
-org.skywalking.apm.collector.worker.node.persistence.NodeCompAgg$Factory
-
-org.skywalking.apm.collector.worker.node.persistence.NodeMappingDayAgg$Factory
-org.skywalking.apm.collector.worker.node.persistence.NodeMappingHourAgg$Factory
-org.skywalking.apm.collector.worker.node.persistence.NodeMappingMinuteAgg$Factory
\ No newline at end of file
diff --git a/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.actor.AbstractLocalWorkerProvider b/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.actor.AbstractLocalWorkerProvider
deleted file mode 100644
index 9847c2360..000000000
--- a/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.actor.AbstractLocalWorkerProvider
+++ /dev/null
@@ -1,48 +0,0 @@
-org.skywalking.apm.collector.worker.segment.analysis.SegmentAnalysis$Factory
-org.skywalking.apm.collector.worker.segment.analysis.SegmentCostAnalysis$Factory
-org.skywalking.apm.collector.worker.segment.analysis.SegmentExceptionAnalysis$Factory
-
-org.skywalking.apm.collector.worker.segment.SegmentReceiver$Factory
-org.skywalking.apm.collector.worker.segment.persistence.SegmentSave$Factory
-org.skywalking.apm.collector.worker.segment.persistence.SegmentCostSave$Factory
-org.skywalking.apm.collector.worker.segment.persistence.SegmentExceptionSave$Factory
-org.skywalking.apm.collector.worker.segment.persistence.SegmentExceptionWithSegId$Factory
-org.skywalking.apm.collector.worker.segment.persistence.SegmentTopSearch$Factory
-
-org.skywalking.apm.collector.worker.noderef.analysis.NodeRefDayAnalysis$Factory
-org.skywalking.apm.collector.worker.noderef.analysis.NodeRefHourAnalysis$Factory
-org.skywalking.apm.collector.worker.noderef.analysis.NodeRefMinuteAnalysis$Factory
-
-org.skywalking.apm.collector.worker.noderef.analysis.NodeRefResSumDayAnalysis$Factory
-org.skywalking.apm.collector.worker.noderef.analysis.NodeRefResSumHourAnalysis$Factory
-org.skywalking.apm.collector.worker.noderef.analysis.NodeRefResSumMinuteAnalysis$Factory
-
-org.skywalking.apm.collector.worker.noderef.persistence.NodeRefDaySave$Factory
-org.skywalking.apm.collector.worker.noderef.persistence.NodeRefHourSave$Factory
-org.skywalking.apm.collector.worker.noderef.persistence.NodeRefMinuteSave$Factory
-org.skywalking.apm.collector.worker.noderef.persistence.NodeRefSearchWithTimeSlice$Factory
-org.skywalking.apm.collector.worker.noderef.persistence.NodeRefResSumSearchWithTimeSlice$Factory
-org.skywalking.apm.collector.worker.noderef.persistence.NodeRefResSumGroupWithTimeSlice$Factory
-
-org.skywalking.apm.collector.worker.noderef.persistence.NodeRefResSumDaySave$Factory
-org.skywalking.apm.collector.worker.noderef.persistence.NodeRefResSumHourSave$Factory
-org.skywalking.apm.collector.worker.noderef.persistence.NodeRefResSumMinuteSave$Factory
-
-org.skywalking.apm.collector.worker.node.analysis.NodeCompAnalysis$Factory
-org.skywalking.apm.collector.worker.node.persistence.NodeCompSave$Factory
-org.skywalking.apm.collector.worker.node.persistence.NodeCompLoad$Factory
-
-org.skywalking.apm.collector.worker.node.analysis.NodeMappingDayAnalysis$Factory
-org.skywalking.apm.collector.worker.node.analysis.NodeMappingHourAnalysis$Factory
-org.skywalking.apm.collector.worker.node.analysis.NodeMappingMinuteAnalysis$Factory
-
-org.skywalking.apm.collector.worker.node.persistence.NodeMappingDaySave$Factory
-org.skywalking.apm.collector.worker.node.persistence.NodeMappingHourSave$Factory
-org.skywalking.apm.collector.worker.node.persistence.NodeMappingMinuteSave$Factory
-org.skywalking.apm.collector.worker.node.persistence.NodeMappingSearchWithTimeSlice$Factory
-
-org.skywalking.apm.collector.worker.globaltrace.analysis.GlobalTraceAnalysis$Factory
-org.skywalking.apm.collector.worker.globaltrace.persistence.GlobalTraceSave$Factory
-org.skywalking.apm.collector.worker.globaltrace.persistence.GlobalTraceSearchWithGlobalId$Factory
-
-org.skywalking.apm.collector.worker.span.persistence.SpanSearchWithId$Factory
\ No newline at end of file
diff --git a/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.config.ConfigProvider b/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.config.ConfigProvider
deleted file mode 100644
index aec02c4db..000000000
--- a/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.config.ConfigProvider
+++ /dev/null
@@ -1,6 +0,0 @@
-org.skywalking.apm.collector.cluster.ClusterConfigProvider
-org.skywalking.apm.collector.worker.config.EsConfigProvider
-org.skywalking.apm.collector.worker.config.HttpConfigProvider
-org.skywalking.apm.collector.worker.config.GRPCConfigProvider
-org.skywalking.apm.collector.worker.config.CacheSizeConfigProvider
-org.skywalking.apm.collector.worker.config.WorkerConfigProvider
\ No newline at end of file
diff --git a/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.worker.httpserver.AbstractGetProvider b/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.worker.httpserver.AbstractGetProvider
deleted file mode 100644
index 3fb933e71..000000000
--- a/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.worker.httpserver.AbstractGetProvider
+++ /dev/null
@@ -1,7 +0,0 @@
-org.skywalking.apm.collector.worker.noderef.NodeRefResSumGetGroupWithTimeSlice$Factory
-org.skywalking.apm.collector.worker.segment.SegmentTopGet$Factory
-org.skywalking.apm.collector.worker.globaltrace.GlobalTraceGetWithGlobalId$Factory
-org.skywalking.apm.collector.worker.span.SpanGetWithId$Factory
-org.skywalking.apm.collector.worker.tracedag.TraceDagGetWithTimeSlice$Factory
-
-org.skywalking.apm.collector.worker.grpcserver.GRPCAddressGet$Factory
\ No newline at end of file
diff --git a/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.worker.httpserver.AbstractPostProvider b/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.worker.httpserver.AbstractPostProvider
deleted file mode 100644
index e69de29bb..000000000
diff --git a/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.worker.httpserver.AbstractStreamPostProvider b/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.worker.httpserver.AbstractStreamPostProvider
deleted file mode 100644
index e69de29bb..000000000
diff --git a/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.worker.storage.AbstractIndex b/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.worker.storage.AbstractIndex
deleted file mode 100644
index 5884e353d..000000000
--- a/apm-collector/apm-collector-worker/src/main/resources/META-INF/services/org.skywalking.apm.collector.worker.storage.AbstractIndex
+++ /dev/null
@@ -1,11 +0,0 @@
-org.skywalking.apm.collector.worker.segment.SegmentIndex
-org.skywalking.apm.collector.worker.segment.SegmentCostIndex
-org.skywalking.apm.collector.worker.segment.SegmentExceptionIndex
-
-org.skywalking.apm.collector.worker.globaltrace.GlobalTraceIndex
-
-org.skywalking.apm.collector.worker.node.NodeCompIndex
-org.skywalking.apm.collector.worker.node.NodeMappingIndex
-
-org.skywalking.apm.collector.worker.noderef.NodeRefIndex
-org.skywalking.apm.collector.worker.noderef.NodeRefResSumIndex
\ No newline at end of file
diff --git a/apm-collector/apm-collector-worker/src/main/resources/collector.config b/apm-collector/apm-collector-worker/src/main/resources/collector.config
deleted file mode 100644
index abdc725fd..000000000
--- a/apm-collector/apm-collector-worker/src/main/resources/collector.config
+++ /dev/null
@@ -1,50 +0,0 @@
-#"hostname" and "port" are used to receive internal messages from other nodes of cluster。
-# Hostname can be either hostname or IP address.
-cluster.current.hostname = 127.0.0.1
-# Listening port.
-cluster.current.port = 11800
-
-# In this version, all members have same roles, and everyone of them is listening the status of others.
-#The routers do not send message to nodes, which is unreachable, caused by network trouble, jvm crash or any other reasons.
-cluster.current.roles=WorkersListener,RPCAddressListener
-
-#Initial contact points of the cluster, e.g. seed_nodes = 127.0.0.1:11800, 127.0.0.1:11801.
-#The nodes to join automatically at startup.
-#When setting akka configuration, it will be change.
-#like: ["akka.tcp://system@127.0.0.1:11800", "akka.tcp://system@127.0.0.1:11801"].
-#This is akka configuration, see: http://doc.akka.io/docs/akka/2.4/general/configuration.html
-cluster.seed_nodes=127.0.0.1:11800
-
-#elasticsearch configuration, see cluster.name in "config/elasticsearch.yml"
- es.cluster.name = CollectorDBCluster
- es.cluster.transport.sniffer = true
-
-# The elasticsearch nodes of cluster, separated by comma, e.g. nodes=ip:port, ip:port
-es.cluster.nodes=127.0.0.1:9300
-
-#Initialized mode of elasticsearch index, default is auto.
-#Options: auto, forced, manual
-#auto: create index when it doesn't exist.
-# forced: delete and create.
-# manual: do nothing.
-es.index.initialize.mode=forced
-# Config of shards or replicas in Elasticsearch.
-es.index.shards.number=2
-es.index.replicas.number=0
-
-# "hostname", "port" and "contextPath" are used to provide HTTP RESTful services.
-# RESTful services include "receive segment" and "webui query services".
-http.hostname=127.0.0.1
-http.port=12800
-# Web context path
-http.contextPath=/
-
-# GRPC services
-grpc.hostname=127.0.0.1
-grpc.port=22800
-
-# Cache size of analysis worker. The value determines whether sending to next worker and clear, or not.
-cache.analysis.size=1024
-# Cache size of persistence worker. The value determines whether save data and clear, or not.
-cache.persistence.size=4096
-
diff --git a/apm-collector/apm-collector-worker/src/main/resources/log4j2.xml b/apm-collector/apm-collector-worker/src/main/resources/log4j2.xml
deleted file mode 100644
index afee48333..000000000
--- a/apm-collector/apm-collector-worker/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
- ../logs
-
-
-
-
- %d - %c -%-4r [%t] %-5p %x - %m%n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/AnalysisMemberTestCase.java b/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/AnalysisMemberTestCase.java
deleted file mode 100644
index aeece4fae..000000000
--- a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/AnalysisMemberTestCase.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.queue.EndOfBatchCommand;
-
-import static org.mockito.Mockito.anyObject;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-/**
- * @author pengys5
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(TestAnalysisMember.class)
-@PowerMockIgnore({"javax.management.*"})
-public class AnalysisMemberTestCase {
-
- @Test
- public void testCommandOnWork() throws Exception {
- ClusterWorkerContext clusterWorkerContext = new ClusterWorkerContext(null);
- LocalWorkerContext localWorkerContext = new LocalWorkerContext();
- TestAnalysisMember member = PowerMockito.spy(new TestAnalysisMember(TestAnalysisMember.Role.INSTANCE, clusterWorkerContext, localWorkerContext));
-
- EndOfBatchCommand command = new EndOfBatchCommand();
- member.onWork(command);
- verify(member, times(1)).aggregation();
- verify(member, never()).analyse(anyObject());
- }
-
- @Test
- public void testAnalyse() throws Exception {
- ClusterWorkerContext clusterWorkerContext = new ClusterWorkerContext(null);
- LocalWorkerContext localWorkerContext = new LocalWorkerContext();
- TestAnalysisMember member = PowerMockito.spy(new TestAnalysisMember(TestAnalysisMember.Role.INSTANCE, clusterWorkerContext, localWorkerContext));
-
- Object message = new Object();
- member.onWork(message);
- verify(member, never()).aggregation();
- verify(member, times(1)).analyse(anyObject());
- }
-
- @Test
- public void testPreStart() throws Exception {
- ClusterWorkerContext clusterWorkerContext = new ClusterWorkerContext(null);
- LocalWorkerContext localWorkerContext = new LocalWorkerContext();
- TestAnalysisMember member = PowerMockito.spy(new TestAnalysisMember(TestAnalysisMember.Role.INSTANCE, clusterWorkerContext, localWorkerContext));
- member.preStart();
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/JoinAndSplitPersistenceMemberTestCase.java b/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/JoinAndSplitPersistenceMemberTestCase.java
deleted file mode 100644
index a94261444..000000000
--- a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/JoinAndSplitPersistenceMemberTestCase.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.worker.mock.MockEsBulkClient;
-import org.skywalking.apm.collector.worker.storage.EsClient;
-import org.skywalking.apm.collector.worker.storage.JoinAndSplitData;
-import org.skywalking.apm.collector.worker.storage.JoinAndSplitPersistenceData;
-
-import static org.powermock.api.mockito.PowerMockito.*;
-
-/**
- * @author pengys5
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest( {TestJoinAndSplitPersistenceMember.class, EsClient.class})
-@PowerMockIgnore( {"javax.management.*"})
-public class JoinAndSplitPersistenceMemberTestCase {
-
- private TestJoinAndSplitPersistenceMember mergePersistenceMember;
- private JoinAndSplitPersistenceData persistenceData;
-
- @Before
- public void init() throws Exception {
- MockEsBulkClient mockEsBulkClient = new MockEsBulkClient();
- mockEsBulkClient.createMock();
-
- ClusterWorkerContext clusterWorkerContext = new ClusterWorkerContext(null);
- LocalWorkerContext localWorkerContext = new LocalWorkerContext();
- mergePersistenceMember = PowerMockito.spy(new TestJoinAndSplitPersistenceMember(TestJoinAndSplitPersistenceMember.Role.INSTANCE, clusterWorkerContext, localWorkerContext));
-
- persistenceData = mock(JoinAndSplitPersistenceData.class);
- JoinAndSplitData joinAndSplitData = mock(JoinAndSplitData.class);
-
- when(mergePersistenceMember, "getPersistenceData").thenReturn(persistenceData);
- when(persistenceData.getOrCreate(Mockito.anyString())).thenReturn(joinAndSplitData);
-
- doCallRealMethod().when(mergePersistenceMember).analyse(Mockito.any(JoinAndSplitData.class));
- }
-
- @Test
- public void testAnalyse() throws Exception {
- String id = "2016" + Const.ID_SPLIT + "A" + Const.ID_SPLIT + "B";
- JoinAndSplitData joinAndSplitData = new JoinAndSplitData(id);
- joinAndSplitData.set("Column", "VALUE");
-
- mergePersistenceMember.analyse(joinAndSplitData);
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/RecordPersistenceMemberTestCase.java b/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/RecordPersistenceMemberTestCase.java
deleted file mode 100644
index 178f45d8e..000000000
--- a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/RecordPersistenceMemberTestCase.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import org.apache.logging.log4j.Logger;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.skywalking.apm.collector.worker.storage.RecordData;
-import org.skywalking.apm.collector.worker.storage.RecordPersistenceData;
-
-import static org.mockito.Mockito.*;
-
-/**
- * @author pengys5
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(RecordPersistenceMember.class)
-public class RecordPersistenceMemberTestCase {
-
- @Test
- public void analyse() throws Exception {
- RecordPersistenceMember member = PowerMockito.mock(RecordPersistenceMember.class, CALLS_REAL_METHODS);
- Logger logger = mock(Logger.class);
- when(member.logger()).thenReturn(logger);
-
- RecordPersistenceData data = mock(RecordPersistenceData.class);
- RecordData recordData = new RecordData("test1");
- when(data.getOrCreate(anyString())).thenReturn(recordData);
-
- when(member.getPersistenceData()).thenReturn(data);
-
- RecordData recordData_1 = new RecordData("test2");
- member.analyse(recordData_1);
-
- verify(data).hold();
- verify(data).release();
-
- member.analyse(new Object());
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/TestAnalysisMember.java b/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/TestAnalysisMember.java
deleted file mode 100644
index 094d22b33..000000000
--- a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/TestAnalysisMember.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-
-/**
- * @author pengys5
- */
-public class TestAnalysisMember extends AnalysisMember {
- TestAnalysisMember(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void analyse(Object message) {
-
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- super.preStart();
- }
-
- @Override
- protected void aggregation() {
-
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return null;
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return null;
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/TestJoinAndSplitAnalysisMember.java b/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/TestJoinAndSplitAnalysisMember.java
deleted file mode 100644
index c777d597c..000000000
--- a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/TestJoinAndSplitAnalysisMember.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.ProviderNotFoundException;
-import org.skywalking.apm.collector.actor.WorkerRefs;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-
-/**
- * @author pengys5
- */
-public class TestJoinAndSplitAnalysisMember extends JoinAndSplitAnalysisMember {
-
- TestJoinAndSplitAnalysisMember(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public void analyse(Object message) {
-
- }
-
- @Override
- public void preStart() throws ProviderNotFoundException {
- super.preStart();
- }
-
- @Override
- protected WorkerRefs aggWorkRefs() {
- return null;
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return null;
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return null;
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/TestJoinAndSplitPersistenceMember.java b/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/TestJoinAndSplitPersistenceMember.java
deleted file mode 100644
index bc0516c1c..000000000
--- a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/TestJoinAndSplitPersistenceMember.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import org.skywalking.apm.collector.actor.ClusterWorkerContext;
-import org.skywalking.apm.collector.actor.LocalWorkerContext;
-import org.skywalking.apm.collector.actor.selector.WorkerSelector;
-
-/**
- * @author pengys5
- */
-public class TestJoinAndSplitPersistenceMember extends JoinAndSplitPersistenceMember {
- TestJoinAndSplitPersistenceMember(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) {
- super(role, clusterContext, selfContext);
- }
-
- @Override
- public String esIndex() {
- return null;
- }
-
- @Override
- public String esType() {
- return null;
- }
-
- public enum Role implements org.skywalking.apm.collector.actor.Role {
- INSTANCE;
-
- @Override
- public String roleName() {
- return null;
- }
-
- @Override
- public WorkerSelector workerSelector() {
- return null;
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/TimeSliceTestCase.java b/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/TimeSliceTestCase.java
deleted file mode 100644
index f2d0ed81a..000000000
--- a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/TimeSliceTestCase.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.skywalking.apm.collector.worker;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author pengys5
- */
-public class TimeSliceTestCase {
-
- @Test
- public void test() {
- TestTimeSlice timeSlice = new TestTimeSlice("A", 10L, 20L);
- Assert.assertEquals("A", timeSlice.getSliceType());
- Assert.assertEquals(10L, timeSlice.getStartTime());
- Assert.assertEquals(20L, timeSlice.getEndTime());
- }
-
- class TestTimeSlice extends TimeSlice {
- public TestTimeSlice(String sliceType, long startTime, long endTime) {
- super(sliceType, startTime, endTime);
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/config/CacheSizeConfigProviderTestCase.java b/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/config/CacheSizeConfigProviderTestCase.java
deleted file mode 100644
index 964512788..000000000
--- a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/config/CacheSizeConfigProviderTestCase.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.skywalking.apm.collector.worker.config;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author pengys5
- */
-public class CacheSizeConfigProviderTestCase {
-
- @Test
- public void test() {
- CacheSizeConfigProvider provider = new CacheSizeConfigProvider();
- provider.cliArgs();
-
- Assert.assertEquals(CacheSizeConfig.class, provider.configClass());
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/config/CacheSizeConfigTestCase.java b/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/config/CacheSizeConfigTestCase.java
deleted file mode 100644
index 7056df653..000000000
--- a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/config/CacheSizeConfigTestCase.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.skywalking.apm.collector.worker.config;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author pengys5
- */
-public class CacheSizeConfigTestCase {
-
- @Test
- public void test() {
- Assert.assertEquals(1024, CacheSizeConfig.Cache.Analysis.SIZE);
- Assert.assertEquals(5000, CacheSizeConfig.Cache.Persistence.SIZE);
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/config/EsConfigProviderTestCase.java b/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/config/EsConfigProviderTestCase.java
deleted file mode 100644
index 09e2bd5f6..000000000
--- a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/config/EsConfigProviderTestCase.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.skywalking.apm.collector.worker.config;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author pengys5
- */
-public class EsConfigProviderTestCase {
-
- @Test
- public void test() {
- EsConfigProvider provider = new EsConfigProvider();
-
- Assert.assertEquals(EsConfig.class, provider.configClass());
-
- System.setProperty("es.cluster.NAME", "A");
- System.setProperty("es.cluster.NODES", "B");
- System.setProperty("es.cluster.transport.SNIFFER", "C");
- System.setProperty("es.index.shards.NUMBER", "10");
- System.setProperty("es.index.replicas.NUMBER", "20");
- provider.cliArgs();
-
- Assert.assertEquals("A", EsConfig.Es.Cluster.NAME);
- Assert.assertEquals("B", EsConfig.Es.Cluster.NODES);
- Assert.assertEquals("C", EsConfig.Es.Cluster.Transport.SNIFFER);
- Assert.assertEquals("10", EsConfig.Es.Index.Shards.NUMBER);
- Assert.assertEquals("20", EsConfig.Es.Index.Replicas.NUMBER);
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/config/HttpConfigProviderTestCase.java b/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/config/HttpConfigProviderTestCase.java
deleted file mode 100644
index d01673b6d..000000000
--- a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/config/HttpConfigProviderTestCase.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.skywalking.apm.collector.worker.config;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author pengys5
- */
-public class HttpConfigProviderTestCase {
-
- @Test
- public void test() {
- HttpConfigProvider provider = new HttpConfigProvider();
-
- Assert.assertEquals(HttpConfig.class, provider.configClass());
-
- System.setProperty("http.HOSTNAME", "A");
- System.setProperty("http.PORT", "B");
- System.setProperty("http.CONTEXTPATH", "C");
- provider.cliArgs();
-
- Assert.assertEquals("A", HttpConfig.Http.HOSTNAME);
- Assert.assertEquals("B", HttpConfig.Http.PORT);
- Assert.assertEquals("C", HttpConfig.Http.CONTEXTPATH);
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/config/WorkerConfigProviderTestCase.java b/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/config/WorkerConfigProviderTestCase.java
deleted file mode 100644
index dff78938d..000000000
--- a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/config/WorkerConfigProviderTestCase.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.skywalking.apm.collector.worker.config;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author pengys5
- */
-public class WorkerConfigProviderTestCase {
-
- @Test
- public void test() {
- WorkerConfigProvider provider = new WorkerConfigProvider();
- provider.cliArgs();
-
- Assert.assertEquals(WorkerConfig.class, provider.configClass());
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/datamerge/JsonDataMerge.java b/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/datamerge/JsonDataMerge.java
deleted file mode 100644
index cf16da0d6..000000000
--- a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/datamerge/JsonDataMerge.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.skywalking.apm.collector.worker.datamerge;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import org.junit.Assert;
-import org.skywalking.apm.collector.worker.tools.DateTools;
-import org.skywalking.apm.collector.worker.tools.JsonFileReader;
-
-import java.io.FileNotFoundException;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * @author pengys5
- */
-public enum JsonDataMerge {
- INSTANCE;
-
- private String path = this.getClass().getResource("/").getPath();
-
- public void merge(String expectJsonFile, JsonArray actualData) throws FileNotFoundException {
- Gson gson = new Gson();
- String jsonStrData = JsonFileReader.INSTANCE.read(path + expectJsonFile);
- JsonArray expectJsonArray = gson.fromJson(jsonStrData, JsonArray.class);
-
- for (int i = 0; i < expectJsonArray.size(); i++) {
- JsonObject expectJson = expectJsonArray.get(i).getAsJsonObject();
- mergeData(expectJson, actualData.get(i).getAsJsonObject());
- }
- }
-
- private void mergeData(JsonObject expectData, JsonObject actualData) {
- Iterator> iterator = expectData.entrySet().iterator();
- while (iterator.hasNext()) {
- Map.Entry entry = iterator.next();
- String key = entry.getKey();
- String value = null;
- if (!entry.getValue().isJsonNull()) {
- value = entry.getValue().getAsString();
- }
-
- if (entry.getValue().isJsonNull()) {
- Assert.assertEquals(true, actualData.get(key).isJsonNull());
- } else {
- if (key.equals("timeSlice") || key.equals("minute") || key.equals("hour") || key.equals("day")) {
- value = String.valueOf(DateTools.changeToUTCSlice(Long.valueOf(value)));
- }
- if (SpecialTimeColumn.INSTANCE.isSpecialTimeColumn(key)) {
- String changedValue = SpecialTimeColumn.INSTANCE.specialTimeColumnChange(value);
- Assert.assertEquals(changedValue, actualData.get(key).getAsString());
- } else {
- Assert.assertEquals(value, actualData.get(key).getAsString());
- }
- }
- }
- }
-}
diff --git a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/datamerge/MetricDataMergeJson.java b/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/datamerge/MetricDataMergeJson.java
deleted file mode 100644
index 2ac304c77..000000000
--- a/apm-collector/apm-collector-worker/src/test/java/org/skywalking/apm/collector/worker/datamerge/MetricDataMergeJson.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.skywalking.apm.collector.worker.datamerge;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import org.junit.Assert;
-import org.skywalking.apm.collector.worker.Const;
-import org.skywalking.apm.collector.worker.storage.MetricData;
-import org.skywalking.apm.collector.worker.tools.DateTools;
-import org.skywalking.apm.collector.worker.tools.JsonFileReader;
-
-import java.io.FileNotFoundException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author pengys5
- */
-public enum MetricDataMergeJson {
- INSTANCE;
-
- private String path = this.getClass().getResource("/").getPath();
-
- public void merge(String expectJsonFile, List metricDataList) throws FileNotFoundException {
- Gson gson = new Gson();
- String jsonStrData = JsonFileReader.INSTANCE.read(path + expectJsonFile);
- JsonArray expectJsonArray = gson.fromJson(jsonStrData, JsonArray.class);
- Assert.assertEquals(expectJsonArray.size(), metricDataList.size());
-
- Map recordDataMap = recordData2Map(metricDataList);
-
- for (int i = 0; i < expectJsonArray.size(); i++) {
- JsonObject rowData = expectJsonArray.get(i).getAsJsonObject();
- String id = rowData.get("id").getAsString();
- id = id2UTCSlice(id);
-
- JsonObject data = rowData.get("data").getAsJsonObject();
- if (recordDataMap.containsKey(id)) {
- mergeData(data, recordDataMap.get(id));
- } else {
- Assert.fail();
- }
- }
- }
-
- private void mergeData(JsonObject expectData, JsonObject actualData) {
- Iterator> iterator = expectData.entrySet().iterator();
- while (iterator.hasNext()) {
- Map.Entry entry = iterator.next();
- String key = entry.getKey();
- String value = null;
- if (!entry.getValue().isJsonNull()) {
- value = entry.getValue().getAsString();
- }
-
- if (entry.getValue().isJsonNull()) {
- Assert.assertEquals(true, actualData.get(key).isJsonNull());
- } else {
- String actualValue = actualData.get(key).getAsString();
- if (key.equals("timeSlice")) {
- value = String.valueOf(DateTools.changeToUTCSlice(Long.valueOf(value)));
- actualValue = String.valueOf(DateTools.changeToUTCSlice(Long.valueOf(actualValue)));
- }
- Assert.assertEquals(value, actualValue);
- }
- }
- }
-
- private Map recordData2Map(List