From 9f6f23846d87e71dd383c3906cc1cbdec0762de3 Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Wed, 1 Nov 2017 00:17:40 +0800 Subject: [PATCH] Refactor remote module. --- .../apm/collector/core/data}/AbstractHashMessage.java | 2 +- .../java/org/skywalking/apm/collector/core/data}/Data.java | 2 +- .../java/org/skywalking/apm/collector/remote/RemoteModule.java | 3 ++- .../skywalking/apm/collector/remote/service/DataReceiver.java | 2 ++ .../skywalking/apm/collector/remote/service/RemoteClient.java | 1 + .../collector/remote/service/SerializableAndDeserialize.java | 1 + .../apm/collector/remote/grpc/RemoteModuleGRPCProvider.java | 2 +- .../skywalking/apm/collector/remote/grpc/data/GRPCData.java | 2 +- .../remote/grpc/data/instance/InstPerformanceData.java | 2 +- .../apm/collector/remote/grpc/service/GRPCRemoteClient.java | 2 +- .../skywalking/apm/collector/storage/define/DataDefine.java | 2 +- .../org/skywalking/apm/collector/storage/define/Transform.java | 2 +- 12 files changed, 14 insertions(+), 9 deletions(-) rename apm-collector/{apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service => apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data}/AbstractHashMessage.java (95%) rename apm-collector/{apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service => apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data}/Data.java (98%) diff --git a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/AbstractHashMessage.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/AbstractHashMessage.java similarity index 95% rename from apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/AbstractHashMessage.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/AbstractHashMessage.java index 17ccf30ef..8e8978c28 100644 --- a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/AbstractHashMessage.java +++ b/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 AbstractHashMessage implementations represent aggregate message, diff --git a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/Data.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Data.java similarity index 98% rename from apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/Data.java rename to apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Data.java index 7f16d3eb0..280411890 100644 --- a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/Data.java +++ b/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 diff --git a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/RemoteModule.java b/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/RemoteModule.java index 06edc0451..b4a3061e6 100644 --- a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/RemoteModule.java +++ b/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}; } } diff --git a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/DataReceiver.java b/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/DataReceiver.java index 857c3bb42..c3e36fc54 100644 --- a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/DataReceiver.java +++ b/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 */ diff --git a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/RemoteClient.java b/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/RemoteClient.java index f41ecd382..2bb01d130 100644 --- a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/RemoteClient.java +++ b/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; /** diff --git a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/SerializableAndDeserialize.java b/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/SerializableAndDeserialize.java index c058d3df3..143d2a93f 100644 --- a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/skywalking/apm/collector/remote/service/SerializableAndDeserialize.java +++ b/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; /** diff --git a/apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/RemoteModuleGRPCProvider.java b/apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/RemoteModuleGRPCProvider.java index 780e94f55..c79251dfc 100644 --- a/apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/RemoteModuleGRPCProvider.java +++ b/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() { diff --git a/apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/data/GRPCData.java b/apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/data/GRPCData.java index e17ef1287..2c9d71197 100644 --- a/apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/data/GRPCData.java +++ b/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; /** diff --git a/apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/data/instance/InstPerformanceData.java b/apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/data/instance/InstPerformanceData.java index e840cc7d1..8860008f0 100644 --- a/apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/data/instance/InstPerformanceData.java +++ b/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 diff --git a/apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/service/GRPCRemoteClient.java b/apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/service/GRPCRemoteClient.java index d8422bc79..ab196ccde 100644 --- a/apm-collector/apm-collector-remote/collector-remote-grpc-define/src/main/java/org/skywalking/apm/collector/remote/grpc/service/GRPCRemoteClient.java +++ b/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; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/DataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/DataDefine.java index 951ec9b27..8cb6d9e24 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/DataDefine.java +++ b/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 diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/Transform.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/Transform.java index cf412f0f9..bc5dd0b70 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/Transform.java +++ b/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