Merge pull request #6 from alibaba/develop

pull latest code

Author: paderlol

Diff for: .github/ISSUE_TEMPLATE.md

@@ -0,0 +1,28 @@
+<!-- Here is for bug reports and feature requests ONLY! 
+
+If you're looking for help, please check our mail list、WeChat group and the Gitter room.
+
+Please try to use English to describe your issue, or at least provide a snippet of English translation.
+我们鼓励使用英文，如果不能直接使用，可以使用翻译软件，您仍旧可以保留中文原文。
+-->
+
+## Issue Description
+
+Type: *bug report* or *feature request*
+
+### Describe what happened (or what feature you want)
+
+
+### Describe what you expected to happen
+
+
+### How to reproduce it (as minimally and precisely as possible)
+
+1. 
+2. 
+3. 
+
+### Tell us your environment
+
+
+### Anything else we need to know?

Diff for: .github/ISSUE_TEMPLATE/bug_report.md

@@ -1,3 +1,19 @@
+## 0.9.0(Feb 28, 2019)
+
+* [#840] Nacos server adds startup mode to distinguish between config and naming.
+* [#762] Register instance returns failed when the health check mode is 'server' in standalone mode.
+* [#473] Nacos Cluster Mode kubernate Startup nacos.log error Log.
+* [#240] Log strong dependence problem.
+* [#824] getServicesOfServer throws exception if service list is empty.
+* [#802] Nacos server multi-boot mode support.
+* [#800] Nacos's client-to-server addressing mode document introduction.
+* [#768] The interval at which the heartbeat is sent in BeatReactor is not controlled by the server return value.
+* [#759] why instance can't auto-delete.
+* [#756] Format of instance and service should be validated.
+* [#720] Memory leak in PushService.
+* [#653] IoUtils under nacos-common-0.2.1-RC1.jar lacks "" judgment on encoding.
+* [#588] Client compatible to jdk1.6.
+
 ## 0.8.0(Jan 22, 2019) PRE-GA
 
 * [#162] Support open metrics and prometheus

Diff for: .github/ISSUE_TEMPLATE/feature_request.md

@@ -40,9 +40,9 @@ It is super easy to get started with your first project.
 
 You can download the package from the  [latest stable release](https://github.com/alibaba/nacos/releases).  
 
-Take release nacos-server-0.8.0.zip for example.
+Take release nacos-server-0.9.0.zip for example.
 ```
-unzip nacos-server-0.8.0.zip
+unzip nacos-server-0.9.0.zip
 cd nacos/bin 
 ``` 
 

Diff for: CHANGELOG.md

@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>0.8.0</version>
+        <version>0.9.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -32,8 +32,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>7</source>
-                    <target>7</target>
+                    <source>6</source>
+                    <target>6</target>
                 </configuration>
             </plugin>
         </plugins>

Diff for: README.md

@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>0.8.0</version>
+        <version>0.9.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -43,7 +43,6 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.8.2</version>
             <optional>true</optional>
         </dependency>
 
@@ -108,9 +107,22 @@
         </dependency>
 
         <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-core</artifactId>
+            <groupId>io.prometheus</groupId>
+            <artifactId>simpleclient</artifactId>
+            <version>0.5.0</version>
         </dependency>
 
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>6</source>
+                    <target>6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Diff for: api/pom.xml

@@ -30,12 +30,11 @@
 import com.alibaba.nacos.client.config.impl.HttpSimpleClient.HttpResult;
 import com.alibaba.nacos.client.config.impl.LocalConfigInfoProcessor;
 import com.alibaba.nacos.client.config.utils.ContentUtils;
-import com.alibaba.nacos.client.config.utils.LogUtils;
 import com.alibaba.nacos.client.config.utils.ParamUtils;
 import com.alibaba.nacos.client.config.utils.TenantUtil;
-import com.alibaba.nacos.client.logger.Logger;
-import com.alibaba.nacos.client.logger.support.LoggerHelper;
+import com.alibaba.nacos.client.utils.LogUtils;
 import com.alibaba.nacos.client.utils.StringUtils;
+import org.slf4j.Logger;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
@@ -52,8 +51,9 @@
 @SuppressWarnings("PMD.ServiceOrDaoClassShouldEndWithImplRule")
 public class NacosConfigService implements ConfigService {
 
-    final static public Logger log = LogUtils.logger(NacosConfigService.class);
-    public final long POST_TIMEOUT = 3000L;
+    private static final Logger LOGGER = LogUtils.logger(NacosConfigService.class);
+
+    private final long POST_TIMEOUT = 3000L;
     /**
      * http agent
      */
@@ -123,8 +123,8 @@ private String getConfigInner(String tenant, String dataId, String group, long t
         // 优先使用本地配置
         String content = LocalConfigInfoProcessor.getFailover(agent.getName(), dataId, group, tenant);
         if (content != null) {
-            log.warn(agent.getName(), "[get-config] get failover ok, dataId={}, group={}, tenant={}, config={}", dataId,
-                group, tenant, ContentUtils.truncateContent(content));
+            LOGGER.warn("[{}] [get-config] get failover ok, dataId={}, group={}, tenant={}, config={}", agent.getName(),
+                dataId, group, tenant, ContentUtils.truncateContent(content));
             cr.setContent(content);
             configFilterChainManager.doFilter(null, cr);
             content = cr.getContent();
@@ -143,14 +143,12 @@ private String getConfigInner(String tenant, String dataId, String group, long t
             if (NacosException.NO_RIGHT == ioe.getErrCode()) {
                 throw ioe;
             }
-            log.warn("NACOS-0003",
-                LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0003", "环境问题", "get from server error"));
-            log.warn(agent.getName(), "[get-config] get from server error, dataId={}, group={}, tenant={}, msg={}",
-                dataId, group, tenant, ioe.toString());
+            LOGGER.warn("[{}] [get-config] get from server error, dataId={}, group={}, tenant={}, msg={}",
+                agent.getName(), dataId, group, tenant, ioe.toString());
         }
 
-        log.warn(agent.getName(), "[get-config] get snapshot ok, dataId={}, group={}, tenant={}, config={}", dataId,
-            group, tenant, ContentUtils.truncateContent(content));
+        LOGGER.warn("[{}] [get-config] get snapshot ok, dataId={}, group={}, tenant={}, config={}", agent.getName(),
+            dataId, group, tenant, ContentUtils.truncateContent(content));
         content = LocalConfigInfoProcessor.getSnapshot(agent.getName(), dataId, group, tenant);
         cr.setContent(content);
         configFilterChainManager.doFilter(null, cr);
@@ -183,20 +181,20 @@ private boolean removeConfigInner(String tenant, String dataId, String group, St
         try {
             result = agent.httpDelete(url, null, params, encode, POST_TIMEOUT);
         } catch (IOException ioe) {
-            log.warn("[remove] error, " + dataId + ", " + group + ", " + tenant + ", msg: " + ioe.toString());
+            LOGGER.warn("[remove] error, " + dataId + ", " + group + ", " + tenant + ", msg: " + ioe.toString());
             return false;
         }
 
         if (HttpURLConnection.HTTP_OK == result.code) {
-            log.info(agent.getName(), "[remove] ok, dataId={}, group={}, tenant={}", dataId, group, tenant);
+            LOGGER.info("[{}] [remove] ok, dataId={}, group={}, tenant={}", agent.getName(), dataId, group, tenant);
             return true;
         } else if (HttpURLConnection.HTTP_FORBIDDEN == result.code) {
-            log.warn(agent.getName(), "[remove] error, dataId={}, group={}, tenant={}, code={}, msg={}", dataId, group,
-                tenant, result.code, result.content);
+            LOGGER.warn("[{}] [remove] error, dataId={}, group={}, tenant={}, code={}, msg={}", agent.getName(), dataId,
+                group, tenant, result.code, result.content);
             throw new NacosException(result.code, result.content);
         } else {
-            log.warn(agent.getName(), "[remove] error, dataId={}, group={}, tenant={}, code={}, msg={}", dataId, group,
-                tenant, result.code, result.content);
+            LOGGER.warn("[{}] [remove] error, dataId={}, group={}, tenant={}, code={}, msg={}", agent.getName(), dataId,
+                group, tenant, result.code, result.content);
             return false;
         }
     }
@@ -245,24 +243,22 @@ private boolean publishConfigInner(String tenant, String dataId, String group, S
         try {
             result = agent.httpPost(url, headers, params, encode, POST_TIMEOUT);
         } catch (IOException ioe) {
-            log.warn("NACOS-0006",
-                LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0006", "环境问题", "[publish-single] exception"));
-            log.warn(agent.getName(), "[publish-single] exception, dataId={}, group={}, msg={}", dataId, group,
-                ioe.toString());
+            LOGGER.warn("[{}] [publish-single] exception, dataId={}, group={}, msg={}", agent.getName(), dataId,
+                group, ioe.toString());
             return false;
         }
 
         if (HttpURLConnection.HTTP_OK == result.code) {
-            log.info(agent.getName(), "[publish-single] ok, dataId={}, group={}, tenant={}, config={}", dataId, group,
-                tenant, ContentUtils.truncateContent(content));
+            LOGGER.info("[{}] [publish-single] ok, dataId={}, group={}, tenant={}, config={}", agent.getName(), dataId,
+                group, tenant, ContentUtils.truncateContent(content));
             return true;
         } else if (HttpURLConnection.HTTP_FORBIDDEN == result.code) {
-            log.warn(agent.getName(), "[publish-single] error, dataId={}, group={}, tenant={}, code={}, msg={}", dataId,
-                group, tenant, result.code, result.content);
+            LOGGER.warn("[{}] [publish-single] error, dataId={}, group={}, tenant={}, code={}, msg={}", agent.getName(),
+                dataId, group, tenant, result.code, result.content);
             throw new NacosException(result.code, result.content);
         } else {
-            log.warn(agent.getName(), "[publish-single] error, dataId={}, group={}, tenant={}, code={}, msg={}", dataId,
-                group, tenant, result.code, result.content);
+            LOGGER.warn("[{}] [publish-single] error, dataId={}, group={}, tenant={}, code={}, msg={}", agent.getName(),
+                dataId, group, tenant, result.code, result.content);
             return false;
         }
 

Diff for: client/pom.xml

@@ -18,10 +18,10 @@
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.client.config.impl.HttpSimpleClient.HttpResult;
 import com.alibaba.nacos.client.monitor.MetricsMonitor;
+import io.prometheus.client.Histogram;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 /**
  * MetricsHttpAgent
@@ -42,58 +42,50 @@ public void start() throws NacosException {
 
     @Override
     public HttpResult httpGet(String path, List<String> headers, List<String> paramValues, String encoding, long readTimeoutMs) throws IOException {
-        long start = System.currentTimeMillis();
-        long end = 0;
+        Histogram.Timer timer = MetricsMonitor.getConfigRequestMonitor("GET", path, "NA");
         HttpResult result = null;
         try {
             result = httpAgent.httpGet(path, headers, paramValues, encoding, readTimeoutMs);
         } catch (IOException e) {
-            end = System.currentTimeMillis();
-            MetricsMonitor.getConfigRequestMonitor("GET", path, "NA").record(end - start, TimeUnit.MILLISECONDS);
             throw e;
+        } finally {
+            timer.observeDuration();
+            timer.close();
         }
 
-        end = System.currentTimeMillis();
-        MetricsMonitor.getConfigRequestMonitor("GET", path, String.valueOf(result.code)).record(end - start, TimeUnit.MILLISECONDS);
-
         return result;
     }
 
     @Override
     public HttpResult httpPost(String path, List<String> headers, List<String> paramValues, String encoding, long readTimeoutMs) throws IOException {
-        long start = System.currentTimeMillis();
-        long end = 0;
+        Histogram.Timer timer = MetricsMonitor.getConfigRequestMonitor("POST", path, "NA");
         HttpResult result = null;
         try {
             result = httpAgent.httpPost(path, headers, paramValues, encoding, readTimeoutMs);
         } catch (IOException e) {
-            end = System.currentTimeMillis();
-            MetricsMonitor.getConfigRequestMonitor("POST", path, "NA").record(end - start, TimeUnit.MILLISECONDS);
             throw e;
+        } finally {
+            timer.observeDuration();
+            timer.close();
         }
 
-        end = System.currentTimeMillis();
-        MetricsMonitor.getConfigRequestMonitor("POST", path, String.valueOf(result.code)).record(end - start, TimeUnit.MILLISECONDS);
-
         return result;
     }
 
     @Override
     public HttpResult httpDelete(String path, List<String> headers, List<String> paramValues, String encoding, long readTimeoutMs) throws IOException {
-        long start = System.currentTimeMillis();
-        long end = 0;
+        Histogram.Timer timer = MetricsMonitor.getConfigRequestMonitor("DELETE", path, "NA");
         HttpResult result = null;
         try {
             result = httpAgent.httpDelete(path, headers, paramValues, encoding, readTimeoutMs);
         } catch (IOException e) {
-            end = System.currentTimeMillis();
-            MetricsMonitor.getConfigRequestMonitor("DELETE", path, "NA").record(end - start, TimeUnit.MILLISECONDS);
+
             throw e;
+        } finally {
+            timer.observeDuration();
+            timer.close();
         }
 
-        end = System.currentTimeMillis();
-        MetricsMonitor.getConfigRequestMonitor("DELETE", path, String.valueOf(result.code)).record(end - start, TimeUnit.MILLISECONDS);
-
         return result;
     }
 
@@ -117,3 +109,4 @@ public String getEncode() {
         return httpAgent.getEncode();
     }
 }
+