Support etcd configuration. (#2973) (76d91635) · Commits · SUMMER2020 / students / proj-2005254

apm-dist/release-docs/LICENSE

+1 −0

Original line number	Diff line number	Diff line
		@@ -325,6 +325,7 @@ The text of each license is the standard Apache 2.0 license.
		Ctripcorp: apollo 1.4.0: https://github.com/ctripcorp/apollo Apache 2.0
		etcd4j 2.17.0: https://github.com/jurmous/etcd4j Apache 2.0
		javaassist 3.25.0-GA: https://github.com/jboss-javassist/javassist Apache 2.0
		jackson-module-afterburner 2.9.5: https://github.com/FasterXML/jackson-modules-base, Apache 2.0

		========================================================================
		MIT licenses

oap-server/pom.xml

+68 −0

Original line number	Diff line number	Diff line
		@@ -82,10 +82,14 @@
		<curator-test.version>2.12.0</curator-test.version>
		<etcd4j.version>2.17.0</etcd4j.version>
		<etcd.version>v3.2.3</etcd.version>
		<netty.version>4.1.27.Final</netty.version>
		<jackson-module-afterburner.version>2.9.5</jackson-module-afterburner.version>
		<antlr.version>4.7.1</antlr.version>
		<freemarker.version>2.3.28</freemarker.version>
		<javaassist.version>3.25.0-GA</javaassist.version>

		<zookeeper.image.version>3.5</zookeeper.image.version>

		</properties>

		<dependencies>
		@@ -378,11 +382,75 @@
		<artifactId>nacos-client</artifactId>
		<version>${nacos.version}</version>
		</dependency>

		<dependency>
		<groupId>org.mousio</groupId>
		<artifactId>etcd4j</artifactId>
		<exclusions>
		<exclusion>
		<artifactId>netty-codec-dns</artifactId>
		<groupId>io.netty</groupId>
		</exclusion>

		<exclusion>
		<artifactId>netty-codec-dns</artifactId>
		<groupId>io.netty</groupId>
		</exclusion>

		<exclusion>
		<artifactId>netty-codec-http</artifactId>
		<groupId>io.netty</groupId>
		</exclusion>

		<exclusion>
		<artifactId>netty-handler</artifactId>
		<groupId>io.netty</groupId>
		</exclusion>

		<exclusion>
		<artifactId>netty-resolver-dns</artifactId>
		<groupId>io.netty</groupId>
		</exclusion>

		<exclusion>
		<groupId>com.fasterxml.jackson.module</groupId>
		<artifactId>jackson-module-afterburner</artifactId>
		</exclusion>
		</exclusions>
		<version>${etcd4j.version}</version>
		</dependency>

		<dependency>
		<groupId>io.netty</groupId>
		<artifactId>netty-handler</artifactId>
		<version>${netty.version}</version>
		</dependency>

		<dependency>
		<groupId>io.netty</groupId>
		<artifactId>netty-resolver-dns</artifactId>
		<version>${netty.version}</version>
		</dependency>

		<dependency>
		<groupId>io.netty</groupId>
		<artifactId>netty-codec-dns</artifactId>
		<version>${netty.version}</version>
		</dependency>

		<dependency>
		<groupId>io.netty</groupId>
		<artifactId>netty-codec-http</artifactId>
		<version>${netty.version}</version>
		</dependency>

		<dependency>
		<groupId>com.fasterxml.jackson.module</groupId>
		<artifactId>jackson-module-afterburner</artifactId>
		<version>${jackson-module-afterburner.version}</version>
		</dependency>


		<dependency>
		<groupId>org.apache.curator</groupId>
		<artifactId>curator-x-discovery</artifactId>

oap-server/server-cluster-plugin/cluster-etcd-plugin/pom.xml

+10 −36

Original line number	Diff line number	Diff line
		@@ -38,58 +38,32 @@

		<dependency>
		<groupId>io.netty</groupId>
		<artifactId>netty-handler</artifactId>
		<version>4.1.27.Final</version>
		<artifactId>netty-codec-dns</artifactId>
		</dependency>

		<dependency>
		<groupId>io.netty</groupId>
		<artifactId>netty-resolver-dns</artifactId>
		<version>4.1.27.Final</version>
		<artifactId>netty-codec-http</artifactId>
		</dependency>


		<dependency>
		<groupId>org.mousio</groupId>
		<artifactId>etcd4j</artifactId>
		<exclusions>
		<exclusion>
		<artifactId>netty-codec-dns</artifactId>
		<groupId>io.netty</groupId>
		</exclusion>

		<exclusion>
		<artifactId>netty-codec-dns</artifactId>
		<groupId>io.netty</groupId>
		</exclusion>

		<exclusion>
		<artifactId>netty-codec-http</artifactId>
		<groupId>io.netty</groupId>
		</exclusion>

		<exclusion>
		<artifactId>netty-handler</artifactId>
		<groupId>io.netty</groupId>
		</exclusion>
		</dependency>

		<exclusion>
		<artifactId>netty-resolver-dns</artifactId>
		<dependency>
		<groupId>io.netty</groupId>
		</exclusion>

		<exclusion>
		<groupId>com.fasterxml.jackson.module</groupId>
		<artifactId>jackson-module-afterburner</artifactId>
		</exclusion>
		</exclusions>
		<artifactId>netty-resolver-dns</artifactId>
		</dependency>

		<dependency>
		<groupId>org.mousio</groupId>
		<artifactId>etcd4j</artifactId>
		</dependency>

		<dependency>
		<groupId>com.fasterxml.jackson.module</groupId>
		<artifactId>jackson-module-afterburner</artifactId>
		<version>2.9.5</version>
		</dependency>

		</dependencies>

oap-server/server-configuration/configuration-etcd/pom.xml

0 → 100644

+177 −0

Original line number	Diff line number	Diff line
		<?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>io.netty</groupId>
		<artifactId>netty-codec-dns</artifactId>
		</dependency>

		<dependency>
		<groupId>io.netty</groupId>
		<artifactId>netty-codec-http</artifactId>
		</dependency>

		<dependency>
		<groupId>io.netty</groupId>
		<artifactId>netty-handler</artifactId>
		</dependency>

		<dependency>
		<groupId>io.netty</groupId>
		<artifactId>netty-resolver-dns</artifactId>
		</dependency>

		<dependency>
		<groupId>org.mousio</groupId>
		<artifactId>etcd4j</artifactId>
		</dependency>

		<dependency>
		<groupId>com.fasterxml.jackson.module</groupId>
		<artifactId>jackson-module-afterburner</artifactId>
		</dependency>

		<dependency>
		<groupId>org.yaml</groupId>
		<artifactId>snakeyaml</artifactId>
		</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>etcd.port:2379</port>
		</ports>
		<wait>
		<time>5000</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>

		<plugin>
		<groupId>org.codehaus.gmaven</groupId>
		<artifactId>gmaven-plugin</artifactId>
		<version>1.5</version>
		<executions>
		<execution>
		<id>add-default-properties</id>
		<phase>initialize</phase>
		<goals>
		<goal>execute</goal>
		</goals>
		<configuration>
		<providerSelection>2.0</providerSelection>
		<source>
		project.properties.setProperty('etcd.host', 'localhost')

		log.info("Etcd host is " + project.properties['etcd.host'])
		</source>
		</configuration>
		</execution>
		</executions>
		</plugin>

		<plugin>
		<groupId>org.apache.maven.plugins</groupId>
		<artifactId>maven-failsafe-plugin</artifactId>
		<configuration>
		<systemPropertyVariables>
		<etcd.host>
		${etcd.host}
		</etcd.host>
		<etcd.port>
		${etcd.port}
		</etcd.port>
		</systemPropertyVariables>
		</configuration>
		<executions>
		<execution>
		<goals>
		<goal>integration-test</goal>
		<goal>verify</goal>
		</goals>
		</execution>
		</executions>
		</plugin>
		</plugins>
		</build>
		</profile>
		</profiles>
		</project>

oap-server/server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigException.java

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		/*
		* 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.oap.server.configuration.etcd;

		/**
		* exception type throw by Etcd Configuration.
		*
		* @author Alan Lau
		*/
		public class EtcdConfigException extends RuntimeException {


		public EtcdConfigException(String message, Throwable cause) {
		super(message, cause);
		}

		}