You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2018/01/10 06:29:15 UTC
[incubator-servicecomb-java-chassis] 01/07: SCB-36 Support dynamic
configuration for chassis by integrating with Apollo.
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 8ae14e89472a0b10c0d20f63a839344bb9a522ae
Author: lijasonvip <ei...@163.com>
AuthorDate: Fri Jan 5 16:04:53 2018 +0800
SCB-36 Support dynamic configuration for chassis by integrating with Apollo.
Signed-off-by: lijasonvip <ei...@163.com>
---
dynamic-config/config-apollo/pom.xml | 61 +++++++
.../sources/ApolloConfigurationSourceImpl.java | 126 +++++++++++++
.../io/servicecomb/config/client/ApolloClient.java | 162 +++++++++++++++++
.../io/servicecomb/config/client/ApolloConfig.java | 89 +++++++++
.../src/main/resources/META-INF/LICENSE.txt | 202 +++++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 ++
...comb.config.spi.ConfigCenterConfigurationSource | 18 ++
dynamic-config/pom.xml | 37 ++++
.../java/io/servicecomb/config/ConfigUtil.java | 5 +-
java-chassis-dependencies/pom.xml | 5 +
pom.xml | 1 +
samples/config-apollo-sample/pom.xml | 47 +++++
.../src/main/java/MainServer.java | 32 ++++
.../src/main/resources/microservice.yaml | 53 ++++++
samples/pom.xml | 1 +
15 files changed, 849 insertions(+), 1 deletion(-)
diff --git a/dynamic-config/config-apollo/pom.xml b/dynamic-config/config-apollo/pom.xml
new file mode 100644
index 0000000..9e13d4b
--- /dev/null
+++ b/dynamic-config/config-apollo/pom.xml
@@ -0,0 +1,61 @@
+<?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>dynamic-config</artifactId>
+ <groupId>io.servicecomb</groupId>
+ <version>0.6.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>config-apollo</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>foundation-config</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>foundation-vertx</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>4.3.11.RELEASE</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
+</project>
\ No newline at end of file
diff --git a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java
new file mode 100644
index 0000000..fce9988
--- /dev/null
+++ b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/archaius/sources/ApolloConfigurationSourceImpl.java
@@ -0,0 +1,126 @@
+/*
+ * 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 io.servicecomb.config.archaius.sources;
+
+import static com.netflix.config.WatchedUpdateResult.createIncremental;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.apache.commons.configuration.Configuration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import com.netflix.config.ConcurrentCompositeConfiguration;
+import com.netflix.config.WatchedUpdateListener;
+import com.netflix.config.WatchedUpdateResult;
+
+import io.servicecomb.config.ConfigMapping;
+import io.servicecomb.config.client.ApolloClient;
+import io.servicecomb.config.client.ApolloConfig;
+import io.servicecomb.config.spi.ConfigCenterConfigurationSource;
+
+public class ApolloConfigurationSourceImpl implements ConfigCenterConfigurationSource {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ConfigCenterConfigurationSource.class);
+
+ private final Map<String, Object> valueCache = Maps.newConcurrentMap();
+
+ private List<WatchedUpdateListener> listeners = new CopyOnWriteArrayList<WatchedUpdateListener>();
+
+ public ApolloConfigurationSourceImpl() {
+ }
+
+ private UpdateHandler updateHandler = new UpdateHandler();
+
+ @Override
+ public void init(Configuration localConfiguration) {
+ ApolloConfig.setConcurrentCompositeConfiguration((ConcurrentCompositeConfiguration) localConfiguration);
+ init();
+ }
+
+ public void init() {
+ ApolloClient apolloClient = new ApolloClient(updateHandler);
+ apolloClient.refreshApolloConfig();
+ }
+
+ @Override
+ public void addUpdateListener(WatchedUpdateListener watchedUpdateListener) {
+ if (watchedUpdateListener != null) {
+ listeners.add(watchedUpdateListener);
+ }
+ }
+
+ @Override
+ public void removeUpdateListener(WatchedUpdateListener watchedUpdateListener) {
+ if (watchedUpdateListener != null) {
+ listeners.remove(watchedUpdateListener);
+ }
+ }
+
+ public void updateConfiguration(WatchedUpdateResult result) {
+ for (WatchedUpdateListener l : listeners) {
+ try {
+ l.updateConfiguration(result);
+ } catch (Throwable ex) {
+ LOGGER.error("Error in invoking WatchedUpdateListener", ex);
+ }
+ }
+ }
+
+ @Override
+ public Map<String, Object> getCurrentData() throws Exception {
+ return valueCache;
+ }
+
+ public List<WatchedUpdateListener> getCurrentListeners() {
+ return listeners;
+ }
+
+ public class UpdateHandler {
+ public void handle(String action, Map<String, Object> config) {
+ if (config == null || config.isEmpty()) {
+ return;
+ }
+ Map<String, Object> configuration = ConfigMapping.getConvertedMap(config);
+ if ("create".equals(action)) {
+ valueCache.putAll(configuration);
+ updateConfiguration(createIncremental(ImmutableMap.<String, Object>copyOf(configuration),
+ null,
+ null));
+ } else if ("set".equals(action)) {
+ valueCache.putAll(configuration);
+ updateConfiguration(createIncremental(null, ImmutableMap.<String, Object>copyOf(configuration),
+ null));
+ } else if ("delete".equals(action)) {
+ for (String itemKey : configuration.keySet()) {
+ valueCache.remove(itemKey);
+ }
+ updateConfiguration(createIncremental(null,
+ null,
+ ImmutableMap.<String, Object>copyOf(configuration)));
+ } else {
+ LOGGER.error("action: {} is invalid.", action);
+ return;
+ }
+ LOGGER.warn("Config value cache changed: action:{}; item:{}", action, configuration.keySet());
+ }
+ }
+}
diff --git a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java
new file mode 100644
index 0000000..ad6bbaa
--- /dev/null
+++ b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloClient.java
@@ -0,0 +1,162 @@
+/*
+ * 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 io.servicecomb.config.client;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.servicecomb.config.archaius.sources.ApolloConfigurationSourceImpl.UpdateHandler;
+import io.servicecomb.foundation.common.utils.JsonUtils;
+import io.servicecomb.foundation.vertx.client.ClientPoolManager;
+import io.servicecomb.foundation.vertx.client.http.HttpClientWithContext;
+
+public class ApolloClient {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ApolloClient.class);
+
+ private static final ApolloConfig APOLLO_CONFIG = ApolloConfig.INSTANCE;
+
+ public static final Map<String, Object> originalConfigMap = new HashMap<>();
+
+ private static ScheduledExecutorService EXECUTOR = Executors.newScheduledThreadPool(1);
+
+ private int refreshInterval = APOLLO_CONFIG.getRefreshInterval();
+
+ private int firstRefreshInterval = APOLLO_CONFIG.getFirstRefreshInterval();
+
+ private String serviceUri = APOLLO_CONFIG.getServerUri();
+
+ private String serviceName = APOLLO_CONFIG.getServiceName();
+
+ private String token = APOLLO_CONFIG.getToken();
+
+ private String env = APOLLO_CONFIG.getEnv();
+
+ private String clusters = APOLLO_CONFIG.getServerClusters();
+
+ private String namespace = APOLLO_CONFIG.getNamespace();
+
+ private UpdateHandler updateHandler;
+
+ private static ClientPoolManager<HttpClientWithContext> clientMgr = new ClientPoolManager<>();
+
+ public ApolloClient(UpdateHandler updateHandler) {
+ this.updateHandler = updateHandler;
+ }
+
+ public void refreshApolloConfig() {
+ EXECUTOR
+ .scheduleWithFixedDelay(new ConfigRefresh(serviceUri), firstRefreshInterval, refreshInterval, TimeUnit.SECONDS);
+ }
+
+ class ConfigRefresh implements Runnable {
+ private String serviceUri;
+
+ public ConfigRefresh(String serviceUris) {
+ this.serviceUri = serviceUris;
+ }
+
+ @Override
+ public void run() {
+ try {
+ refreshConfig();
+ } catch (Exception e) {
+ LOGGER.error("client refresh thread exception", e);
+ }
+ }
+
+ public void refreshConfig() {
+ RestTemplate rest = new RestTemplate();
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json;charset=UTF-8");
+ headers.add("Authorization", token);
+ HttpEntity<String> entity = new HttpEntity<String>(headers);
+ ResponseEntity<String> exchange = rest.exchange(composeAPI(), HttpMethod.GET, entity, String.class);
+ if (HttpResponseStatus.OK.code() == exchange.getStatusCode().value()) {
+ try {
+ Map<String, Object> body = JsonUtils.OBJ_MAPPER.readValue(exchange.getBody(),
+ new TypeReference<Map<String, Object>>() {
+ });
+ refreshConfigItems((Map<String, Object>) body.get("configurations"));
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ private String composeAPI() {
+ String api = serviceUri + "/openapi/v1/envs/" + env +
+ "/apps/" + serviceName +
+ "/clusters/" + clusters +
+ "/namespaces/" + namespace +
+ "/releases/latest";
+ return api;
+ }
+
+ private void refreshConfigItems(Map<String, Object> map) {
+ compareChangedConfig(originalConfigMap, map);
+ originalConfigMap.clear();
+ originalConfigMap.putAll(map);
+ }
+
+ private void compareChangedConfig(Map<String, Object> before, Map<String, Object> after) {
+ Map<String, Object> itemsCreated = new HashMap<>();
+ Map<String, Object> itemsDeleted = new HashMap<>();
+ Map<String, Object> itemsModified = new HashMap<>();
+ if (before == null || before.isEmpty()) {
+ updateHandler.handle("create", after);
+ return;
+ }
+ if (after == null || after.isEmpty()) {
+ updateHandler.handle("delete", before);
+ return;
+ }
+ for (String itemKey : after.keySet()) {
+ if (!before.containsKey(itemKey)) {
+ itemsCreated.put(itemKey, after.get(itemKey));
+ } else if (!after.get(itemKey).equals(before.get(itemKey))) {
+ itemsModified.put(itemKey, after.get(itemKey));
+ }
+ }
+ for (String itemKey : before.keySet()) {
+ if (!after.containsKey(itemKey)) {
+ itemsDeleted.put(itemKey, "");
+ }
+ }
+ updateHandler.handle("create", itemsCreated);
+ updateHandler.handle("set", itemsModified);
+ updateHandler.handle("delete", itemsDeleted);
+ }
+ }
+}
+
diff --git a/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloConfig.java b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloConfig.java
new file mode 100644
index 0000000..d4dbdc6
--- /dev/null
+++ b/dynamic-config/config-apollo/src/main/java/io/servicecomb/config/client/ApolloConfig.java
@@ -0,0 +1,89 @@
+/*
+ * 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 io.servicecomb.config.client;
+
+import com.netflix.config.ConcurrentCompositeConfiguration;
+
+public class ApolloConfig {
+ public static final ApolloConfig INSTANCE = new ApolloConfig();
+
+ private static ConcurrentCompositeConfiguration finalConfig;
+
+ private static final String SERVER_URL_KEY = "apollo.config.serverUri";
+
+ private static final String SERVER_NAMESPACE = "apollo.config.namespace";
+
+ private static final String SERVER_ENV = "apollo.config.env";
+
+ private static final String SERVER_CLUSTERS = "apollo.config.clusters";
+
+ private static final String APOLLO_SERVICE_NAME = "apollo.config.serviceName";
+
+ private static final String TOKEN = "apollo.config.token";
+
+ private static final String REFRESH_INTERVAL = "apollo.config.refreshInterval";
+
+ private static final String FIRST_REFRESH_INTERVAL = "apollo.config.firstRefreshInterval";
+
+ private static final int DEFAULT_REFRESH_INTERVAL = 3;
+
+ private static final int DEFAULT_FIRST_REFRESH_INTERVAL = 0;
+
+ private ApolloConfig() {
+ }
+
+ public static void setConcurrentCompositeConfiguration(ConcurrentCompositeConfiguration config) {
+ finalConfig = (ConcurrentCompositeConfiguration) config;
+ }
+
+ public ConcurrentCompositeConfiguration getConcurrentCompositeConfiguration() {
+ return finalConfig;
+ }
+
+ public String getServiceName() {
+ return finalConfig.getString(APOLLO_SERVICE_NAME);
+ }
+
+ public String getServerUri() {
+ return finalConfig.getString(SERVER_URL_KEY);
+ }
+
+ public String getToken() {
+ return finalConfig.getString(TOKEN);
+ }
+
+ public String getEnv() {
+ return finalConfig.getString(SERVER_ENV);
+ }
+
+ public String getNamespace() {
+ return finalConfig.getString(SERVER_NAMESPACE);
+ }
+
+ public String getServerClusters() {
+ return finalConfig.getString(SERVER_CLUSTERS);
+ }
+
+ public int getRefreshInterval() {
+ return finalConfig.getInt(REFRESH_INTERVAL, DEFAULT_REFRESH_INTERVAL);
+ }
+
+ public int getFirstRefreshInterval() {
+ return finalConfig.getInt(FIRST_REFRESH_INTERVAL, DEFAULT_FIRST_REFRESH_INTERVAL);
+ }
+}
diff --git a/dynamic-config/config-apollo/src/main/resources/META-INF/LICENSE.txt b/dynamic-config/config-apollo/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/dynamic-config/config-apollo/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
diff --git a/dynamic-config/config-apollo/src/main/resources/META-INF/NOTICE.txt b/dynamic-config/config-apollo/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/dynamic-config/config-apollo/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
diff --git a/dynamic-config/config-apollo/src/main/resources/META-INF/services/io.servicecomb.config.spi.ConfigCenterConfigurationSource b/dynamic-config/config-apollo/src/main/resources/META-INF/services/io.servicecomb.config.spi.ConfigCenterConfigurationSource
new file mode 100644
index 0000000..d696ccd
--- /dev/null
+++ b/dynamic-config/config-apollo/src/main/resources/META-INF/services/io.servicecomb.config.spi.ConfigCenterConfigurationSource
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+
+io.servicecomb.config.archaius.sources.ApolloConfigurationSourceImpl
diff --git a/dynamic-config/pom.xml b/dynamic-config/pom.xml
new file mode 100644
index 0000000..4d25131
--- /dev/null
+++ b/dynamic-config/pom.xml
@@ -0,0 +1,37 @@
+<?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>java-chassis</artifactId>
+ <groupId>io.servicecomb</groupId>
+ <version>0.6.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>dynamic-config</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>config-apollo</module>
+ </modules>
+
+
+</project>
\ No newline at end of file
diff --git a/foundations/foundation-config/src/main/java/io/servicecomb/config/ConfigUtil.java b/foundations/foundation-config/src/main/java/io/servicecomb/config/ConfigUtil.java
index d0c4038..3a92454 100644
--- a/foundations/foundation-config/src/main/java/io/servicecomb/config/ConfigUtil.java
+++ b/foundations/foundation-config/src/main/java/io/servicecomb/config/ConfigUtil.java
@@ -53,6 +53,8 @@ public final class ConfigUtil {
protected static final String configCenterUrlKey = "cse.config.client.serverUri";
+ protected static final String dynamicConfigEnabled = "dynamic.config.enabled";
+
private static final String MICROSERVICE_CONFIG_LOADER_KEY = "cse-microservice-config-loader";
private ConfigUtil() {
@@ -151,7 +153,8 @@ public final class ConfigUtil {
}
public static DynamicWatchedConfiguration createConfigFromConfigCenter(Configuration localConfiguration) {
- if (localConfiguration.getProperty(configCenterUrlKey) == null) {
+ if (localConfiguration.getProperty(configCenterUrlKey) == null &&
+ !localConfiguration.getBoolean(dynamicConfigEnabled, false)) {
LOGGER.info("config center URL is missing, skip to load configuration from config center");
return null;
}
diff --git a/java-chassis-dependencies/pom.xml b/java-chassis-dependencies/pom.xml
index a111a3f..86a3b2d 100644
--- a/java-chassis-dependencies/pom.xml
+++ b/java-chassis-dependencies/pom.xml
@@ -735,6 +735,11 @@
<artifactId>foundation-config-cc</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>config-apollo</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>io.servicecomb</groupId>
<artifactId>foundation-vertx</artifactId>
diff --git a/pom.xml b/pom.xml
index d91a410..b1dfa7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,7 @@
<module>tracing</module>
<module>edge</module>
<module>metrics</module>
+ <module>dynamic-config</module>
</modules>
<distributionManagement>
diff --git a/samples/config-apollo-sample/pom.xml b/samples/config-apollo-sample/pom.xml
new file mode 100644
index 0000000..c2a3f58
--- /dev/null
+++ b/samples/config-apollo-sample/pom.xml
@@ -0,0 +1,47 @@
+<?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>samples</artifactId>
+ <groupId>io.servicecomb.samples</groupId>
+ <version>0.6.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>config-apollo-sample</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>foundation-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.netflix.archaius</groupId>
+ <artifactId>archaius-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.servicecomb</groupId>
+ <artifactId>config-apollo</artifactId>
+ </dependency>
+ </dependencies>
+
+
+</project>
\ No newline at end of file
diff --git a/samples/config-apollo-sample/src/main/java/MainServer.java b/samples/config-apollo-sample/src/main/java/MainServer.java
new file mode 100644
index 0000000..9a4d2b0
--- /dev/null
+++ b/samples/config-apollo-sample/src/main/java/MainServer.java
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+import com.netflix.config.DynamicPropertyFactory;
+
+import io.servicecomb.foundation.common.utils.BeanUtils;
+import io.servicecomb.foundation.common.utils.Log4jUtils;
+
+public class MainServer {
+ public static void main(String[] args) throws Exception {
+ Log4jUtils.init();
+ BeanUtils.init();
+ while (true) {
+ System.out.println(DynamicPropertyFactory.getInstance().getStringProperty("timeout", "default"));
+ Thread.sleep(3000);
+ }
+ }
+}
diff --git a/samples/config-apollo-sample/src/main/resources/microservice.yaml b/samples/config-apollo-sample/src/main/resources/microservice.yaml
new file mode 100644
index 0000000..1bbd3c2
--- /dev/null
+++ b/samples/config-apollo-sample/src/main/resources/microservice.yaml
@@ -0,0 +1,53 @@
+#
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+APPLICATION_ID: pojotest
+service_description:
+ name: apollo-test
+ version: 1.0.1
+
+dynamic:
+ config:
+ enabled: true
+
+apollo:
+ config:
+ serverUri: http://127.0.0.1:8070
+ serviceName: apollo-test
+ env: DEV
+ clusters: test-cluster
+ namespace: application
+ token: #get token from Apollo web pages
+
+cse:
+ service:
+ registry:
+ address: http://127.0.0.1:30100
+ rest:
+ address: 0.0.0.0:8080
+ highway:
+ address: 0.0.0.0:7070
+ handler:
+ chain:
+ Provider:
+ default: bizkeeper-provider
+ #executors:
+ #default: test
+ #Provider:
+ #server: test
+ #server.wrapParam: test
\ No newline at end of file
diff --git a/samples/pom.xml b/samples/pom.xml
index d83bf39..1d735dd 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -34,6 +34,7 @@
<module>auth-sample</module>
<module>bmi</module>
<module>metrics-write-file-sample</module>
+ <module>config-apollo-sample</module>
</modules>
<dependencyManagement>
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.