Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
月轩居士
SkyWalking
提交
9b0b919f
S
SkyWalking
项目概览
月轩居士
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
4
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9b0b919f
编写于
10月 29, 2017
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Break server manager module into two modules: grpc manager module and jetty manager module.
上级
be7b774a
变更
26
隐藏空白更改
内联
并排
Showing
26 changed file
with
179 addition
and
175 deletion
+179
-175
apm-collector/apm-collector-boot/pom.xml
apm-collector/apm-collector-boot/pom.xml
+4
-2
apm-collector/apm-collector-core/src/main/resources/application-default.yml
...collector-core/src/main/resources/application-default.yml
+2
-1
apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/pom.xml
...lector-grpc-manager/collector-grpc-manager-define/pom.xml
+2
-2
apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/java/org/skywalking/apm/collector/grpc/manager/GRPCManagerModule.java
...walking/apm/collector/grpc/manager/GRPCManagerModule.java
+5
-6
apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/java/org/skywalking/apm/collector/grpc/manager/service/GRPCManagerService.java
...pm/collector/grpc/manager/service/GRPCManagerService.java
+3
-3
apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
.../services/org.skywalking.apm.collector.core.module.Module
+1
-1
apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/pom.xml
...ctor-grpc-manager/collector-grpc-manager-provider/pom.xml
+2
-2
apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/grpc/manager/GRPCManagerProvider.java
...lking/apm/collector/grpc/manager/GRPCManagerProvider.java
+6
-7
apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/grpc/manager/service/GRPCManagerServiceImpl.java
...ollector/grpc/manager/service/GRPCManagerServiceImpl.java
+5
-7
apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
...s/org.skywalking.apm.collector.core.module.ModuleProvider
+1
-1
apm-collector/apm-collector-grpc-manager/pom.xml
apm-collector/apm-collector-grpc-manager/pom.xml
+49
-0
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml
...ctor-jetty-manager/collector-jetty-manager-define/pom.xml
+33
-0
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/skywalking/apm/collector/jetty/manager/JettyManagerModule.java
...lking/apm/collector/jetty/manager/JettyManagerModule.java
+14
-2
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerService.java
.../collector/jetty/manager/service/JettyManagerService.java
+6
-6
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
.../services/org.skywalking.apm.collector.core.module.Module
+19
-0
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/pom.xml
...or-jetty-manager/collector-jetty-manager-provider/pom.xml
+2
-2
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/jetty/manager/JettyManagerProvider.java
...ing/apm/collector/jetty/manager/JettyManagerProvider.java
+6
-7
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerServiceImpl.java
...lector/jetty/manager/service/JettyManagerServiceImpl.java
+5
-7
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
...s/org.skywalking.apm.collector.core.module.ModuleProvider
+1
-1
apm-collector/apm-collector-jetty-manager/pom.xml
apm-collector/apm-collector-jetty-manager/pom.xml
+2
-3
apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/JettyServerConfig.java
...m/collector/server/manager/service/JettyServerConfig.java
+0
-36
apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/JettyServerManagerService.java
...tor/server/manager/service/JettyServerManagerService.java
+0
-25
apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/ServerConfig.java
...ng/apm/collector/server/manager/service/ServerConfig.java
+0
-40
apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml
...ctor/apm-collector-ui/collector-ui-jetty-provider/pom.xml
+1
-1
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java
...walking/apm/collector/ui/jetty/UIModuleJettyProvider.java
+8
-12
apm-collector/pom.xml
apm-collector/pom.xml
+2
-1
未找到文件。
apm-collector/apm-collector-boot/pom.xml
浏览文件 @
9b0b919f
...
...
@@ -58,18 +58,20 @@
<version>
${project.version}
</version>
</dependency>
<!-- cluster provider -->
<!--
server
manager provider -->
<!--
grpc
manager provider -->
<dependency>
<groupId>
org.skywalking
</groupId>
<artifactId>
collector-grpc-manager-provider
</artifactId>
<version>
${project.version}
</version>
</dependency>
<!-- grpc manager provider -->
<!-- jetty manager provider -->
<dependency>
<groupId>
org.skywalking
</groupId>
<artifactId>
collector-jetty-manager-provider
</artifactId>
<version>
${project.version}
</version>
</dependency>
<!--
server
manager provider -->
<!--
jetty
manager provider -->
<dependency>
<groupId>
org.skywalking
</groupId>
<artifactId>
collector-ui-jetty-provider
</artifactId>
...
...
apm-collector/apm-collector-core/src/main/resources/application-default.yml
浏览文件 @
9b0b919f
...
...
@@ -23,8 +23,9 @@ ui:
host
:
localhost
port
:
12800
context_path
:
/
server
_manager
:
jetty
_manager
:
jetty
:
gRPC_manager
:
gRPC
:
#collector_inside:
# grpc:
...
...
apm-collector/apm-collector-
server-manager/collector-server
-manager-define/pom.xml
→
apm-collector/apm-collector-
grpc-manager/collector-grpc
-manager-define/pom.xml
浏览文件 @
9b0b919f
...
...
@@ -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"
>
<parent>
<artifactId>
apm-collector-
server
-manager
</artifactId>
<artifactId>
apm-collector-
grpc
-manager
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.2.3-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
collector-
server
-manager-define
</artifactId>
<artifactId>
collector-
grpc
-manager-define
</artifactId>
<packaging>
jar
</packaging>
</project>
\ No newline at end of file
apm-collector/apm-collector-
server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/Server
ManagerModule.java
→
apm-collector/apm-collector-
grpc-manager/collector-grpc-manager-define/src/main/java/org/skywalking/apm/collector/grpc/manager/GRPC
ManagerModule.java
浏览文件 @
9b0b919f
...
...
@@ -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
Server
ManagerModule
extends
Module
{
public
class
GRPC
ManagerModule
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
[]
{
GRPC
ServerManagerService
.
class
,
JettyServer
ManagerService
.
class
};
return
new
Class
[]
{
GRPCManagerService
.
class
};
}
}
apm-collector/apm-collector-
server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/
ManagerService.java
→
apm-collector/apm-collector-
grpc-manager/collector-grpc-manager-define/src/main/java/org/skywalking/apm/collector/grpc/manager/service/GRPC
ManagerService.java
浏览文件 @
9b0b919f
...
...
@@ -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
<
T
extends
ServerConfig
>
extends
Service
{
Server
getElseCreateServer
(
T
config
);
public
interface
GRPCManagerService
extends
Service
{
Server
getElseCreateServer
(
String
host
,
int
port
);
}
apm-collector/apm-collector-
server-manager/collector-server
-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
→
apm-collector/apm-collector-
grpc-manager/collector-grpc
-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
浏览文件 @
9b0b919f
...
...
@@ -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
apm-collector/apm-collector-
server
-manager/collector-grpc-manager-provider/pom.xml
→
apm-collector/apm-collector-
grpc
-manager/collector-grpc-manager-provider/pom.xml
浏览文件 @
9b0b919f
...
...
@@ -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"
>
<parent>
<artifactId>
apm-collector-
server
-manager
</artifactId>
<artifactId>
apm-collector-
grpc
-manager
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.2.3-2017
</version>
</parent>
...
...
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>
org.skywalking
</groupId>
<artifactId>
collector-
server
-manager-define
</artifactId>
<artifactId>
collector-
grpc
-manager-define
</artifactId>
<version>
${project.version}
</version>
</dependency>
</dependencies>
...
...
apm-collector/apm-collector-
server-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/grpc/ServerManagerModuleGRPC
Provider.java
→
apm-collector/apm-collector-
grpc-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/grpc/manager/GRPCManager
Provider.java
浏览文件 @
9b0b919f
...
...
@@ -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
ServerManagerModuleGRPC
Provider
extends
ModuleProvider
{
public
class
GRPCManager
Provider
extends
ModuleProvider
{
@Override
public
String
name
()
{
return
"gRPC"
;
}
@Override
public
Class
<?
extends
Module
>
module
()
{
return
Server
ManagerModule
.
class
;
return
GRPC
ManagerModule
.
class
;
}
@Override
public
void
prepare
(
Properties
config
)
throws
ServiceNotProvidedException
{
this
.
registerServiceImplementation
(
GRPC
ServerManagerService
.
class
,
new
GRPCServerService
());
this
.
registerServiceImplementation
(
GRPC
ManagerService
.
class
,
new
GRPCManagerServiceImpl
());
}
@Override
public
void
start
(
Properties
config
)
throws
ServiceNotProvidedException
{
...
...
apm-collector/apm-collector-
server-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/grpc/service/GRPCServerService
.java
→
apm-collector/apm-collector-
grpc-manager/collector-grpc-manager-provider/src/main/java/org/skywalking/apm/collector/grpc/manager/service/GRPCManagerServiceImpl
.java
浏览文件 @
9b0b919f
...
...
@@ -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
GRPC
ServerService
implements
GRPCServer
ManagerService
{
public
class
GRPC
ManagerServiceImpl
implements
GRPC
ManagerService
{
private
Map
<
String
,
GRPCServer
>
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
;
}
...
...
apm-collector/apm-collector-
server
-manager/collector-grpc-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
→
apm-collector/apm-collector-
grpc
-manager/collector-grpc-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
浏览文件 @
9b0b919f
...
...
@@ -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
apm-collector/apm-collector-grpc-manager/pom.xml
0 → 100644
浏览文件 @
9b0b919f
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ 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
-->
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<parent>
<artifactId>
apm-collector
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.2.3-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
apm-collector-grpc-manager
</artifactId>
<packaging>
pom
</packaging>
<modules>
<module>
collector-grpc-manager-define
</module>
<module>
collector-grpc-manager-provider
</module>
</modules>
<dependencies>
<dependency>
<groupId>
org.skywalking
</groupId>
<artifactId>
apm-collector-core
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
org.skywalking
</groupId>
<artifactId>
server-component
</artifactId>
<version>
${project.version}
</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/pom.xml
0 → 100644
浏览文件 @
9b0b919f
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ 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
-->
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<parent>
<artifactId>
apm-collector-jetty-manager
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.2.3-2017
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
collector-jetty-manager-define
</artifactId>
<packaging>
jar
</packaging>
</project>
\ No newline at end of file
apm-collector/apm-collector-
server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/GRPCServerManagerServic
e.java
→
apm-collector/apm-collector-
jetty-manager/collector-jetty-manager-define/src/main/java/org/skywalking/apm/collector/jetty/manager/JettyManagerModul
e.java
浏览文件 @
9b0b919f
...
...
@@ -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
<
GRPCServerConfig
>
{
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
];
}
}
apm-collector/apm-collector-
server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/GRPCServerConfig
.java
→
apm-collector/apm-collector-
jetty-manager/collector-jetty-manager-define/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerService
.java
浏览文件 @
9b0b919f
...
...
@@ -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
);
}
apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
0 → 100644
浏览文件 @
9b0b919f
#
# 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
apm-collector/apm-collector-
server
-manager/collector-jetty-manager-provider/pom.xml
→
apm-collector/apm-collector-
jetty
-manager/collector-jetty-manager-provider/pom.xml
浏览文件 @
9b0b919f
...
...
@@ -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"
>
<parent>
<artifactId>
apm-collector-
server
-manager
</artifactId>
<artifactId>
apm-collector-
jetty
-manager
</artifactId>
<groupId>
org.skywalking
</groupId>
<version>
3.2.3-2017
</version>
</parent>
...
...
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>
org.skywalking
</groupId>
<artifactId>
collector-
server
-manager-define
</artifactId>
<artifactId>
collector-
jetty
-manager-define
</artifactId>
<version>
${project.version}
</version>
</dependency>
</dependencies>
...
...
apm-collector/apm-collector-
server-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/jetty/ServerManagerModuleJetty
Provider.java
→
apm-collector/apm-collector-
jetty-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/jetty/manager/JettyManager
Provider.java
浏览文件 @
9b0b919f
...
...
@@ -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
ServerManagerModuleJetty
Provider
extends
ModuleProvider
{
public
class
JettyManager
Provider
extends
ModuleProvider
{
@Override
public
String
name
()
{
return
"jetty"
;
}
@Override
public
Class
<?
extends
Module
>
module
()
{
return
Server
ManagerModule
.
class
;
return
Jetty
ManagerModule
.
class
;
}
@Override
public
void
prepare
(
Properties
config
)
throws
ServiceNotProvidedException
{
this
.
registerServiceImplementation
(
Jetty
ServerManagerService
.
class
,
new
JettyServerService
());
this
.
registerServiceImplementation
(
Jetty
ManagerService
.
class
,
new
JettyManagerServiceImpl
());
}
@Override
public
void
start
(
Properties
config
)
throws
ServiceNotProvidedException
{
...
...
apm-collector/apm-collector-
server-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/server/manager/jetty/service/JettyServerService
.java
→
apm-collector/apm-collector-
jetty-manager/collector-jetty-manager-provider/src/main/java/org/skywalking/apm/collector/jetty/manager/service/JettyManagerServiceImpl
.java
浏览文件 @
9b0b919f
...
...
@@ -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
Jetty
ServerService
implements
JettyServer
ManagerService
{
public
class
Jetty
ManagerServiceImpl
implements
Jetty
ManagerService
{
private
Map
<
String
,
JettyServer
>
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
;
}
...
...
apm-collector/apm-collector-
server
-manager/collector-jetty-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
→
apm-collector/apm-collector-
jetty
-manager/collector-jetty-manager-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
浏览文件 @
9b0b919f
...
...
@@ -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
apm-collector/apm-collector-
server
-manager/pom.xml
→
apm-collector/apm-collector-
jetty
-manager/pom.xml
浏览文件 @
9b0b919f
...
...
@@ -27,12 +27,11 @@
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
apm-collector-
server
-manager
</artifactId>
<artifactId>
apm-collector-
jetty
-manager
</artifactId>
<packaging>
pom
</packaging>
<modules>
<module>
collector-
server
-manager-define
</module>
<module>
collector-
jetty
-manager-define
</module>
<module>
collector-jetty-manager-provider
</module>
<module>
collector-grpc-manager-provider
</module>
</modules>
<dependencies>
...
...
apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/JettyServerConfig.java
已删除
100644 → 0
浏览文件 @
be7b774a
/*
* 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
;
}
}
apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/JettyServerManagerService.java
已删除
100644 → 0
浏览文件 @
be7b774a
/*
* 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
<
JettyServerConfig
>
{
}
apm-collector/apm-collector-server-manager/collector-server-manager-define/src/main/java/org/skywalking/apm/collector/server/manager/service/ServerConfig.java
已删除
100644 → 0
浏览文件 @
be7b774a
/*
* 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
;
}
}
apm-collector/apm-collector-ui/collector-ui-jetty-provider/pom.xml
浏览文件 @
9b0b919f
...
...
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>
org.skywalking
</groupId>
<artifactId>
collector-
server
-manager-define
</artifactId>
<artifactId>
collector-
jetty
-manager-define
</artifactId>
<version>
${project.version}
</version>
</dependency>
</dependencies>
...
...
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java
浏览文件 @
9b0b919f
...
...
@@ -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
{
Jetty
ServerManagerService
managerService
=
getManager
().
find
(
ServerManagerModule
.
NAME
).
getService
(
JettyServer
ManagerService
.
class
);
Server
jettyServer
=
managerService
.
getElseCreateServer
(
serverConfig
);
Jetty
ManagerService
managerService
=
getManager
().
find
(
JettyManagerModule
.
NAME
).
getService
(
Jetty
ManagerService
.
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
,
Server
ManagerModule
.
NAME
};
return
new
String
[]
{
ClusterModule
.
NAME
,
Jetty
ManagerModule
.
NAME
};
}
}
apm-collector/pom.xml
浏览文件 @
9b0b919f
...
...
@@ -40,7 +40,8 @@
<module>
apm-collector-cache
</module>
<module>
apm-collector-storage
</module>
<module>
apm-collector-naming
</module>
<module>
apm-collector-server-manager
</module>
<module>
apm-collector-grpc-manager
</module>
<module>
apm-collector-jetty-manager
</module>
</modules>
<properties>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录