From ef0c9a7cd38aae45acbd4bfcd16ee9fe00bf541b Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Sun, 17 Dec 2017 15:47:42 +0800 Subject: [PATCH] Move collector alerting into collector analysis module. --- ...g.apm.collector.core.module.ModuleProvider | 20 ---------- .../analysis-alarm/alarm-define}/pom.xml | 6 +-- .../alarm/define/AnalysisAlarmModule.java} | 7 ++-- ...kywalking.apm.collector.core.module.Module | 3 +- .../analysis-alarm/alarm-provider}/pom.xml | 14 +++---- .../provider}/AlertingModuleProvider.java | 10 ++--- .../worker/AlertingListAggregationWorker.java | 2 +- .../worker/AlertingListPersistenceWorker.java | 2 +- ...g.apm.collector.core.module.ModuleProvider | 38 +++++++++++++++++++ .../analysis-alarm}/pom.xml | 35 +++++------------ apm-collector/apm-collector-analysis/pom.xml | 1 + 11 files changed, 66 insertions(+), 72 deletions(-) delete mode 100644 apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider rename apm-collector/{apm-collector-alerting/collector-alerting-define => apm-collector-analysis/analysis-alarm/alarm-define}/pom.xml (91%) rename apm-collector/{apm-collector-alerting/collector-alerting-define/src/main/java/org/apache/skywalking/apm/collector/alerting/AlertingModule.java => apm-collector-analysis/analysis-alarm/alarm-define/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/define/AnalysisAlarmModule.java} (85%) rename apm-collector/{apm-collector-alerting/collector-alerting-define => apm-collector-analysis/analysis-alarm/alarm-define}/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module (91%) rename apm-collector/{apm-collector-alerting => apm-collector-analysis/analysis-alarm/alarm-provider}/pom.xml (81%) rename apm-collector/{apm-collector-alerting/collector-alerting-provider/src/main/java/org/apache/skywalking/apm/collector/alerting => apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider}/AlertingModuleProvider.java (84%) rename apm-collector/{apm-collector-alerting/collector-alerting-provider/src/main/java/org/apache/skywalking/apm/collector/alerting => apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider}/worker/AlertingListAggregationWorker.java (95%) rename apm-collector/{apm-collector-alerting/collector-alerting-provider/src/main/java/org/apache/skywalking/apm/collector/alerting => apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider}/worker/AlertingListPersistenceWorker.java (97%) create mode 100644 apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider rename apm-collector/{apm-collector-alerting/collector-alerting-provider => apm-collector-analysis/analysis-alarm}/pom.xml (54%) diff --git a/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider deleted file mode 100644 index 313e6650b..000000000 --- a/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider +++ /dev/null @@ -1,20 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - - -org.apache.skywalking.apm.collector.alerting.AlertingModuleProvider diff --git a/apm-collector/apm-collector-alerting/collector-alerting-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/pom.xml similarity index 91% rename from apm-collector/apm-collector-alerting/collector-alerting-define/pom.xml rename to apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/pom.xml index acbfc9a4e..7f762747e 100644 --- a/apm-collector/apm-collector-alerting/collector-alerting-define/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-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-alerting + analysis-alarm org.apache.skywalking 5.0.0-alpha 4.0.0 - collector-alerting-define + alarm-define jar - + \ No newline at end of file diff --git a/apm-collector/apm-collector-alerting/collector-alerting-define/src/main/java/org/apache/skywalking/apm/collector/alerting/AlertingModule.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/define/AnalysisAlarmModule.java similarity index 85% rename from apm-collector/apm-collector-alerting/collector-alerting-define/src/main/java/org/apache/skywalking/apm/collector/alerting/AlertingModule.java rename to apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/define/AnalysisAlarmModule.java index fa7b16473..e6d22e62a 100644 --- a/apm-collector/apm-collector-alerting/collector-alerting-define/src/main/java/org/apache/skywalking/apm/collector/alerting/AlertingModule.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/define/AnalysisAlarmModule.java @@ -16,17 +16,16 @@ * */ - -package org.apache.skywalking.apm.collector.alerting; +package org.apache.skywalking.apm.collector.analysis.alarm.define; import org.apache.skywalking.apm.collector.core.module.Module; /** * @author peng-yongsheng */ -public class AlertingModule extends Module { +public class AnalysisAlarmModule extends Module { - public static final String NAME = "alerting"; + public static final String NAME = "analysis_alarm"; @Override public String name() { return NAME; diff --git a/apm-collector/apm-collector-alerting/collector-alerting-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module similarity index 91% rename from apm-collector/apm-collector-alerting/collector-alerting-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module index bd6975ba4..5c95ca418 100644 --- a/apm-collector/apm-collector-alerting/collector-alerting-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module @@ -16,5 +16,4 @@ # # - -org.apache.skywalking.apm.collector.alerting.AlertingModule +org.apache.skywalking.apm.collector.analysis.alarm.define.AnalysisAlarmModule \ No newline at end of file diff --git a/apm-collector/apm-collector-alerting/pom.xml b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml similarity index 81% rename from apm-collector/apm-collector-alerting/pom.xml rename to apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml index b4fb0ee0a..887faf325 100644 --- a/apm-collector/apm-collector-alerting/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/pom.xml @@ -21,24 +21,20 @@ 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 + analysis-alarm org.apache.skywalking 5.0.0-alpha 4.0.0 - apm-collector-alerting - pom - - collector-alerting-define - collector-alerting-provider - + alarm-provider + jar org.apache.skywalking - apm-collector-core + alarm-define ${project.version} - + \ No newline at end of file diff --git a/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/apache/skywalking/apm/collector/alerting/AlertingModuleProvider.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AlertingModuleProvider.java similarity index 84% rename from apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/apache/skywalking/apm/collector/alerting/AlertingModuleProvider.java rename to apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AlertingModuleProvider.java index 93cbd0e5f..4143fd2a6 100644 --- a/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/apache/skywalking/apm/collector/alerting/AlertingModuleProvider.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AlertingModuleProvider.java @@ -16,15 +16,13 @@ * */ - -package org.apache.skywalking.apm.collector.alerting; +package org.apache.skywalking.apm.collector.analysis.alarm.provider; import java.util.Properties; -import org.apache.skywalking.apm.collector.agent.stream.AgentStreamModule; +import org.apache.skywalking.apm.collector.analysis.alarm.define.AnalysisAlarmModule; 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.storage.StorageModule; /** * @author peng-yongsheng @@ -36,7 +34,7 @@ public class AlertingModuleProvider extends ModuleProvider { } @Override public Class module() { - return AlertingModule.class; + return AnalysisAlarmModule.class; } @Override public void prepare(Properties config) throws ServiceNotProvidedException { @@ -52,6 +50,6 @@ public class AlertingModuleProvider extends ModuleProvider { } @Override public String[] requiredModules() { - return new String[] {AgentStreamModule.NAME, StorageModule.NAME}; + return new String[] {}; } } diff --git a/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/apache/skywalking/apm/collector/alerting/worker/AlertingListAggregationWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListAggregationWorker.java similarity index 95% rename from apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/apache/skywalking/apm/collector/alerting/worker/AlertingListAggregationWorker.java rename to apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListAggregationWorker.java index 8da7fe419..2874316e4 100644 --- a/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/apache/skywalking/apm/collector/alerting/worker/AlertingListAggregationWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListAggregationWorker.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.collector.alerting.worker; +package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker; import org.apache.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker; import org.apache.skywalking.apm.collector.core.module.ModuleManager; diff --git a/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/apache/skywalking/apm/collector/alerting/worker/AlertingListPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListPersistenceWorker.java similarity index 97% rename from apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/apache/skywalking/apm/collector/alerting/worker/AlertingListPersistenceWorker.java rename to apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListPersistenceWorker.java index 2fc13b5f0..51969d31f 100644 --- a/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/apache/skywalking/apm/collector/alerting/worker/AlertingListPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/AlertingListPersistenceWorker.java @@ -17,7 +17,7 @@ */ -package org.apache.skywalking.apm.collector.alerting.worker; +package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; import org.apache.skywalking.apm.collector.core.module.ModuleManager; diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider new file mode 100644 index 000000000..2adafe72c --- /dev/null +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider @@ -0,0 +1,38 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# + + +org.apache.skywalking.apm.collector.analysis.alarm.provider.AlertingModuleProvider diff --git a/apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-alarm/pom.xml similarity index 54% rename from apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml rename to apm-collector/apm-collector-analysis/analysis-alarm/pom.xml index 0fdb59e2c..1d9f94990 100644 --- a/apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml +++ b/apm-collector/apm-collector-analysis/analysis-alarm/pom.xml @@ -21,35 +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-alerting + apm-collector-analysis org.apache.skywalking 5.0.0-alpha 4.0.0 - collector-alerting-provider - jar + analysis-alarm + pom + + alarm-define + alarm-provider + - - - org.apache.skywalking - collector-alerting-define - ${project.version} - - - org.apache.skywalking - collector-agent-stream-define - ${project.version} - - - org.apache.skywalking - collector-storage-define - ${project.version} - - - org.apache.skywalking - apm-collector-stream - ${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 index 3ca85beb9..405ef0ff5 100644 --- a/apm-collector/apm-collector-analysis/pom.xml +++ b/apm-collector/apm-collector-analysis/pom.xml @@ -32,6 +32,7 @@ analysis-segment-parser analysis-layer-register + analysis-alarm