Skip to content

S
SkyWalking

月轩居士 / SkyWalking
与 Fork 源项目一致

Fork自 apache / SkyWalking

通知 4
Star 0
Fork 0
S
SkyWalking

体验新版 GitCode，发现更多精彩内容 >>

提交 8e02787d 编写于 作者: P peng-yongsheng
浏览文件
操作

Move agent grpc and jetty module into apm-collector-agent module.

上级 17cb21d6
隐藏空白更改
内联 并排
Showing with 172 addition and 300 deletion
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-consumer.json 已删除 100644 → 0
浏览文件 @ 17cb21d6
[
{
"gt": [
[
230150,
185809,
24040000
]
],
"sg": {
"ts": [
230150,
185809,
24040000
],
"ai": -1,
"ii": 1,
"rs": [],
"ss": [
{
"si": 1,
"tv": 1,
"lv": 1,
"ps": 0,
"st": 1501858094526,
"et": 1501858097004,
"ci": 3,
"cn": "",
"oi": 0,
"on": "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()",
"pi": 0,
"pn": "172.25.0.4:20880",
"ie": false,
"to": [
{
"k": "url",
"v": "rest://172.25.0.4:20880/org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()"
}
],
"lo": []
},
{
"si": 0,
"tv": 0,
"lv": 2,
"ps": -1,
"st": 1501858092409,
"et": 1501858097033,
"ci": 1,
"cn": "",
"oi": 0,
"on": "/dubbox-case/case/dubbox-rest",
"pi": 0,
"pn": "",
"ie": false,
"to": [
{
"k": "url",
"v": "http://localhost:18080/dubbox-case/case/dubbox-rest"
},
{
"k": "http.method",
"v": "GET"
}
],
"lo": []
}
]
}
}
]
\ No newline at end of file
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-provider.json 已删除 100644 → 0
浏览文件 @ 17cb21d6
[
{
"gt": [
[
230150,
185809,
24040000
]
],
"sg": {
"ts": [
137150,
185809,
48780000
],
"ai": 2,
"ii": 2,
"ss": [
{
"si": 0,
"tv": 0,
"lv": 2,
"ps": -1,
"st": 1501858094726,
"et": 1501858096804,
"ci": 3,
"cn": "",
"oi": 0,
"on": "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()",
"pi": 0,
"pn": "",
"ie": false,
"rs": [
{
"ts": [
230150,
185809,
24040000
],
"ai": -1,
"si": 1,
"vi": 0,
"vn": "/dubbox-case/case/dubbox-rest",
"ni": 0,
"nn": "172.25.0.4:20880",
"ea": 2,
"ei": 0,
"en": "/dubbox-case/case/dubbox-rest",
"rn": 0
}
],
"to": [
{
"k": "url",
"v": "rest://172.25.0.4:20880/org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()"
},
{
"k": "http.method",
"v": "GET"
}
],
"lo": []
}
]
}
}
]
\ No newline at end of file
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-consumer.json 已删除 100644 → 0
浏览文件 @ 17cb21d6
{
"ai": -1,
"au": "dubbox-consumer",
"rt": 1501858094526,
"oi": {
"any_name": "any_value",
"any_name1": "any_value1"
}
}
\ No newline at end of file
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-provider.json 已删除 100644 → 0
浏览文件 @ 17cb21d6
{
"ai": 2,
"au": "dubbox-provider",
"rt": 1501858094526,
"oi": {
"any_name": "any_value",
"any_name1": "any_value1"
}
}
\ No newline at end of file
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-consumer.json 已删除 100644 → 0
浏览文件 @ 17cb21d6
[
{
"ai": -1,
"sn": "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()"
}
]
\ No newline at end of file
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-provider.json 已删除 100644 → 0
浏览文件 @ 17cb21d6
[
{
"ai": 2,
"sn": "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()"
}
]
\ No newline at end of file
apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml → apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml
浏览文件 @ 8e02787d
......@@ -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-agent-grpc</artifactId>
<artifactId>agent-grpc</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>5.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>collector-agent-grpc-define</artifactId>
<packaging>jar</packaging>
<artifactId>agent-grpc-define</artifactId>
</project>
</project>
\ No newline at end of file
apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml → apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml
浏览文件 @ 8e02787d
......@@ -21,24 +21,18 @@
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-agent-grpc</artifactId>
<artifactId>agent-grpc</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>5.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>collector-agent-grpc-provider</artifactId>
<packaging>jar</packaging>
<artifactId>agent-grpc-provider</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>collector-agent-grpc-define</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>collector-grpc-manager-define</artifactId>
<artifactId>agent-grpc-define</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
......@@ -53,8 +47,8 @@
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>collector-agent-stream-define</artifactId>
<artifactId>collector-grpc-manager-define</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
</project>
\ No newline at end of file
apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentModuleGRPCProvider.java → apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCProvider.java
浏览文件 @ 8e02787d
......@@ -16,28 +16,27 @@
*
*/
package org.apache.skywalking.apm.collector.agent.grpc;
package org.apache.skywalking.apm.collector.agent.grpc.provider;
import java.util.Properties;
import org.apache.skywalking.apm.collector.agent.grpc.handler.naming.AgentGRPCNamingListener;
import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
import org.apache.skywalking.apm.collector.naming.NamingModule;
import org.apache.skywalking.apm.collector.naming.service.NamingHandlerRegisterService;
import org.apache.skywalking.apm.collector.agent.grpc.handler.ApplicationRegisterServiceHandler;
import org.apache.skywalking.apm.collector.agent.grpc.handler.InstanceDiscoveryServiceHandler;
import org.apache.skywalking.apm.collector.agent.grpc.handler.JVMMetricsServiceHandler;
import org.apache.skywalking.apm.collector.agent.grpc.handler.ServiceNameDiscoveryServiceHandler;
import org.apache.skywalking.apm.collector.agent.grpc.handler.TraceSegmentServiceHandler;
import org.apache.skywalking.apm.collector.agent.grpc.handler.naming.AgentGRPCNamingHandler;
import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule;
import org.apache.skywalking.apm.collector.agent.grpc.define.AgentGRPCModule;
import org.apache.skywalking.apm.collector.agent.grpc.provider.handler.ApplicationRegisterServiceHandler;
import org.apache.skywalking.apm.collector.agent.grpc.provider.handler.InstanceDiscoveryServiceHandler;
import org.apache.skywalking.apm.collector.agent.grpc.provider.handler.JVMMetricsServiceHandler;
import org.apache.skywalking.apm.collector.agent.grpc.provider.handler.ServiceNameDiscoveryServiceHandler;
import org.apache.skywalking.apm.collector.agent.grpc.provider.handler.TraceSegmentServiceHandler;
import org.apache.skywalking.apm.collector.agent.grpc.provider.handler.naming.AgentGRPCNamingHandler;
import org.apache.skywalking.apm.collector.agent.grpc.provider.handler.naming.AgentGRPCNamingListener;
import org.apache.skywalking.apm.collector.cluster.ClusterModule;
import org.apache.skywalking.apm.collector.cluster.service.ModuleListenerService;
import org.apache.skywalking.apm.collector.cluster.service.ModuleRegisterService;
import org.apache.skywalking.apm.collector.core.module.Module;
import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
import org.apache.skywalking.apm.collector.grpc.manager.GRPCManagerModule;
import org.apache.skywalking.apm.collector.grpc.manager.service.GRPCManagerService;
import org.apache.skywalking.apm.collector.naming.NamingModule;
import org.apache.skywalking.apm.collector.naming.service.NamingHandlerRegisterService;
import org.apache.skywalking.apm.collector.server.Server;
/**
......@@ -86,7 +85,7 @@ public class AgentModuleGRPCProvider extends ModuleProvider {
}
@Override public String[] requiredModules() {
return new String[] {ClusterModule.NAME, NamingModule.NAME, GRPCManagerModule.NAME, AgentStreamModule.NAME};
return new String[] {ClusterModule.NAME, NamingModule.NAME, GRPCManagerModule.NAME};
}
private void addHandlers(Server gRPCServer) {
......
apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentModuleGRPCRegistration.java → apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCRegistration.java
浏览文件 @ 8e02787d
......@@ -17,7 +17,7 @@
*/
package org.apache.skywalking.apm.collector.agent.grpc;
package org.apache.skywalking.apm.collector.agent.grpc.provider;
import org.apache.skywalking.apm.collector.cluster.ModuleRegistration;
import org.apache.skywalking.apm.collector.core.util.Const;
......
apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/TraceSegmentServiceHandler.java → apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java
浏览文件 @ 8e02787d
......@@ -17,7 +17,7 @@
*/
package org.apache.skywalking.apm.collector.agent.grpc.handler;
package org.apache.skywalking.apm.collector.agent.grpc.provider.handler;
import io.grpc.stub.StreamObserver;
import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule;
......
apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingHandler.java → apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/naming/AgentGRPCNamingHandler.java
浏览文件 @ 8e02787d
......@@ -17,7 +17,7 @@
*/
package org.apache.skywalking.apm.collector.agent.grpc.handler.naming;
package org.apache.skywalking.apm.collector.agent.grpc.provider.handler.naming;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
......
apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingListener.java → apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/naming/AgentGRPCNamingListener.java
浏览文件 @ 8e02787d
......@@ -17,10 +17,10 @@
*/
package org.apache.skywalking.apm.collector.agent.grpc.handler.naming;
package org.apache.skywalking.apm.collector.agent.grpc.provider.handler.naming;
import org.apache.skywalking.apm.collector.agent.grpc.AgentGRPCModule;
import org.apache.skywalking.apm.collector.agent.grpc.AgentModuleGRPCProvider;
import org.apache.skywalking.apm.collector.agent.grpc.provider.AgentModuleGRPCProvider;
import org.apache.skywalking.apm.collector.cluster.ClusterModuleListener;
/**
......
apm-collector/apm-collector-agent-jetty/pom.xml → apm-collector/apm-collector-agent/agent-grpc/pom.xml
浏览文件 @ 8e02787d
......@@ -21,24 +21,17 @@
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>
<artifactId>apm-collector-agent</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>5.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apm-collector-agent-jetty</artifactId>
<artifactId>agent-grpc</artifactId>
<packaging>pom</packaging>
<modules>
<module>collector-agent-jetty-define</module>
<module>collector-agent-jetty-provider</module>
<module>agent-grpc-define</module>
<module>agent-grpc-provider</module>
</modules>
<dependencies>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-collector-core</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
</project>
\ No newline at end of file
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/pom.xml → apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml
浏览文件 @ 8e02787d
......@@ -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-agent-jetty</artifactId>
<artifactId>agent-jetty</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>5.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>collector-agent-jetty-define</artifactId>
<packaging>jar</packaging>
<artifactId>agent-jetty-define</artifactId>
</project>
</project>
\ No newline at end of file
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/pom.xml → apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml
浏览文件 @ 8e02787d
......@@ -21,24 +21,19 @@
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-agent-jetty</artifactId>
<artifactId>agent-jetty</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>5.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>collector-agent-jetty-provider</artifactId>
<artifactId>agent-jetty-provider</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>collector-agent-jetty-define</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>collector-jetty-manager-define</artifactId>
<artifactId>agent-jetty-define</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
......@@ -53,8 +48,8 @@
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>collector-agent-stream-define</artifactId>
<artifactId>collector-jetty-manager-define</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
</project>
\ No newline at end of file
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentModuleJettyProvider.java → apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyProvider.java
浏览文件 @ 8e02787d
......@@ -16,28 +16,27 @@
*
*/
package org.apache.skywalking.apm.collector.agent.jetty;
package org.apache.skywalking.apm.collector.agent.jetty.provider;
import java.util.Properties;
import org.apache.skywalking.apm.collector.agent.jetty.handler.TraceSegmentServletHandler;
import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule;
import org.apache.skywalking.apm.collector.agent.jetty.define.AgentJettyModule;
import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.ApplicationRegisterServletHandler;
import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.InstanceDiscoveryServletHandler;
import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.ServiceNameDiscoveryServiceHandler;
import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.TraceSegmentServletHandler;
import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.naming.AgentJettyNamingHandler;
import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.naming.AgentJettyNamingListener;
import org.apache.skywalking.apm.collector.cluster.ClusterModule;
import org.apache.skywalking.apm.collector.cluster.service.ModuleListenerService;
import org.apache.skywalking.apm.collector.cluster.service.ModuleRegisterService;
import org.apache.skywalking.apm.collector.core.module.Module;
import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
import org.apache.skywalking.apm.collector.jetty.manager.JettyManagerModule;
import org.apache.skywalking.apm.collector.jetty.manager.service.JettyManagerService;
import org.apache.skywalking.apm.collector.naming.NamingModule;
import org.apache.skywalking.apm.collector.naming.service.NamingHandlerRegisterService;
import org.apache.skywalking.apm.collector.server.Server;
import org.apache.skywalking.apm.collector.agent.jetty.handler.ApplicationRegisterServletHandler;
import org.apache.skywalking.apm.collector.agent.jetty.handler.InstanceDiscoveryServletHandler;
import org.apache.skywalking.apm.collector.agent.jetty.handler.ServiceNameDiscoveryServiceHandler;
import org.apache.skywalking.apm.collector.agent.jetty.handler.naming.AgentJettyNamingHandler;
import org.apache.skywalking.apm.collector.agent.jetty.handler.naming.AgentJettyNamingListener;
import org.apache.skywalking.apm.collector.cluster.service.ModuleListenerService;
import org.apache.skywalking.apm.collector.core.module.Module;
import org.apache.skywalking.apm.collector.jetty.manager.JettyManagerModule;
import org.apache.skywalking.apm.collector.jetty.manager.service.JettyManagerService;
/**
* @author peng-yongsheng
......@@ -86,7 +85,7 @@ public class AgentModuleJettyProvider extends ModuleProvider {
}
@Override public String[] requiredModules() {
return new String[] {ClusterModule.NAME, NamingModule.NAME, JettyManagerModule.NAME, AgentStreamModule.NAME};
return new String[] {ClusterModule.NAME, NamingModule.NAME, JettyManagerModule.NAME};
}
private void addHandlers(Server jettyServer) {
......
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/JsonFileReader.java → apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/JsonFileReader.java
浏览文件 @ 8e02787d
......@@ -17,7 +17,7 @@
*/
package org.apache.skywalking.apm.collector.agent.jetty.handler;
package org.apache.skywalking.apm.collector.agent.jetty.provider.handler;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
......
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/SegmentPost.java → apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/SegmentPost.java
浏览文件 @ 8e02787d
......@@ -17,7 +17,7 @@
*/
package org.apache.skywalking.apm.collector.agent.jetty.handler;
package org.apache.skywalking.apm.collector.agent.jetty.provider.handler;
import com.google.gson.JsonElement;
import java.io.IOException;
......
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/TraceSegmentServletHandler.java → apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandler.java
浏览文件 @ 8e02787d
......@@ -17,15 +17,15 @@
*/
package org.apache.skywalking.apm.collector.agent.jetty.handler;
package org.apache.skywalking.apm.collector.agent.jetty.provider.handler;
import com.google.gson.JsonElement;
import com.google.gson.stream.JsonReader;
import java.io.BufferedReader;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import org.apache.skywalking.apm.collector.agent.jetty.handler.reader.TraceSegment;
import org.apache.skywalking.apm.collector.agent.jetty.handler.reader.TraceSegmentJsonReader;
import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader.TraceSegment;
import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader.TraceSegmentJsonReader;
import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule;
import org.apache.skywalking.apm.collector.agent.stream.service.trace.ITraceSegmentService;
import org.apache.skywalking.apm.collector.core.module.ModuleManager;
......
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingListener.java → apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingListener.java
浏览文件 @ 8e02787d
......@@ -17,10 +17,10 @@
*/
package org.apache.skywalking.apm.collector.agent.jetty.handler.naming;
package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.naming;
import org.apache.skywalking.apm.collector.agent.jetty.AgentJettyModule;
import org.apache.skywalking.apm.collector.agent.jetty.AgentModuleJettyProvider;
import org.apache.skywalking.apm.collector.agent.jetty.provider.AgentModuleJettyProvider;
import org.apache.skywalking.apm.collector.cluster.ClusterModuleListener;
/**
......
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/LogJsonReader.java → apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/LogJsonReader.java
浏览文件 @ 8e02787d
......@@ -17,7 +17,7 @@
*/
package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
import com.google.gson.stream.JsonReader;
import java.io.IOException;
......
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/ReferenceJsonReader.java → apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/ReferenceJsonReader.java
浏览文件 @ 8e02787d
......@@ -17,7 +17,7 @@
*/
package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
import com.google.gson.stream.JsonReader;
import java.io.IOException;
......
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/SegmentJsonReader.java → apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SegmentJsonReader.java
浏览文件 @ 8e02787d
......@@ -17,7 +17,7 @@
*/
package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
import com.google.gson.stream.JsonReader;
import java.io.IOException;
......
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/SpanJsonReader.java → apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/SpanJsonReader.java
浏览文件 @ 8e02787d
......@@ -17,7 +17,7 @@
*/
package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
import com.google.gson.stream.JsonReader;
import java.io.IOException;
......
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/StreamJsonReader.java → apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/StreamJsonReader.java
浏览文件 @ 8e02787d
......@@ -17,7 +17,7 @@
*/
package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
import com.google.gson.stream.JsonReader;
import java.io.IOException;
......
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegment.java → apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegment.java
浏览文件 @ 8e02787d
......@@ -17,7 +17,7 @@
*/
package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
import org.apache.skywalking.apm.network.proto.TraceSegmentObject;
import org.apache.skywalking.apm.network.proto.UniqueId;
......
apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/UniqueIdJsonReader.java → apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/UniqueIdJsonReader.java
浏览文件 @ 8e02787d
......@@ -17,7 +17,7 @@
*/
package org.apache.skywalking.apm.collector.agent.jetty.handler.reader;
package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.reader;
import com.google.gson.stream.JsonReader;
import java.io.IOException;
......
apm-collector/apm-collector-agent/agent-jetty/pom.xml 0 → 100644
浏览文件 @ 8e02787d
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
~ this work for additional information regarding copyright ownership.
~ The ASF licenses this file to You 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 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-agent</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>5.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>agent-jetty</artifactId>
<packaging>pom</packaging>
<modules>
<module>agent-jetty-define</module>
<module>agent-jetty-provider</module>
</modules>
</project>
\ No newline at end of file
apm-collector/apm-collector-agent-grpc/pom.xml → apm-collector/apm-collector-agent/pom.xml
浏览文件 @ 8e02787d
......@@ -27,11 +27,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apm-collector-agent-grpc</artifactId>
<artifactId>apm-collector-agent</artifactId>
<packaging>pom</packaging>
<modules>
<module>collector-agent-grpc-define</module>
<module>collector-agent-grpc-provider</module>
<module>agent-grpc</module>
<module>agent-jetty</module>
</modules>
<dependencies>
......@@ -41,4 +41,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
</project>
\ No newline at end of file
apm-collector/apm-collector-analysis/pom.xml 0 → 100644
浏览文件 @ 8e02787d
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
~ this work for additional information regarding copyright ownership.
~ The ASF licenses this file to You 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 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.apache.skywalking</groupId>
<version>5.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apm-collector-analysis</artifactId>
</project>
\ No newline at end of file
apm-collector/apm-collector-boot/docker/log4j2.xml
浏览文件 @ 8e02787d
......@@ -26,7 +26,7 @@
<Loggers>
<logger name="org.eclipse.jetty" level="INFO"/>
<logger name="org.apache.zookeeper" level="INFO"/>
<logger name="org.apache.skywalking.apm.collector.agent.grpc.handler.JVMMetricsServiceHandler" level="INFO"/>
<logger name="org.apache.skywalking.apm.collector.agent.grpc.provider.handler.JVMMetricsServiceHandler" level="INFO"/>
<logger name="org.apache.skywalking.apm.collector.stream.timer.PersistenceTimer" level="INFO"/>
<logger name="io.grpc.netty" level="INFO"/>
<Root level="info">
......
apm-collector/apm-collector-boot/pom.xml
浏览文件 @ 8e02787d
......@@ -87,14 +87,14 @@
<!-- agent gRPC provider -->
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>collector-agent-grpc-provider</artifactId>
<artifactId>agent-grpc-provider</artifactId>
<version>${project.version}</version>
</dependency>
<!-- agent gRPC provider -->
<!-- agent jetty provider -->
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>collector-agent-jetty-provider</artifactId>
<artifactId>agent-jetty-provider</artifactId>
<version>${project.version}</version>
</dependency>
<!-- agent jetty provider -->
......
apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml
浏览文件 @ 8e02787d
......@@ -36,7 +36,7 @@
<Loggers>
<logger name="org.eclipse.jetty" level="INFO"/>
<logger name="org.apache.zookeeper" level="INFO"/>
<logger name="org.apache.skywalking.apm.collector.agent.grpc.handler.JVMMetricsServiceHandler" level="INFO"/>
<logger name="org.apache.skywalking.apm.collector.agent.grpc.provider.handler.JVMMetricsServiceHandler" level="INFO"/>
<logger name="org.apache.skywalking.apm.collector.stream.timer.PersistenceTimer" level="INFO"/>
<logger name="io.grpc.netty" level="INFO"/>
<Root level="info">
......
apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
浏览文件 @ 8e02787d
......@@ -27,7 +27,7 @@
<logger name="org.eclipse.jetty" level="INFO"/>
<logger name="org.apache.zookeeper" level="INFO"/>
<logger name="org.elasticsearch.common.network.IfConfig" level="INFO"/>
<logger name="org.apache.skywalking.apm.collector.agent.grpc.handler.JVMMetricsServiceHandler" level="INFO"/>
<logger name="org.apache.skywalking.apm.collector.agent.grpc.provider.handler.JVMMetricsServiceHandler" level="INFO"/>
<logger name="org.apache.skywalking.apm.collector.stream.timer.PersistenceTimer" level="INFO"/>
<logger name="io.grpc.netty" level="INFO"/>
<Root level="debug">
......
apm-collector/pom.xml
浏览文件 @ 8e02787d
......@@ -46,11 +46,11 @@
<module>apm-collector-queue</module>
<module>apm-collector-instrument</module>
<module>apm-collector-baseline</module>
<module>apm-collector-agent-grpc</module>
<module>apm-collector-agent-jetty</module>
<module>apm-collector-agent-stream</module>
<module>apm-collector-alerting</module>
<module>apm-collector-configuration</module>
<module>apm-collector-agent</module>
<module>apm-collector-analysis</module>
</modules>
<dependencies>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或