From 3afb0c4a84d381612951adadcfddd2be7879967a Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Mon, 18 Dec 2017 17:34:06 +0800 Subject: [PATCH] Rename analysis layer register to analysis register. --- .../pom.xml | 6 +++--- .../register-define}/pom.xml | 7 ++++--- .../define/AnalysisRegisterModule.java} | 12 +++++------ .../define/service/IApplicationIDService.java | 2 +- .../define/service/IInstanceIDService.java | 2 +- .../define/service/IServiceNameService.java | 2 +- ...kywalking.apm.collector.core.module.Module | 2 +- .../register-provider}/pom.xml | 11 +++------- .../AnalysisRegisterModuleProvider.java} | 20 +++++++++---------- .../service/ApplicationIDService.java | 4 ++-- .../provider/service/InstanceIDService.java | 4 ++-- .../provider/service/ServiceNameService.java | 4 ++-- ...g.apm.collector.core.module.ModuleProvider | 2 +- .../standardization/ReferenceIdExchanger.java | 4 ++-- .../standardization/SpanIdExchanger.java | 4 ++-- apm-collector/apm-collector-analysis/pom.xml | 2 +- 16 files changed, 42 insertions(+), 46 deletions(-) rename apm-collector/apm-collector-analysis/{analysis-layer-register => analysis-register}/pom.xml (89%) rename apm-collector/apm-collector-analysis/{analysis-layer-register/layer-register-define => analysis-register/register-define}/pom.xml (89%) rename apm-collector/apm-collector-analysis/{analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/AnalysisLayerRegisterModule.java => analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/AnalysisRegisterModule.java} (69%) rename apm-collector/apm-collector-analysis/{analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer => analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis}/register/define/service/IApplicationIDService.java (92%) rename apm-collector/apm-collector-analysis/{analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer => analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis}/register/define/service/IInstanceIDService.java (93%) rename apm-collector/apm-collector-analysis/{analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer => analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis}/register/define/service/IServiceNameService.java (92%) rename apm-collector/apm-collector-analysis/{analysis-layer-register/layer-register-define => analysis-register/register-define}/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module (89%) rename apm-collector/apm-collector-analysis/{analysis-layer-register/layer-register-provider => analysis-register/register-provider}/pom.xml (79%) rename apm-collector/apm-collector-analysis/{analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/AnalysisLayerRegisterModuleProvider.java => analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/AnalysisRegisterModuleProvider.java} (68%) rename apm-collector/apm-collector-analysis/{analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer => analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis}/register/provider/service/ApplicationIDService.java (93%) rename apm-collector/apm-collector-analysis/{analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer => analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis}/register/provider/service/InstanceIDService.java (95%) rename apm-collector/apm-collector-analysis/{analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer => analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis}/register/provider/service/ServiceNameService.java (93%) rename apm-collector/apm-collector-analysis/{analysis-layer-register/layer-register-provider => analysis-register/register-provider}/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider (88%) diff --git a/apm-collector/apm-collector-analysis/analysis-layer-register/pom.xml b/apm-collector/apm-collector-analysis/analysis-register/pom.xml similarity index 89% rename from apm-collector/apm-collector-analysis/analysis-layer-register/pom.xml rename to apm-collector/apm-collector-analysis/analysis-register/pom.xml index 354ddfae4..6e8138262 100644 --- a/apm-collector/apm-collector-analysis/analysis-layer-register/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-register/pom.xml @@ -27,11 +27,11 @@ 4.0.0 - analysis-layer-register + analysis-register pom - layer-register-define - layer-register-provider + register-define + register-provider diff --git a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-register/register-define/pom.xml similarity index 89% rename from apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/pom.xml rename to apm-collector/apm-collector-analysis/analysis-register/register-define/pom.xml index bcc3a2acc..31517f891 100644 --- a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-register/register-define/pom.xml @@ -21,12 +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"> - analysis-layer-register + analysis-register org.apache.skywalking 5.0.0-alpha 4.0.0 - layer-register-define - jar + register-define + + \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/AnalysisLayerRegisterModule.java b/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/AnalysisRegisterModule.java similarity index 69% rename from apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/AnalysisLayerRegisterModule.java rename to apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/AnalysisRegisterModule.java index a282bb308..95347495e 100644 --- a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/AnalysisLayerRegisterModule.java +++ b/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/AnalysisRegisterModule.java @@ -16,19 +16,19 @@ * */ -package org.apache.skywalking.apm.collector.analysis.layer.register.define; +package org.apache.skywalking.apm.collector.analysis.register.define; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IApplicationIDService; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IInstanceIDService; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IServiceNameService; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IInstanceIDService; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService; import org.apache.skywalking.apm.collector.core.module.Module; /** * @author peng-yongsheng */ -public class AnalysisLayerRegisterModule extends Module { +public class AnalysisRegisterModule extends Module { - public static final String NAME = "analysis_layer_register"; + public static final String NAME = "analysis_register"; @Override public String name() { return NAME; diff --git a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/service/IApplicationIDService.java b/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IApplicationIDService.java similarity index 92% rename from apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/service/IApplicationIDService.java rename to apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IApplicationIDService.java index d6882cbb0..27734ebff 100644 --- a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/service/IApplicationIDService.java +++ b/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IApplicationIDService.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.collector.analysis.layer.register.define.service; +package org.apache.skywalking.apm.collector.analysis.register.define.service; import org.apache.skywalking.apm.collector.core.module.Service; diff --git a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/service/IInstanceIDService.java b/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IInstanceIDService.java similarity index 93% rename from apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/service/IInstanceIDService.java rename to apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IInstanceIDService.java index c25c5c4c6..56c44e6c9 100644 --- a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/service/IInstanceIDService.java +++ b/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IInstanceIDService.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.collector.analysis.layer.register.define.service; +package org.apache.skywalking.apm.collector.analysis.register.define.service; import org.apache.skywalking.apm.collector.core.module.Service; diff --git a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/service/IServiceNameService.java b/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IServiceNameService.java similarity index 92% rename from apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/service/IServiceNameService.java rename to apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IServiceNameService.java index d7c2c2a5e..a91f7dd2d 100644 --- a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/define/service/IServiceNameService.java +++ b/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/service/IServiceNameService.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.collector.analysis.layer.register.define.service; +package org.apache.skywalking.apm.collector.analysis.register.define.service; import org.apache.skywalking.apm.collector.core.module.Service; diff --git a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module similarity index 89% rename from apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module index 5c8214837..f43207d38 100644 --- a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module +++ b/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module @@ -16,4 +16,4 @@ # # -org.apache.skywalking.apm.collector.analysis.layer.register.define.AnalysisLayerRegisterModule \ No newline at end of file +org.apache.skywalking.apm.collector.analysis.register.define.AnalysisRegisterModule \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-register/register-provider/pom.xml similarity index 79% rename from apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/pom.xml rename to apm-collector/apm-collector-analysis/analysis-register/register-provider/pom.xml index 321d14595..5c23d3c7c 100644 --- a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-register/register-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"> - analysis-layer-register + analysis-register org.apache.skywalking 5.0.0-alpha 4.0.0 - layer-register-provider + register-provider jar org.apache.skywalking - layer-register-define - ${project.version} - - - org.apache.skywalking - collector-cache-define + register-define ${project.version} diff --git a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/AnalysisLayerRegisterModuleProvider.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/AnalysisRegisterModuleProvider.java similarity index 68% rename from apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/AnalysisLayerRegisterModuleProvider.java rename to apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/AnalysisRegisterModuleProvider.java index 6468d8663..6d602ce31 100644 --- a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/AnalysisLayerRegisterModuleProvider.java +++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/AnalysisRegisterModuleProvider.java @@ -16,16 +16,16 @@ * */ -package org.apache.skywalking.apm.collector.analysis.layer.register.provider; +package org.apache.skywalking.apm.collector.analysis.register.provider; import java.util.Properties; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.AnalysisLayerRegisterModule; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IApplicationIDService; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IInstanceIDService; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IServiceNameService; -import org.apache.skywalking.apm.collector.analysis.layer.register.provider.service.ApplicationIDService; -import org.apache.skywalking.apm.collector.analysis.layer.register.provider.service.InstanceIDService; -import org.apache.skywalking.apm.collector.analysis.layer.register.provider.service.ServiceNameService; +import org.apache.skywalking.apm.collector.analysis.register.define.AnalysisRegisterModule; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IInstanceIDService; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService; +import org.apache.skywalking.apm.collector.analysis.register.provider.service.ApplicationIDService; +import org.apache.skywalking.apm.collector.analysis.register.provider.service.InstanceIDService; +import org.apache.skywalking.apm.collector.analysis.register.provider.service.ServiceNameService; 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; @@ -33,7 +33,7 @@ import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedExcepti /** * @author peng-yongsheng */ -public class AnalysisLayerRegisterModuleProvider extends ModuleProvider { +public class AnalysisRegisterModuleProvider extends ModuleProvider { public static final String NAME = "default"; @@ -42,7 +42,7 @@ public class AnalysisLayerRegisterModuleProvider extends ModuleProvider { } @Override public Class module() { - return AnalysisLayerRegisterModule.class; + return AnalysisRegisterModule.class; } @Override public void prepare(Properties config) throws ServiceNotProvidedException { diff --git a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/service/ApplicationIDService.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/ApplicationIDService.java similarity index 93% rename from apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/service/ApplicationIDService.java rename to apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/ApplicationIDService.java index b16998c8c..884af29b9 100644 --- a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/service/ApplicationIDService.java +++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/ApplicationIDService.java @@ -16,9 +16,9 @@ * */ -package org.apache.skywalking.apm.collector.analysis.layer.register.provider.service; +package org.apache.skywalking.apm.collector.analysis.register.provider.service; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IApplicationIDService; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService; import org.apache.skywalking.apm.collector.cache.CacheModule; import org.apache.skywalking.apm.collector.cache.service.ApplicationCacheService; import org.apache.skywalking.apm.collector.core.graph.Graph; diff --git a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/service/InstanceIDService.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/InstanceIDService.java similarity index 95% rename from apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/service/InstanceIDService.java rename to apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/InstanceIDService.java index ba010b0d1..e239f3717 100644 --- a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/service/InstanceIDService.java +++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/InstanceIDService.java @@ -16,9 +16,9 @@ * */ -package org.apache.skywalking.apm.collector.analysis.layer.register.provider.service; +package org.apache.skywalking.apm.collector.analysis.register.provider.service; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IInstanceIDService; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IInstanceIDService; import org.apache.skywalking.apm.collector.cache.CacheModule; import org.apache.skywalking.apm.collector.cache.service.InstanceCacheService; import org.apache.skywalking.apm.collector.core.graph.Graph; diff --git a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/service/ServiceNameService.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/ServiceNameService.java similarity index 93% rename from apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/service/ServiceNameService.java rename to apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/ServiceNameService.java index bca414f36..a9d8f304b 100644 --- a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/layer/register/provider/service/ServiceNameService.java +++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/ServiceNameService.java @@ -16,9 +16,9 @@ * */ -package org.apache.skywalking.apm.collector.analysis.layer.register.provider.service; +package org.apache.skywalking.apm.collector.analysis.register.provider.service; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IServiceNameService; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService; import org.apache.skywalking.apm.collector.cache.CacheModule; import org.apache.skywalking.apm.collector.cache.service.ServiceIdCacheService; import org.apache.skywalking.apm.collector.core.graph.Graph; diff --git a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider similarity index 88% rename from apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider rename to apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider index c5b05474b..7fcd99df6 100644 --- a/apm-collector/apm-collector-analysis/analysis-layer-register/layer-register-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider +++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider @@ -16,4 +16,4 @@ # # -org.apache.skywalking.apm.collector.analysis.layer.register.provider.AnalysisLayerRegisterModuleProvider \ No newline at end of file +org.apache.skywalking.apm.collector.analysis.register.provider.AnalysisRegisterModuleProvider \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java index 975c78071..d136d1c9e 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser.standardization; import org.apache.skywalking.apm.collector.analysis.layer.register.define.AnalysisLayerRegisterModule; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IApplicationIDService; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IServiceNameService; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService; import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.ReferenceDecorator; import org.apache.skywalking.apm.collector.cache.CacheModule; import org.apache.skywalking.apm.collector.cache.service.InstanceCacheService; diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java index fcf9e0457..ddffaccbe 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser.standardization; import org.apache.skywalking.apm.collector.analysis.layer.register.define.AnalysisLayerRegisterModule; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IApplicationIDService; -import org.apache.skywalking.apm.collector.analysis.layer.register.define.service.IServiceNameService; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IApplicationIDService; +import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService; import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.SpanDecorator; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.core.util.Const; diff --git a/apm-collector/apm-collector-analysis/pom.xml b/apm-collector/apm-collector-analysis/pom.xml index c083bd9cd..9488ad270 100644 --- a/apm-collector/apm-collector-analysis/pom.xml +++ b/apm-collector/apm-collector-analysis/pom.xml @@ -31,11 +31,11 @@ pom analysis-segment-parser - analysis-layer-register analysis-alarm analysis-baseline analysis-worker-model analysis-metric + analysis-register