Move stream module into analysis module.

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/AgentStreamBootStartup.java

@@ -23,7 +23,7 @@ import org.apache.skywalking.apm.collector.agent.stream.graph.JvmMetricStreamGra
 import org.apache.skywalking.apm.collector.agent.stream.graph.RegisterStreamGraph;
 import org.apache.skywalking.apm.collector.agent.stream.graph.TraceStreamGraph;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerCreateListener;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerCreateListener;
 import org.apache.skywalking.apm.collector.stream.timer.PersistenceTimer;
 
 /**

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/graph/JvmMetricStreamGraph.java

@@ -27,7 +27,7 @@ import org.apache.skywalking.apm.collector.queue.QueueModule;
 import org.apache.skywalking.apm.collector.storage.table.jvm.GCMetric;
 import org.apache.skywalking.apm.collector.storage.table.jvm.MemoryMetric;
 import org.apache.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetric;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerCreateListener;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerCreateListener;
 import org.apache.skywalking.apm.collector.agent.stream.worker.jvm.GCMetricPersistenceWorker;
 import org.apache.skywalking.apm.collector.agent.stream.worker.jvm.InstHeartBeatPersistenceWorker;
 import org.apache.skywalking.apm.collector.agent.stream.worker.jvm.MemoryMetricPersistenceWorker;

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/graph/RegisterStreamGraph.java

@@ -36,7 +36,7 @@ import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService;
 import org.apache.skywalking.apm.collector.storage.table.register.Application;
 import org.apache.skywalking.apm.collector.storage.table.register.Instance;
 import org.apache.skywalking.apm.collector.storage.table.register.ServiceName;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerCreateListener;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerCreateListener;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java

@@ -31,7 +31,7 @@ import org.apache.skywalking.apm.collector.queue.QueueModule;
 import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService;
 import org.apache.skywalking.apm.collector.storage.table.application.ApplicationMapping;
 import org.apache.skywalking.apm.collector.storage.table.instance.InstanceMetric;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerCreateListener;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerCreateListener;
 import org.apache.skywalking.apm.collector.agent.stream.parser.standardization.SegmentStandardization;
 import org.apache.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationComponentAggregationWorker;
 import org.apache.skywalking.apm.collector.agent.stream.worker.trace.application.ApplicationMappingPersistenceWorker;

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java

@@ -25,8 +25,8 @@ import org.apache.skywalking.apm.collector.storage.StorageModule;
 import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.ICpuMetricPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.table.jvm.CpuMetric;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java

@@ -25,8 +25,8 @@ import org.apache.skywalking.apm.collector.storage.dao.IGCMetricPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.table.jvm.GCMetric;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java

@@ -25,8 +25,8 @@ import org.apache.skywalking.apm.collector.storage.dao.IInstanceHeartBeatPersist
 import org.apache.skywalking.apm.collector.storage.table.register.Instance;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java

@@ -25,8 +25,8 @@ import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.IMemoryMetricPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.table.jvm.MemoryMetric;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java

@@ -25,8 +25,8 @@ import org.apache.skywalking.apm.collector.storage.dao.IMemoryPoolMetricPersiste
 import org.apache.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetric;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterRemoteWorker.java

@@ -22,10 +22,10 @@ package org.apache.skywalking.apm.collector.agent.stream.worker.register;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService;
 import org.apache.skywalking.apm.collector.storage.table.register.Application;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorkerProvider;
 import org.apache.skywalking.apm.collector.remote.service.Selector;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterSerialWorker.java

@@ -25,12 +25,12 @@ import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.core.util.Const;
 import org.apache.skywalking.apm.collector.storage.dao.IApplicationRegisterDAO;
 import org.apache.skywalking.apm.collector.storage.table.register.Application;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorker;
 import org.apache.skywalking.apm.collector.cache.service.ApplicationCacheService;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterRemoteWorker.java

@@ -23,9 +23,9 @@ import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService;
 import org.apache.skywalking.apm.collector.remote.service.Selector;
 import org.apache.skywalking.apm.collector.storage.table.register.Instance;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterSerialWorker.java

@@ -19,7 +19,7 @@
 
 package org.apache.skywalking.apm.collector.agent.stream.worker.register;
 
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorker;
 import org.apache.skywalking.apm.collector.cache.CacheModule;
 import org.apache.skywalking.apm.collector.cache.service.InstanceCacheService;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
@@ -27,8 +27,8 @@ import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
 import org.apache.skywalking.apm.collector.storage.dao.IInstanceRegisterDAO;
 import org.apache.skywalking.apm.collector.storage.table.register.Instance;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterRemoteWorker.java

@@ -21,11 +21,11 @@ package org.apache.skywalking.apm.collector.agent.stream.worker.register;
 
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorkerProvider;
 import org.apache.skywalking.apm.collector.remote.service.Selector;
 import org.apache.skywalking.apm.collector.storage.table.register.ServiceName;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterSerialWorker.java

@@ -26,11 +26,11 @@ import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.core.util.Const;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.dao.IServiceNameRegisterDAO;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
 import org.apache.skywalking.apm.collector.storage.table.register.ServiceName;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentAggregationWorker.java

@@ -22,8 +22,8 @@ package org.apache.skywalking.apm.collector.agent.stream.worker.trace.applicatio
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.table.application.ApplicationComponent;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.AggregationWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.AggregationWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentPersistenceWorker.java

@@ -25,8 +25,8 @@ import org.apache.skywalking.apm.collector.storage.StorageModule;
 import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.IApplicationComponentPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.table.application.ApplicationComponent;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentRemoteWorker.java

@@ -20,12 +20,12 @@
 package org.apache.skywalking.apm.collector.agent.stream.worker.trace.application;
 
 import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorkerProvider;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.remote.service.Selector;
 import org.apache.skywalking.apm.collector.storage.table.application.ApplicationComponent;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingAggregationWorker.java

@@ -22,8 +22,8 @@ package org.apache.skywalking.apm.collector.agent.stream.worker.trace.applicatio
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.table.application.ApplicationMapping;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.AggregationWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.AggregationWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingPersistenceWorker.java

@@ -24,9 +24,9 @@ import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.IApplicationMappingPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.table.application.ApplicationMapping;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingRemoteWorker.java

@@ -22,10 +22,10 @@ package org.apache.skywalking.apm.collector.agent.stream.worker.trace.applicatio
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService;
 import org.apache.skywalking.apm.collector.storage.table.application.ApplicationMapping;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorkerProvider;
 import org.apache.skywalking.apm.collector.remote.service.Selector;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMetricAggregationWorker.java

@@ -24,8 +24,8 @@ import org.apache.skywalking.apm.collector.core.util.Const;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.table.application.ApplicationMetric;
 import org.apache.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetric;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.AggregationWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.AggregationWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMetricPersistenceWorker.java

@@ -25,8 +25,8 @@ import org.apache.skywalking.apm.collector.storage.dao.IApplicationMetricPersist
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
 import org.apache.skywalking.apm.collector.storage.table.application.ApplicationMetric;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMetricRemoteWorker.java

@@ -23,9 +23,9 @@ import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService;
 import org.apache.skywalking.apm.collector.remote.service.Selector;
 import org.apache.skywalking.apm.collector.storage.table.application.ApplicationMetric;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricAggregationWorker.java

@@ -27,8 +27,8 @@ import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetric;
 import org.apache.skywalking.apm.collector.storage.table.instance.InstanceReferenceMetric;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.AggregationWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.AggregationWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricPersistenceWorker.java

@@ -26,8 +26,8 @@ import org.apache.skywalking.apm.collector.storage.StorageModule;
 import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.IApplicationReferenceMetricPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetric;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricRemoteWorker.java

@@ -21,9 +21,9 @@ package org.apache.skywalking.apm.collector.agent.stream.worker.trace.applicatio
 
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 import org.apache.skywalking.apm.collector.agent.stream.service.graph.ApplicationGraphNodeIdDefine;
 import org.apache.skywalking.apm.collector.remote.service.Selector;
 import org.apache.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetric;

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/global/GlobalTracePersistenceWorker.java

@@ -25,8 +25,8 @@ import org.apache.skywalking.apm.collector.storage.StorageModule;
 import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.IGlobalTracePersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.table.global.GlobalTrace;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/instance/InstanceMetricPersistenceWorker.java

@@ -25,8 +25,8 @@ import org.apache.skywalking.apm.collector.storage.dao.IInstanceMetricPersistenc
 import org.apache.skywalking.apm.collector.storage.table.instance.InstanceMetric;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/instance/InstanceReferenceMetricAggregationWorker.java

@@ -25,8 +25,8 @@ import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.table.instance.InstanceReferenceMetric;
 import org.apache.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.AggregationWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.AggregationWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/instance/InstanceReferenceMetricRemoteWorker.java

@@ -22,11 +22,11 @@ package org.apache.skywalking.apm.collector.agent.stream.worker.trace.instance;
 import org.apache.skywalking.apm.collector.agent.stream.service.graph.InstanceGraphNodeIdDefine;
 import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService;
 import org.apache.skywalking.apm.collector.storage.table.instance.InstanceReferenceMetric;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorkerProvider;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.remote.service.Selector;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/instance/InstanceReferencePersistenceWorker.java

@@ -26,8 +26,8 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceRefere
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/segment/SegmentCostPersistenceWorker.java

@@ -25,8 +25,8 @@ import org.apache.skywalking.apm.collector.storage.dao.ISegmentCostPersistenceDA
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
 import org.apache.skywalking.apm.collector.storage.table.segment.SegmentCost;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/segment/SegmentPersistenceWorker.java

@@ -25,8 +25,8 @@ import org.apache.skywalking.apm.collector.storage.StorageModule;
 import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.ISegmentPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.table.segment.Segment;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntryAggregationWorker.java

@@ -22,8 +22,8 @@ package org.apache.skywalking.apm.collector.agent.stream.worker.trace.service;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.table.service.ServiceEntry;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.AggregationWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.AggregationWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntryPersistenceWorker.java

@@ -25,8 +25,8 @@ import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
 import org.apache.skywalking.apm.collector.storage.dao.IServiceEntryPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.table.service.ServiceEntry;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntryRemoteWorker.java

@@ -20,12 +20,12 @@
 package org.apache.skywalking.apm.collector.agent.stream.worker.trace.service;
 
 import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorkerProvider;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.remote.service.Selector;
 import org.apache.skywalking.apm.collector.storage.table.service.ServiceEntry;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceMetricAggregationWorker.java

@@ -24,8 +24,8 @@ import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.table.service.ServiceMetric;
 import org.apache.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.AggregationWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.AggregationWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceMetricPersistenceWorker.java

@@ -25,8 +25,8 @@ import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
 import org.apache.skywalking.apm.collector.storage.dao.IServiceMetricPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.table.service.ServiceMetric;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceMetricRemoteWorker.java

@@ -22,9 +22,9 @@ package org.apache.skywalking.apm.collector.agent.stream.worker.trace.service;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService;
 import org.apache.skywalking.apm.collector.storage.table.service.ServiceMetric;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 import org.apache.skywalking.apm.collector.remote.service.Selector;
 
 /**

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricAggregationWorker.java

@@ -23,8 +23,8 @@ import org.apache.skywalking.apm.collector.agent.stream.service.graph.ServiceGra
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.AggregationWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.AggregationWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricPersistenceWorker.java

@@ -26,8 +26,8 @@ import org.apache.skywalking.apm.collector.storage.dao.IServiceReferenceMetricPe
 import org.apache.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricRemoteWorker.java

@@ -20,13 +20,13 @@
 package org.apache.skywalking.apm.collector.agent.stream.worker.trace.service;
 
 import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorkerProvider;
 import org.apache.skywalking.apm.collector.agent.stream.service.graph.ServiceGraphNodeIdDefine;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.remote.service.Selector;
 import org.apache.skywalking.apm.collector.storage.table.service.ServiceReferenceMetric;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractRemoteWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListAggregationWorker.java

@@ -19,10 +19,10 @@
 
 package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker;
 
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorker;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.storage.table.alerting.AlertingList;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListPersistenceWorker.java

@@ -25,8 +25,8 @@ import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
 import org.apache.skywalking.apm.collector.storage.dao.IAlertingListPersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.table.alerting.AlertingList;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SegmentStandardizationWorker.java

@@ -21,12 +21,12 @@ package org.apache.skywalking.apm.collector.analysis.segment.parser.provider.par
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorker;
 import org.apache.skywalking.apm.collector.agent.stream.buffer.SegmentBufferManager;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-stream/pom.xml → apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml

@@ -21,40 +21,20 @@
          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">
     <parent>
-        <artifactId>apm-collector</artifactId>
+        <artifactId>apm-collector-analysis</artifactId>
         <groupId>org.apache.skywalking</groupId>
         <version>5.0.0-alpha</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>apm-collector-stream</artifactId>
+    <artifactId>analysis-worker-model</artifactId>
     <packaging>jar</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-collector-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-queue-define</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.skywalking</groupId>
             <artifactId>collector-storage-define</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-remote-define</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-cache-define</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorker.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractLocalAsyncWorker.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorkerProvider.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractLocalAsyncWorkerProvider.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.queue.base.QueueEventHandler;

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorker.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractRemoteWorker.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 import org.apache.skywalking.apm.collector.core.data.Data;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorkerProvider.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractRemoteWorkerProvider.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 import org.apache.skywalking.apm.collector.core.data.Data;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractWorker.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractWorker.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 import org.apache.skywalking.apm.collector.core.graph.Next;
 import org.apache.skywalking.apm.collector.core.graph.NodeProcessor;

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractWorkerProvider.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractWorkerProvider.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/LocalAsyncWorkerRef.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/LocalAsyncWorkerRef.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 import org.apache.skywalking.apm.collector.core.CollectorException;
 import org.apache.skywalking.apm.collector.core.graph.NodeProcessor;

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/Provider.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/Provider.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/ProviderNotFoundException.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/ProviderNotFoundException.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 public class ProviderNotFoundException extends Exception {
     public ProviderNotFoundException(String message) {

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/RemoteWorkerRef.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/RemoteWorkerRef.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 import org.apache.skywalking.apm.collector.core.data.Data;
 import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService;

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/UsedRoleNameException.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/UsedRoleNameException.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 public class UsedRoleNameException extends Exception {
     public UsedRoleNameException(String message) {

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerCreateListener.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerCreateListener.java

@@ -16,12 +16,11 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerException.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerException.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 import org.apache.skywalking.apm.collector.core.CollectorException;
 

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerInvokeException.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerInvokeException.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 /**
  * This exception is raised when worker fails to process job during "call" or "ask"

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerNotFoundException.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerNotFoundException.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 public class WorkerNotFoundException extends WorkerException {
     public WorkerNotFoundException(String message) {

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerRef.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerRef.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.base;
+package org.apache.skywalking.apm.collector.analysis.worker.model.base;
 
 import org.apache.skywalking.apm.collector.core.graph.NodeProcessor;
 import org.apache.skywalking.apm.collector.core.graph.WayToNode;

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/AggregationWorker.java

@@ -16,14 +16,13 @@
  *
  */
 
+package org.apache.skywalking.apm.collector.analysis.worker.model.impl;
 
-package org.apache.skywalking.apm.collector.stream.worker.impl;
-
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.data.DataCache;
 import org.apache.skywalking.apm.collector.core.data.Data;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
-import org.apache.skywalking.apm.collector.stream.worker.impl.data.DataCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/FlushAndSwitch.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/FlushAndSwitch.java

@@ -16,8 +16,7 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.impl;
+package org.apache.skywalking.apm.collector.analysis.worker.model.impl;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/PersistenceWorker.java

@@ -16,21 +16,20 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.worker.impl;
+package org.apache.skywalking.apm.collector.analysis.worker.model.impl;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorker;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.data.DataCache;
 import org.apache.skywalking.apm.collector.core.data.Data;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.core.util.ObjectUtils;
-import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
 import org.apache.skywalking.apm.collector.storage.base.dao.IBatchDAO;
-import org.apache.skywalking.apm.collector.stream.worker.impl.data.DataCache;
+import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/data/DataCache.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCache.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.stream.worker.impl.data;
+package org.apache.skywalking.apm.collector.analysis.worker.model.impl.data;
 
 import org.apache.skywalking.apm.collector.core.cache.Window;
 import org.apache.skywalking.apm.collector.core.data.Data;

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/data/DataCollection.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCollection.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.skywalking.apm.collector.stream.worker.impl.data;
+package org.apache.skywalking.apm.collector.analysis.worker.model.impl.data;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/timer/PersistenceTimer.java → apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/timer/PersistenceTimer.java

@@ -16,18 +16,17 @@
  *
  */
 
-
-package org.apache.skywalking.apm.collector.stream.timer;
+package org.apache.skywalking.apm.collector.analysis.worker.timer;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException;
+import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker;
 import org.apache.skywalking.apm.collector.core.module.ModuleManager;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
 import org.apache.skywalking.apm.collector.storage.base.dao.IBatchDAO;
-import org.apache.skywalking.apm.collector.stream.worker.base.WorkerException;
-import org.apache.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-analysis/pom.xml

@@ -34,6 +34,7 @@
         <module>analysis-layer-register</module>
         <module>analysis-alarm</module>
         <module>analysis-baseline</module>
+        <module>analysis-worker-model</module>
     </modules>
 
     <dependencies>

apm-collector/apm-collector-boot/docker/log4j2.xml

@@ -27,7 +27,7 @@
         <logger name="org.eclipse.jetty" level="INFO"/>
         <logger name="org.apache.zookeeper" level="INFO"/>
         <logger name="org.apache.skywalking.apm.collector.agent.grpc.provider.handler.JVMMetricsServiceHandler" level="INFO"/>
-        <logger name="org.apache.skywalking.apm.collector.stream.timer.PersistenceTimer" level="INFO"/>
+        <logger name="org.apache.skywalking.apm.collector.analysis.worker.timer.PersistenceTimer" level="INFO"/>
         <logger name="io.grpc.netty" level="INFO"/>
         <Root level="info">
             <AppenderRef ref="Console"/>

apm-collector/apm-collector-boot/pom.xml

@@ -157,13 +157,13 @@
             <version>${project.version}</version>
         </dependency>
         <!-- configuration provider -->
-        <!-- alerting provider -->
+        <!-- alarm provider -->
         <dependency>
             <groupId>org.apache.skywalking</groupId>
-            <artifactId>collector-alerting-provider</artifactId>
+            <artifactId>alarm-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- alerting provider -->
+        <!-- alarm provider -->
     </dependencies>
 
     <build>

apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml

@@ -37,7 +37,7 @@
         <logger name="org.eclipse.jetty" level="INFO"/>
         <logger name="org.apache.zookeeper" level="INFO"/>
         <logger name="org.apache.skywalking.apm.collector.agent.grpc.provider.handler.JVMMetricsServiceHandler" level="INFO"/>
-        <logger name="org.apache.skywalking.apm.collector.stream.timer.PersistenceTimer" level="INFO"/>
+        <logger name="org.apache.skywalking.apm.collector.analysis.worker.timer.PersistenceTimer" level="INFO"/>
         <logger name="io.grpc.netty" level="INFO"/>
         <Root level="info">
             <AppenderRef ref="RollingFile"/>

apm-collector/apm-collector-boot/src/main/resources/log4j2.xml

@@ -28,7 +28,7 @@
         <logger name="org.apache.zookeeper" level="INFO"/>
         <logger name="org.elasticsearch.common.network.IfConfig" level="INFO"/>
         <logger name="org.apache.skywalking.apm.collector.agent.grpc.provider.handler.JVMMetricsServiceHandler" level="INFO"/>
-        <logger name="org.apache.skywalking.apm.collector.stream.timer.PersistenceTimer" level="INFO"/>
+        <logger name="org.apache.skywalking.apm.collector.analysis.worker.timer.PersistenceTimer" level="INFO"/>
         <logger name="io.grpc.netty" level="INFO"/>
         <Root level="debug">
             <AppenderRef ref="Console"/>

apm-collector/pom.xml

@@ -42,12 +42,9 @@
         <module>apm-collector-grpc-manager</module>
         <module>apm-collector-jetty-manager</module>
         <module>apm-collector-remote</module>
-        <module>apm-collector-stream</module>
         <module>apm-collector-queue</module>
         <module>apm-collector-instrument</module>
-        <module>apm-collector-baseline</module>
         <module>apm-collector-agent-stream</module>
-        <module>apm-collector-alerting</module>
         <module>apm-collector-configuration</module>
         <module>apm-collector-agent</module>
         <module>apm-collector-analysis</module>