This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch fix-dc in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 9d1f1e6a878b3d47895f24f840bb6d37b9782beb Author: Wu Sheng <[email protected]> AuthorDate: Mon Jul 1 10:04:01 2019 +0800 etcd configuration is not implemented and the provider definition is copied from cluster management, which could cause multiple loading by module manager. --- .../configuration-etcd/pom.xml | 106 --------------------- ...alking.oap.server.library.module.ModuleProvider | 19 ---- .../src/test/resources/log4j2.xml | 31 ------ 3 files changed, 156 deletions(-) diff --git a/oap-server/server-configuration/configuration-etcd/pom.xml b/oap-server/server-configuration/configuration-etcd/pom.xml deleted file mode 100644 index cdfe420..0000000 --- a/oap-server/server-configuration/configuration-etcd/pom.xml +++ /dev/null @@ -1,106 +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>server-configuration</artifactId> - <groupId>org.apache.skywalking</groupId> - <version>6.3.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>configuration-etcd</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.skywalking</groupId> - <artifactId>configuration-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.skywalking</groupId> - <artifactId>library-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.skywalking</groupId> - <artifactId>cluster-etcd-plugin</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>CI-with-IT</id> - <build> - <plugins> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <configuration> - <sourceMode>all</sourceMode> - <logDate>default</logDate> - <verbose>true</verbose> - <imagePullPolicy>IfNotPresent</imagePullPolicy> - </configuration> - <executions> - <execution> - <id>start</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start</goal> - </goals> - <configuration> - <images> - <image> - <name>quayio/coreos-etcd:${etcd.version}</name> - <alias>etcd-client-integration-test</alias> - <run> - <ports> - <port>2379:2379</port> - </ports> - <wait> - <time>30000</time> - </wait> - <entrypoint> - <!-- exec form --> - <exec> - <arg>/usr/local/bin/etcd</arg> - <arg>--advertise-client-urls=http://0.0.0.0:2379</arg> - <arg>--listen-client-urls=http://0.0.0.0:2379</arg> - </exec> - </entrypoint> - </run> - </image> - </images> - </configuration> - </execution> - <execution> - <id>remove-it-etcd</id> - <phase>post-integration-test</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> diff --git a/oap-server/server-configuration/configuration-etcd/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider b/oap-server/server-configuration/configuration-etcd/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider deleted file mode 100644 index bf8dafb..0000000 --- a/oap-server/server-configuration/configuration-etcd/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider +++ /dev/null @@ -1,19 +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.oap.server.cluster.plugin.etcd.ClusterModuleEtcdProvider \ No newline at end of file diff --git a/oap-server/server-configuration/configuration-etcd/src/test/resources/log4j2.xml b/oap-server/server-configuration/configuration-etcd/src/test/resources/log4j2.xml deleted file mode 100644 index c9eec4f..0000000 --- a/oap-server/server-configuration/configuration-etcd/src/test/resources/log4j2.xml +++ /dev/null @@ -1,31 +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. - ~ - --> - -<Configuration status="info"> - <Appenders> - <Console name="Console" target="SYSTEM_OUT"> - <PatternLayout charset="UTF-8" pattern="%d - %c -%-4r [%t] %-5p %x - %m%n"/> - </Console> - </Appenders> - <Loggers> - <Root level="info"> - <AppenderRef ref="Console"/> - </Root> - </Loggers> -</Configuration>
