From 5d4a00d0ca1a1f22e72ece55edb9a6cf8b6aa1db Mon Sep 17 00:00:00 2001 From: peng-yongsheng <8082209@qq.com> Date: Mon, 18 Dec 2017 17:24:57 +0800 Subject: [PATCH] initialize analysis metric module. --- .../analysis-metric/metric-define/pom.xml | 33 +++++++++++ .../metric/define/AnalysisMetricModule.java | 37 ++++++++++++ ...kywalking.apm.collector.core.module.Module | 19 +++++++ .../analysis-metric/metric-provider/pom.xml | 45 +++++++++++++++ .../AnalysisMetricModuleProvider.java | 56 +++++++++++++++++++ ...g.apm.collector.core.module.ModuleProvider | 19 +++++++ .../analysis-metric/pom.xml | 38 +++++++++++++ apm-collector/apm-collector-analysis/pom.xml | 1 + apm-collector/apm-collector-boot/pom.xml | 19 ------- 9 files changed, 248 insertions(+), 19 deletions(-) create mode 100644 apm-collector/apm-collector-analysis/analysis-metric/metric-define/pom.xml create mode 100644 apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/AnalysisMetricModule.java create mode 100644 apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module create mode 100644 apm-collector/apm-collector-analysis/analysis-metric/metric-provider/pom.xml create mode 100644 apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/AnalysisMetricModuleProvider.java create mode 100644 apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider create mode 100644 apm-collector/apm-collector-analysis/analysis-metric/pom.xml diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-define/pom.xml b/apm-collector/apm-collector-analysis/analysis-metric/metric-define/pom.xml new file mode 100644 index 000000000..2d274cb39 --- /dev/null +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-define/pom.xml @@ -0,0 +1,33 @@ + + + + + + analysis-metric + org.apache.skywalking + 5.0.0-alpha + + 4.0.0 + + metric-define + jar + + \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/AnalysisMetricModule.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/AnalysisMetricModule.java new file mode 100644 index 000000000..9cf788088 --- /dev/null +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/AnalysisMetricModule.java @@ -0,0 +1,37 @@ +/* + * 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. + * + */ + +package org.apache.skywalking.apm.collector.analysis.metric.define; + +import org.apache.skywalking.apm.collector.core.module.Module; + +/** + * @author peng-yongsheng + */ +public class AnalysisMetricModule extends Module { + + public static final String NAME = "analysis_metric"; + + @Override public String name() { + return NAME; + } + + @Override public Class[] services() { + return new Class[] {}; + } +} diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module new file mode 100644 index 000000000..28fa66136 --- /dev/null +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module @@ -0,0 +1,19 @@ +# +# 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.metric.define.AnalysisMetricModule \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/pom.xml b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/pom.xml new file mode 100644 index 000000000..65083dd29 --- /dev/null +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/pom.xml @@ -0,0 +1,45 @@ + + + + + + analysis-metric + org.apache.skywalking + 5.0.0-alpha + + 4.0.0 + + metric-provider + jar + + + + org.apache.skywalking + metric-define + ${project.version} + + + org.apache.skywalking + analysis-worker-model + ${project.version} + + + \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/AnalysisMetricModuleProvider.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/AnalysisMetricModuleProvider.java new file mode 100644 index 000000000..c78d76532 --- /dev/null +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/AnalysisMetricModuleProvider.java @@ -0,0 +1,56 @@ +/* + * 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. + * + */ + +package org.apache.skywalking.apm.collector.analysis.metric.provider; + +import java.util.Properties; +import org.apache.skywalking.apm.collector.analysis.metric.define.AnalysisMetricModule; +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; + +/** + * @author peng-yongsheng + */ +public class AnalysisMetricModuleProvider extends ModuleProvider { + + public static final String NAME = "default"; + + @Override public String name() { + return NAME; + } + + @Override public Class module() { + return AnalysisMetricModule.class; + } + + @Override public void prepare(Properties config) throws ServiceNotProvidedException { + } + + @Override public void start(Properties config) throws ServiceNotProvidedException { + + } + + @Override public void notifyAfterCompleted() throws ServiceNotProvidedException { + + } + + @Override public String[] requiredModules() { + return new String[0]; + } +} diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider new file mode 100644 index 000000000..aa5946400 --- /dev/null +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleProvider @@ -0,0 +1,19 @@ +# +# 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.metric.provider.AnalysisMetricModuleProvider \ No newline at end of file diff --git a/apm-collector/apm-collector-analysis/analysis-metric/pom.xml b/apm-collector/apm-collector-analysis/analysis-metric/pom.xml new file mode 100644 index 000000000..da8b6bbd2 --- /dev/null +++ b/apm-collector/apm-collector-analysis/analysis-metric/pom.xml @@ -0,0 +1,38 @@ + + + + + + apm-collector-analysis + org.apache.skywalking + 5.0.0-alpha + + 4.0.0 + + analysis-metric + pom + + metric-define + metric-provider + + + + \ 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 01011c2db..c083bd9cd 100644 --- a/apm-collector/apm-collector-analysis/pom.xml +++ b/apm-collector/apm-collector-analysis/pom.xml @@ -35,6 +35,7 @@ analysis-alarm analysis-baseline analysis-worker-model + analysis-metric diff --git a/apm-collector/apm-collector-boot/pom.xml b/apm-collector/apm-collector-boot/pom.xml index 68db643fc..a30409315 100644 --- a/apm-collector/apm-collector-boot/pom.xml +++ b/apm-collector/apm-collector-boot/pom.xml @@ -98,13 +98,6 @@ ${project.version} - - - org.apache.skywalking - collector-agent-stream-provider - ${project.version} - - org.apache.skywalking @@ -131,18 +124,6 @@ ${project.version} - - - org.apache.skywalking - collector-queue-datacarrier-provider - ${project.version} - - - org.apache.skywalking - collector-queue-disruptor-provider - ${project.version} - - org.apache.skywalking