kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move base line computing module into collector analysis module.

This commit is contained in:
peng-yongsheng 2017-12-17 15:59:55 +08:00
parent ef0c9a7cd3
commit a2ea3c7d11
10 changed files with 52 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apm-collector/apm-collector-baseline/collector-baseline-computing-define/pom.xml → apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/pom.xml
View File

@ -21,13 +21,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm-collector-baseline</artifactId>
<artifactId>analysis-baseline</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>5.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>collector-baseline-computing-define</artifactId>
<artifactId>baseline-computing-define</artifactId>
<packaging>jar</packaging>
</project>
</project>

12
apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/java/org/apache/skywalking/apm/collector/baseline/computing/ComputingModule.java → apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/define/AnalysisBaselineComputingModule.java
View File

@ -16,18 +16,18 @@
*
*/
package org.apache.skywalking.apm.collector.baseline.computing;
package org.apache.skywalking.apm.collector.analysis.baseline.computing.define;
import org.apache.skywalking.apm.collector.core.module.Module;
/**
* The <code>ComputingModule</code> defines the required service interfaces.
* The <code>AnalysisBaselineComputingModule</code> defines the required service interfaces.
*
* @author wu-sheng
* @author wu-sheng, peng-yongsheng
*/
public class ComputingModule extends Module {
public static final String NAME = "baseline-computing";
public class AnalysisBaselineComputingModule extends Module {
public static final String NAME = "analysis_baseline-computing";
@Override public String name() {
return NAME;

19
apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module Normal file
View File

@ -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.baseline.computing.define.AnalysisBaselineComputingModule

15
apm-collector/apm-collector-baseline/pom.xml → apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/pom.xml
View File

@ -21,25 +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">
<parent>
<artifactId>apm-collector</artifactId>
<artifactId>analysis-baseline</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>5.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apm-collector-baseline</artifactId>
<packaging>pom</packaging>
<modules>
<module>collector-baseline-computing-define</module>
<module>collector-baseline-computing-provider</module>
<module>collector-baseline-scheduler-define</module>
</modules>
<artifactId>baseline-computing-provider</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-collector-core</artifactId>
<artifactId>baseline-computing-define</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
</project>

15
apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/java/org/apache/skywalking/collector/baseline/computing/provider/ComputingProvider.java → apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/provider/AnalysisBaselineComputingModuleProvider.java
View File

@ -16,21 +16,22 @@
*
*/
package org.apache.skywalking.collector.baseline.computing.provider;
package org.apache.skywalking.apm.collector.analysis.baseline.computing.provider;
import java.util.Properties;
import org.apache.skywalking.apm.collector.analysis.baseline.computing.define.AnalysisBaselineComputingModule;
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.baseline.computing.ComputingModule;
import org.apache.skywalking.apm.collector.core.module.Module;
/**
* The <code>ComputingProvider</code> is the default implementation of {@link ComputingModule}
* The <code>AnalysisBaselineComputingModuleProvider</code> is the default implementation of {@link
* AnalysisBaselineComputingModule}
*
* @author wu-sheng
*/
public class ComputingProvider extends ModuleProvider {
public class AnalysisBaselineComputingModuleProvider extends ModuleProvider {
public static final String NAME = "default";
@Override public String name() {
@ -38,7 +39,7 @@ public class ComputingProvider extends ModuleProvider {
}
@Override public Class<? extends Module> module() {
return ComputingModule.class;
return AnalysisBaselineComputingModule.class;
}
@Override public void prepare(Properties config) throws ServiceNotProvidedException {

2
apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/resources/services/org.skywalking.apm.collector.core.module.ModuleProvider → apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
View File

@ -16,4 +16,4 @@
#
#
org.apache.skywalking.collector.baseline.computing.provider.ComputingProvider
org.apache.skywalking.apm.collector.analysis.baseline.computing.provider.AnalysisBaselineComputingModuleProvider

11
apm-collector/apm-collector-baseline/collector-baseline-scheduler-define/pom.xml → apm-collector/apm-collector-analysis/analysis-baseline/pom.xml
View File

@ -21,13 +21,18 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm-collector-baseline</artifactId>
<artifactId>apm-collector-analysis</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>5.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>collector-baseline-scheduler-define</artifactId>
<artifactId>analysis-baseline</artifactId>
<packaging>pom</packaging>
<modules>
<module>baseline-computing-define</module>
<module>baseline-computing-provider</module>
</modules>
</project>
</project>

1
apm-collector/apm-collector-analysis/pom.xml
View File

@ -33,6 +33,7 @@
<module>analysis-segment-parser</module>
<module>analysis-layer-register</module>
<module>analysis-alarm</module>
<module>analysis-baseline</module>
</modules>
<dependencies>

2
apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/resources/services/org.skywalking.apm.collector.core.module.Module
View File

@ -1,2 +0,0 @@
org.apache.skywalking.apm.collector.baseline.computing.ComputingModule

44
apm-collector/apm-collector-baseline/collector-baseline-computing-provider/pom.xml
View File

@ -1,44 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
~ this work for additional information regarding copyright ownership.
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm-collector-baseline</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>5.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>collector-baseline-computing-provider</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>collector-baseline-computing-define</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>collector-baseline-computing-define</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>