Merge pull request #3 from uavorg/master

merge from uavstack

README.md

@@ -87,9 +87,9 @@ uavstack is the All in One source repository of UAVStack.
 * 服务授权（代码整理中，陆续更新...）
 
 # 如何构建 How to Build
-如果由于缺少jar包或某些依赖jar无法下载导致Maven Build Failure，可下载[参考Maven依赖仓库](http://pan.baidu.com/s/1i5veR33)，使用该Maven仓库或将其复制到你正在使用的Maven仓库中。
+如果由于缺少jar包或某些依赖jar无法下载导致Maven Build Failure，可下载[参考Maven依赖仓库](https://pan.baidu.com/s/1gfeY8pH)，使用该Maven仓库或将其复制到你正在使用的Maven仓库中。
 
-If you are unable to build because of the lack of jar packages or certain dependency jar, pleaser refer this [Maven Repository](http://pan.baidu.com/s/1i5veR33), use the Maven repository, or copy it to the Maven warehouse you are using.
+If you are unable to build because of the lack of jar packages or certain dependency jar, pleaser refer this [Maven Repository](https://pan.baidu.com/s/1gfeY8pH), use the Maven repository, or copy it to the Maven warehouse you are using.
 
 1. build com.creditease.uav.superpom
 ```
@@ -150,23 +150,23 @@ build结果
 
 # 下载中心 Downloads
 ## 全维监控UAV.Monitor+APM
-* [MOF探针](http://pan.baidu.com/s/1c1P0rni)
-* [监控代理程序](http://pan.baidu.com/s/1cD9tuu)
-* [健康管理服务](http://pan.baidu.com/s/1eROaqEA)
-* [AppHub](http://pan.baidu.com/s/1dEBlhwX)
+* [MOF探针](https://pan.baidu.com/s/1cg4J0q)
+* [监控代理程序](https://pan.baidu.com/s/1ge5MJ9h)
+* [健康管理服务](https://pan.baidu.com/s/1i4HnV85)
+* [AppHub](https://pan.baidu.com/s/1dFxtDZV)
 
 ## 第三方下载 Thirdparty Downloads
-* [rocket.war](http://pan.baidu.com/s/1pKCmJ3P)
+* [rocket.war](https://pan.baidu.com/s/1dF6NeHN)
 
 ## AllInOne开发演示版 AllInOne Install Downloads
 开发演示版的健康管理服务(HM)仅适合开发环境，演示环境，小规模测试环境。
 生产环境推荐使用[分布式部署](https://uavorg.github.io/main/uavdoc_deploydocs/healmanagerInstall/healmanagerInstall/microservice.html)
 
 The health management service (HM) in AllInOne Install Package is only suitable for development environments, demos, and small scale testing environments. [A distributed deployment](https://uavorg.github.io/main/uavdoc_deploydocs/healmanagerInstall/healmanagerInstall/microservice.html) is recommended for the production environment
 
-* [Windows64位](http://pan.baidu.com/s/1boA9p75)
-* [Mac](http://pan.baidu.com/s/1boOMZ2f)
-* [Linux(CentOS)](http://pan.baidu.com/s/1qYSG5QW)
+* [Windows64位](https://pan.baidu.com/s/1jIF0wNs)
+* [Mac](https://pan.baidu.com/s/1mhCykp6)
+* [Linux(CentOS)](https://pan.baidu.com/s/1nvj6jW1)
 
 
 

com.creditease.uav.agent.buildComponent/bin/start.bat

@@ -19,4 +19,4 @@ if not exist C:\Windows\System32\drivers\npf.sys (move lib\npf.sys C:\Windows\Sy
 set CLASSPATH=bin/com.creditease.uav.base-1.0-boot.jar
 set javaAgent="-javaagent:../uavmof/com.creditease.uav.agent/com.creditease.uav.monitorframework.agent-1.0-agent.jar"
 set javaOpts=-server -Xms64m -Xmx256m -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+CMSIncrementalPacing -XX:CMSIncrementalDutyCycleMin=0 -XX:CMSIncrementalDutyCycle=10 -XX:+UseParNewGC
-java %javaAgent% %javaOpts% -Djava.library.path=./lib -DNetCardIndex=0 -DJAppID=%appID% -DJAppGroup=UAV -classpath "%CLASSPATH%" com.creditease.mscp.boot.MSCPBoot -p %profile%
+%executeJava% %javaAgent% %javaOpts% -Djava.library.path=./lib -DNetCardIndex=0 -DJAppID=%appID% -DJAppGroup=UAV -classpath "%CLASSPATH%" com.creditease.mscp.boot.MSCPBoot -p %profile%

com.creditease.uav.base/src/main/java/com/creditease/agent/profile/api/StandardProfileModeler.java

@@ -45,6 +45,8 @@ public class StandardProfileModeler extends AbstractBaseAction {
 
     protected IStandardProfileModelListener listener;
 
+    protected static final String LAZY_INFO = "@LAZY";
+
     public StandardProfileModeler(String cName, String feature, IActionEngine engine) {
         this(cName, feature, engine, null);
     }
@@ -286,8 +288,7 @@ private void createAppProfileData(ActionContext context, MonitorDataFrame mdf, M
         /**
          * lib
          */
-
-        pi.put("jars.lib", "@LAZY");
+        pi.put("jars.lib", LAZY_INFO);
 
         /**
          * logs
@@ -340,8 +341,7 @@ private void buildDubboServiceComponents(MonitorDataFrame mdf, Map<String, Objec
         if (comps == null || comps.size() == 0) {
             return;
         }
-
-        pi.put("cpt.dubbo.provider", JSONHelper.toString(comps));
+        pi.put("cpt.dubbo.provider", LAZY_INFO);
 
         for (String compName : comps.keySet()) {
 
@@ -429,7 +429,7 @@ private void buildMSCPServiceComponents(MonitorDataFrame mdf, Map<String, Object
 
         if (mscpHttp != null && mscpHttp.size() > 0) {
 
-            pi.put("cpt.mscp.http", JSONHelper.toString(mscpHttp));
+            pi.put("cpt.mscp.http", LAZY_INFO);
 
             for (String mscpCompName : mscpHttp.keySet()) {
                 Map<String, Object> info = (Map<String, Object>) mscpHttp.get(mscpCompName);
@@ -461,10 +461,10 @@ private void buildMSCPServiceComponents(MonitorDataFrame mdf, Map<String, Object
         // timer work
         Map<String, Object> mscpTimeWork = mdf.getElemInstValues(appid, "cpt",
                 "com.creditease.agent.spi.AbstractTimerWork");
-
         if (mscpTimeWork != null && mscpTimeWork.size() > 0) {
-            pi.put("cpt.mscp.timework", JSONHelper.toString(mscpTimeWork));
+            pi.put("cpt.mscp.timework", LAZY_INFO);
         }
+
     }
 
     /**
@@ -479,48 +479,63 @@ private void buildMSCPServiceComponents(MonitorDataFrame mdf, Map<String, Object
     private void buildJEEServiceComponents(MonitorDataFrame mdf, Map<String, Object> pi, String appid, String appurl,
             Map<String, Set<String>> compServices) {
 
-        Map<String, Object> filters = mdf.getElemInstValues(appid, "cpt", "javax.servlet.annotation.WebFilter");
-
-        Map<String, Object> listeners = mdf.getElemInstValues(appid, "cpt", "javax.servlet.annotation.WebListener");
-
-        pi.put("cpt.filters", JSONHelper.toString(filters));
-
-        pi.put("cpt.listeners", JSONHelper.toString(listeners));
-
         Map<String, Object> servlets = mdf.getElemInstValues(appid, "cpt", "javax.servlet.annotation.WebServlet");
 
         // all servlet based tech
         if (servlets == null || servlets.size() == 0) {
             return;
         }
+        pi.put("cpt.servlets", LAZY_INFO);
 
         // get servlets URLs
         Map<String, String> serviceServlets = getServletsURLs(appurl, compServices, servlets);
 
         Map<String, Object> jaxws = mdf.getElemInstValues(appid, "cpt", "javax.jws.WebService");
 
+        if (jaxws != null && jaxws.size() > 0) {
+            pi.put("cpt.jaxws", LAZY_INFO);
+        }
+
         String jaxwsBaseURL = serviceServlets.get("jaxws");
 
         // get jaxws URLs
         getJAXWSURLs(compServices, jaxws, serviceServlets, appurl);
 
         Map<String, Object> jaxwsProviders = mdf.getElemInstValues(appid, "cpt", "javax.xml.ws.WebServiceProvider");
 
+        if (jaxwsProviders != null && jaxwsProviders.size() > 0) {
+            pi.put("cpt.jaxwsP", LAZY_INFO);
+
+        }
+
         // get jaxws provider urls
         getJAXWSProviderURLs(jaxwsBaseURL, compServices, jaxwsProviders);
 
         Map<String, Object> jaxrs = mdf.getElemInstValues(appid, "cpt", "javax.ws.rs.Path");
 
+        if (jaxrs != null && jaxrs.size() > 0) {
+            pi.put("cpt.jaxrs", LAZY_INFO);
+
+        }
+
         // get jaxrs urls
         String jaxrsBaseURL = serviceServlets.get("jaxrs");
 
         getJAXRSURLs(jaxrsBaseURL, compServices, jaxrs);
 
         Map<String, Object> springMVC = mdf.getElemInstValues(appid, "cpt",
                 "org.springframework.stereotype.Controller");
+        if (springMVC != null && springMVC.size() > 0) {
+            pi.put("cpt.springmvc", LAZY_INFO);
+
+        }
 
         Map<String, Object> springMVCRest = mdf.getElemInstValues(appid, "cpt",
                 "org.springframework.web.bind.annotation.RestController");
+        if (springMVCRest != null && springMVCRest.size() > 0) {
+            pi.put("cpt.springmvcRest", LAZY_INFO);
+
+        }
 
         // get spring mvc urls
         String springmvcBaseURL = serviceServlets.get("springmvc");
@@ -531,15 +546,25 @@ private void buildJEEServiceComponents(MonitorDataFrame mdf, Map<String, Object>
 
         // get struts2 urls
         Map<String, Object> strutsAction = mdf.getElemInstValues(appid, "cpt", "com.opensymphony.xwork2.Action");
+        if (strutsAction != null && strutsAction.size() > 0) {
+            pi.put("cpt.struts2", LAZY_INFO);
+
+        }
         getStruts2URLs(appurl, compServices, strutsAction);
 
-        pi.put("cpt.servlets", JSONHelper.toString(servlets));
-        pi.put("cpt.jaxws", JSONHelper.toString(jaxws));
-        pi.put("cpt.jaxwsP", JSONHelper.toString(jaxwsProviders));
-        pi.put("cpt.jaxrs", JSONHelper.toString(jaxrs));
-        pi.put("cpt.springmvc", JSONHelper.toString(springMVC));
-        pi.put("cpt.springmvcRest", JSONHelper.toString(springMVCRest));
-        pi.put("cpt.struts2", JSONHelper.toString(strutsAction));
+        // get filters and listeners
+        Map<String, Object> filters = mdf.getElemInstValues(appid, "cpt", "javax.servlet.annotation.WebFilter");
+        if (filters != null && filters.size() > 0) {
+            pi.put("cpt.filters", LAZY_INFO);
+
+        }
+
+        Map<String, Object> listeners = mdf.getElemInstValues(appid, "cpt", "javax.servlet.annotation.WebListener");
+        if (listeners != null && listeners.size() > 0) {
+            pi.put("cpt.listeners", LAZY_INFO);
+
+        }
+
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })

com.creditease.uav.console.buildComponent/config/web_pro.xml

@@ -33,7 +33,7 @@
 			<param-name>es.info</param-name>
 			<param-value>{"forwar.url":"http://127.0.0.1:9200,http://127.0.0.1:9200"}</param-value>
 		</init-param>
-		<load-on-startup>3</load-on-startup>
+		<load-on-startup>2</load-on-startup>
 		<async-supported>true</async-supported>
 	</servlet>
 
@@ -45,7 +45,7 @@
 	<servlet>
 		<servlet-name>opentsdb-agent-servlet</servlet-name>
 		<servlet-class>com.creditease.uav.opentsdb.OpenTSDBRestAgentServlet</servlet-class>
-		<load-on-startup>2</load-on-startup>
+		<load-on-startup>3</load-on-startup>
 		<async-supported>true</async-supported>
 	</servlet>
 
@@ -89,7 +89,6 @@
 			<param-name>log.app.enable</param-name>
 			<param-value>true</param-value>
 		</init-param>
-		<load-on-startup>2</load-on-startup>
 		<async-supported>true</async-supported>
     </filter>
     <filter-mapping>

com.creditease.uav.console.buildComponent/config/web_test.xml

@@ -33,7 +33,7 @@
 			<param-name>es.info</param-name>
 			<param-value>{"forwar.url":"http://127.0.0.1:9200,http://127.0.0.1:9200"}</param-value>
 		</init-param>
-		<load-on-startup>3</load-on-startup>
+		<load-on-startup>2</load-on-startup>
 		<async-supported>true</async-supported>
 	</servlet>
 
@@ -45,7 +45,7 @@
 	<servlet>
 		<servlet-name>opentsdb-agent-servlet</servlet-name>
 		<servlet-class>com.creditease.uav.opentsdb.OpenTSDBRestAgentServlet</servlet-class>
-		<load-on-startup>2</load-on-startup>
+		<load-on-startup>3</load-on-startup>
 		<async-supported>true</async-supported>
 	</servlet>
 
@@ -89,7 +89,6 @@
 			<param-name>log.app.enable</param-name>
 			<param-value>true</param-value>
 		</init-param>
-		<load-on-startup>2</load-on-startup>
 		<async-supported>true</async-supported>
     </filter>
     <filter-mapping>

com.creditease.uav.console/src/main/webapp/WEB-INF/web.xml

@@ -32,7 +32,7 @@
 			<param-name>es.info</param-name>
 			<param-value>{"forwar.url":"http://localhost:9200"}</param-value>
 		</init-param>
-		<load-on-startup>3</load-on-startup>
+		<load-on-startup>2</load-on-startup>
 		<async-supported>true</async-supported>
 	</servlet>
 
@@ -44,7 +44,7 @@
 	<servlet>
 		<servlet-name>opentsdb-agent-servlet</servlet-name>
 		<servlet-class>com.creditease.uav.opentsdb.OpenTSDBRestAgentServlet</servlet-class>
-		<load-on-startup>2</load-on-startup>
+		<load-on-startup>3</load-on-startup>
 		<async-supported>true</async-supported>
 	</servlet>
 
@@ -88,7 +88,6 @@
 			<param-name>log.app.enable</param-name>
 			<param-value>true</param-value>
 		</init-param>
-		<load-on-startup>2</load-on-startup>
 		<async-supported>true</async-supported>
     </filter>
     <filter-mapping>