This is an automated email from the ASF dual-hosted git repository.

pengys pushed a change to branch doc/roadmap
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.


    from 9d683d7  Update ROADMAP.md
     add dbee953  Add [Agent] V1 servicecomb  plugin
     add 45d9491  Adjust build guide document.
     add 29fcc3d  Update README.md
     add 8a33bf7  Update README_ZH.md
     add f82d339  Update README_ZH.md
     add de383fe  Update README_ZH.md
     add 93bf408  Merge pull request #824 from apache/doc/how-to-build
     add 047df44  Merge branch 'master' into servicecomb
     add 00f7900  Merge pull request #826 from lytscu/servicecomb
     add 2c493bc  [Agent] fix the servicecomb-1.x-plugin build failure in local 
workdir
     add 239579f  Merge pull request #827 from 
ascrutae/fix/servicecomb-1.x-plugin-compile-failure
     add 338b2c6  The nodes and calls in cluster topology build success.
     add 7ce2ac5  Set call type on line, but when source is USER then return 
empty string.
     add 1cca13d  Change the attribute name from responseTimePerSec to 
avgResponseTime.
     add fc86ef6  Calculate SLA and APDEX metric.
     add 3c8eaa8  Get number of server for application node.
     add bece77e  TPS calculate.
     add 8d38197  [Agent] fix HierarchyMatch donot support generic type
     add e8477c0  Merge pull request #828 from ascrutae/feature/generic-type
     add 158b6ff  Fixing javadoc. And try to trigger a ci fail in this commit, 
in order to make sure javadoc will be checked in further pull request.
     add 1d6ca31  Commit many java doc fixes.
     add 400ad41  Fix all javadoc issues.
     add 64d0660  Fix optional plugin javadoc
     add 5ba864d  Fix an oracle javadoc.
     add df328b6  Try another ci command to speed up.
     add e72f668  Merge pull request #830 from apache/fix/javadoc
     add f7fdd9f  Fix assmbly for mvn clean install -Papache-release and update 
version to SNAPSHOT for SNAPSHOT release.
     add 0a5c4ec  Merge pull request #831 from apache/deploy-snapshot
     add a3cb3e4  add hystrix framework to support list
     add b090cfa  Move Hystrix to Spring Ecosystem
     add 0d6233d  [Agent] fix that javadoc import unused class cause 
classloader issue
     add 49b4314  fix check style failed
     add 83461aa  fix checkstyle failed
     add 7f83f42  Merge pull request #833 from ascrutae/fix/remove-javadoc
     add 2893d38  Merge branch 'master' into feature/support-list-hystrix
     add fe587c8  Update Supported-list.md
     add fa99652  [Agent] Support hystrix plugin
     add c58c9ec  Merge upstream/master to master
     add 6545671  add comment
     add b4d58cd  Adjust variable name and remove some confuse comment
     add 851ee0f  Merge branch 'master' into feature/support-hystrix-plugin
     add 107eaac  Adjust hystrix plugin buried point
     add acae617  Merge branch 'master' into feature/support-hystrix-plugin
     add a1711f7  Update pom.xml
     add 64c48ea  remove javadoc
     add 9a401a3  Merge branch 'master' into feature/support-hystrix-plugin
     add 66e3eb0  [Agent] fix some intercept package name about toolkit's class 
is incorrect
     add 014fd12  Merge pull request #835 from ascrutae/fix/toolkit-issue
     add 2b153b8  Merge branch 'master' into feature/support-hystrix-plugin
     add ca9bada  Merge pull request #829 from 
ascrutae/feature/support-hystrix-plugin
     add dd4626f  Merge branch 'master' into feature/support-list-hystrix
     add 818b6b4  Merge pull request #834 from 
ascrutae/feature/support-list-hystrix
     add 2e9f07c  Merge remote-tracking branch 'upstream/master' into 
feature/getClusterTopology
     add 9cd0f98  Merge pull request #836 from 
peng-yongsheng/feature/getClusterTopology
     add 7de5718  1. Add the column named srcSpanType into service_name table. 
2. Add column named service_name_keyword into service_name elastic search table 
by the type of keyword.
     add 0692d41  1. Make the number of service contains the entry src span 
type only. 2. Make the number of application not contains user application.
     add e90cfc8  Merge pull request #837 from 
peng-yongsheng/feature/getClusterBrief
     add 2caa29a  1. Changed the attribute name from TPS to callsPerSec. 2. 
Calculate the callsPerSec.
     add 4086122  Merge pull request #838 from 
peng-yongsheng/feature/getTopNSlowService
     add 62d5148  1. Changed the attribute name from TPS to callsPerSec. 2. 
Calculate the callsPerSec.
     add 534b049  Fix typo. K8s - > Kubernetes
     add f50c5b1  add rocketMQ-3.x-plugin
     add 3b58be2  Merge branch 'master' of 
https://github.com/carlvine500/incubator-skywalking
     add 02d1ec4  Merge branch 'master' into master
     add e56a5e6  Merge https://github.com/apache/incubator-skywalking
     add 8956b9b  rocketMQ-3.x-plugin class MQVersion cause 
ClassNotFoundException
     add bcec5c8  rocketmq-3.x-plugin refactor tag name
     add 8d5fbcf  update rocketMQ-3.x-plugin junit tests like 
rocketMQ-4.x-plugin
     add 2f70e3a  Merge branch 'master' into master
     add eb70abd  Merge branch 'master' of 
https://github.com/carlvine500/incubator-skywalking
     add 78b4b34  remove interceptor in xxxInstrument
     add e2adfe4  Merge branch 'master' into master
     add e9c9a3e  Merge branch 'master' into master
     add 14546ec  Update pom.xml
     add 2e3ee1b  Merge branch 'master' of 
https://github.com/carlvine500/incubator-skywalking
     add 4019070  Merge branch 'master' into master
     add d1a6f0d  Merge pull request #796 from carlvine500/master
     add 6f12e8b  Merge branch 'master' into fix/typo
     add 2fb111c  Merge pull request #839 from apache/fix/typo
     add 1b2376c  Merge branch 'master' into 
feature/getTopNApplicationThroughput
     add 8186365  Merge pull request #840 from 
peng-yongsheng/feature/getTopNApplicationThroughput
     add 9bde7b7  Remove the application named USER.
     add ea33be3  Merge pull request #841 from 
peng-yongsheng/feature/getAllApplication
     add 8419aa3  Refactor topology build logic.
     add 7039338  Add apm-webapp module
     add a393abc  Merge pull request #2 from apache/master
     add 4139918  Merge pull request #3 from hanahmily/master
     add 9e6160e  Update submodule skywalking-ui
     add d5ce8fd  Add travis debug
     add 19c58e0  Add test case
     add e729290  Merge pull request #4 from apache/master
     add 022f703  Overhaul pom.xml
     add 726cd84  Merge pull request #842 from hanahmily/module/apm-webapp
     add 2fe8577  Merge branch 'master' into feature/getApplicationTopology
     add e138b8d  Merge pull request #844 from 
peng-yongsheng/feature/getApplicationTopology
     add 9b24f52  Calculate callsPerSec metric.
     add 71eb594  Merge pull request #846 from 
peng-yongsheng/feature/getSlowService
     add c1fedb0  1. Changed the attribute name from TPS to callsPerSec. 2. 
Calculate the callsPerSec.
     add d66f56a  Change the parameter name: Start -> startSecondTimeBucket End 
-> endSecondTimeBucket
     add a5216a9  1. Change the parameter name: Start -> startSecondTimeBucket 
End -> endSecondTimeBucket
     add 45a718d  1. Change the parameter name: Start -> startTimeBucket End -> 
endTimeBucket
     add 48981e8  1. Change the parameter name: Start -> startTimeBucket End -> 
endTimeBucket
     add 4057f37  Merge pull request #848 from 
peng-yongsheng/feature/getServerThroughput
     add 91a2209  Merge branch 'master' into feature/getServerResponseTimeTrend
     add 43ddc84  Merge branch 'master' into feature/searchServer
     add 6fd9c3b  Merge pull request #849 from 
peng-yongsheng/feature/searchServer
     add cc1c25a  Merge branch 'master' into feature/getServerResponseTimeTrend
     add 7e740a2  Merge pull request #850 from 
peng-yongsheng/feature/getServerResponseTimeTrend
     add 96b5b20  searchService: add the src span type condition by the value 
of SpanType.Entry_VALUE.
     add c33ac10  getServiceTPSTrend: 1. Change the parameter name: Start -> 
startTimeBucket End -> endTimeBucket 2. Calculate callsPerSec metric.
     add 5af1c91  getServiceSLATrend: 1. Change the parameter name: Start -> 
startTimeBucket End -> endTimeBucket
     add 573291e  Refactor service topology build logic.
     add 196354f  Add apm-backend-dist module
     add 9cb0a53  Convert CRLF to LF
     add cfb6462  Amend bash
     add 8dd788d  HttpGet:add http time out
     add 880bc8b  Merge branch 'master' into add-http-time-out
     add b76b373  Merge pull request #847 from carlvine500/add-http-time-out
     add 28d2911  Merge branch 'master' into module/apm-backend-dist
     add fc5eada  Merge pull request #852 from hanahmily/module/apm-backend-dist
     add 7e5ad62  Merge branch 'master' into feature/ServiceQuery
     add ce3bff8  Merge pull request #853 from 
peng-yongsheng/feature/ServiceQuery
     add b7f1f4c  queryBasicTraces: 1. Query segment id from global trace table 
by trace id. 2. Query BasicTrace from segment duration table by segment id.
     add a498a91  Merge pull request #854 from peng-yongsheng/feature/TraceQuery
     add 08d26ec  Change the traceId type to be collection in trace graphql 
protocol.
     add accaf60  Merge pull request #856 from 
peng-yongsheng/feature/queryBasicTraces
     add c2ddbe9  UI up to date.
     add 6ba42f3  Merge pull request #857 from apache/sync-ui
     add f9c241c  Pagination calculate
     add 36d0eb5  getAlarmTrend ok.
     add 3863aa7  1. Generate alarm content. 2. loadAlarmList ok.
     add fc5f67f  Setting the alarm attributes in topology.
     add 75a9283  1. Add application code into instance table. 2. Search server 
by application code by searchServer method.
     add 710cce1  Include the agent into `dist`
     add 56fd109  Rename dist.
     add 6b04ad6  Fix source package of agent.
     add 766a78d  Merge pull request #861 from apache/re-organize-dist
     add d615a69  Merge branch 'master' into feature/appCodeInServer
     add e7a6a24  Merge pull request #863 from 
peng-yongsheng/feature/appCodeInServer
     add 43f3e8e  Merge pull request #5 from apache/master
     add f293abc  Update skywalking-ui submodule
     add 1b7ac0f  Merge branch 'master' into feature/Alarm
     add 718d88c  Merge branch 'master' into feature/Alarm
     add 560d9bf  Merge pull request #860 from peng-yongsheng/feature/Alarm
     add 25ac1ca  Merge branch 'master' into submodule/update-ui
     add ad31bf2  Update skywalking-ui submodule
     add eee27e0  Merge pull request #864 from hanahmily/submodule/update-ui
     add 73f108a  Fix dist deploy
     add baa5765  Merge pull request #866 from apache/fix/dist
     add a7bbe2f  Sync UI updates.
     add 21c58f0  Update some documents for 5.0.0-alpha release.
     add 00a9cde  Add UI startup.sh description.
     add 293fd9a  Sync Chinese doc
     add 5765b1e  Remove all bintray related.
     add 9ae8318  Rename collector to backend
     add 0ef48ad  Merge pull request #867 from apache/5.0.0-alpha-doc
     add fd3d5ad  Merge branch 'master' into sync-ui
     add 5825914  Fixed the Dashboard and Topology bug.
     add 6ba5453  Use JVM metric to update instance heart beat time when using 
java agent.
     add 41840ce  Fixed the bug which the memory max non heap metric value is 
-1 when using JDK 1.8.
     add bdc0601  Fixed the call type in calls of topology.
     add 09f9c12  Fixed the pagination bug.
     add 40eeb87  1. Get the service id only when agent register service name. 
2. Setting the src span type when agent register service name. 3. Revert the 
topology build logic.
     add 5d0ea12  Merge branch 'master' into fixed/855
     add 8b366e1  Merge branch 'fixed/855' of 
https://github.com/peng-yongsheng/incubator-skywalking into fixed/855
     add 0e61c97  Merge branch 'master' into fixed/855
     add e7b3014  Merge pull request #865 from peng-yongsheng/fixed/855
     add c6dce72  Merge branch 'master' into sync-ui
     add 10ccd4f  Merge pull request #868 from apache/sync-ui
     add 8e3e0a3  Clear the duration in query condition when trace id is not 
empty.
     add c7dae33  Make the alarm trend rate value is 0 when application size 
equal to 0.
     add da3d993  Add application node when the source of reference is not have 
application metric.
     add 0006cb4  Fixed the NullPointerException in getServerThroughput method.
     add ca20d08  Use application mapping to get the actual application id for 
the alarm title.
     add 610edfe  Fixed compile error.
     add 9b6f872  Merge pull request #870 from peng-yongsheng/fixed/855
     add b4f455c  Merge branch 'master' of 
https://github.com/apache/incubator-skywalking into apache-master
     add 00229e4  Merge branch 'apache-master' into submodule/update-ui
     add 67a8771  Merge pull request #872 from hanahmily/submodule/update-ui
     add 7a73e3b  Add the third Party Components description into notice file.
     add cc30009  Update submodule/skywaling-ui
     add a66d280  Merge pull request #876 from hanahmily/submodule/update-ui
     add 5776889  Merge branch 'master' into feature/notice
     add ae6a739  Update NOTICE.txt
     add c587b9f  Report @ 2018/03/04 23:00, Dashboard [COLLECTOR] The 
/api/dashboard response is incorrect . Fixed the number of application bug.
     add a9850c1  Report @ 2018/03/04 23:00, Application, [COLLECTOR] The 
topology is incorrect. Fixed the getApplicationTopology bug, remove the 
application node which not contains the source or target of calls.
     add 9e9c08d  Merge pull request #879 from peng-yongsheng/fixed/855
     add ba3a506  Merge branch 'master' into feature/notice
     add 4a7f11c  Merge pull request #878 from peng-yongsheng/feature/notice
     add 2688904  [Agent] fix create entry span failure
     add de81e21  Merge pull request #881 from ascrutae/fix/entry-span-issue
     add 87c0f73  Make the page number to be 1 when the value equal to 0.
     add 9906e68  When entry span layer is MQ: 1. Use peer id in entry span to 
find the instance id and application id. 2. Make the instance id and 
application id to be the front instance id and front application id of the 
reference metric. 3. Do not create the application mapping metric.
     add 24468b1  Add the segmentId into BasicTrace which belongs to trace 
query graphql protocol.
     add 77f7ce2  Update NOTICE.txt
     add b74f59e  Merge branch 'master' into 5.0.0-alpha-doc
     add 12a486f  Merge branch 'master' into 5.0.0-alpha-doc
     add 101fc11  Merge pull request #880 from apache/5.0.0-alpha-doc
     add 3d1acbc  Merge branch 'master' into fixed/855
     add fd5ef76  Create CONTRIBUTING.md
     add a8459e6  Merge pull request #882 from apache/contributing-doc
     add 07151c5  Merge branch 'master' into fixed/855
     add c9bb341  Merge pull request #883 from peng-yongsheng/fixed/855
     add 6c13c38  Remove docker document and docker plugin
     add 395ad44  The instance heart beat implementation of http JSON protocol.
     add 845f553  Merge branch 'master' into feature/http_json
     add beda526  Merge pull request #884 from peng-yongsheng/feature/http_json
     add 26d108d  Merge branch 'master' into fix/remove-docker
     add f436c99  Merge pull request #885 from ascrutae/fix/remove-docker
     add 58f4207  Change some files for preparing release. (#887)
     add 2fbf617  Update webapp start script (#888)
     add f17f69b  Update doc for ui deploy (#889)
     add 6e89250  Get the MQ server address id from reference. (#891)
     add d8bc2a1  Update COC to Apache edition (#890)
     add d3f87ed  Merge branch 'master' into doc/roadmap

No new revisions were added by this update.

Summary of changes:
 .gitignore                                         |   2 +
 .travis.yml                                        |   1 +
 CODE_OF_CONDUCT.md                                 |  90 +++++---
 CONTRIBUTING.md                                    |  43 ++++
 NOTICE                                             |  53 +++++
 NOTICE.txt                                         |  21 --
 README.md                                          |   3 +-
 README_ZH.md                                       |   8 +-
 .../apm-toolkit-log4j-1.x/pom.xml                  |  11 +-
 .../apm-toolkit-log4j-2.x/pom.xml                  |  10 +-
 .../toolkit/log/log4j/v2/x/TraceIdConverter.java   |   2 +-
 .../apm-toolkit-logback-1.x/pom.xml                |  11 +-
 .../apm-toolkit-opentracing/pom.xml                |  11 +-
 apm-application-toolkit/apm-toolkit-trace/pom.xml  |  11 +-
 apm-application-toolkit/pom.xml                    |   2 +-
 .../agent-grpc/agent-grpc-define/pom.xml           |   2 +-
 .../agent-grpc/agent-grpc-provider/pom.xml         |   2 +-
 .../provider/handler/JVMMetricsServiceHandler.java |   9 +
 .../ServiceNameDiscoveryServiceHandler.java        |   3 +-
 .../grpc/provider/handler/mock/RegisterMock.java   |   3 +
 .../apm-collector-agent/agent-grpc/pom.xml         |   2 +-
 .../agent-jetty/agent-jetty-define/pom.xml         |   2 +-
 .../agent-jetty/agent-jetty-provider/pom.xml       |  12 +-
 ...r.java => InstanceHeartBeatServletHandler.java} |  35 ++--
 .../ServiceNameDiscoveryServiceHandler.java        |   4 +-
 .../apm-collector-agent/agent-jetty/pom.xml        |   2 +-
 apm-collector/apm-collector-agent/pom.xml          |   2 +-
 .../analysis-alarm/alarm-define/pom.xml            |   2 +-
 .../analysis-alarm/alarm-provider/pom.xml          |   7 +-
 .../alarm/provider/worker/AlarmAssertWorker.java   |  10 +-
 .../ApplicationMetricAlarmAssertWorker.java        |  22 ++
 ...pplicationReferenceMetricAlarmAssertWorker.java |  22 ++
 .../instance/InstanceMetricAlarmAssertWorker.java  |  30 +++
 .../InstanceReferenceMetricAlarmAssertWorker.java  |  30 +++
 .../service/ServiceMetricAlarmAssertWorker.java    |  22 ++
 .../ServiceReferenceMetricAlarmAssertWorker.java   |  28 ++-
 .../apm-collector-analysis/analysis-alarm/pom.xml  |   2 +-
 .../baseline-computing-define/pom.xml              |   2 +-
 .../baseline-computing-provider/pom.xml            |   2 +-
 .../analysis-baseline/pom.xml                      |   2 +-
 .../analysis-jvm/jvm-define/pom.xml                |   2 +-
 .../analysis-jvm/jvm-provider/pom.xml              |   2 +-
 .../apm-collector-analysis/analysis-jvm/pom.xml    |   2 +-
 .../analysis-metric/metric-define/pom.xml          |   2 +-
 .../analysis-metric/metric-provider/pom.xml        |   2 +-
 .../mapping/ApplicationMappingSpanListener.java    |  23 +-
 .../ServiceReferenceMetricSpanListener.java        |  14 +-
 .../apm-collector-analysis/analysis-metric/pom.xml |   2 +-
 .../analysis-register/pom.xml                      |   2 +-
 .../analysis-register/register-define/pom.xml      |   2 +-
 .../define/service/IInstanceIDService.java         |   2 -
 .../define/service/IServiceNameService.java        |   6 +-
 .../analysis-register/register-provider/pom.xml    |   2 +-
 .../register/InstanceRegisterSerialWorker.java     |   3 +
 .../register/ServiceNameRegisterSerialWorker.java  |   9 +-
 .../provider/service/InstanceIDService.java        |  29 +--
 .../provider/service/ServiceNameService.java       |   9 +-
 .../analysis-segment-parser/pom.xml                |   2 +-
 .../segment-parser-define/pom.xml                  |   2 +-
 .../define/decorator/ReferenceDecorator.java       |   1 +
 .../segment-parser-provider/pom.xml                |   2 +-
 .../standardization/ReferenceIdExchanger.java      |   5 +-
 .../parser/standardization/SpanIdExchanger.java    |   2 +-
 .../provider/service/SegmentBase64Printer.java     |  87 ++++++++
 .../src/test}/resources/log4j2.xml                 |   0
 .../analysis-worker-model/pom.xml                  |   4 +-
 apm-collector/apm-collector-analysis/pom.xml       |   2 +-
 apm-collector/apm-collector-boot/bin/startup.sh    |   7 -
 apm-collector/apm-collector-boot/docker/Dockerfile |  29 ---
 .../apm-collector-boot/docker/application.yml      |  40 ----
 .../apm-collector-boot/docker/collectorService.sh  |  23 --
 .../apm-collector-boot/docker/docker-entrypoint.sh |  40 ----
 apm-collector/apm-collector-boot/docker/log4j2.xml |  36 ----
 apm-collector/apm-collector-boot/pom.xml           |  23 +-
 .../src/main/assembly/assembly.xml                 |  12 +-
 .../collector-cache-define/pom.xml                 |   2 +-
 .../cache/service/ServiceIdCacheService.java       |   3 +-
 .../collector-cache-guava-provider/pom.xml         |   2 +-
 .../guava/service/ServiceIdCacheGuavaService.java  |  14 +-
 apm-collector/apm-collector-cache/pom.xml          |   2 +-
 .../collector-cluster-define/pom.xml               |   2 +-
 .../collector-cluster-redis-provider/pom.xml       |   2 +-
 .../collector-cluster-standalone-provider/pom.xml  |   2 +-
 .../collector-cluster-zookeeper-provider/pom.xml   |   2 +-
 apm-collector/apm-collector-cluster/pom.xml        |   2 +-
 .../client-component/pom.xml                       |   2 +-
 apm-collector/apm-collector-component/pom.xml      |   2 +-
 .../server-component/pom.xml                       |   2 +-
 .../collector-configuration-define/pom.xml         |   2 +-
 .../collector-configuration-provider/pom.xml       |   2 +-
 apm-collector/apm-collector-configuration/pom.xml  |   2 +-
 apm-collector/apm-collector-core/pom.xml           |   2 +-
 .../skywalking/apm/collector/core/util/Const.java  |   1 +
 .../collector-grpc-manager-define/pom.xml          |   2 +-
 .../collector-grpc-manager-provider/pom.xml        |   2 +-
 apm-collector/apm-collector-grpc-manager/pom.xml   |   2 +-
 apm-collector/apm-collector-instrument/pom.xml     |   2 +-
 .../collector-jetty-manager-define/pom.xml         |   2 +-
 .../collector-jetty-manager-provider/pom.xml       |   2 +-
 apm-collector/apm-collector-jetty-manager/pom.xml  |   2 +-
 .../collector-naming-define/pom.xml                |   2 +-
 .../collector-naming-jetty-provider/pom.xml        |   2 +-
 apm-collector/apm-collector-naming/pom.xml         |   2 +-
 .../collector-remote-define/pom.xml                |   2 +-
 .../collector-remote-grpc-provider/pom.xml         |   2 +-
 .../collector-remote-kafka-provider/pom.xml        |   2 +-
 apm-collector/apm-collector-remote/pom.xml         |   2 +-
 .../collector-storage-define/pom.xml               |   2 +-
 .../storage/dao/cache/IServiceNameCacheDAO.java    |   2 +-
 .../storage/dao/ui/IApplicationAlarmListUIDAO.java |  23 +-
 .../storage/dao/ui/IApplicationAlarmUIDAO.java     |   2 +-
 .../storage/dao/ui/IApplicationComponentUIDAO.java |   2 +-
 .../storage/dao/ui/IApplicationMappingUIDAO.java   |   2 +-
 .../storage/dao/ui/IApplicationMetricUIDAO.java    |  80 ++++++-
 .../dao/ui/IApplicationReferenceMetricUIDAO.java   |  64 +++++-
 .../storage/dao/ui/IInstanceAlarmUIDAO.java        |   2 +-
 .../storage/dao/ui/IInstanceMetricUIDAO.java       |   5 +-
 .../collector/storage/dao/ui/IInstanceUIDAO.java   |  10 +-
 .../storage/dao/ui/ISegmentDurationUIDAO.java      |   4 +-
 .../storage/dao/ui/IServiceAlarmUIDAO.java         |   2 +-
 .../storage/dao/ui/IServiceMetricUIDAO.java        |   4 +-
 .../dao/ui/IServiceReferenceMetricUIDAO.java       |  64 +++++-
 .../collector/storage/table/register/Instance.java |   9 +
 .../storage/table/register/InstanceTable.java      |   1 +
 .../storage/table/register/ServerTypeDefine.java   |   3 +-
 .../storage/table/register/ServiceName.java        |  11 +-
 .../storage/table/register/ServiceNameTable.java   |   3 +-
 .../apm/collector/storage/ui/alarm/AlarmItem.java  |   6 +-
 .../storage/ui/application/ApplicationNode.java    |  54 ++---
 .../apm/collector/storage/ui/common/Call.java      |  28 +--
 .../collector/storage/ui/common/Pagination.java    |  18 +-
 .../storage/ui/overview/ApplicationTPS.java        |  10 +-
 .../collector/storage/ui/server/AppServerInfo.java |  10 +-
 .../storage/ui/service/ServiceMetric.java          |  19 +-
 .../apm/collector/storage/ui/trace/BasicTrace.java |  27 ++-
 .../collector-storage-es-provider/pom.xml          |   2 +-
 .../es/dao/InstanceHeartBeatEsPersistenceDAO.java  |   4 +-
 .../es/dao/SegmentDurationEsPersistenceDAO.java    |   2 +-
 .../es/dao/cache/ServiceNameEsCacheDAO.java        |   7 +-
 .../es/dao/register/ApplicationRegisterEsDAO.java  |   4 +-
 .../es/dao/register/InstanceRegisterEsDAO.java     |   5 +-
 .../dao/register/NetworkAddressRegisterEsDAO.java  |   4 +-
 .../es/dao/register/ServiceNameRegisterEsDAO.java  |   6 +-
 .../storage/es/dao/ui/ApplicationAlarmEsUIDAO.java |   8 +-
 .../es/dao/ui/ApplicationAlarmListEsUIDAO.java     |  15 +-
 .../es/dao/ui/ApplicationComponentEsUIDAO.java     |   6 +-
 .../es/dao/ui/ApplicationMappingEsUIDAO.java       |   4 +-
 .../es/dao/ui/ApplicationMetricEsUIDAO.java        |  79 +++++--
 .../dao/ui/ApplicationReferenceMetricEsUIDAO.java  | 150 ++++---------
 .../storage/es/dao/ui/InstanceAlarmEsUIDAO.java    |   7 +-
 .../storage/es/dao/ui/InstanceEsUIDAO.java         |  79 ++++++-
 .../storage/es/dao/ui/InstanceMetricEsUIDAO.java   |   8 +-
 .../storage/es/dao/ui/MemoryMetricEsUIDAO.java     |   8 +-
 .../storage/es/dao/ui/SegmentDurationEsUIDAO.java  |  16 +-
 .../storage/es/dao/ui/ServiceAlarmEsUIDAO.java     |   7 +-
 .../storage/es/dao/ui/ServiceMetricEsUIDAO.java    |  10 +-
 .../es/dao/ui/ServiceNameServiceEsUIDAO.java       |   9 +-
 .../es/dao/ui/ServiceReferenceEsMetricUIDAO.java   | 134 ++++--------
 .../es/define/register/InstanceEsTableDefine.java  |   3 +-
 .../define/register/ServiceNameEsTableDefine.java  |   2 +
 .../collector-storage-h2-provider/pom.xml          |   2 +-
 .../h2/dao/SegmentDurationH2PersistenceDAO.java    |   2 +-
 .../h2/dao/cache/ServiceNameH2CacheDAO.java        |  11 +-
 .../h2/dao/register/InstanceRegisterH2DAO.java     |   1 +
 .../h2/dao/register/ServiceNameRegisterH2DAO.java  |  10 +-
 .../storage/h2/dao/ui/ApplicationAlarmH2UIDAO.java |   2 +-
 .../h2/dao/ui/ApplicationAlarmListH2UIDAO.java     |   2 +-
 .../h2/dao/ui/ApplicationComponentH2UIDAO.java     |   4 +-
 .../h2/dao/ui/ApplicationMappingH2UIDAO.java       |   4 +-
 .../h2/dao/ui/ApplicationMetricH2UIDAO.java        |   9 +-
 .../dao/ui/ApplicationReferenceMetricH2UIDAO.java  |  42 +---
 .../storage/h2/dao/ui/InstanceAlarmH2UIDAO.java    |   2 +-
 .../storage/h2/dao/ui/InstanceH2UIDAO.java         |  37 ++--
 .../storage/h2/dao/ui/InstanceMetricH2UIDAO.java   |   4 +-
 .../storage/h2/dao/ui/MemoryMetricH2UIDAO.java     |   7 +-
 .../storage/h2/dao/ui/SegmentDurationH2UIDAO.java  |  14 +-
 .../storage/h2/dao/ui/ServiceAlarmH2UIDAO.java     |   2 +-
 .../storage/h2/dao/ui/ServiceMetricH2UIDAO.java    |   2 +-
 .../h2/dao/ui/ServiceNameServiceH2UIDAO.java       |  13 +-
 .../h2/dao/ui/ServiceReferenceH2MetricUIDAO.java   |  17 +-
 .../h2/define/register/InstanceH2TableDefine.java  |   1 +
 .../define/register/ServiceNameH2TableDefine.java  |   2 +-
 apm-collector/apm-collector-storage/pom.xml        |   2 +-
 .../apm-collector-ui/collector-ui-define/pom.xml   |   2 +-
 .../apm-collector-ui/collector-ui-graphql/pom.xml  |   2 +-
 .../collector-ui-jetty-provider/pom.xml            |   2 +-
 .../apm/collector/ui/query/AlarmQuery.java         |  14 +-
 .../apm/collector/ui/query/ApplicationQuery.java   |  33 +--
 .../apm/collector/ui/query/OverViewLayerQuery.java |  42 ++--
 .../apm/collector/ui/query/ServerQuery.java        |  42 ++--
 .../apm/collector/ui/query/ServiceQuery.java       |  31 +--
 .../apm/collector/ui/query/TraceQuery.java         |  24 ++-
 .../apm/collector/ui/service/AlarmService.java     | 126 +++++++++--
 .../collector/ui/service/ApplicationService.java   |  51 +++--
 .../ui/service/ApplicationTopologyService.java     |  88 +++-----
 .../ui/service/ClusterTopologyService.java         |  33 ++-
 .../collector/ui/service/SecondBetweenService.java |  62 ++++++
 .../collector/ui/service/SegmentTopService.java    |  28 ++-
 .../apm/collector/ui/service/ServerService.java    |  73 ++++---
 .../collector/ui/service/ServiceNameService.java   |  44 ++--
 .../ui/service/ServiceTopologyService.java         |  62 +++++-
 .../apm/collector/ui/service/TopologyBuilder.java  | 232 +++++++++++++++------
 .../apm/collector/ui/utils/ApdexCalculator.java}   |  20 +-
 .../apm/collector/ui/utils/DurationUtils.java      |  34 +--
 .../apm/collector/ui/utils/PaginationUtils.java}   |  45 ++--
 .../apm/collector/ui/utils/SLACalculator.java}     |  11 +-
 .../ui/utils/PaginationUtilsTestCase.java          |  55 +++++
 apm-collector/apm-collector-ui/pom.xml             |   2 +-
 apm-collector/pom.xml                              |   2 +-
 apm-commons/apm-datacarrier/pom.xml                |   2 +-
 .../apm/commons/datacarrier/DataCarrier.java       |  17 +-
 apm-commons/apm-util/pom.xml                       |   2 +-
 apm-commons/pom.xml                                |   2 +-
 .../bin/collectorService.bat                       |   2 +-
 .../bin/collectorService.sh                        |   2 +-
 .../bin/startup.bat                                |   1 +
 apm-dist/bin/startup.sh                            |  10 +
 apm-dist/bin/webappService.bat                     |  18 ++
 apm-dist/bin/webappService.sh                      |  28 +++
 apm-dist/pom.xml                                   |  82 ++++++++
 .../src/main/assembly/binary.xml                   | 140 +++++++------
 apm-protocol/apm-network/pom.xml                   |   2 +-
 .../network/trace/component/ComponentsDefine.java  |   5 +-
 apm-protocol/apm-ui-protocol/pom.xml               |   2 +-
 .../ui-graphql/application-layer.graphqls          |   2 +-
 .../src/main/resources/ui-graphql/common.graphqls  |   2 +-
 .../resources/ui-graphql/overview-layer.graphqls   |   2 +-
 .../resources/ui-graphql/server-layer.graphqls     |   2 +-
 .../resources/ui-graphql/service-layer.graphqls    |   2 +-
 .../src/main/resources/ui-graphql/trace.graphqls   |   3 +-
 apm-protocol/pom.xml                               |   2 +-
 apm-sniffer/apm-agent-core/pom.xml                 |   2 +-
 .../skywalking/apm/agent/core/conf/Config.java     |   4 +-
 .../agent/core/conf/SnifferConfigInitializer.java  |   2 -
 .../agent/core/context/AbstractTracerContext.java  |  11 -
 .../apm/agent/core/context/ContextManager.java     |   5 +-
 .../apm/agent/core/context/TracingContext.java     |  38 ++--
 .../agent/core/context/ids/GlobalIdGenerator.java  |   5 +-
 .../core/context/trace/AbstractTracingSpan.java    |   2 +-
 .../apm/agent/core/context/trace/EntrySpan.java    |   2 +-
 .../apm/agent/core/context/trace/ExitSpan.java     |   2 +-
 .../apm/agent/core/context/trace/TraceSegment.java |   6 +-
 .../core/dictionary/OperationNameDictionary.java   |  22 +-
 .../plugin/AbstractClassEnhancePluginDefine.java   |   2 +-
 .../plugin/bytebuddy/ArgumentTypeNameMatch.java    |   2 +-
 .../ClassInstanceMethodsEnhancePluginDefine.java   |   2 +-
 .../ClassStaticMethodsEnhancePluginDefine.java     |   2 +-
 .../enhance/InstanceMethodsAroundInterceptor.java  |   1 -
 .../interceptor/enhance/MethodInterceptResult.java |   9 +-
 .../agent/core/plugin/match/HierarchyMatch.java    |   2 +-
 .../core/remote/DiscoveryRestServiceClient.java    |  10 +-
 .../apm/agent/core/sampling/SamplingService.java   |   2 +-
 apm-sniffer/apm-agent/pom.xml                      |  12 +-
 apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml    |   2 +-
 .../apm/plugin/dubbo/DubboInstrumentation.java     |  11 +-
 .../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml  |   2 +-
 .../feign-default-http-9.x-plugin/pom.xml          |   2 +-
 .../define/DefaultHttpClientInstrumentation.java   |  10 -
 apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml |   2 +-
 .../AbstractServerImplBuilderInstrumentation.java  |   7 -
 .../v1/define/AbstractStubInstrumentation.java     |   7 -
 apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml   |   2 +-
 ...PooledJdbcConnectionConstructorInterceptor.java |   4 -
 .../define/AbstractConnectionInstrumentation.java  |   2 +-
 .../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml   |   2 +-
 .../define/AbstractHttpClientInstrumentation.java  |  10 +-
 .../DefaultRequestDirectorInstrumentation.java     |   7 +-
 .../v4/define/HttpClientInstrumentation.java       |  10 +-
 .../define/InternalHttpClientInstrumentation.java  |   6 +-
 .../define/MinimalHttpClientInstrumentation.java   |   5 +-
 .../httpasyncclient-4.x-plugin/pom.xml             |   2 +-
 .../define/AbstractNIOConnPoolInstrumentation.java |   4 +-
 .../DefaultConnectingIOReactorInstrumentation.java |   4 +-
 .../v4/define/ExecuteInstrumentation.java          |   2 +-
 .../v4/define/ProcessResponseInstrumentation.java  |   5 +-
 .../define/SessionRequestImplInstrumentation.java  |   5 +-
 .../v4/define/StateInstrumentation.java            |   3 +-
 .../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml      |  24 +++
 .../hystrix/v1/EnhanceRequireObjectCache.java}     |  23 +-
 .../v1/HystrixCommandConstructorInterceptor.java   |  60 ++++++
 .../v1/HystrixCommandGetFallbackInterceptor.java}  |  18 +-
 .../hystrix/v1/HystrixCommandRunInterceptor.java}  |  31 ++-
 .../hystrix/v1/HystrixPluginsInterceptor.java}     |  21 +-
 .../plugin/hystrix/v1/SWExecutionHookWrapper.java  | 180 ++++++++++++++++
 .../v1/define/HystrixCommandInstrumentation.java}  |  42 ++--
 .../v1/define/HystrixPluginsInstrumentation.java}  |  24 ++-
 .../src/main/resources/skywalking-plugin.def       |   2 +
 apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml    |   2 +-
 .../jdbc/connectionurl/parser/H2URLParser.java     |   8 +-
 .../jdbc/connectionurl/parser/MysqlURLParser.java  |   5 -
 .../jdbc/connectionurl/parser/OracleURLParser.java |   8 +-
 .../connectionurl/parser/PostgreSQLURLParser.java  |   5 -
 .../jdbc/define/AbstractDriverInstrumentation.java |   9 +-
 .../apm/plugin/jdbc/trace/ConnectionInfo.java      |   2 +-
 .../apm-sdk-plugin/jedis-2.x-plugin/pom.xml        |   2 +-
 .../v2/define/JedisClusterInstrumentation.java     |  15 +-
 .../jedis/v2/define/JedisInstrumentation.java      |  16 +-
 .../jetty-plugin/jetty-client-9.0-plugin/pom.xml   |   2 +-
 .../jetty-plugin/jetty-client-9.x-plugin/pom.xml   |   2 +-
 .../jetty-plugin/jetty-server-9.x-plugin/pom.xml   |   2 +-
 apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml    |   2 +-
 apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml |   2 +-
 .../plugin/kafka/v1/KafkaConsumerInterceptor.java  |   2 +-
 .../kafka/v1/define/CallbackInstrumentation.java   |   7 -
 .../v1/define/KafkaConsumerInstrumentation.java    |   4 -
 .../v1/define/KafkaProducerInstrumentation.java    |   4 -
 .../v1/define/ProducerRecordInstrumentation.java   |   9 -
 .../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml      |   2 +-
 .../v2/MongoDBCollectionMethodInterceptor.java     |   7 +-
 .../plugin/mongodb/v2/define/InterceptPoint.java   |   2 +-
 .../MongoDBCollectionImplInstrumentation.java      |  16 +-
 .../define/MongoDBCollectionInstrumentation.java   |  21 +-
 .../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml      |   2 +-
 apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml    |   2 +-
 .../motan/define/MotanConsumerInstrumentation.java |  10 +-
 .../motan/define/MotanProviderInstrumentation.java |  14 +-
 .../apm-sdk-plugin/mysql-5.x-plugin/pom.xml        |   2 +-
 .../mysql/CreateCallableStatementInterceptor.java  |   3 -
 .../mysql/CreatePreparedStatementInterceptor.java  |   6 +-
 .../jdbc/mysql/CreateStatementInterceptor.java     |   3 -
 .../jdbc/mysql/define/CallableInstrumentation.java |  10 +-
 .../mysql/define/ConnectionInstrumentation.java    |   4 +-
 .../define/Mysql50ConnectionInstrumentation.java   |   2 +-
 .../define/PreparedStatementInstrumentation.java   |  14 +-
 .../mysql/define/StatementInstrumentation.java     |  22 +-
 .../nutz-plugins/http-1.x-plugin/pom.xml           |   2 +-
 .../nutz-plugins/mvc-annotation-1.x-plugin/pom.xml |   2 +-
 apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml    |   2 +-
 .../apm-sdk-plugin/okhttp-3.x-plugin/pom.xml       |   2 +-
 .../apm/plugin/okhttp/v3/RealCallInterceptor.java  |  12 +-
 .../okhttp/v3/define/RealCallInstrumentation.java  |   4 -
 .../apm-sdk-plugin/oracle-10.x-plugin/pom.xml      |   2 +-
 .../{pom.xml => pom.xml.versionsBackup}            |   0
 .../oracle/define/ConnectionInstrumentation.java   |   6 +-
 .../define/OracleCallableInstrumentation.java      |   7 -
 .../OraclePrepareStatementInstrumentation.java     |   7 -
 .../define/OracleStatementInstrumentation.java     |   7 -
 apm-sniffer/apm-sdk-plugin/pom.xml                 |   6 +-
 .../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml   |   2 +-
 .../CreateCallableStatementInterceptor.java        |   5 +-
 .../CreatePreparedStatementInterceptor.java        |   5 +-
 .../postgresql/CreateStatementInterceptor.java     |   4 -
 .../AbstractJdbc2StatementInstrumentation.java     |  20 +-
 .../define/ConnectionInstrumentation.java          |   6 +-
 .../define/Jdbc3ConnectionInstrumentation.java     |   8 +-
 .../define/Jdbc4ConnectionInstrumentation.java     |   6 +-
 .../apm-sdk-plugin/resin-3.x-plugin/pom.xml        |   2 +-
 .../{pom.xml => pom.xml.versionsBackup}            |   0
 .../apm/plugin/resin/v3/ResinV3Interceptor.java    |   3 -
 .../resin/v3/define/ResinV3Instrumentation.java    |  10 +-
 .../apm-sdk-plugin/resin-4.x-plugin/pom.xml        |   2 +-
 .../{pom.xml => pom.xml.versionsBackup}            |   0
 .../resin/v4/define/ResinV4Instrumentation.java    |   8 -
 .../pom.xml                                        |  10 +-
 .../v3}/AbstractMessageConsumeInterceptor.java     |  17 +-
 .../v3}/MessageConcurrentlyConsumeInterceptor.java |  13 +-
 .../v3}/MessageOrderlyConsumeInterceptor.java      |  13 +-
 .../rocketMQ/v3}/MessageSendInterceptor.java       |  27 ++-
 .../rocketMQ/v3}/OnExceptionInterceptor.java       |  11 +-
 .../plugin/rocketMQ/v3}/OnSuccessInterceptor.java  |  13 +-
 .../rocketMQ/v3}/UpdateNameServerInterceptor.java  |   3 +-
 .../ConsumeMessageConcurrentlyInstrumentation.java |  19 +-
 .../ConsumeMessageOrderlyInstrumentation.java      |  17 +-
 .../v3}/define/MQClientAPIImplInstrumentation.java |  31 ++-
 .../v3}/define/SendCallBackEnhanceInfo.java        |   5 +-
 .../v3}/define/SendCallbackInstrumentation.java    |  24 +--
 .../src/main/resources/skywalking-plugin.def       |   4 +
 .../rocketMQ/v3}/MessageSendInterceptorTest.java   |   8 +-
 .../rocketMQ/v3}/OnExceptionInterceptorTest.java   |   4 +-
 .../rocketMQ/v3}/OnSuccessInterceptorTest.java     |   8 +-
 .../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml     |   2 +-
 .../ConsumeMessageConcurrentlyInstrumentation.java |   8 -
 .../ConsumeMessageOrderlyInstrumentation.java      |  10 +-
 .../v4/define/MQClientAPIImplInstrumentation.java  |  12 --
 .../v4/define/SendCallbackInstrumentation.java     |  12 +-
 .../apm-sdk-plugin/servicecomb-plugin/pom.xml      |   7 +-
 .../servicecomb-java-chassis-0.x-plugin/pom.xml    |   2 +-
 .../ProducerOperationHandlerInterceptor.java       |   3 -
 .../TransportClientHandlerInterceptor.java         |   3 -
 .../ProducerOperationHandlerInstrumentation.java   |   6 +-
 .../TransportClientHandlerInstrumentation.java     |   4 +-
 .../pom.xml                                        |  23 +-
 .../v1}/ProducerOperationHandlerInterceptor.java   |   7 +-
 .../v1}/TransportClientHandlerInterceptor.java     |   7 +-
 .../ProducerOperationHandlerInstrumentation.java   |  12 +-
 .../TransportClientHandlerInstrumentation.java     |  12 +-
 .../src/main/resources/skywalking-plugin.def       |   2 +
 .../ProducerOperationHandlerInterceptorTest.java   |  14 +-
 .../v1}/TransportClientHandlerInterceptorTest.java |  16 +-
 .../sharding-jdbc-1.5.x-plugin/pom.xml             |   2 +-
 .../ExecutorEngineConstructorInterceptor.java      |   4 +-
 .../concurrent-util-4.x-plugin/pom.xml             |   2 +-
 .../define/FailureCallbackInstrumentation.java     |  10 +-
 .../spring-plugins/core-patch/pom.xml              |   2 +-
 .../spring/patch/CreateAopProxyInterceptor.java    |   2 +-
 .../define/AopProxyFactoryInstrumentation.java     |   8 -
 .../mvc-annotation-3.x-plugin/pom.xml              |   2 +-
 .../mvc-annotation-4.x-plugin/pom.xml              |   2 +-
 .../spring-plugins/mvc-annotation-commons/pom.xml  |   2 +-
 apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml  |   2 +-
 .../spring-plugins/resttemplate-4.x-plugin/pom.xml |   2 +-
 .../spring-cloud/netflix-plugins/pom.xml           |   2 +-
 .../spring-cloud-feign-1.x-plugin/pom.xml          |   2 +-
 .../v11/define/NetflixFeignInstrumentation.java    |  10 +-
 .../spring-plugins/spring-cloud/pom.xml            |   2 +-
 .../apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml |   2 +-
 .../apm-sdk-plugin/struts2-2.x-plugin/pom.xml      |   2 +-
 .../apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml   |   2 +-
 .../tomcat78x/define/TomcatInstrumentation.java    |   5 -
 .../apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml   |   2 +-
 ...cachedConstructorWithComplexArgInterceptor.java |  11 -
 ...achedConstructorWithHostPortArgInterceptor.java |   4 -
 ...tructorWithInetSocketAddressArgInterceptor.java |   4 -
 ...torWithInetSocketAddressListArgInterceptor.java |   3 -
 .../v2/define/XMemcachedInstrumentation.java       |   9 +-
 apm-sniffer/apm-test-tools/pom.xml                 |   2 +-
 .../apm-toolkit-log4j-1.x-activation/pom.xml       |   2 +-
 .../v1/x/TraceIdPatternConverterActivation.java    |  11 +-
 .../apm-toolkit-log4j-2.x-activation/pom.xml       |   2 +-
 .../log4j/v2/x/Log4j2OutputAppenderActivation.java |  11 +-
 .../apm-toolkit-logback-1.x-activation/pom.xml     |   2 +-
 .../v1/x/LogbackPatternConverterActivation.java    |  11 +-
 .../logback/v1/x/mdc/MDCConverterActivation.java   |  10 +-
 .../apm-toolkit-opentracing-activation/pom.xml     |   2 +-
 .../opentracing/span/SkywalkingSpanActivation.java |   2 +-
 .../apm-toolkit-trace-activation/pom.xml           |   2 +-
 .../activation/trace/TraceContextActivation.java   |  11 +-
 apm-sniffer/apm-toolkit-activation/pom.xml         |   6 +-
 apm-sniffer/config/agent.config                    |   2 +-
 .../optional-spring-plugins/pom.xml                |   4 +-
 .../spring-annotation-plugin/pom.xml               |   2 +-
 apm-sniffer/optional-plugins/pom.xml               |   4 +-
 apm-sniffer/pom.xml                                |   2 +-
 apm-webapp/pom.xml                                 | 157 ++++++++++++++
 .../skywalking/apm/webapp/ApplicationStartUp.java  |  42 ++++
 .../skywalking/apm/webapp/config/UIConfig.java     |  18 +-
 .../apm/webapp/tools/CollectorServerList.java      |  89 ++++++++
 .../apm/webapp/tools}/HttpClientTools.java         |  52 ++---
 .../apm/webapp/tools/RewritePathFilter.java        |  65 ++++++
 apm-webapp/src/main/resources/application.yml      |  14 ++
 .../apm/webapp/tools/RewritePathFilterTest.java    |  60 ++++++
 docker-compose.yml                                 |  76 -------
 docs/README.md                                     |   1 -
 docs/README_ZH.md                                  |   3 +-
 docs/Supported-list.md                             |   1 +
 ...-CN.md => Deploy-backend-in-cluster-mode-CN.md} |  15 ++
 ....md => Deploy-backend-in-standalone-mode-CN.md} |  10 +-
 docs/cn/Deploy-docker-image-CN.md                  |  13 --
 docs/cn/How-to-build-CN.md                         |   3 +
 ...walking-opentracing-CN.md => Opentracing-CN.md} |   2 -
 docs/cn/Quick-start-CN.md                          |   8 +-
 ...r-mode.md => Deploy-backend-in-cluster-mode.md} |  22 +-
 ...ode.md => Deploy-backend-in-standalone-mode.md} |  12 +-
 docs/en/Deploy-docker-image.md                     |  14 --
 docs/en/Deploy-skywalking-agent.md                 |   2 +-
 docs/en/How-to-build.md                            |   3 +
 docs/en/How-to-release.md                          |  16 ++
 docs/en/Opentracing.md                             |   1 -
 docs/en/Quick-start.md                             |  10 +-
 pom.xml                                            |  18 +-
 skywalking-ui                                      |   2 +-
 461 files changed, 3706 insertions(+), 2448 deletions(-)
 create mode 100644 CONTRIBUTING.md
 create mode 100644 NOTICE
 delete mode 100644 NOTICE.txt
 copy 
apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/{InstanceDiscoveryServletHandler.java
 => InstanceHeartBeatServletHandler.java} (58%)
 create mode 100644 
apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/test/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/service/SegmentBase64Printer.java
 copy apm-collector/{apm-collector-boot/src/main => 
apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/test}/resources/log4j2.xml
 (100%)
 delete mode 100644 apm-collector/apm-collector-boot/bin/startup.sh
 delete mode 100644 apm-collector/apm-collector-boot/docker/Dockerfile
 delete mode 100644 apm-collector/apm-collector-boot/docker/application.yml
 delete mode 100644 apm-collector/apm-collector-boot/docker/collectorService.sh
 delete mode 100644 apm-collector/apm-collector-boot/docker/docker-entrypoint.sh
 delete mode 100644 apm-collector/apm-collector-boot/docker/log4j2.xml
 create mode 100644 
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/SecondBetweenService.java
 copy 
apm-collector/{apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/ApdexThresholdUtils.java
 => 
apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/utils/ApdexCalculator.java}
 (67%)
 copy 
apm-collector/{apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/BooleanUtils.java
 => 
apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/utils/PaginationUtils.java}
 (55%)
 copy 
apm-collector/{apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/decorator/StandardBuilder.java
 => 
apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/utils/SLACalculator.java}
 (79%)
 create mode 100644 
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/utils/PaginationUtilsTestCase.java
 rename {apm-collector/apm-collector-boot => apm-dist}/bin/collectorService.bat 
(89%)
 rename {apm-collector/apm-collector-boot => apm-dist}/bin/collectorService.sh 
(94%)
 rename {apm-collector/apm-collector-boot => apm-dist}/bin/startup.bat (65%)
 create mode 100644 apm-dist/bin/startup.sh
 create mode 100644 apm-dist/bin/webappService.bat
 create mode 100644 apm-dist/bin/webappService.sh
 create mode 100644 apm-dist/pom.xml
 copy apm-collector/apm-collector-boot/src/main/assembly/assembly.xml => 
apm-dist/src/main/assembly/binary.xml (60%)
 create mode 100644 apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4/define/SendCallBackEnhanceInfo.java
 => 
hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java}
 (68%)
 create mode 100644 
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandConstructorInterceptor.java
 copy 
apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/CallbackInterceptor.java
 => 
hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandGetFallbackInterceptor.java}
 (74%)
 copy 
apm-sniffer/apm-sdk-plugin/{spring-plugins/concurrent-util-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/concurrent/FailureCallbackInterceptor.java
 => 
hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandRunInterceptor.java}
 (69%)
 copy 
apm-sniffer/apm-sdk-plugin/{spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java
 => 
hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixPluginsInterceptor.java}
 (76%)
 create mode 100644 
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/SWExecutionHookWrapper.java
 copy 
apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/RealCallInstrumentation.java
 => 
hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixCommandInstrumentation.java}
 (71%)
 copy 
apm-sniffer/apm-sdk-plugin/{spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/define/AnnotationMethodHandlerAdapterInstrumentation.java
 => 
hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java}
 (70%)
 create mode 100644 
apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/resources/skywalking-plugin.def
 copy apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/{pom.xml => 
pom.xml.versionsBackup} (100%)
 mode change 100755 => 100644
 copy apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/{pom.xml => 
pom.xml.versionsBackup} (100%)
 copy apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/{pom.xml => 
pom.xml.versionsBackup} (100%)
 copy apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin => 
rocketMQ-3.x-plugin}/pom.xml (90%)
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4
 => 
rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/AbstractMessageConsumeInterceptor.java
 (86%)
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4
 => 
rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/MessageConcurrentlyConsumeInterceptor.java
 (84%)
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4
 => 
rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/MessageOrderlyConsumeInterceptor.java
 (84%)
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4
 => 
rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/MessageSendInterceptor.java
 (79%)
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4
 => 
rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/OnExceptionInterceptor.java
 (89%)
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4
 => 
rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/OnSuccessInterceptor.java
 (89%)
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4
 => 
rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/UpdateNameServerInterceptor.java
 (97%)
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4
 => 
rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/define/ConsumeMessageConcurrentlyInstrumentation.java
 (78%)
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4
 => 
rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/define/ConsumeMessageOrderlyInstrumentation.java
 (83%)
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4
 => 
rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/define/MQClientAPIImplInstrumentation.java
 (70%)
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4
 => 
rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/define/SendCallBackEnhanceInfo.java
 (94%)
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v4
 => 
rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/define/SendCallbackInstrumentation.java
 (81%)
 create mode 100644 
apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/resources/skywalking-plugin.def
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4
 => 
rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/MessageSendInterceptorTest.java
 (95%)
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4
 => 
rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/OnExceptionInterceptorTest.java
 (96%)
 copy 
apm-sniffer/apm-sdk-plugin/{rocketMQ-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v4
 => 
rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3}/OnSuccessInterceptorTest.java
 (95%)
 copy 
apm-sniffer/apm-sdk-plugin/servicecomb-plugin/{servicecomb-java-chassis-0.x-plugin
 => servicecomb-java-chassis-1.x-plugin}/pom.xml (66%)
 copy 
apm-sniffer/apm-sdk-plugin/servicecomb-plugin/{servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb
 => 
servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1}/ProducerOperationHandlerInterceptor.java
 (91%)
 copy 
apm-sniffer/apm-sdk-plugin/servicecomb-plugin/{servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb
 => 
servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1}/TransportClientHandlerInterceptor.java
 (93%)
 copy 
apm-sniffer/apm-sdk-plugin/servicecomb-plugin/{servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb
 => 
servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1}/define/ProducerOperationHandlerInstrumentation.java
 (83%)
 copy 
apm-sniffer/apm-sdk-plugin/servicecomb-plugin/{servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb
 => 
servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1}/define/TransportClientHandlerInstrumentation.java
 (86%)
 create mode 100644 
apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/resources/skywalking-plugin.def
 copy 
apm-sniffer/apm-sdk-plugin/servicecomb-plugin/{servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb
 => 
servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1}/ProducerOperationHandlerInterceptorTest.java
 (92%)
 copy 
apm-sniffer/apm-sdk-plugin/servicecomb-plugin/{servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb
 => 
servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1}/TransportClientHandlerInterceptorTest.java
 (91%)
 create mode 100644 apm-webapp/pom.xml
 create mode 100644 
apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/ApplicationStartUp.java
 copy 
apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/apache/skywalking/apm/collector/cluster/ClusterNodeExistException.java
 => 
apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/config/UIConfig.java 
(71%)
 create mode 100644 
apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/tools/CollectorServerList.java
 copy 
{apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/agent/jetty/provider
 => 
apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/tools}/HttpClientTools.java
 (58%)
 create mode 100644 
apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/tools/RewritePathFilter.java
 create mode 100644 apm-webapp/src/main/resources/application.yml
 create mode 100644 
apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/tools/RewritePathFilterTest.java
 delete mode 100644 docker-compose.yml
 rename docs/cn/{Deploy-collector-in-cluster-mode-CN.md => 
Deploy-backend-in-cluster-mode-CN.md} (72%)
 rename docs/cn/{Deploy-collector-in-standalone-mode-CN.md => 
Deploy-backend-in-standalone-mode-CN.md} (81%)
 delete mode 100644 docs/cn/Deploy-docker-image-CN.md
 rename docs/cn/{skywalking-opentracing-CN.md => Opentracing-CN.md} (65%)
 rename docs/en/{Deploy-collector-in-cluster-mode.md => 
Deploy-backend-in-cluster-mode.md} (61%)
 rename docs/en/{Deploy-collector-in-standalone-mode.md => 
Deploy-backend-in-standalone-mode.md} (67%)
 delete mode 100644 docs/en/Deploy-docker-image.md
 create mode 100644 docs/en/How-to-release.md

-- 
To stop receiving notification emails like this one, please contact
pen...@apache.org.

Reply via email to