Refactor remote module.

apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/AbstractHashMessage.java → apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/AbstractHashMessage.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.remote.service;
+package org.skywalking.apm.collector.core.data;
 
 /**
  * The <code>AbstractHashMessage</code> implementations represent aggregate message,

apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/Data.java → apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Data.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.remote.service;
+package org.skywalking.apm.collector.core.data;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/RemoteModule.java

@@ -19,6 +19,7 @@
 package org.skywalking.apm.collector.remote;
 
 import org.skywalking.apm.collector.core.module.Module;
+import org.skywalking.apm.collector.remote.service.RemoteClientService;
 import org.skywalking.apm.collector.remote.service.RemoteServerService;
 
 /**
@@ -33,6 +34,6 @@ public class RemoteModule extends Module {
     }
 
     @Override public Class[] services() {
-        return new Class[] {RemoteServerService.class};
+        return new Class[] {RemoteServerService.class, RemoteClientService.class};
     }
 }

apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/DataReceiver.java

@@ -18,6 +18,8 @@
 
 package org.skywalking.apm.collector.remote.service;
 
+import org.skywalking.apm.collector.core.data.Data;
+
 /**
  * @author peng-yongsheng
  */

apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/RemoteClient.java

@@ -18,6 +18,7 @@
 
 package org.skywalking.apm.collector.remote.service;
 
+import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.remote.RemoteDataMapping;
 
 /**

apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/SerializableAndDeserialize.java

@@ -18,6 +18,7 @@
 
 package org.skywalking.apm.collector.remote.service;
 
+import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.remote.RemoteDataMapping;
 
 /**

apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/RemoteModuleGRPCProvider.java

@@ -65,7 +65,7 @@ public class RemoteModuleGRPCProvider extends ModuleProvider {
     }
 
     @Override public String[] requiredModules() {
-        return new String[0];
+        return new String[] {ClusterModule.NAME, GRPCManagerModule.NAME};
     }
 
     private RemoteDataMappingContainer loadMapping() {

apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/data/GRPCData.java

@@ -19,7 +19,7 @@
 package org.skywalking.apm.collector.remote.grpc.data;
 
 import org.skywalking.apm.collector.remote.grpc.proto.RemoteData;
-import org.skywalking.apm.collector.remote.service.Data;
+import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.remote.service.SerializableAndDeserialize;
 
 /**

apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/data/instance/InstPerformanceData.java

@@ -21,7 +21,7 @@ package org.skywalking.apm.collector.remote.grpc.data.instance;
 import org.skywalking.apm.collector.remote.RemoteDataMapping;
 import org.skywalking.apm.collector.remote.grpc.data.GRPCData;
 import org.skywalking.apm.collector.remote.grpc.proto.RemoteData;
-import org.skywalking.apm.collector.remote.service.Data;
+import org.skywalking.apm.collector.core.data.Data;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/service/GRPCRemoteClient.java

@@ -23,7 +23,7 @@ import org.skywalking.apm.collector.remote.RemoteDataMapping;
 import org.skywalking.apm.collector.remote.RemoteDataMappingContainer;
 import org.skywalking.apm.collector.remote.grpc.proto.RemoteData;
 import org.skywalking.apm.collector.remote.grpc.proto.RemoteMessage;
-import org.skywalking.apm.collector.remote.service.Data;
+import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.remote.service.RemoteClient;
 
 /**

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/DataDefine.java

@@ -18,7 +18,7 @@
 
 package org.skywalking.apm.collector.storage.define;
 
-import org.skywalking.apm.collector.remote.service.Data;
+import org.skywalking.apm.collector.core.data.Data;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/Transform.java

@@ -18,7 +18,7 @@
 
 package org.skywalking.apm.collector.storage.define;
 
-import org.skywalking.apm.collector.remote.service.Data;
+import org.skywalking.apm.collector.core.data.Data;
 
 /**
  * @author peng-yongsheng