diff --git a/apm-collector/apm-collector-boot/pom.xml b/apm-collector/apm-collector-boot/pom.xml
index 5ec0b19dd69f2783bebfeda00b27c79f8d7747e9..eb8dcd9f7614b0649b52ec7459958823d8caff54 100644
--- a/apm-collector/apm-collector-boot/pom.xml
+++ b/apm-collector/apm-collector-boot/pom.xml
@@ -58,18 +58,20 @@
${project.version}
-
+
org.skywalking
collector-grpc-manager-provider
${project.version}
+
+
org.skywalking
collector-jetty-manager-provider
${project.version}
-
+
org.skywalking
collector-ui-jetty-provider
diff --git a/apm-collector/apm-collector-core/src/main/resources/application-default.yml b/apm-collector/apm-collector-core/src/main/resources/application-default.yml
index 047e4dff949d55032aab714b300dd8e1b620669d..dfe95482dcbdea560ac7a94024e065de3d1e10a1 100644
--- a/apm-collector/apm-collector-core/src/main/resources/application-default.yml
+++ b/apm-collector/apm-collector-core/src/main/resources/application-default.yml
@@ -23,8 +23,9 @@ ui:
host: localhost
port: 12800
context_path: /
-server_manager:
+jetty_manager:
jetty:
+gRPC_manager:
gRPC:
#collector_inside:
# grpc:
diff --git a/apm-collector/apm-collector-server-manager/collector-server-manager-define/pom.xml b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml
similarity index 89%
rename from apm-collector/apm-collector-server-manager/collector-server-manager-define/pom.xml
rename to apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml
index baa5ffe76f34dc1521acf106b7c253d7fbb260ca..ae7b41721e5a6e8dba0d8f82dd34e221a10e05ab 100644
--- a/apm-collector/apm-collector-server-manager/collector-server-manager-define/pom.xml
+++ b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml
@@ -21,13 +21,13 @@
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-server-manager
+ apm-collector-grpc-manager
org.skywalking
3.2.3-2017
4.0.0
- collector-server-manager-define
+ collector-grpc-manager-define
jar
\ No newline at end of file
diff --git a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/ServerManagerModule.java b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/java/org/skywalking/apm/collector/grpc/manager/GRPCManagerModule.java
similarity index 68%
rename from apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/ServerManagerModule.java
rename to apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/java/org/skywalking/apm/collector/grpc/manager/GRPCManagerModule.java
index 286ff4404ffb70e6544d56a594f0b7ad179b748c..306eb1bed650000ac8288a82a8bb794c310e1988 100644
--- a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/ServerManagerModule.java
+++ b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/java/org/skywalking/apm/collector/grpc/manager/GRPCManagerModule.java
@@ -16,24 +16,23 @@
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
-package org.skywalking.apm.collector.server.manager;
+package org.skywalking.apm.collector.grpc.manager;
import org.skywalking.apm.collector.core.module.Module;
-import org.skywalking.apm.collector.server.manager.service.GRPCServerManagerService;
-import org.skywalking.apm.collector.server.manager.service.JettyServerManagerService;
+import org.skywalking.apm.collector.grpc.manager.service.GRPCManagerService;
/**
* @author peng-yongsheng
*/
-public class ServerManagerModule extends Module {
+public class GRPCManagerModule extends Module {
- public static final String NAME = "server_manager";
+ public static final String NAME = "gRPC_manager";
@Override public String name() {
return NAME;
}
@Override public Class[] services() {
- return new Class[] {GRPCServerManagerService.class, JettyServerManagerService.class};
+ return new Class[] {GRPCManagerService.class};
}
}
diff --git a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/ManagerService.java b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/java/org/skywalking/apm/collector/grpc/manager/service/GRPCManagerService.java
similarity index 82%
rename from apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/ManagerService.java
rename to apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/java/org/skywalking/apm/collector/grpc/manager/service/GRPCManagerService.java
index e1f18e4bfab6a2bd0d90bdc05e7592941cee63f7..b4c6121fd4cce797db3385e00af36e003f40251d 100644
--- a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/ManagerService.java
+++ b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/java/org/skywalking/apm/collector/grpc/manager/service/GRPCManagerService.java
@@ -16,7 +16,7 @@
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
-package org.skywalking.apm.collector.server.manager.service;
+package org.skywalking.apm.collector.grpc.manager.service;
import org.skywalking.apm.collector.core.module.Service;
import org.skywalking.apm.collector.server.Server;
@@ -24,6 +24,6 @@ import org.skywalking.apm.collector.server.Server;
/**
* @author peng-yongsheng
*/
-public interface ManagerService extends Service {
- Server getElseCreateServer(T config);
+public interface GRPCManagerService extends Service {
+ Server getElseCreateServer(String host, int port);
}
diff --git a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
similarity index 91%
rename from apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
rename to apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
index 0519f8c4ce5dca2d77dc1db55444cf14efb3b130..ae4846b83e6d1b09b390a48cda66b9d16a2d00fa 100644
--- a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
+++ b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
@@ -16,4 +16,4 @@
# Project repository: https://github.com/OpenSkywalking/skywalking
#
-org.skywalking.apm.collector.server.manager.ServerManagerModule
\ No newline at end of file
+org.skywalking.apm.collector.grpc.manager.GRPCManagerModule
\ No newline at end of file
diff --git a/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/pom.xml b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml
similarity index 90%
rename from apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/pom.xml
rename to apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml
index 3c08f7b637e3601ad94b8d0ae69cf55af63624f0..c22a5b9e3b76c0873aad63ff4a78712ab44d1216 100644
--- a/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/pom.xml
+++ b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml
@@ -21,7 +21,7 @@
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-server-manager
+ apm-collector-grpc-manager
org.skywalking
3.2.3-2017
@@ -33,7 +33,7 @@
org.skywalking
- collector-server-manager-define
+ collector-grpc-manager-define
${project.version}
diff --git a/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/grpc/ServerManagerModuleGRPCProvider.java b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/grpc/manager/GRPCManagerProvider.java
similarity index 74%
rename from apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/grpc/ServerManagerModuleGRPCProvider.java
rename to apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/grpc/manager/GRPCManagerProvider.java
index e760b30bd8900c1fba022774a89ea6378cf68825..6864b35614add3d6d30cb911e3ac10cf3185df8e 100644
--- a/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/grpc/ServerManagerModuleGRPCProvider.java
+++ b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/grpc/manager/GRPCManagerProvider.java
@@ -16,31 +16,30 @@
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
-package org.skywalking.apm.collector.server.manager.grpc;
+package org.skywalking.apm.collector.grpc.manager;
import java.util.Properties;
import org.skywalking.apm.collector.core.module.Module;
import org.skywalking.apm.collector.core.module.ModuleProvider;
import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
-import org.skywalking.apm.collector.server.manager.ServerManagerModule;
-import org.skywalking.apm.collector.server.manager.grpc.service.GRPCServerService;
-import org.skywalking.apm.collector.server.manager.service.GRPCServerManagerService;
+import org.skywalking.apm.collector.grpc.manager.service.GRPCManagerService;
+import org.skywalking.apm.collector.grpc.manager.service.GRPCManagerServiceImpl;
/**
* @author peng-yongsheng
*/
-public class ServerManagerModuleGRPCProvider extends ModuleProvider {
+public class GRPCManagerProvider extends ModuleProvider {
@Override public String name() {
return "gRPC";
}
@Override public Class extends Module> module() {
- return ServerManagerModule.class;
+ return GRPCManagerModule.class;
}
@Override public void prepare(Properties config) throws ServiceNotProvidedException {
- this.registerServiceImplementation(GRPCServerManagerService.class, new GRPCServerService());
+ this.registerServiceImplementation(GRPCManagerService.class, new GRPCManagerServiceImpl());
}
@Override public void start(Properties config) throws ServiceNotProvidedException {
diff --git a/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/grpc/service/GRPCServerService.java b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/grpc/manager/service/GRPCManagerServiceImpl.java
similarity index 68%
rename from apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/grpc/service/GRPCServerService.java
rename to apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/grpc/manager/service/GRPCManagerServiceImpl.java
index c2aa632a98fcb7c521c2230bd664723f820e3975..74ac4a87bf9fa103e6808fbcf72252bfddb4d353 100644
--- a/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/grpc/service/GRPCServerService.java
+++ b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/grpc/manager/service/GRPCManagerServiceImpl.java
@@ -16,28 +16,26 @@
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
-package org.skywalking.apm.collector.server.manager.grpc.service;
+package org.skywalking.apm.collector.grpc.manager.service;
import java.util.HashMap;
import java.util.Map;
import org.skywalking.apm.collector.server.Server;
import org.skywalking.apm.collector.server.grpc.GRPCServer;
-import org.skywalking.apm.collector.server.manager.service.GRPCServerConfig;
-import org.skywalking.apm.collector.server.manager.service.GRPCServerManagerService;
/**
* @author peng-yongsheng
*/
-public class GRPCServerService implements GRPCServerManagerService {
+public class GRPCManagerServiceImpl implements GRPCManagerService {
private Map servers = new HashMap<>();
- @Override public Server getElseCreateServer(GRPCServerConfig config) {
- String id = config.getHost() + String.valueOf(config.getPort());
+ @Override public Server getElseCreateServer(String host, int port) {
+ String id = host + String.valueOf(port);
if (servers.containsKey(id)) {
return servers.get(id);
} else {
- GRPCServer server = new GRPCServer(config.getHost(), config.getPort());
+ GRPCServer server = new GRPCServer(host, port);
servers.put(id, server);
return server;
}
diff --git a/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
similarity index 89%
rename from apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
rename to apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
index 71cd59a096b81b014e0afbc425f3c202bef675e4..1bd78e98d9c44d0b105e33c195ac1053aa2fe0d4 100644
--- a/apm-collector/apm-collector-server-manager/collector-grpc-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
+++ b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
@@ -16,4 +16,4 @@
# Project repository: https://github.com/OpenSkywalking/skywalking
#
-org.skywalking.apm.collector.server.manager.grpc.ServerManagerModuleGRPCProvider
\ No newline at end of file
+org.skywalking.apm.collector.grpc.manager.GRPCManagerProvider
\ No newline at end of file
diff --git a/apm-collector/apm-collector-grpc-manager/pom.xml b/apm-collector/apm-collector-grpc-manager/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a95546f0b957e7993a99ecff1f3d20c2f76ad040
--- /dev/null
+++ b/apm-collector/apm-collector-grpc-manager/pom.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+ apm-collector
+ org.skywalking
+ 3.2.3-2017
+
+ 4.0.0
+
+ apm-collector-grpc-manager
+ pom
+
+ collector-grpc-manager-define
+ collector-grpc-manager-provider
+
+
+
+
+ org.skywalking
+ apm-collector-core
+ ${project.version}
+
+
+ org.skywalking
+ server-component
+ ${project.version}
+
+
+
\ No newline at end of file
diff --git a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..377ac2ee95732fc4f601d6746a0f019310d8dc56
--- /dev/null
+++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+ apm-collector-jetty-manager
+ org.skywalking
+ 3.2.3-2017
+
+ 4.0.0
+
+ collector-jetty-manager-define
+ jar
+
+
\ No newline at end of file
diff --git a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/GRPCServerManagerService.java b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/skywalking/apm/collector/jetty/manager/JettyManagerModule.java
similarity index 67%
rename from apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/GRPCServerManagerService.java
rename to apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/skywalking/apm/collector/jetty/manager/JettyManagerModule.java
index 5a8e8950ba29295c485cc29eeeaa1f55a1576a94..d4476551043b5b8258ea0a763407744a1327134c 100644
--- a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/GRPCServerManagerService.java
+++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/skywalking/apm/collector/jetty/manager/JettyManagerModule.java
@@ -16,10 +16,22 @@
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
-package org.skywalking.apm.collector.server.manager.service;
+package org.skywalking.apm.collector.jetty.manager;
+
+import org.skywalking.apm.collector.core.module.Module;
/**
* @author peng-yongsheng
*/
-public interface GRPCServerManagerService extends ManagerService {
+public class JettyManagerModule extends Module {
+
+ public static final String NAME = "jetty_manager";
+
+ @Override public String name() {
+ return NAME;
+ }
+
+ @Override public Class[] services() {
+ return new Class[0];
+ }
}
diff --git a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/GRPCServerConfig.java b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerService.java
similarity index 71%
rename from apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/GRPCServerConfig.java
rename to apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerService.java
index 4b9d02fd422f766da1b3cd210c52f81cd896576b..b1dc608b6bbd56fa6378c06adff4afcff636ce3d 100644
--- a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/GRPCServerConfig.java
+++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerService.java
@@ -16,14 +16,14 @@
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
-package org.skywalking.apm.collector.server.manager.service;
+package org.skywalking.apm.collector.jetty.manager.service;
+
+import org.skywalking.apm.collector.core.module.Service;
+import org.skywalking.apm.collector.server.Server;
/**
* @author peng-yongsheng
*/
-public class GRPCServerConfig extends ServerConfig {
-
- public GRPCServerConfig(String host, int port) {
- super(host, port);
- }
+public interface JettyManagerService extends Service {
+ Server getElseCreateServer(String host, int port, String contextPath);
}
diff --git a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
new file mode 100644
index 0000000000000000000000000000000000000000..a6d571a3070c4d24aa7703ff002059ea855f2e2e
--- /dev/null
+++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
@@ -0,0 +1,19 @@
+#
+# Copyright 2017, OpenSkywalking Organization All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Project repository: https://github.com/OpenSkywalking/skywalking
+#
+
+org.skywalking.apm.collector.jetty.manager.JettyManagerModule
\ No newline at end of file
diff --git a/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/pom.xml b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml
similarity index 90%
rename from apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/pom.xml
rename to apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml
index 38f62bf095ac7fa939dc15dc155e143a6b1b439d..3b490869c5f5977bcbe213fd69810d796225073e 100644
--- a/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/pom.xml
+++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml
@@ -21,7 +21,7 @@
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-server-manager
+ apm-collector-jetty-manager
org.skywalking
3.2.3-2017
@@ -33,7 +33,7 @@
org.skywalking
- collector-server-manager-define
+ collector-jetty-manager-define
${project.version}
diff --git a/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/jetty/ServerManagerModuleJettyProvider.java b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/jetty/manager/JettyManagerProvider.java
similarity index 73%
rename from apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/jetty/ServerManagerModuleJettyProvider.java
rename to apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/jetty/manager/JettyManagerProvider.java
index 7ebc153d573e4c7158517c92ea6e3b510ddcf4a7..8dfb75fe59c6b389f7d56714efdaa2f53e2fa3bb 100644
--- a/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/jetty/ServerManagerModuleJettyProvider.java
+++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/jetty/manager/JettyManagerProvider.java
@@ -16,31 +16,30 @@
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
-package org.skywalking.apm.collector.server.manager.jetty;
+package org.skywalking.apm.collector.jetty.manager;
import java.util.Properties;
import org.skywalking.apm.collector.core.module.Module;
import org.skywalking.apm.collector.core.module.ModuleProvider;
import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
-import org.skywalking.apm.collector.server.manager.ServerManagerModule;
-import org.skywalking.apm.collector.server.manager.jetty.service.JettyServerService;
-import org.skywalking.apm.collector.server.manager.service.JettyServerManagerService;
+import org.skywalking.apm.collector.jetty.manager.service.JettyManagerService;
+import org.skywalking.apm.collector.jetty.manager.service.JettyManagerServiceImpl;
/**
* @author peng-yongsheng
*/
-public class ServerManagerModuleJettyProvider extends ModuleProvider {
+public class JettyManagerProvider extends ModuleProvider {
@Override public String name() {
return "jetty";
}
@Override public Class extends Module> module() {
- return ServerManagerModule.class;
+ return JettyManagerModule.class;
}
@Override public void prepare(Properties config) throws ServiceNotProvidedException {
- this.registerServiceImplementation(JettyServerManagerService.class, new JettyServerService());
+ this.registerServiceImplementation(JettyManagerService.class, new JettyManagerServiceImpl());
}
@Override public void start(Properties config) throws ServiceNotProvidedException {
diff --git a/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/jetty/service/JettyServerService.java b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerServiceImpl.java
similarity index 67%
rename from apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/jetty/service/JettyServerService.java
rename to apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerServiceImpl.java
index a2f912b08fb41a390ab60cb7fc7dd3e3f49a62af..2bf0e4cef16ec7d3296a0410b2c63abd1d7f3a9c 100644
--- a/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/jetty/service/JettyServerService.java
+++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerServiceImpl.java
@@ -16,28 +16,26 @@
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
-package org.skywalking.apm.collector.server.manager.jetty.service;
+package org.skywalking.apm.collector.jetty.manager.service;
import java.util.HashMap;
import java.util.Map;
import org.skywalking.apm.collector.server.Server;
import org.skywalking.apm.collector.server.jetty.JettyServer;
-import org.skywalking.apm.collector.server.manager.service.JettyServerConfig;
-import org.skywalking.apm.collector.server.manager.service.JettyServerManagerService;
/**
* @author peng-yongsheng
*/
-public class JettyServerService implements JettyServerManagerService {
+public class JettyManagerServiceImpl implements JettyManagerService {
private Map servers = new HashMap<>();
- @Override public Server getElseCreateServer(JettyServerConfig config) {
- String id = config.getHost() + String.valueOf(config.getPort());
+ @Override public Server getElseCreateServer(String host, int port, String contextPath) {
+ String id = host + String.valueOf(port);
if (servers.containsKey(id)) {
return servers.get(id);
} else {
- JettyServer server = new JettyServer(config.getHost(), config.getPort(), config.getContextPath());
+ JettyServer server = new JettyServer(host, port, contextPath);
servers.put(id, server);
return server;
}
diff --git a/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
similarity index 89%
rename from apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
rename to apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
index c2db217398d0e0303ba9b518f84c15fd3f0af7e3..800e04cc59e492601ad5ef43beb49a8823d71bd1 100644
--- a/apm-collector/apm-collector-server-manager/collector-jetty-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
+++ b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
@@ -16,4 +16,4 @@
# Project repository: https://github.com/OpenSkywalking/skywalking
#
-org.skywalking.apm.collector.server.manager.jetty.ServerManagerModuleJettyProvider
\ No newline at end of file
+org.skywalking.apm.collector.jetty.manager.JettyManagerProvider
\ No newline at end of file
diff --git a/apm-collector/apm-collector-server-manager/pom.xml b/apm-collector/apm-collector-jetty-manager/pom.xml
similarity index 90%
rename from apm-collector/apm-collector-server-manager/pom.xml
rename to apm-collector/apm-collector-jetty-manager/pom.xml
index ed1ff091a58eb446897d3db3d22efc98524b606d..b88655834eafed60623af5298a0792d38aa90185 100644
--- a/apm-collector/apm-collector-server-manager/pom.xml
+++ b/apm-collector/apm-collector-jetty-manager/pom.xml
@@ -27,12 +27,11 @@
4.0.0
- apm-collector-server-manager
+ apm-collector-jetty-manager
pom
- collector-server-manager-define
+ collector-jetty-manager-define
collector-jetty-manager-provider
- collector-grpc-manager-provider
diff --git a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/JettyServerConfig.java b/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/JettyServerConfig.java
deleted file mode 100644
index 35a33f311caf79f16eb429dab623ead71e0292c4..0000000000000000000000000000000000000000
--- a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/JettyServerConfig.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Project repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.server.manager.service;
-
-/**
- * @author peng-yongsheng
- */
-public class JettyServerConfig extends ServerConfig {
-
- private final String contextPath;
-
- public JettyServerConfig(String host, int port, String contextPath) {
- super(host, port);
- this.contextPath = contextPath;
- }
-
- public final String getContextPath() {
- return contextPath;
- }
-}
diff --git a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/JettyServerManagerService.java b/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/JettyServerManagerService.java
deleted file mode 100644
index 21f0d32ad65c43e10e44ea3f9f82f06d137c61a3..0000000000000000000000000000000000000000
--- a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/JettyServerManagerService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Project repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.server.manager.service;
-
-/**
- * @author peng-yongsheng
- */
-public interface JettyServerManagerService extends ManagerService {
-}
diff --git a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/ServerConfig.java b/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/ServerConfig.java
deleted file mode 100644
index 23966d0be4853177e3f05efb47df15acbb0911b4..0000000000000000000000000000000000000000
--- a/apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/ServerConfig.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Project repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.server.manager.service;
-
-/**
- * @author peng-yongsheng
- */
-public abstract class ServerConfig {
- private final String host;
- private final int port;
-
- public ServerConfig(String host, int port) {
- this.host = host;
- this.port = port;
- }
-
- public final String getHost() {
- return host;
- }
-
- public final int getPort() {
- return port;
- }
-}
diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml
index 45269ccec3c663d0992aaa68abc35a9858b9acce..2dda8936735b60ccdf64e2188c16a2e636d798a8 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml
@@ -43,7 +43,7 @@
org.skywalking
- collector-server-manager-define
+ collector-jetty-manager-define
${project.version}
diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java
index 06ea4663079d2e2c79554da1e35c9bf623ac0bee..c33d101091cee017346e22c7afadf5caf9db3a00 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java
@@ -25,10 +25,9 @@ import org.skywalking.apm.collector.core.module.Module;
import org.skywalking.apm.collector.core.module.ModuleNotFoundException;
import org.skywalking.apm.collector.core.module.ModuleProvider;
import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
+import org.skywalking.apm.collector.jetty.manager.JettyManagerModule;
+import org.skywalking.apm.collector.jetty.manager.service.JettyManagerService;
import org.skywalking.apm.collector.server.Server;
-import org.skywalking.apm.collector.server.manager.ServerManagerModule;
-import org.skywalking.apm.collector.server.manager.service.JettyServerConfig;
-import org.skywalking.apm.collector.server.manager.service.JettyServerManagerService;
import org.skywalking.apm.collector.ui.UIModule;
/**
@@ -40,8 +39,6 @@ public class UIModuleJettyProvider extends ModuleProvider {
private static final String PORT = "port";
private static final String CONTEXT_PATH = "context_path";
- private JettyServerConfig serverConfig;
-
@Override public String name() {
return "jetty";
}
@@ -51,16 +48,15 @@ public class UIModuleJettyProvider extends ModuleProvider {
}
@Override public void prepare(Properties config) throws ServiceNotProvidedException {
- String host = config.getProperty(HOST);
- Integer port = (Integer)config.get(PORT);
- String contextPath = config.getProperty(CONTEXT_PATH);
- serverConfig = new JettyServerConfig(host, port, contextPath);
}
@Override public void start(Properties config) throws ServiceNotProvidedException {
+ String host = config.getProperty(HOST);
+ Integer port = (Integer)config.get(PORT);
+ String contextPath = config.getProperty(CONTEXT_PATH);
try {
- JettyServerManagerService managerService = getManager().find(ServerManagerModule.NAME).getService(JettyServerManagerService.class);
- Server jettyServer = managerService.getElseCreateServer(serverConfig);
+ JettyManagerService managerService = getManager().find(JettyManagerModule.NAME).getService(JettyManagerService.class);
+ Server jettyServer = managerService.getElseCreateServer(host, port, contextPath);
ModuleRegisterService moduleRegisterService = getManager().find(ClusterModule.NAME).getService(ModuleRegisterService.class);
} catch (ModuleNotFoundException e) {
@@ -73,6 +69,6 @@ public class UIModuleJettyProvider extends ModuleProvider {
}
@Override public String[] requiredModules() {
- return new String[] {ClusterModule.NAME, ServerManagerModule.NAME};
+ return new String[] {ClusterModule.NAME, JettyManagerModule.NAME};
}
}
diff --git a/apm-collector/pom.xml b/apm-collector/pom.xml
index 5cd494a62c2f3ca7715197890e3c5e8309986837..8e65c8fbdf7c1fa9f916a6dacd7e27ec78db2ec6 100644
--- a/apm-collector/pom.xml
+++ b/apm-collector/pom.xml
@@ -40,7 +40,8 @@
apm-collector-cache
apm-collector-storage
apm-collector-naming
- apm-collector-server-manager
+ apm-collector-grpc-manager
+ apm-collector-jetty-manager