diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-consumer.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-consumer.json deleted file mode 100644 index b7f243635..000000000 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-consumer.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - "dubbox-consumer" -] \ No newline at end of file diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-provider.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-provider.json deleted file mode 100644 index 08a2c156b..000000000 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-provider.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - "dubbox-provider" -] \ No newline at end of file diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-consumer.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-consumer.json deleted file mode 100644 index 453dce3eb..000000000 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-consumer.json +++ /dev/null @@ -1,71 +0,0 @@ -[ - { - "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 diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-provider.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-provider.json deleted file mode 100644 index aba490792..000000000 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-provider.json +++ /dev/null @@ -1,67 +0,0 @@ -[ - { - "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 diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-consumer.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-consumer.json deleted file mode 100644 index 139dc5743..000000000 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-consumer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ai": -1, - "au": "dubbox-consumer", - "rt": 1501858094526, - "oi": { - "any_name": "any_value", - "any_name1": "any_value1" - } -} \ No newline at end of file diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-provider.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-provider.json deleted file mode 100644 index 976928f9c..000000000 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-provider.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ai": 2, - "au": "dubbox-provider", - "rt": 1501858094526, - "oi": { - "any_name": "any_value", - "any_name1": "any_value1" - } -} \ No newline at end of file diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-consumer.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-consumer.json deleted file mode 100644 index 9cc919204..000000000 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-consumer.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "ai": -1, - "sn": "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()" - } -] \ No newline at end of file diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-provider.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-provider.json deleted file mode 100644 index 0e9a96153..000000000 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-provider.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "ai": 2, - "sn": "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()" - } -] \ No newline at end of file diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml similarity index 88% rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/pom.xml index 7a9fe60c1..cc1cc4269 100644 --- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-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-agent-grpc + agent-grpc org.apache.skywalking 5.0.0-alpha 4.0.0 - collector-agent-grpc-define - jar + agent-grpc-define - + + \ No newline at end of file diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentGRPCModule.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/define/AgentGRPCModule.java similarity index 94% rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentGRPCModule.java rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/define/AgentGRPCModule.java index 02323f387..8878c3fb9 100644 --- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentGRPCModule.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/define/AgentGRPCModule.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.collector.agent.grpc; +package org.apache.skywalking.apm.collector.agent.grpc.define; import org.apache.skywalking.apm.collector.core.module.Module; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module similarity index 91% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module index 1234d192e..502c70faa 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module @@ -16,5 +16,4 @@ # # - -org.apache.skywalking.apm.collector.agent.jetty.AgentJettyModule +org.apache.skywalking.apm.collector.agent.grpc.define.AgentGRPCModule diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml similarity index 82% rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml index 83df2b360..111390e65 100644 --- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/pom.xml @@ -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"> - apm-collector-agent-grpc + agent-grpc org.apache.skywalking 5.0.0-alpha 4.0.0 - collector-agent-grpc-provider - jar + agent-grpc-provider org.apache.skywalking - collector-agent-grpc-define - ${project.version} - - - org.apache.skywalking - collector-grpc-manager-define + agent-grpc-define ${project.version} @@ -53,8 +47,8 @@ org.apache.skywalking - collector-agent-stream-define + collector-grpc-manager-define ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentModuleGRPCProvider.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCProvider.java similarity index 81% rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentModuleGRPCProvider.java rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCProvider.java index 114a31f8c..d349b3ef6 100644 --- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentModuleGRPCProvider.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCProvider.java @@ -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) { diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentModuleGRPCRegistration.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCRegistration.java similarity index 95% rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentModuleGRPCRegistration.java rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCRegistration.java index d82f06b3a..cf49deaa2 100644 --- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/AgentModuleGRPCRegistration.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCRegistration.java @@ -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; diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java similarity index 97% rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandler.java rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java index b4aab258f..efb139ee8 100644 --- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandler.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.collector.agent.grpc.handler; +package org.apache.skywalking.apm.collector.agent.grpc.provider.handler; import com.google.protobuf.ProtocolStringList; import io.grpc.stub.StreamObserver; diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandlerTestCase.java similarity index 96% rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandlerTestCase.java index 4abdd900f..5e67abdbf 100644 --- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandlerTestCase.java @@ -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.ManagedChannel; import io.grpc.ManagedChannelBuilder; diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/InstanceDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java similarity index 98% rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/InstanceDiscoveryServiceHandler.java rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java index 99fa6565b..5ff4a2602 100644 --- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/InstanceDiscoveryServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/InstanceDiscoveryServiceHandler.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.collector.agent.grpc.handler; +package org.apache.skywalking.apm.collector.agent.grpc.provider.handler; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/JVMMetricsServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java similarity index 98% rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/JVMMetricsServiceHandler.java rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java index 88f3f500e..079a5c9c5 100644 --- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/JVMMetricsServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java @@ -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 java.util.List; diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ServiceNameDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java similarity index 97% rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ServiceNameDiscoveryServiceHandler.java rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java index a83b70d2a..7cf381f60 100644 --- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/ServiceNameDiscoveryServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ServiceNameDiscoveryServiceHandler.java @@ -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 java.util.List; diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/TraceSegmentServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java similarity index 97% rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/TraceSegmentServiceHandler.java rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java index 6d365f99e..52bead8c8 100644 --- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/TraceSegmentServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java @@ -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; diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingHandler.java b/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 similarity index 95% rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingHandler.java rename to 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 index a0bb48ad8..3d5ce31f2 100644 --- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingHandler.java +++ b/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 @@ -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; diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingListener.java b/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 similarity index 89% rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingListener.java rename to 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 index a8be523f7..412589522 100644 --- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingListener.java +++ b/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 @@ -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; /** diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider similarity index 90% rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider index 4eb9a529c..c32b4c937 100644 --- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider @@ -16,5 +16,4 @@ # # - -org.apache.skywalking.apm.collector.agent.grpc.AgentModuleGRPCProvider +org.apache.skywalking.apm.collector.agent.grpc.provider.AgentModuleGRPCProvider diff --git a/apm-collector/apm-collector-agent-jetty/pom.xml b/apm-collector/apm-collector-agent/agent-grpc/pom.xml similarity index 73% rename from apm-collector/apm-collector-agent-jetty/pom.xml rename to apm-collector/apm-collector-agent/agent-grpc/pom.xml index 887eb259f..c411f4f72 100644 --- a/apm-collector/apm-collector-agent-jetty/pom.xml +++ b/apm-collector/apm-collector-agent/agent-grpc/pom.xml @@ -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"> - apm-collector + apm-collector-agent org.apache.skywalking 5.0.0-alpha 4.0.0 - apm-collector-agent-jetty + agent-grpc pom - collector-agent-jetty-define - collector-agent-jetty-provider + agent-grpc-define + agent-grpc-provider - - - org.apache.skywalking - apm-collector-core - ${project.version} - - - + \ No newline at end of file diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/pom.xml b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml similarity index 88% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/pom.xml rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/pom.xml index 68bae50c0..6a54c7f62 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/pom.xml +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-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-agent-jetty + agent-jetty org.apache.skywalking 5.0.0-alpha 4.0.0 - collector-agent-jetty-define - jar + agent-jetty-define - + + \ No newline at end of file diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentJettyModule.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/define/AgentJettyModule.java similarity index 94% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentJettyModule.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/define/AgentJettyModule.java index 970b72a26..125baf2ab 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentJettyModule.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/define/AgentJettyModule.java @@ -16,8 +16,7 @@ * */ - -package org.apache.skywalking.apm.collector.agent.jetty; +package org.apache.skywalking.apm.collector.agent.jetty.define; import org.apache.skywalking.apm.collector.core.module.Module; diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module similarity index 91% rename from apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module index ec8255a67..24ac5122e 100644 --- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module @@ -16,5 +16,4 @@ # # - -org.apache.skywalking.apm.collector.agent.grpc.AgentGRPCModule +org.apache.skywalking.apm.collector.agent.jetty.define.AgentJettyModule diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/pom.xml b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml similarity index 83% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/pom.xml rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml index 6060eadca..058fc884d 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/pom.xml +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/pom.xml @@ -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"> - apm-collector-agent-jetty + agent-jetty org.apache.skywalking 5.0.0-alpha 4.0.0 - collector-agent-jetty-provider + agent-jetty-provider jar org.apache.skywalking - collector-agent-jetty-define - ${project.version} - - - org.apache.skywalking - collector-jetty-manager-define + agent-jetty-define ${project.version} @@ -53,8 +48,8 @@ org.apache.skywalking - collector-agent-stream-define + collector-jetty-manager-define ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentModuleJettyProvider.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyProvider.java similarity index 83% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentModuleJettyProvider.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyProvider.java index 4ed4cb16a..8ca30e585 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentModuleJettyProvider.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyProvider.java @@ -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) { diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentModuleJettyRegistration.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyRegistration.java similarity index 95% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentModuleJettyRegistration.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyRegistration.java index 11cc7e122..d8a55c91d 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/AgentModuleJettyRegistration.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyRegistration.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.collector.agent.jetty; +package org.apache.skywalking.apm.collector.agent.jetty.provider; import org.apache.skywalking.apm.collector.cluster.ModuleRegistration; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterPost.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterPost.java similarity index 94% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterPost.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterPost.java index 6169d090e..b023bc2bd 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterPost.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterPost.java @@ -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; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterServletHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterServletHandler.java similarity index 97% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterServletHandler.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterServletHandler.java index ad757598f..31cb368b2 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterServletHandler.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ApplicationRegisterServletHandler.java @@ -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.Gson; import com.google.gson.JsonArray; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/HttpClientTools.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/HttpClientTools.java similarity index 97% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/HttpClientTools.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/HttpClientTools.java index 022c0bf6e..3dec5869b 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/HttpClientTools.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/HttpClientTools.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.collector.agent.jetty.handler; +package org.apache.skywalking.apm.collector.agent.jetty.provider.handler; import java.io.IOException; import java.net.URI; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/InstanceDiscoveryServletHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceDiscoveryServletHandler.java similarity index 97% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/InstanceDiscoveryServletHandler.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceDiscoveryServletHandler.java index 467227dac..8839e97c2 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/InstanceDiscoveryServletHandler.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceDiscoveryServletHandler.java @@ -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.Gson; import com.google.gson.JsonElement; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/InstanceRegisterPost.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceRegisterPost.java similarity index 94% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/InstanceRegisterPost.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceRegisterPost.java index dbc1b6947..33cb3f63d 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/InstanceRegisterPost.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceRegisterPost.java @@ -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; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/JsonFileReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/JsonFileReader.java similarity index 95% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/JsonFileReader.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/JsonFileReader.java index a13368219..b8e646dbb 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/JsonFileReader.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/JsonFileReader.java @@ -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; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/SegmentPost.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/SegmentPost.java similarity index 96% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/SegmentPost.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/SegmentPost.java index 8551e9c20..40fbf2480 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/SegmentPost.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/SegmentPost.java @@ -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; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ServiceNameDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java similarity index 97% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ServiceNameDiscoveryServiceHandler.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java index fbbfdd31c..b395682a7 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ServiceNameDiscoveryServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameDiscoveryServiceHandler.java @@ -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.Gson; import com.google.gson.JsonArray; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ServiceNameRegisterPost.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameRegisterPost.java similarity index 94% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ServiceNameRegisterPost.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameRegisterPost.java index 66e3d70dc..7ea2b6122 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/handler/ServiceNameRegisterPost.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/ServiceNameRegisterPost.java @@ -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; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/TraceSegmentServletHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandler.java similarity index 91% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/TraceSegmentServletHandler.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandler.java index 40ff15d53..495f5bfd5 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/TraceSegmentServletHandler.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/TraceSegmentServletHandler.java @@ -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; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingHandler.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingHandler.java similarity index 95% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingHandler.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingHandler.java index cf64bffc7..cf6335002 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingHandler.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/naming/AgentJettyNamingHandler.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.collector.agent.jetty.handler.naming; +package org.apache.skywalking.apm.collector.agent.jetty.provider.handler.naming; import com.google.gson.JsonArray; import com.google.gson.JsonElement; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingListener.java b/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 similarity index 88% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingListener.java rename to 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 index 12253abef..ada3f16e3 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingListener.java +++ b/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 @@ -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; /** diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/KeyWithStringValueJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/KeyWithStringValueJsonReader.java similarity index 95% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/KeyWithStringValueJsonReader.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/KeyWithStringValueJsonReader.java index 353eb3065..f2b129791 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/KeyWithStringValueJsonReader.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/KeyWithStringValueJsonReader.java @@ -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; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/LogJsonReader.java b/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 similarity index 95% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/LogJsonReader.java rename to 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 index 7a958c431..be9d71843 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/LogJsonReader.java +++ b/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 @@ -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; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/ReferenceJsonReader.java b/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 similarity index 97% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/ReferenceJsonReader.java rename to 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 index 7f6bd7217..8ddbfba0f 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/ReferenceJsonReader.java +++ b/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 @@ -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; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/SegmentJsonReader.java b/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 similarity index 97% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/SegmentJsonReader.java rename to 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 index 21fadb147..c6d8b9812 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/SegmentJsonReader.java +++ b/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 @@ -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; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/SpanJsonReader.java b/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 similarity index 98% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/SpanJsonReader.java rename to 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 index f8aaea82e..111ea1a72 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/SpanJsonReader.java +++ b/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 @@ -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; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/StreamJsonReader.java b/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 similarity index 92% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/StreamJsonReader.java rename to 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 index 725ed10a7..0b757c4ce 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/StreamJsonReader.java +++ b/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 @@ -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; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegment.java b/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 similarity index 95% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegment.java rename to 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 index 9ebb8f233..c53c4b642 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegment.java +++ b/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 @@ -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; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegmentJsonReader.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegmentJsonReader.java similarity index 96% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegmentJsonReader.java rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegmentJsonReader.java index 333cd950c..b11125ebb 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegmentJsonReader.java +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/reader/TraceSegmentJsonReader.java @@ -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; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/UniqueIdJsonReader.java b/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 similarity index 94% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/UniqueIdJsonReader.java rename to 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 index eb7fb80a6..54d0c32dc 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/handler/reader/UniqueIdJsonReader.java +++ b/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 @@ -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; diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider similarity index 90% rename from apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider index b353e5433..d481e10a6 100644 --- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider +++ b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider @@ -16,5 +16,4 @@ # # - -org.apache.skywalking.apm.collector.agent.jetty.AgentModuleJettyProvider +org.apache.skywalking.apm.collector.agent.jetty.provider.AgentModuleJettyProvider \ No newline at end of file diff --git a/apm-collector/apm-collector-agent/agent-jetty/pom.xml b/apm-collector/apm-collector-agent/agent-jetty/pom.xml new file mode 100644 index 000000000..9ad00a524 --- /dev/null +++ b/apm-collector/apm-collector-agent/agent-jetty/pom.xml @@ -0,0 +1,38 @@ + + + + + + apm-collector-agent + org.apache.skywalking + 5.0.0-alpha + + 4.0.0 + + agent-jetty + pom + + agent-jetty-define + agent-jetty-provider + + + + \ No newline at end of file diff --git a/apm-collector/apm-collector-agent-grpc/pom.xml b/apm-collector/apm-collector-agent/pom.xml similarity index 90% rename from apm-collector/apm-collector-agent-grpc/pom.xml rename to apm-collector/apm-collector-agent/pom.xml index 286102764..72c071e24 100644 --- a/apm-collector/apm-collector-agent-grpc/pom.xml +++ b/apm-collector/apm-collector-agent/pom.xml @@ -27,11 +27,11 @@ 4.0.0 - apm-collector-agent-grpc + apm-collector-agent pom - collector-agent-grpc-define - collector-agent-grpc-provider + agent-grpc + agent-jetty @@ -41,4 +41,4 @@ ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/pom.xml b/apm-collector/apm-collector-analysis/pom.xml new file mode 100644 index 000000000..397062a43 --- /dev/null +++ b/apm-collector/apm-collector-analysis/pom.xml @@ -0,0 +1,33 @@ + + + + + + apm-collector + org.apache.skywalking + 5.0.0-alpha + + 4.0.0 + + apm-collector-analysis + + + \ No newline at end of file diff --git a/apm-collector/apm-collector-boot/docker/log4j2.xml b/apm-collector/apm-collector-boot/docker/log4j2.xml index 50b77b8d7..25f53accd 100644 --- a/apm-collector/apm-collector-boot/docker/log4j2.xml +++ b/apm-collector/apm-collector-boot/docker/log4j2.xml @@ -26,7 +26,7 @@ - + diff --git a/apm-collector/apm-collector-boot/pom.xml b/apm-collector/apm-collector-boot/pom.xml index 937603435..f399d3de5 100644 --- a/apm-collector/apm-collector-boot/pom.xml +++ b/apm-collector/apm-collector-boot/pom.xml @@ -87,14 +87,14 @@ org.apache.skywalking - collector-agent-grpc-provider + agent-grpc-provider ${project.version} org.apache.skywalking - collector-agent-jetty-provider + agent-jetty-provider ${project.version} diff --git a/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml b/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml index e85143ff6..8a9358e9d 100644 --- a/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml +++ b/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml @@ -36,7 +36,7 @@ - + diff --git a/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml b/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml index 90ce682c8..c40fb0d4b 100644 --- a/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml +++ b/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml @@ -27,7 +27,7 @@ - + diff --git a/apm-collector/pom.xml b/apm-collector/pom.xml index 93c9486c2..7ead1aa57 100644 --- a/apm-collector/pom.xml +++ b/apm-collector/pom.xml @@ -46,11 +46,11 @@ apm-collector-queue apm-collector-instrument apm-collector-baseline - apm-collector-agent-grpc - apm-collector-agent-jetty apm-collector-agent-stream apm-collector-alerting apm-collector-configuration + apm-collector-agent + apm-collector-analysis