From f40da63caa3174fdd58e34e1e9032b382c2f7bd3 Mon Sep 17 00:00:00 2001
From: peng-yongsheng <8082209@qq.com>
Date: Sun, 17 Dec 2017 16:13:57 +0800
Subject: [PATCH] Move stream module into analysis module.
---
.../agent/stream/AgentStreamBootStartup.java | 2 +-
.../stream/graph/JvmMetricStreamGraph.java | 2 +-
.../stream/graph/RegisterStreamGraph.java | 2 +-
.../agent/stream/graph/TraceStreamGraph.java | 2 +-
.../jvm/CpuMetricPersistenceWorker.java | 4 +--
.../worker/jvm/GCMetricPersistenceWorker.java | 4 +--
.../jvm/InstHeartBeatPersistenceWorker.java | 4 +--
.../jvm/MemoryMetricPersistenceWorker.java | 4 +--
.../MemoryPoolMetricPersistenceWorker.java | 4 +--
.../ApplicationRegisterRemoteWorker.java | 6 ++---
.../ApplicationRegisterSerialWorker.java | 6 ++---
.../InstanceRegisterRemoteWorker.java | 6 ++---
.../InstanceRegisterSerialWorker.java | 6 ++---
.../ServiceNameRegisterRemoteWorker.java | 6 ++---
.../ServiceNameRegisterSerialWorker.java | 6 ++---
...ApplicationComponentAggregationWorker.java | 4 +--
...ApplicationComponentPersistenceWorker.java | 4 +--
.../ApplicationComponentRemoteWorker.java | 6 ++---
.../ApplicationMappingAggregationWorker.java | 4 +--
.../ApplicationMappingPersistenceWorker.java | 4 +--
.../ApplicationMappingRemoteWorker.java | 6 ++---
.../ApplicationMetricAggregationWorker.java | 4 +--
.../ApplicationMetricPersistenceWorker.java | 4 +--
.../ApplicationMetricRemoteWorker.java | 6 ++---
...ationReferenceMetricAggregationWorker.java | 4 +--
...ationReferenceMetricPersistenceWorker.java | 4 +--
...pplicationReferenceMetricRemoteWorker.java | 6 ++---
.../global/GlobalTracePersistenceWorker.java | 4 +--
.../InstanceMetricPersistenceWorker.java | 4 +--
...tanceReferenceMetricAggregationWorker.java | 4 +--
.../InstanceReferenceMetricRemoteWorker.java | 6 ++---
.../InstanceReferencePersistenceWorker.java | 4 +--
.../segment/SegmentCostPersistenceWorker.java | 4 +--
.../segment/SegmentPersistenceWorker.java | 4 +--
.../ServiceEntryAggregationWorker.java | 4 +--
.../ServiceEntryPersistenceWorker.java | 4 +--
.../service/ServiceEntryRemoteWorker.java | 6 ++---
.../ServiceMetricAggregationWorker.java | 4 +--
.../ServiceMetricPersistenceWorker.java | 4 +--
.../service/ServiceMetricRemoteWorker.java | 6 ++---
...rviceReferenceMetricAggregationWorker.java | 4 +--
...rviceReferenceMetricPersistenceWorker.java | 4 +--
.../ServiceReferenceMetricRemoteWorker.java | 6 ++---
.../worker/AlertingListAggregationWorker.java | 4 +--
.../worker/AlertingListPersistenceWorker.java | 4 +--
.../SegmentStandardizationWorker.java | 6 ++---
.../analysis-worker-model}/pom.xml | 26 +++----------------
.../model}/base/AbstractLocalAsyncWorker.java | 3 +--
.../AbstractLocalAsyncWorkerProvider.java | 3 +--
.../model}/base/AbstractRemoteWorker.java | 3 +--
.../base/AbstractRemoteWorkerProvider.java | 3 +--
.../worker/model}/base/AbstractWorker.java | 3 +--
.../model}/base/AbstractWorkerProvider.java | 3 +--
.../model}/base/LocalAsyncWorkerRef.java | 3 +--
.../analysis/worker/model}/base/Provider.java | 3 +--
.../base/ProviderNotFoundException.java | 3 +--
.../worker/model}/base/RemoteWorkerRef.java | 3 +--
.../model}/base/UsedRoleNameException.java | 3 +--
.../model}/base/WorkerCreateListener.java | 5 ++--
.../worker/model}/base/WorkerException.java | 3 +--
.../model}/base/WorkerInvokeException.java | 3 +--
.../model}/base/WorkerNotFoundException.java | 3 +--
.../worker/model}/base/WorkerRef.java | 3 +--
.../worker/model}/impl/AggregationWorker.java | 9 +++----
.../worker/model}/impl/FlushAndSwitch.java | 3 +--
.../worker/model}/impl/PersistenceWorker.java | 11 ++++----
.../worker/model}/impl/data/DataCache.java | 2 +-
.../model}/impl/data/DataCollection.java | 2 +-
.../worker}/timer/PersistenceTimer.java | 7 +++--
apm-collector/apm-collector-analysis/pom.xml | 1 +
.../apm-collector-boot/docker/log4j2.xml | 2 +-
apm-collector/apm-collector-boot/pom.xml | 6 ++---
.../src/main/assembly/log4j2.xml | 2 +-
.../src/main/resources/log4j2.xml | 2 +-
apm-collector/pom.xml | 3 ---
75 files changed, 145 insertions(+), 187 deletions(-)
rename apm-collector/{apm-collector-stream => apm-collector-analysis/analysis-worker-model}/pom.xml (62%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/AbstractLocalAsyncWorker.java (94%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/AbstractLocalAsyncWorkerProvider.java (96%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/AbstractRemoteWorker.java (95%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/AbstractRemoteWorkerProvider.java (97%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/AbstractWorker.java (96%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/AbstractWorkerProvider.java (95%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/LocalAsyncWorkerRef.java (96%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/Provider.java (93%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/ProviderNotFoundException.java (92%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/RemoteWorkerRef.java (96%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/UsedRoleNameException.java (92%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/WorkerCreateListener.java (89%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/WorkerException.java (94%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/WorkerInvokeException.java (94%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/WorkerNotFoundException.java (92%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/base/WorkerRef.java (94%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/impl/AggregationWorker.java (89%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/impl/FlushAndSwitch.java (92%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/impl/PersistenceWorker.java (93%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/impl/data/DataCache.java (95%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model}/impl/data/DataCollection.java (96%)
rename apm-collector/{apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream => apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker}/timer/PersistenceTimer.java (92%)
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/AgentStreamBootStartup.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/AgentStreamBootStartup.java
index 70c6cbe17..3399e2d82 100644
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/AgentStreamBootStartup.java
+++ b/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;
/**
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/graph/JvmMetricStreamGraph.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/graph/JvmMetricStreamGraph.java
index b07b9173e..903c1ead3 100644
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/graph/JvmMetricStreamGraph.java
+++ b/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;
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/graph/RegisterStreamGraph.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/graph/RegisterStreamGraph.java
index f2c1cb60c..4b4c7bb03 100644
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/graph/RegisterStreamGraph.java
+++ b/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
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java
index d63f2b9b7..a988493b9 100644
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java
+++ b/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;
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java
index 95f96b87a..e2fae9c0f 100644
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java
+++ b/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
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java
index 5cd4fe489..ca2c82e57 100644
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java
+++ b/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
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java
index ea876dbd2..ac7c20a79 100644
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java
+++ b/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
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java
index 63901a847..8204765bb 100644
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java
+++ b/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
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java
index bce484454..dd190ceff 100644
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java
+++ b/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
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterRemoteWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterRemoteWorker.java
index aef101c96..757cfc991 100644
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterRemoteWorker.java
+++ b/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;
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterSerialWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterSerialWorker.java
index aa922eca7..3f1bcacd7 100644
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterSerialWorker.java
+++ b/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;
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterRemoteWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterRemoteWorker.java
index 2c375449e..77a4d1127 100644
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterRemoteWorker.java
+++ b/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;
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterSerialWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterSerialWorker.java
index 50454c560..a87ea12c3 100644
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterSerialWorker.java
+++ b/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;
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterRemoteWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterRemoteWorker.java
index 78736927f..053951eb0 100644
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterRemoteWorker.java
+++ b/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;
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterSerialWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterSerialWorker.java
index b93cabff8..f4cdfe282 100644
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/apache/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterSerialWorker.java
+++ b/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;
diff --git a/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 b/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
index eef352d67..21d113c89 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index a6f3799ec..e0e71ca8e 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 6b01c4842..2c46c1877 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index df42bd504..47a681a2d 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 62ac3d7d4..7ae066df6 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 9f0bcb497..1f57022d8 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 8a7dfe191..89ee41c5b 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 4b6147230..5e54b7c6e 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index f56feb60c..0f68599a4 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 76d5994b2..cc6516c2b 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 286d25f82..3113ee19e 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 2e11ad34b..ca0352664 100644
--- a/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
+++ b/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;
diff --git a/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 b/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
index bffca1329..45f145274 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index efa477f0c..6b83b221a 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 43785a5d3..223cceccf 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index a928d5814..3ea3719e6 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 3dc6aac4a..0664973f4 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 4c4e8291e..cc4155513 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index e3f2763e1..a28ad425a 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index d7277fb74..ca53cfd51 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 04225b647..d142d8dc5 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 759fdd257..f6630cff5 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 972c119b7..4af12b68c 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 0aa51d31b..1f1858979 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 506c4b918..f26306f50 100644
--- a/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
+++ b/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;
/**
diff --git a/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 b/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
index 6e79867aa..7e1b296c8 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 6f6310c17..2e41e6f71 100644
--- a/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
+++ b/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
diff --git a/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 b/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
index 5f5fe6e0b..6970149d0 100644
--- a/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
+++ b/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
diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListAggregationWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListAggregationWorker.java
index 2874316e4..7d5fd8b84 100644
--- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListAggregationWorker.java
+++ b/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
diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListPersistenceWorker.java
index 51969d31f..886b12129 100644
--- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListPersistenceWorker.java
+++ b/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
diff --git a/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 b/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
index 12b6206d6..a5c81bc92 100644
--- a/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
+++ b/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;
diff --git a/apm-collector/apm-collector-stream/pom.xml b/apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml
similarity index 62%
rename from apm-collector/apm-collector-stream/pom.xml
rename to apm-collector/apm-collector-analysis/analysis-worker-model/pom.xml
index 95a2c6a37..29013db29 100644
--- a/apm-collector/apm-collector-stream/pom.xml
+++ b/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">
- apm-collector
+ apm-collector-analysis
org.apache.skywalking
5.0.0-alpha
4.0.0
- apm-collector-stream
+ analysis-worker-model
jar
-
- org.apache.skywalking
- apm-collector-core
- ${project.version}
-
-
- org.apache.skywalking
- collector-queue-define
- ${project.version}
-
org.apache.skywalking
collector-storage-define
${project.version}
-
- org.apache.skywalking
- collector-remote-define
- ${project.version}
-
-
- org.apache.skywalking
- collector-cache-define
- ${project.version}
-
-
+
\ No newline at end of file
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorker.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractLocalAsyncWorker.java
similarity index 94%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorker.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractLocalAsyncWorker.java
index fea5e8719..17b5ae2d0 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorker.java
+++ b/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;
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorkerProvider.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractLocalAsyncWorkerProvider.java
similarity index 96%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorkerProvider.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractLocalAsyncWorkerProvider.java
index 15ac0e300..b67b31192 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractLocalAsyncWorkerProvider.java
+++ b/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;
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorker.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractRemoteWorker.java
similarity index 95%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorker.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractRemoteWorker.java
index a8d478de8..2445a6bd8 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorker.java
+++ b/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;
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorkerProvider.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractRemoteWorkerProvider.java
similarity index 97%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorkerProvider.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractRemoteWorkerProvider.java
index da882db24..899f3ffc4 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractRemoteWorkerProvider.java
+++ b/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;
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractWorker.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractWorker.java
similarity index 96%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractWorker.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractWorker.java
index 7c1dd4f41..92b0deb7a 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractWorker.java
+++ b/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;
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractWorkerProvider.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractWorkerProvider.java
similarity index 95%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractWorkerProvider.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractWorkerProvider.java
index c6173cc06..8f78d2507 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/AbstractWorkerProvider.java
+++ b/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;
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/LocalAsyncWorkerRef.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/LocalAsyncWorkerRef.java
similarity index 96%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/LocalAsyncWorkerRef.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/LocalAsyncWorkerRef.java
index 3812666b8..11cdecea5 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/LocalAsyncWorkerRef.java
+++ b/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;
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/Provider.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/Provider.java
similarity index 93%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/Provider.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/Provider.java
index 42a6339e5..179729782 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/Provider.java
+++ b/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
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/ProviderNotFoundException.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/ProviderNotFoundException.java
similarity index 92%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/ProviderNotFoundException.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/ProviderNotFoundException.java
index 73e354646..44a6dc3db 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/ProviderNotFoundException.java
+++ b/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) {
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/RemoteWorkerRef.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/RemoteWorkerRef.java
similarity index 96%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/RemoteWorkerRef.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/RemoteWorkerRef.java
index b346c87f4..58a14e70a 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/RemoteWorkerRef.java
+++ b/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;
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/UsedRoleNameException.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/UsedRoleNameException.java
similarity index 92%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/UsedRoleNameException.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/UsedRoleNameException.java
index f5c419b9d..e27653c8e 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/UsedRoleNameException.java
+++ b/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) {
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerCreateListener.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerCreateListener.java
similarity index 89%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerCreateListener.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerCreateListener.java
index ef3b20f10..23e602d28 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerCreateListener.java
+++ b/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
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerException.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerException.java
similarity index 94%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerException.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerException.java
index d8c40536c..126c0a0fd 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerException.java
+++ b/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;
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerInvokeException.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerInvokeException.java
similarity index 94%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerInvokeException.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerInvokeException.java
index 25fbbf3af..3e7c85a7c 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerInvokeException.java
+++ b/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"
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerNotFoundException.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerNotFoundException.java
similarity index 92%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerNotFoundException.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerNotFoundException.java
index fac4488e5..8efd2095c 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerNotFoundException.java
+++ b/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) {
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerRef.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerRef.java
similarity index 94%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerRef.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerRef.java
index 8957ccf0e..b1fa00b5d 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/base/WorkerRef.java
+++ b/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;
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/AggregationWorker.java
similarity index 89%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/AggregationWorker.java
index 11e5276b9..d8aecc36a 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/AggregationWorker.java
+++ b/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;
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/FlushAndSwitch.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/FlushAndSwitch.java
similarity index 92%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/FlushAndSwitch.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/FlushAndSwitch.java
index 15b94ccb8..40be19212 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/FlushAndSwitch.java
+++ b/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
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/PersistenceWorker.java
similarity index 93%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/PersistenceWorker.java
index ebef4df39..82da9d17f 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java
+++ b/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;
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/data/DataCache.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCache.java
similarity index 95%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/data/DataCache.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCache.java
index 2faa154f1..7e2891a11 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/data/DataCache.java
+++ b/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;
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/data/DataCollection.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCollection.java
similarity index 96%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/data/DataCollection.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCollection.java
index 7aa53f8fb..dc3feda90 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/worker/impl/data/DataCollection.java
+++ b/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;
diff --git a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/timer/PersistenceTimer.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/timer/PersistenceTimer.java
similarity index 92%
rename from apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/timer/PersistenceTimer.java
rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/timer/PersistenceTimer.java
index fcda6474a..4d8691b42 100644
--- a/apm-collector/apm-collector-stream/src/main/java/org/apache/skywalking/apm/collector/stream/timer/PersistenceTimer.java
+++ b/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;
diff --git a/apm-collector/apm-collector-analysis/pom.xml b/apm-collector/apm-collector-analysis/pom.xml
index 62024bccc..01011c2db 100644
--- a/apm-collector/apm-collector-analysis/pom.xml
+++ b/apm-collector/apm-collector-analysis/pom.xml
@@ -34,6 +34,7 @@
analysis-layer-register
analysis-alarm
analysis-baseline
+ analysis-worker-model
diff --git a/apm-collector/apm-collector-boot/docker/log4j2.xml b/apm-collector/apm-collector-boot/docker/log4j2.xml
index 25f53accd..16213cb93 100644
--- a/apm-collector/apm-collector-boot/docker/log4j2.xml
+++ b/apm-collector/apm-collector-boot/docker/log4j2.xml
@@ -27,7 +27,7 @@
-
+
diff --git a/apm-collector/apm-collector-boot/pom.xml b/apm-collector/apm-collector-boot/pom.xml
index f399d3de5..68db643fc 100644
--- a/apm-collector/apm-collector-boot/pom.xml
+++ b/apm-collector/apm-collector-boot/pom.xml
@@ -157,13 +157,13 @@
${project.version}
-
+
org.apache.skywalking
- collector-alerting-provider
+ alarm-provider
${project.version}
-
+
diff --git a/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml b/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml
index 8a9358e9d..bc1d36d49 100644
--- a/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml
+++ b/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml
@@ -37,7 +37,7 @@
-
+
diff --git a/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml b/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
index c40fb0d4b..92f26c585 100644
--- a/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
+++ b/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
@@ -28,7 +28,7 @@
-
+
diff --git a/apm-collector/pom.xml b/apm-collector/pom.xml
index 7ead1aa57..8f1f76264 100644
--- a/apm-collector/pom.xml
+++ b/apm-collector/pom.xml
@@ -42,12 +42,9 @@
apm-collector-grpc-manager
apm-collector-jetty-manager
apm-collector-remote
- apm-collector-stream
apm-collector-queue
apm-collector-instrument
- apm-collector-baseline
apm-collector-agent-stream
- apm-collector-alerting
apm-collector-configuration
apm-collector-agent
apm-collector-analysis