Merge pull request #1 from apache/master

update

Author: coder-yqj

.travis.yml

@@ -2,13 +2,14 @@ sudo: required
 
 language: java
 before_install:
+  - mkdir ci-dependencies
   - cd ci-dependencies
   - curl -O https://openskywalking.github.io/skywalking-ci-assist/jars/ojdbc14-10.2.0.4.0.jar
   - curl -O https://openskywalking.github.io/skywalking-ci-assist/jars/resin-4.0.41.jar
   - cd ..
 
 install:
   - jdk_switcher use oraclejdk8
-  - mvn clean install --quiet jacoco:report coveralls:report
+  - mvn clean install -Ptravis-ci-submodule --quiet jacoco:report coveralls:report
   - mvn clean javadoc:javadoc -Dmaven.test.skip=true --quiet
 

CHANGELOG.md

@@ -0,0 +1,102 @@
+ Changes by Version
+ ==================
+ Release Notes.
+  
+ 5.0.0-beta
+ ------------------
+ 
+#### UI -> Collector GraphQL query protocol
+  - Replace all tps to throughtput/cpm(calls per min)
+  - Add `getThermodynamic` service
+  - Update version to beta
+ 
+#### Agent Changes
+  - Support TLS.
+  - Support namespace.
+  - Support direct link.
+  - Support token.
+  - Add across thread toolkit.
+  - Add new plugin extend machenism to override agent core implementations.
+  - Fix an agent start up sequence bug.
+  - Fix wrong gc count.
+  - Remove system env override.
+  - Add Spring AOP aspect patch to avoid aop conflicts.
+ 
+#### Collector Changes
+  - Trace query based on timeline.
+  - Delete JVM aggregation in second.
+  - Support TLS.
+  - Support namespace.
+  - Support token auth.
+  - Group and aggregate requests based on reponse time and timeline, support Thermodynamic chart query
+  - Support component librariy setting through yml file for better extendibility.
+  - Optimize performance.
+  - Support short column name in ES or other storage implementor.
+  - Add a new cache module implementor, based on **Caffeine**.
+  - Support system property override settings.
+  - Refactor settings initialization.
+  - Provide collector instrumentation agent.
+  - Support .NET core component libraries.
+  - Fix `divide zero` in query.
+  - Fix `Data don't remove as expected` in ES implementor.
+  - Add some checks in collector modulization core.
+  - Add some test cases.
+ 
+#### UI Changes
+  - New trace query UI.
+  - New Application UI, merge server tab(removed) into applciation as sub page.
+  - New Topology UI.
+  - New response time / throughput TopN list.
+  - Add Thermodynamic chart in overview page.
+  - Change all tps to cpm(calls per minutes).
+  - Fix wrong osName in server view.
+  - Fix wrong startTime in trace view.
+  - Fix some icons internet requirements.
+ 
+#### Documents
+   - Add TLS document.
+   - Add namespace document.
+   - Add direct link document.
+   - Add token document.
+   - Add across thread toolkit document.
+   - Add a FAQ about, `Agent or collector version upgrade`.
+   - Sync all English document to Chinese.
+ 
+  [Issues and Pull requests](https://github.com/apache/incubator-skywalking/milestone/24)
+ 
+ 5.0.0-alpha
+ ------------------
+ 
+#### Agent -> Collector protocol
+ - Remove C++ keywords
+ - Move **Ref** into Span from Segment
+ - Add span type, when register an operation
+
+#### UI -> Collector GraphQL query protocol
+ - First version protocol
+ 
+#### Agent Changes
+ - Support gRPC 1.x plugin
+ - Support kafka 0.11 and 1.x plugin
+ - Support ServiceComb 0.x plugin
+ - Support optional plugin mechanism.
+ - Support Spring 3.x and 4.x bean annotation optional plugin
+ - Support Apache httpcomponent AsyncClient 4.x plugin 
+ - Provide automatic agent daily tests, and release reports [here](https://github.com/SkywalkingTest/agent-integration-test-report).
+ - Refactor Postgresql, Oracle, MySQL plugin for compatible.
+ - Fix jetty client 9 plugin error
+ - Fix async APIs of okhttp plugin error
+ - Fix log config didn't work
+ - Fix a class loader error in okhttp plugin
+ 
+#### Collector Changes
+ - Support metrics analysis and aggregation for application, application instance and service in minute, hour, day and month.
+ - Support new GraphQL query protocol
+ - Support alarm
+ - Provide a prototype instrument for collector.
+ - Support node speculate in cluster and application topology. (Provider Node -> Consumer Node) -> (Provider Node -> MQ Server -> Consumer Node)
+ 
+#### UI Changes
+ - New 5.0.0 UI!!!
+ 
+ [Issues and Pull requests](https://github.com/apache/incubator-skywalking/milestone/17)

CHANGES.md

@@ -1,4 +1,4 @@
-Apache SkyWalking (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator. 
+Apache SkyWalking (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC.
 Incubation is required of all newly accepted projects until a further review indicates 
 that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
 While incubation status is not necessarily a reflection of the completeness or stability of the code, 

DISCLAIMER

@@ -199,90 +199,3 @@
    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.
-
-=======================================================================
-Apache SkyWalking Subcomponents:
-
-The Apache SkyWalking project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
-licenses.
-
-========================================================================
-Apache 2.0 licenses
-========================================================================
-
-The following components are provided under the Apache License. See project link for details.
-The text of each license is also included at licenses/LICENSE-[project].txt.
-
-    raphw (byte-buddy): http://bytebuddy.net/ , Apache 2.0
-    Google: grpc: https://grpc.io/ , Apache 2.0
-    Google: guava: https://github.com/google/guava , Apache 2.0
-    Google: gson: https://github.com/google/gson , Apache 2.0
-    Elasticsearch BV (Elasticsearch): https://www.elastic.co/products/elasticsearch , Apache 2.0
-    LMAX Ltd.(disruptor): https://github.com/LMAX-Exchange/disruptor , Apache 2.0
-    powermock: https://github.com/powermock/powermock , Apache 2.0
-    Eclipse (Jetty): https://www.eclipse.org/jetty/ , Apache 2.0 and Eclipse Public License 1.0
-    SnakeYAML: http://www.snakeyaml.org , Apache 2.0
-    Joda-Time: http://www.joda.org/joda-time/ , Apache 2.0
-    Spring Boot: https://spring.io/, Apache 2.0
-    Spring Cloud: http://projects.spring.io/spring-cloud/, Apache-2.0
-    Spring Cloud Netflix Zuul: https://github.com/spring-cloud/spring-cloud-netflix, Apache 2.0
-
-
-========================================================================
-MIT licenses
-========================================================================
-
-The following components are provided under the MIT License. See project link for details.
-The text of each license is also included at licenses/LICENSE-[project].txt.
-
-    mockito: http://site.mockito.org/ , MIT
-    QOS.ch (slf4j): https://www.slf4j.org/ , MIT
-    Jedis: https://github.com/xetorthio/jedis , MIT
-    GraphQL Java Tools: https://github.com/graphql-java/graphql-java-tools , MIT
-    antd: https://github.com/ant-design/ant-design , MIT
-    babel-runtime: https://github.com/babel/babel , MIT
-    bizcharts: https://github.com/alibaba/BizCharts , MIT
-    classnames: https://github.com/JedWatson/classnames/raw/master/LICENSE , MIT
-    cytoscape-cose-bilkent: https://github.com/cytoscape/cytoscape.js-cose-bilkent , MIT
-    cytoscape-node-html-label: https://github.com/kaluginserg/cytoscape-node-html-label , MIT
-    cytoscape: https://github.com/cytoscape/cytoscape.js , MIT
-    dva-loading: https://github.com/dvajs/dva , MIT
-    dva: https://github.com/dvajs/dva , MIT
-    enquire-js: https://github.com/jljsj/enquire-js , MIT
-    fastclick: https://github.com/ftlabs/fastclick , MIT
-    lodash-decorators: https://github.com/steelsojka/lodash-decorators , MIT
-    lodash: https://github.com/lodash/lodash , MIT
-    moment: https://github.com/moment/moment , MIT
-    numeral: https://github.com/adamwdraper/Numeral-js , MIT
-    omit.js: https://github.com/benjycui/omit.js , MIT
-    path-to-regexp: https://github.com/pillarjs/path-to-regexp , MIT
-    prop-types: https://github.com/facebook/prop-types , MIT
-    rc-drawer-menu: https://github.com/ant-motion/drawer-menu , MIT
-    react-container-query: https://github.com/d6u/react-container-query , MIT
-    react-document-title: https://github.com/gaearon/react-document-title , MIT
-    react-dom: https://github.com/facebook/react , MIT
-    react-fittext: https://github.com/gianu/react-fittext , MIT
-    react: https://github.com/facebook/react , MIT
-    url-polyfill: https://github.com/lifaon74/url-polyfill , MIT
-
-========================================================================
-BSD-3 licenses
-========================================================================
-
-The following components are provided under a BSD-3 license. See project link for details.
-The text of each license is also included at licenses/LICENSE-[project].txt.
-
-    asm:https://gitlab.ow2.org , BSD-3-Clause
-    d3: https://github.com/d3/d3 , BSD-3-Clause
-    qs: https://github.com/ljharb/qs , BSD-3-Clause
-
-========================================================================
-MPL 2.0 licenses
-========================================================================
-
-The following components are provided under a MPL 2.0 license. See project link for details.
-The text of each license is also included at licenses/LICENSE-[project].txt.
-
-    H2 Database: http://www.h2database.com/html/main.html , MPL 2.0 or EPL 1.0