This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch document/changelog in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 993ebf0 Update CHANGELOG.md add 06f675a Changed dependency graphql-java from 6.0 to 7.0. add 1152135 initialize collector ui graphql module. add 6b3aa98 Initialize the java class entity for mapping graphql protocol. add 9619712 Provide GraphQL jetty servlet do get method. add 843e709 Provide GraphQL jetty servlet do post method. add a25e353 Implement the method named getAllApplication in application layer graphql protocol. add e755bba Move the entity into storage module. add 9a6520f Provide the application topology query, but only completed es storage. add 953cfbb no message add 04ef598 Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui add 3909a5b Merge branch 'master' into feature/graphql-ui add a4891dd Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui add 3438071 Catch the exception in doPost and doGet method, make this two method do not throw exception. add 1510f70 Change the data type from int to long which attributes named responseTimePerSec and callsPerSec. add f177ebd Provide the search server query, but only completed es storage and non tps. add 0ee4b1c Provide the getAllServer query, but only completed es storage and non tps. add 4a933e1 Provide the getResponseTimeTrend query. add 703a591 Move DurationUtilsTestCase to ui provider module. add 86e05bc Provide the getServerTPSTrend query. add 8585e42 Provide the getCPUTrend query. add 06d5b88 Provide the getGCTrend query. add 474e47c Provide the getMemoryTrend query. add c70b132 Add variables parse add cff4871 Convert the type of data node from String to JsonObject add 297a282 Merge remote-tracking branch 'sw/master' into feature/graphql-ui add 7925c7b Provide the getClusterBrief query. add 7a17557 Move ui dao to ui package. add 8cfadaa Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui add 77f615a Provide the queryBasicTraces query. add 1d625d2 Provide the queryTrace query. add b513024 Provide the searchService query. add cccba2e Provide the getServiceResponseTimeTrend query. add 2c6b03b Provide the getServiceSLATrend query. add 62477a5 Provide the getServiceTopology query. add 505f6a0 Merge branch 'master' into feature/graphql-ui add 90c820d Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui add 87ebf65 Merge branch 'master' into feature/graphql-ui add 8cd6b5b Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui add a817197 Provide the getSlowService query. add 7b2cb2e Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui add 425324e Provide the overview/getTopNSlowService query. add 59c512f CI fail fixed. add 87d246d Fixed the bug: service/searchService #104 add f0c2be4 Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui add af6d91d Refactor alarm schema add 1bc0d84 Provide the getTopNServerThroughput query. add 87ee4f2 Merge remote-tracking branch 'origin/feature/graphql-ui' into feature/graphql-ui add 93c4ef9 Fix the docker version is out of date add 43fa3c0 Merge pull request #800 from ascrutae/fix/docker-compose-version add bb0552a Create SImpleDateFormat everytime. add a3609de Merge pull request #801 from apache/fix/dateformat-concurrency add cbe5227 Merge branch 'master' into feature/graphql-ui add e6f0c3e Fixed CI fail. add 1afe6c7 Merge pull request #775 from peng-yongsheng/feature/graphql-ui add a736c01 Fix protocol mistakes. add 59ae085 Merge pull request #802 from apache/fix/query add 7127546 Provide the getTopNApplicationThroughput query. add da0a8b8 Provide the getServerThroughput query. add e09c243 Merge pull request #803 from peng-yongsheng/feature/getTopNApplicationThroughput add 1864380 Merge branch 'master' into feature/getServerThroughput add 4419bca Merge pull request #804 from peng-yongsheng/feature/getServerThroughput add 0c9686e Provide the getServiceTPSTrend query. add 6fc4579 Merge pull request #805 from peng-yongsheng/feature/getServiceTPSTrend add c9aadf2 Change the elasticsearch analyzer type to stop that can tokenizer the sentence such as “ org.apache.skywalking” to “org” “apache” “skywalking” add eda2d81 Update span layer and server type by address id when those not equals to the values in cache. add 508b11d Provide the getConjecturalApps query. add ed82e49 Merge pull request #806 from peng-yongsheng/feature/servertype add 2e3666c Merge branch 'master' into feature/getConjecturalApps add f84961d Merge pull request #807 from peng-yongsheng/feature/getConjecturalApps add d2eb0b8 Merge branch 'master' into feature/searchService add 778731f Merge pull request #808 from peng-yongsheng/feature/searchService add 7ab59cb Split application alarm list entity to minute, hour, day, month. add 52c1139 Application metric alarm list graph. add cb2ea6b Merge pull request #809 from peng-yongsheng/feature/applicationalarm add 47e1db5 Provide the loadAlarmList query. add 2397567 Provide the getAlarmTrend query. add 1b499f0 Add [Agent] ServiceComb Plugin #437 add 9ff2093 fix collector/start.sh tip. add 94dcf96 Modify catalog add f561b6a Merge branch 'master' into servicecomb add d2a3a28 Modify catalog add 7ccdcbc Merge branch 'servicecomb' of https://github.com/lytscu/incubator-skywalking into servicecomb add 5e8bc00 Modify operationName to invocation.getInvocationQualifiedName add 1a8fb0f Modify operationName to invocation.getMicroserviceQualifiedName() add a3985d7 Merge branch 'master' into servicecomb add 48f8fce Modify ComponentId =28 add 5fce5dc Update servicecomb-java-chassis-0.x-plugin add 49a99a5 Merge branch 'master' into servicecomb add 6793deb Merge branch 'master' into servicecomb add b5ec187 Update servicecomb-java-chassis-0.x-plugin/pom.xml add cbb2eca Merge branch 'master' into servicecomb add e233b7b Merge branch 'master' into servicecomb add 2e95e7f Update exception status add 61f8d3e Update afterMethod exception status add 098251c Update consumer register add 4fa19f8 Merge branch 'master' into servicecomb add 59380c4 Merge branch 'master' into servicecomb add 3eeacb1 Update comments add 6e56c7f Update /org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefine.java add 7cbed1b Merge pull request #810 from peng-yongsheng/feature/loadAlarmList add e4e6940 Merge branch 'master' into servicecomb add e53b50e Merge pull request #771 from lytscu/servicecomb add cf04f03 Update Supported-list.md add 1bef96d Merge pull request #811 from apache/update-supported-list add 58365eb Merge branch 'master' into feature/getAlarmTrend add cc0f6f5 Merge branch 'master' into feature/getAlarmTrend add fb1c99d Merge branch 'feature/getAlarmTrend' of https://github.com/peng-yongsheng/incubator-skywalking into feature/getAlarmTrend add 4032e95 Merge pull request #812 from peng-yongsheng/feature/getAlarmTrend add 56d9b27 Mock trace segment data which sniffer from Dubbo framework. add 724b9c5 Application, Instance, Service register tested with elastic search. add 8276eac Merge pull request #814 from peng-yongsheng/feature/mock add 5445058 Merge branch 'master' into feature/register_test add add26b8 Sleeping when id not get. add abb3515 Merge pull request #816 from peng-yongsheng/feature/register_test add ede4260 Merge branch 'master' into feature/heartbeat_test add a14207e Instance heart beat tested with elastic search. OK. add 2cef97a Merge pull request #817 from peng-yongsheng/feature/heartbeat_test add 1435cbb Trace segment metric aggregate and alarm metric aggregate tested. add 37a5287 JVM metric aggregate tested. add ab3615e Merge pull request #818 from peng-yongsheng/feature/metric_check add 4836883 Change the data type of sla and apdex attributes from Float to Int. add 4544d99 Update logback version in application logback toolkit, based on #813 , where I explained that the logback library is not really used, just for compiling the bridge. But anyway, no harm to fix the risk add efcc8e8 Merge branch 'master' into update/logbck-version add d42458f Merge pull request #815 from apache/update/logbck-version add 47e2990 Merge branch 'master' into feature/graphql_protocol add 787f262 Merge pull request #819 from peng-yongsheng/feature/graphql_protocol add c96077e Update assembly.xml add 3298c38 Merge pull request #820 from sdanzo/master add c8b2110 add UI as a submodule add 3b3a20e Add submodule links for protocol add 8435871 Merge pull request #822 from apache/submodule add dbee953 Add [Agent] V1 servicecomb plugin add edffdf6 Add links to resources catalog in https://github.com/OpenSkywalking/Community add 9486fbf Merge branch 'master' into document/community-links add 8a1f443 Update submodule. add 0c47dac Merge pull request #823 from apache/proto-update add 65dc377 Merge branch 'master' into document/community-links add 98256a8 Merge pull request #821 from apache/document/community-links 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 074acb1 Application.yml configuration change. (#893) add 525a944 Merge branch 'master' into document/changelog No new revisions were added by this update. Summary of changes: .gitignore | 2 + .gitmodules | 6 + .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 | 13 +- .../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 +- .../handler/InstanceDiscoveryServiceHandler.java | 6 +- .../provider/handler/JVMMetricsServiceHandler.java | 9 + .../NetworkAddressRegisterServiceHandler.java | 5 +- .../ServiceNameDiscoveryServiceHandler.java | 3 +- .../ApplicationRegisterServiceHandlerTestCase.java | 46 ---- .../handler/JVMMetricServiceHandlerTestCase.java | 94 ------- .../AgentDataMock.java} | 30 ++- .../grpc/provider/handler/mock/ConsumerMock.java | 84 +++++++ .../grpc/provider/handler/mock/JVMMetricMock.java | 159 ++++++++++++ .../grpc/provider/handler/mock/ProviderMock.java | 101 ++++++++ .../grpc/provider/handler/mock/RegisterMock.java | 179 +++++++++++++ .../grpc/provider/handler/mock/TimeBuilder.java | 104 ++++++++ .../provider/handler/mock/TraceSegmentMock.java | 71 ++++++ .../provider/handler/mock/UniqueIdBuilder.java} | 24 +- .../src/test}/resources/log4j2.xml | 0 .../apm-collector-agent/agent-grpc/pom.xml | 2 +- .../agent-jetty/agent-jetty-define/pom.xml | 2 +- .../agent-jetty/agent-jetty-provider/pom.xml | 12 +- .../handler/InstanceHeartBeatServletHandler.java} | 53 ++-- .../NetworkAddressRegisterServletHandler.java | 2 +- .../ServiceNameDiscoveryServiceHandler.java | 4 +- .../src/test/resources/json/dubbox-consumer.json | 54 ++-- .../src/test/resources/json/dubbox-provider.json | 57 +++-- .../resources/json/instance-register-consumer.json | 9 +- .../resources/json/instance-register-provider.json | 9 +- .../apm-collector-agent/agent-jetty/pom.xml | 2 +- apm-collector/apm-collector-agent/pom.xml | 2 +- .../analysis-alarm/alarm-define/pom.xml | 2 +- .../alarm/define/graph/AlarmWorkerIdDefine.java | 79 +++--- .../analysis-alarm/alarm-provider/pom.xml | 7 +- .../alarm/provider/worker/AlarmAssertWorker.java | 39 +-- .../ApplicationMetricAlarmAssertWorker.java | 22 ++ .../application/ApplicationMetricAlarmGraph.java | 15 +- .../ApplicationMetricAlarmListCopy.java} | 17 +- ...cationMetricAlarmListDayPersistenceWorker.java} | 16 +- ...pplicationMetricAlarmListDayTransformNode.java} | 25 +- ...ationMetricAlarmListHourPersistenceWorker.java} | 16 +- ...plicationMetricAlarmListHourTransformNode.java} | 25 +- ...ionMetricAlarmListMinutePersistenceWorker.java} | 16 +- ...tionMetricAlarmListMonthPersistenceWorker.java} | 16 +- ...licationMetricAlarmListMonthTransformNode.java} | 25 +- .../ApplicationMetricAlarmToListNodeProcessor.java | 5 +- ...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 +- .../jvm/provider/service/MemoryMetricService.java | 2 +- .../apm-collector-analysis/analysis-jvm/pom.xml | 2 +- .../analysis-metric/metric-define/pom.xml | 2 +- .../metric/define/graph/MetricGraphIdDefine.java | 3 +- .../metric/define/graph/MetricWorkerIdDefine.java | 56 ++--- .../analysis-metric/metric-provider/pom.xml | 2 +- .../provider/AnalysisMetricModuleProvider.java | 10 +- .../component/ApplicationComponentCopy.java | 2 +- .../ApplicationComponentSpanListener.java | 17 +- .../mapping/ApplicationMappingCopy.java | 2 +- .../mapping/ApplicationMappingSpanListener.java | 31 ++- ...entCostGraph.java => SegmentDurationGraph.java} | 10 +- ....java => SegmentDurationPersistenceWorker.java} | 20 +- ...tener.java => SegmentDurationSpanListener.java} | 46 ++-- .../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/INetworkAddressIDService.java | 4 + .../define/service/IServiceNameService.java | 6 +- .../analysis-register/register-provider/pom.xml | 2 +- .../register/ApplicationRegisterSerialWorker.java | 9 +- .../register/InstanceRegisterSerialWorker.java | 12 +- .../NetworkAddressRegisterSerialWorker.java | 42 ++-- .../register/ServiceNameRegisterSerialWorker.java | 9 +- .../provider/service/InstanceIDService.java | 33 +-- .../provider/service/NetworkAddressIDService.java | 27 +- .../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 +- .../provider/buffer/SegmentBufferManager.java | 2 +- .../standardization/ReferenceIdExchanger.java | 9 +- .../parser/standardization/SpanIdExchanger.java | 7 +- .../provider/service/SegmentBase64Printer.java | 87 +++++++ .../src/test/resources}/log4j2.xml | 1 + .../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/pom.xml | 23 +- .../src/main/assembly/assembly.xml | 14 +- .../src/main/resources/application.yml | 22 +- .../src/main/resources/log4j2.xml | 4 +- .../collector-cache-define/pom.xml | 2 +- .../cache/service/ApplicationCacheService.java | 3 +- .../cache/service/NetworkAddressCacheService.java | 2 + .../cache/service/ServiceIdCacheService.java | 3 +- .../cache/service/ServiceNameCacheService.java | 6 +- .../collector-cache-guava-provider/pom.xml | 2 +- .../cache/guava/CacheModuleGuavaProvider.java | 4 +- .../service/ApplicationCacheGuavaService.java | 21 +- ...e.java => NetworkAddressCacheGuavaService.java} | 42 +++- .../guava/service/ServiceIdCacheGuavaService.java | 14 +- .../service/ServiceNameCacheGuavaService.java | 35 +-- 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 +- .../apm/collector/server/jetty/JettyHandler.java | 31 ++- .../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 | 7 +- .../apm/collector/core/util/BooleanUtils.java | 12 +- .../skywalking/apm/collector/core/util/Const.java | 1 + .../apm/collector/core/util/TimeBucketUtils.java | 82 +----- .../collector/core/util/TimeBucketUtilsTest.java | 25 -- .../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 +- .../apm/collector/storage/StorageModule.java | 62 +++-- .../storage/dao/IInstanceMetricUIDAO.java | 61 ----- ...AO.java => ISegmentDurationPersistenceDAO.java} | 4 +- .../storage/dao/IServiceReferenceUIDAO.java | 30 --- ...=> IApplicationAlarmListDayPersistenceDAO.java} | 2 +- ...> IApplicationAlarmListHourPersistenceDAO.java} | 2 +- ...IApplicationAlarmListMinutePersistenceDAO.java} | 2 +- ... IApplicationAlarmListMonthPersistenceDAO.java} | 2 +- .../storage/dao/cache/IApplicationCacheDAO.java | 3 +- .../storage/dao/cache/INetworkAddressCacheDAO.java | 5 +- .../storage/dao/cache/IServiceNameCacheDAO.java | 5 +- .../dao/register/INetworkAddressRegisterDAO.java | 2 + .../IApplicationAlarmListUIDAO.java} | 44 ++-- .../IApplicationAlarmUIDAO.java} | 10 +- .../IApplicationComponentUIDAO.java} | 33 ++- .../IApplicationMappingUIDAO.java} | 36 ++- .../storage/dao/ui/IApplicationMetricUIDAO.java | 111 +++++++++ .../dao/ui/IApplicationReferenceMetricUIDAO.java | 90 +++++++ .../ICpuMetricUIDAO.java} | 10 +- .../IGCMetricUIDAO.java} | 18 +- .../storage/dao/{ => ui}/IGlobalTraceUIDAO.java | 2 +- .../IInstanceAlarmUIDAO.java} | 10 +- .../IInstanceMetricUIDAO.java} | 22 +- .../storage/dao/{ => ui}/IInstanceUIDAO.java | 27 +- .../storage/dao/ui/IMemoryMetricUIDAO.java | 60 +++++ .../dao/{ => ui}/IMemoryPoolMetricUIDAO.java | 2 +- .../INetworkAddressUIDAO.java} | 9 +- .../ISegmentDurationUIDAO.java} | 9 +- .../storage/dao/{ => ui}/ISegmentUIDAO.java | 2 +- .../IServiceAlarmUIDAO.java} | 10 +- .../storage/dao/ui/IServiceMetricUIDAO.java | 45 ++++ .../IServiceNameServiceUIDAO.java} | 11 +- .../dao/ui/IServiceReferenceMetricUIDAO.java | 93 +++++++ .../apm/collector/storage/table}/MetricSource.java | 2 +- .../storage/table/alarm/ApplicationAlarmList.java | 21 +- .../table/application/ApplicationComponent.java | 8 +- .../application/ApplicationComponentTable.java | 3 +- .../table/application/ApplicationMapping.java | 8 +- .../table/application/ApplicationMappingTable.java | 3 +- .../storage/table/register/Application.java | 17 +- .../storage/table/register/ApplicationTable.java | 1 + .../collector/storage/table/register/Instance.java | 9 + .../storage/table/register/InstanceTable.java | 1 + .../storage/table/register/NetworkAddress.java | 19 ++ .../table/register/NetworkAddressTable.java | 2 + .../{ServiceNameTable.java => ServerType.java} | 30 ++- .../storage/table/register/ServerTypeDefine.java | 84 +++++++ .../storage/table/register/ServiceName.java | 11 +- .../storage/table/register/ServiceNameTable.java | 3 +- .../{SegmentCost.java => SegmentDuration.java} | 37 +-- ...entCostTable.java => SegmentDurationTable.java} | 8 +- .../ISegmentCostUIDAO.java => ui/alarm/Alarm.java} | 31 ++- .../apm/collector/storage/ui/alarm/AlarmItem.java | 79 ++++++ .../apm/collector/storage/ui/alarm/AlarmType.java} | 11 +- .../apm/collector/storage/ui/alarm/CauseType.java} | 10 +- .../storage/ui/application/Application.java} | 31 ++- .../storage/ui/application/ApplicationNode.java | 100 ++++++++ .../application/ConjecturalNode.java} | 8 +- .../apm/collector/storage/ui/common/Call.java | 97 ++++++++ .../common/Duration.java} | 38 ++- .../ISegmentCostUIDAO.java => ui/common/Node.java} | 37 ++- .../collector/storage/ui/common/Pagination.java} | 31 ++- .../common/ResponseTimeTrend.java} | 15 +- .../common/SLATrend.java} | 15 +- .../apm/collector/storage/ui/common/Step.java} | 13 +- .../common/ThroughputTrend.java} | 20 +- .../common/Topology.java} | 33 ++- .../storage/ui/common/VisualUserNode.java} | 8 +- .../storage/ui/config/AlarmThreshold.java} | 13 +- .../ui/config/ExistedAlarmThresholdItem.java} | 10 +- .../storage/ui/config/ExistedAlarmThresholds.java} | 9 +- .../storage/ui/config/ExistedTTLConfigs.java} | 9 +- .../apm/collector/storage/ui/config/TTL.java} | 10 +- .../storage/ui/config/TTLConfigItem.java} | 10 +- .../overview/AlarmTrend.java} | 21 +- .../storage/ui/overview/ApplicationTPS.java} | 31 ++- .../storage/ui/overview/ClusterBrief.java | 70 ++++++ .../overview/ConjecturalApp.java} | 37 ++- .../overview/ConjecturalAppBrief.java} | 20 +- .../collector/storage/ui/server/AppServerInfo.java | 108 ++++++++ .../apm/collector/storage/ui/server/CPUTrend.java} | 18 +- .../server/GCTrend.java} | 24 +- .../server/MemoryTrend.java} | 44 +++- .../collector/storage/ui/service/ServiceInfo.java} | 23 +- .../storage/ui/service/ServiceMetric.java | 70 ++++++ .../collector/storage/ui/service/ServiceNode.java | 63 +++++ .../apm/collector/storage/ui/trace/BasicTrace.java | 87 +++++++ .../apm/collector/storage/ui/trace/KeyValue.java} | 21 +- .../trace/LogEntity.java} | 31 ++- .../apm/collector/storage/ui/trace/Ref.java} | 40 ++- .../apm/collector/storage/ui/trace/RefType.java} | 10 +- .../apm/collector/storage/ui/trace/Segment.java} | 12 +- .../apm/collector/storage/ui/trace/Span.java | 205 +++++++++++++++ .../IGlobalTraceUIDAO.java => ui/trace/Trace.java} | 21 +- .../trace/TraceBrief.java} | 31 ++- .../storage/ui/trace/TraceQueryCondition.java | 91 +++++++ .../collector/storage/utils/DurationPoint.java} | 20 +- .../storage/utils/TimePyramidTableNameBuilder.java | 50 ++++ ...che.skywalking.apm.collector.core.module.Module | 3 +- .../table/register/ServerTypeDefineTestCase.java} | 28 ++- .../collector-storage-es-provider/pom.xml | 2 +- .../collector/storage/es/DataTTLKeeperTimer.java | 14 +- .../storage/es/StorageModuleEsNamingListener.java | 3 +- .../storage/es/StorageModuleEsProvider.java | 106 +++++--- .../es/base/dao/AbstractPersistenceEsDAO.java | 4 +- .../collector/storage/es/base/dao/BatchEsDAO.java | 4 + .../base/define/ElasticSearchStorageInstaller.java | 13 +- .../es/dao/ApplicationReferenceMetricEsUIDAO.java | 99 -------- .../collector/storage/es/dao/GCMetricEsUIDAO.java | 155 ------------ .../es/dao/InstanceHeartBeatEsPersistenceDAO.java | 4 +- .../storage/es/dao/InstanceMetricEsUIDAO.java | 143 ----------- .../storage/es/dao/MemoryMetricEsUIDAO.java | 89 ------- .../storage/es/dao/SegmentCostEsUIDAO.java | 122 --------- ...O.java => SegmentDurationEsPersistenceDAO.java} | 44 ++-- .../storage/es/dao/ServiceReferenceEsUIDAO.java | 115 --------- ...stractApplicationComponentEsPersistenceDAO.java | 6 +- ...tractApplicationAlarmListEsPersistenceDAO.java} | 43 ++-- .../ApplicationAlarmListEsDayPersistenceDAO.java | 42 ++++ .../ApplicationAlarmListEsHourPersistenceDAO.java | 42 ++++ ...ApplicationAlarmListEsMinutePersistenceDAO.java | 42 ++++ .../ApplicationAlarmListEsMonthPersistenceDAO.java | 42 ++++ .../ApplicationAlarmListEsPersistenceDAO.java | 104 -------- .../AbstractApplicationMetricEsPersistenceDAO.java | 2 - ...AbstractApplicationMappingEsPersistenceDAO.java | 6 +- ...ApplicationReferenceMetricEsPersistenceDAO.java | 2 - .../es/dao/cache/ApplicationEsCacheDAO.java | 16 +- .../storage/es/dao/cache/InstanceEsCacheDAO.java | 4 +- .../es/dao/cache/NetworkAddressEsCacheDAO.java | 24 +- .../es/dao/cache/ServiceNameEsCacheDAO.java | 22 +- .../cpump/AbstractCpuMetricEsPersistenceDAO.java | 2 - .../dao/gcmp/AbstractGCMetricEsPersistenceDAO.java | 2 - .../AbstractInstanceMetricEsPersistenceDAO.java | 2 - .../AbstractInstanceMappingEsPersistenceDAO.java | 2 - ...actInstanceReferenceMetricEsPersistenceDAO.java | 2 - .../AbstractMemoryMetricEsPersistenceDAO.java | 2 - .../AbstractMemoryPoolMetricEsPersistenceDAO.java | 2 - .../es/dao/register/ApplicationRegisterEsDAO.java | 4 +- .../es/dao/register/InstanceRegisterEsDAO.java | 12 +- .../dao/register/NetworkAddressRegisterEsDAO.java | 15 +- .../es/dao/register/ServiceNameRegisterEsDAO.java | 6 +- .../smp/AbstractServiceMetricEsPersistenceDAO.java | 2 - ...ractServiceReferenceMetricEsPersistenceDAO.java | 2 - .../storage/es/dao/ui/ApplicationAlarmEsUIDAO.java | 90 +++++++ .../es/dao/ui/ApplicationAlarmListEsUIDAO.java | 72 ++++++ .../dao/{ => ui}/ApplicationComponentEsUIDAO.java | 53 ++-- .../es/dao/{ => ui}/ApplicationMappingEsUIDAO.java | 37 +-- .../es/dao/ui/ApplicationMetricEsUIDAO.java | 159 ++++++++++++ .../dao/ui/ApplicationReferenceMetricEsUIDAO.java | 119 +++++++++ .../storage/es/dao/{ => ui}/CpuMetricEsUIDAO.java | 45 ++-- .../storage/es/dao/ui/GCMetricEsUIDAO.java | 76 ++++++ .../es/dao/{ => ui}/GlobalTraceEsUIDAO.java | 4 +- .../storage/es/dao/ui/InstanceAlarmEsUIDAO.java | 91 +++++++ .../storage/es/dao/{ => ui}/InstanceEsUIDAO.java | 139 +++++++++-- .../storage/es/dao/ui/InstanceMetricEsUIDAO.java | 159 ++++++++++++ .../storage/es/dao/ui/MemoryMetricEsUIDAO.java | 85 +++++++ .../es/dao/{ => ui}/MemoryPoolMetricEsUIDAO.java | 7 +- .../storage/es/dao/ui/NetworkAddressEsUIDAO.java | 83 +++++++ .../storage/es/dao/ui/SegmentDurationEsUIDAO.java | 104 ++++++++ .../storage/es/dao/{ => ui}/SegmentEsUIDAO.java | 4 +- .../storage/es/dao/ui/ServiceAlarmEsUIDAO.java | 91 +++++++ .../storage/es/dao/ui/ServiceMetricEsUIDAO.java | 235 ++++++++++++++++++ .../es/dao/ui/ServiceNameServiceEsUIDAO.java | 80 ++++++ .../es/dao/ui/ServiceReferenceEsMetricUIDAO.java | 156 ++++++++++++ .../es/define/SegmentCostEsTableDefine.java | 49 ---- .../es/define/SegmentDurationEsTableDefine.java | 49 ++++ ...AbstractApplicationAlarmListEsTableDefine.java} | 16 +- .../ApplicationAlarmListDayEsTableDefine.java} | 17 +- .../ApplicationAlarmListHourEsTableDefine.java} | 17 +- .../ApplicationAlarmListMinuteEsTableDefine.java} | 17 +- .../ApplicationAlarmListMonthEsTableDefine.java} | 17 +- .../AbstractApplicationComponentEsTableDefine.java | 2 +- .../AbstractApplicationMappingEsTableDefine.java | 2 +- .../define/register/ApplicationEsTableDefine.java | 1 + .../es/define/register/InstanceEsTableDefine.java | 3 +- .../register/NetworkAddressEsTableDefine.java | 2 + .../define/register/ServiceNameEsTableDefine.java | 4 +- .../main/resources/META-INF/defines/storage.define | 9 +- .../collector-storage-h2-provider/pom.xml | 2 +- .../storage/h2/StorageModuleH2Provider.java | 104 +++++--- .../h2/dao/ApplicationReferenceMetricH2UIDAO.java | 72 ------ .../collector/storage/h2/dao/GCMetricH2UIDAO.java | 161 ------------ .../storage/h2/dao/InstanceMetricH2UIDAO.java | 169 ------------- .../storage/h2/dao/MemoryMetricH2UIDAO.java | 107 -------- .../storage/h2/dao/SegmentCostH2UIDAO.java | 155 ------------ ...O.java => SegmentDurationH2PersistenceDAO.java} | 40 +-- .../storage/h2/dao/ServiceReferenceH2UIDAO.java | 103 -------- ...stractApplicationComponentH2PersistenceDAO.java | 5 +- ...tractApplicationAlarmListH2PersistenceDAO.java} | 17 +- .../ApplicationAlarmListH2DayPersistenceDAO.java | 41 +++ .../ApplicationAlarmListH2HourPersistenceDAO.java | 41 +++ ...ApplicationAlarmListH2MinutePersistenceDAO.java | 41 +++ .../ApplicationAlarmListH2MonthPersistenceDAO.java | 41 +++ .../AbstractApplicationMetricH2PersistenceDAO.java | 1 + ...AbstractApplicationMappingH2PersistenceDAO.java | 5 +- ...ApplicationReferenceMetricH2PersistenceDAO.java | 1 + .../h2/dao/cache/ApplicationH2CacheDAO.java | 16 +- .../h2/dao/cache/NetworkAddressH2CacheDAO.java | 29 ++- .../h2/dao/cache/ServiceNameH2CacheDAO.java | 28 ++- .../cpump/AbstractCpuMetricH2PersistenceDAO.java | 1 + .../dao/gcmp/AbstractGCMetricH2PersistenceDAO.java | 1 + .../AbstractInstanceMetricH2PersistenceDAO.java | 3 +- .../AbstractInstanceMappingH2PersistenceDAO.java | 1 + ...actInstanceReferenceMetricH2PersistenceDAO.java | 1 + .../AbstractMemoryMetricH2PersistenceDAO.java | 1 + .../AbstractMemoryPoolMetricH2PersistenceDAO.java | 1 + .../h2/dao/register/InstanceRegisterH2DAO.java | 8 +- .../dao/register/NetworkAddressRegisterH2DAO.java | 20 ++ .../h2/dao/register/ServiceNameRegisterH2DAO.java | 10 +- .../smp/AbstractServiceMetricH2PersistenceDAO.java | 1 + ...ractServiceReferenceMetricH2PersistenceDAO.java | 1 + .../h2/dao/ui/ApplicationAlarmH2UIDAO.java} | 32 +-- .../h2/dao/ui/ApplicationAlarmListH2UIDAO.java} | 20 +- .../dao/{ => ui}/ApplicationComponentH2UIDAO.java | 45 ++-- .../h2/dao/{ => ui}/ApplicationMappingH2UIDAO.java | 38 +-- .../h2/dao/ui/ApplicationMetricH2UIDAO.java | 52 ++++ .../dao/ui/ApplicationReferenceMetricH2UIDAO.java | 47 ++++ .../storage/h2/dao/{ => ui}/CpuMetricH2UIDAO.java | 58 ++--- .../storage/h2/dao/ui/GCMetricH2UIDAO.java | 83 +++++++ .../h2/dao/{ => ui}/GlobalTraceH2UIDAO.java | 4 +- .../storage/h2/dao/ui/InstanceAlarmH2UIDAO.java} | 20 +- .../storage/h2/dao/{ => ui}/InstanceH2UIDAO.java | 70 ++++-- .../storage/h2/dao/ui/InstanceMetricH2UIDAO.java | 106 ++++++++ .../storage/h2/dao/ui/MemoryMetricH2UIDAO.java | 91 +++++++ .../h2/dao/{ => ui}/MemoryPoolMetricH2UIDAO.java | 12 +- .../NetworkAddressH2UIDAO.java} | 46 ++-- .../storage/h2/dao/ui/SegmentDurationH2UIDAO.java | 118 +++++++++ .../storage/h2/dao/{ => ui}/SegmentH2UIDAO.java | 4 +- .../storage/h2/dao/ui/ServiceAlarmH2UIDAO.java} | 20 +- .../storage/h2/dao/ui/ServiceMetricH2UIDAO.java | 123 +++++++++ .../h2/dao/ui/ServiceNameServiceH2UIDAO.java | 80 ++++++ .../h2/dao/ui/ServiceReferenceH2MetricUIDAO.java | 48 ++++ .../h2/define/SegmentCostH2TableDefine.java | 45 ---- .../h2/define/SegmentDurationH2TableDefine.java | 46 ++++ ...AbstractApplicationAlarmListH2TableDefine.java} | 6 +- .../ApplicationAlarmListDayH2TableDefine.java} | 13 +- .../ApplicationAlarmListHourH2TableDefine.java} | 13 +- .../ApplicationAlarmListMinuteH2TableDefine.java} | 13 +- .../ApplicationAlarmListMonthH2TableDefine.java} | 13 +- .../AbstractApplicationComponentH2TableDefine.java | 2 +- .../AbstractApplicationMappingH2TableDefine.java | 2 +- .../define/register/ApplicationH2TableDefine.java | 1 + .../h2/define/register/InstanceH2TableDefine.java | 1 + .../register/NetworkAddressH2TableDefine.java | 2 + .../define/register/ServiceNameH2TableDefine.java | 2 +- .../main/resources/META-INF/defines/storage.define | 11 +- apm-collector/apm-collector-storage/pom.xml | 2 +- .../apm-collector-ui/collector-ui-define/pom.xml | 2 +- .../collector-ui-graphql}/pom.xml | 18 +- .../apm/collector/ui/graphql/Mutation.java} | 8 +- .../apm/collector/ui/graphql/Query.java} | 8 +- .../apm/collector/ui/graphql/VersionMutation.java} | 9 +- .../apm/collector/ui/graphql/VersionQuery.java} | 9 +- .../collector-ui-jetty-provider/pom.xml | 7 +- .../collector/ui/jetty/UIModuleJettyProvider.java | 26 +- .../collector/ui/jetty/handler/GraphQLHandler.java | 156 ++++++++++++ .../ui/jetty/handler/SegmentTopGetHandler.java | 141 ----------- .../collector/ui/jetty/handler/SpanGetHandler.java | 66 ----- .../ui/jetty/handler/TraceDagGetHandler.java | 77 ------ .../ui/jetty/handler/TraceStackGetHandler.java | 58 ----- .../application/ApplicationsGetHandler.java | 77 ------ .../instancehealth/InstanceHealthGetHandler.java | 85 ------- .../InstanceMetricGetOneTimeBucketHandler.java | 86 ------- .../InstanceMetricGetRangeTimeBucketHandler.java | 94 ------- .../servicetree/ServiceTreeGetByIdHandler.java | 85 ------- .../time/AllInstanceLastTimeGetHandler.java | 71 ------ .../time/OneInstanceLastTimeGetHandler.java | 70 ------ .../apm/collector/ui/mutation/ConfigMutation.java} | 19 +- .../apm/collector/ui/query/AlarmQuery.java | 70 ++++++ .../apm/collector/ui/query/ApplicationQuery.java | 109 ++++++++ .../apm/collector/ui/query/ConfigQuery.java} | 21 +- .../apm/collector/ui/query/OverViewLayerQuery.java | 148 +++++++++++ .../apm/collector/ui/query/ServerQuery.java | 96 +++++++ .../apm/collector/ui/query/ServiceQuery.java | 98 ++++++++ .../apm/collector/ui/query/TraceQuery.java | 89 +++++++ .../apm/collector/ui/service/AlarmService.java | 183 ++++++++++++++ .../collector/ui/service/ApplicationService.java | 97 +++++++- .../ui/service/ApplicationTopologyService.java | 101 ++++++++ .../ui/service/ClusterTopologyService.java | 77 ++++++ .../ui/service/InstanceHealthService.java | 114 --------- .../collector/ui/service/InstanceJVMService.java | 144 ----------- ...nousService.java => NetworkAddressService.java} | 26 +- .../collector/ui/service/SecondBetweenService.java | 62 +++++ .../collector/ui/service/SegmentTopService.java | 58 ++--- .../apm/collector/ui/service/ServerService.java | 197 +++++++++++++++ .../collector/ui/service/ServiceNameService.java | 112 +++++++++ .../ui/service/ServiceTopologyService.java | 133 ++++++++++ .../collector/ui/service/ServiceTreeService.java | 123 --------- .../apm/collector/ui/service/SpanService.java | 15 +- .../ui/service/TimeSynchronousService.java | 2 +- .../apm/collector/ui/service/TopologyBuilder.java | 251 +++++++++++++++++++ .../collector/ui/service/TraceDagDataBuilder.java | 153 ------------ .../apm/collector/ui/service/TraceDagService.java | 64 ----- .../collector/ui/service/TraceStackService.java | 276 ++++++++++----------- .../apm/collector/ui/utils/ApdexCalculator.java} | 20 +- .../apm/collector/ui/utils/DurationUtils.java | 186 ++++++++++++++ .../apm/collector/ui/utils/PaginationUtils.java} | 45 ++-- .../apm/collector/ui/utils/SLACalculator.java} | 13 +- .../ui/query/ApplicationQueryTestCase.java | 139 +++++++++++ .../collector/ui/utils/DurationUtilsTestCase.java | 112 +++++++++ .../ui/utils/PaginationUtilsTestCase.java | 55 ++++ apm-collector/apm-collector-ui/pom.xml | 3 +- 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 | 8 +- apm-protocol/apm-network/src/main/proto | 1 + .../main/proto/ApplicationRegisterService.proto | 20 -- .../apm-network/src/main/proto/Common.proto | 10 - .../src/main/proto/DiscoveryService.proto | 72 ------ .../apm-network/src/main/proto/Downstream.proto | 8 - .../src/main/proto/JVMMetricsService.proto | 64 ----- .../src/main/proto/KeyWithIntegerValue.proto | 9 - .../src/main/proto/KeyWithStringValue.proto | 9 - .../main/proto/NetworkAddressRegisterService.proto | 19 -- .../src/main/proto/TraceSegmentService.proto | 82 ------ apm-protocol/apm-ui-protocol/pom.xml | 4 +- .../src/main/resources/ui-graphql/alarm.graphqls | 1 + .../ui-graphql/application-layer.graphqls | 26 +- .../src/main/resources/ui-graphql/common.graphqls | 4 +- .../resources/ui-graphql/overview-layer.graphqls | 10 +- .../resources/ui-graphql/server-layer.graphqls | 8 +- .../resources/ui-graphql/service-layer.graphqls | 14 +- .../src/main/resources/ui-graphql/trace.graphqls | 6 +- 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 | 31 ++- .../v1/HystrixCommandConstructorInterceptor.java | 60 +++++ .../v1/HystrixCommandGetFallbackInterceptor.java} | 28 +-- .../hystrix/v1/HystrixCommandRunInterceptor.java} | 34 +-- .../hystrix/v1/HystrixPluginsInterceptor.java} | 21 +- .../plugin/hystrix/v1/SWExecutionHookWrapper.java | 180 ++++++++++++++ .../v1/define/HystrixCommandInstrumentation.java} | 42 ++-- .../v1/define/HystrixPluginsInstrumentation.java} | 30 ++- .../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 | 7 +- .../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 | 78 ++++++ .../v3/MessageConcurrentlyConsumeInterceptor.java} | 41 ++- .../v3/MessageOrderlyConsumeInterceptor.java} | 38 ++- .../plugin/rocketMQ/v3/MessageSendInterceptor.java | 100 ++++++++ .../rocketMQ/v3/OnExceptionInterceptor.java} | 32 ++- .../plugin/rocketMQ/v3/OnSuccessInterceptor.java} | 39 ++- .../rocketMQ/v3/UpdateNameServerInterceptor.java} | 20 +- .../ConsumeMessageConcurrentlyInstrumentation.java | 19 +- .../ConsumeMessageOrderlyInstrumentation.java | 17 +- .../v3}/define/MQClientAPIImplInstrumentation.java | 31 ++- .../v3/define/SendCallBackEnhanceInfo.java | 29 +-- .../v3}/define/SendCallbackInstrumentation.java | 24 +- .../src/main/resources/skywalking-plugin.def | 4 + .../rocketMQ/v3/MessageSendInterceptorTest.java | 136 ++++++++++ .../rocketMQ/v3/OnExceptionInterceptorTest.java | 88 +++++++ .../rocketMQ/v3/OnSuccessInterceptorTest.java | 114 +++++++++ .../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 | 31 +++ .../servicecomb-java-chassis-0.x-plugin/pom.xml | 46 ++++ .../ProducerOperationHandlerInterceptor.java} | 68 ++--- .../TransportClientHandlerInterceptor.java} | 88 +++---- .../ProducerOperationHandlerInstrumentation.java} | 23 +- .../TransportClientHandlerInstrumentation.java} | 30 +-- .../src/main/resources/skywalking-plugin.def | 2 + .../ProducerOperationHandlerInterceptorTest.java | 133 ++++++++++ .../TransportClientHandlerInterceptorTest.java | 128 ++++++++++ .../servicecomb-java-chassis-1.x-plugin/pom.xml | 59 +++++ .../v1/ProducerOperationHandlerInterceptor.java} | 68 ++--- .../v1/TransportClientHandlerInterceptor.java} | 88 +++---- .../ProducerOperationHandlerInstrumentation.java} | 23 +- .../TransportClientHandlerInstrumentation.java} | 30 +-- .../src/main/resources/skywalking-plugin.def | 2 + .../ProducerOperationHandlerInterceptorTest.java | 133 ++++++++++ .../v1/TransportClientHandlerInterceptorTest.java | 128 ++++++++++ .../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 | 22 +- .../apm/webapp/tools/CollectorServerList.java | 89 +++++++ .../apm/webapp/tools/HttpClientTools.java | 73 ++++++ .../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 | 5 +- docs/README_ZH.md | 7 +- docs/Supported-list.md | 2 + ...-CN.md => Deploy-backend-in-cluster-mode-CN.md} | 25 +- ....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 +- docs/cn/Trace-Data-Protocol-CN.md | 162 +++++++++++- ...r-mode.md => Deploy-backend-in-cluster-mode.md} | 38 ++- ...ode.md => Deploy-backend-in-standalone-mode.md} | 14 +- 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 | 1 + 733 files changed, 13805 insertions(+), 7462 deletions(-) create mode 100644 .gitmodules create mode 100644 CONTRIBUTING.md create mode 100644 NOTICE delete mode 100644 NOTICE.txt delete mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandlerTestCase.java delete mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricServiceHandlerTestCase.java rename apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/{InstHeartBeatServiceTestCase.java => mock/AgentDataMock.java} (60%) create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ConsumerMock.java create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/JVMMetricMock.java create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ProviderMock.java create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TimeBuilder.java create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TraceSegmentMock.java copy apm-collector/{apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ISegmentCostUIDAO.java => apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/UniqueIdBuilder.java} (60%) copy apm-collector/{apm-collector-boot/src/main => apm-collector-agent/agent-grpc/agent-grpc-provider/src/test}/resources/log4j2.xml (100%) rename apm-collector/{apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceOsInfoGetHandler.java => apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/handler/InstanceHeartBeatServletHandler.java} (52%) copy apm-collector/{apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListCopy.java} (51%) copy apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/{ApplicationMetricAlarmListPersistenceWorker.java => ApplicationMetricAlarmListDayPersistenceWorker.java} (79%) copy apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/{ApplicationMetricAlarmToListNodeProcessor.java => ApplicationMetricAlarmListDayTransformNode.java} (52%) copy apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/{ApplicationMetricAlarmListPersistenceWorker.java => ApplicationMetricAlarmListHourPersistenceWorker.java} (78%) copy apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/{ApplicationMetricAlarmToListNodeProcessor.java => ApplicationMetricAlarmListHourTransformNode.java} (52%) copy apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/{ApplicationMetricAlarmListPersistenceWorker.java => ApplicationMetricAlarmListMinutePersistenceWorker.java} (78%) rename apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/{ApplicationMetricAlarmListPersistenceWorker.java => ApplicationMetricAlarmListMonthPersistenceWorker.java} (78%) copy apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/{ApplicationMetricAlarmToListNodeProcessor.java => ApplicationMetricAlarmListMonthTransformNode.java} (52%) rename apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/{SegmentCostGraph.java => SegmentDurationGraph.java} (83%) rename apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/{SegmentCostPersistenceWorker.java => SegmentDurationPersistenceWorker.java} (74%) rename apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/{SegmentCostSpanListener.java => SegmentDurationSpanListener.java} (71%) 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 rename apm-collector/{apm-collector-boot/docker => apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/test/resources}/log4j2.xml (95%) 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 rename apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/apache/skywalking/apm/collector/cache/guava/service/{NetworAddressCacheGuavaService.java => NetworkAddressCacheGuavaService.java} (70%) delete mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/IInstanceMetricUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ISegmentCostPersistenceDAO.java => ISegmentDurationPersistenceDAO.java} (86%) delete mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/IServiceReferenceUIDAO.java copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/{IApplicationAlarmListPersistenceDAO.java => IApplicationAlarmListDayPersistenceDAO.java} (86%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/{IApplicationAlarmListPersistenceDAO.java => IApplicationAlarmListHourPersistenceDAO.java} (86%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/{IApplicationAlarmListPersistenceDAO.java => IApplicationAlarmListMinutePersistenceDAO.java} (86%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/{IApplicationAlarmListPersistenceDAO.java => IApplicationAlarmListMonthPersistenceDAO.java} (86%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IGCMetricUIDAO.java => ui/IApplicationAlarmListUIDAO.java} (53%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IGlobalTraceUIDAO.java => ui/IApplicationAlarmUIDAO.java} (72%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IInstanceUIDAO.java => ui/IApplicationComponentUIDAO.java} (59%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IInstanceUIDAO.java => ui/IApplicationMappingUIDAO.java} (59%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IApplicationMetricUIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IApplicationReferenceMetricUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IApplicationReferenceMetricUIDAO.java => ui/ICpuMetricUIDAO.java} (71%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ISegmentCostUIDAO.java => ui/IGCMetricUIDAO.java} (68%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ => ui}/IGlobalTraceUIDAO.java (94%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IGlobalTraceUIDAO.java => ui/IInstanceAlarmUIDAO.java} (72%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ISegmentCostUIDAO.java => ui/IInstanceMetricUIDAO.java} (54%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ => ui}/IInstanceUIDAO.java (64%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IMemoryMetricUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ => ui}/IMemoryPoolMetricUIDAO.java (95%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IGlobalTraceUIDAO.java => ui/INetworkAddressUIDAO.java} (76%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IApplicationComponentUIDAO.java => ui/ISegmentDurationUIDAO.java} (69%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ => ui}/ISegmentUIDAO.java (94%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{IMemoryMetricUIDAO.java => ui/IServiceAlarmUIDAO.java} (73%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IServiceMetricUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/{ICpuMetricUIDAO.java => ui/IServiceNameServiceUIDAO.java} (75%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/IServiceReferenceMetricUIDAO.java copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table}/MetricSource.java (93%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/{ServiceNameTable.java => ServerType.java} (67%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefine.java rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/segment/{SegmentCost.java => SegmentDuration.java} (73%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/segment/{SegmentCostTable.java => SegmentDurationTable.java} (85%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/alarm/Alarm.java} (63%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/alarm/AlarmItem.java copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/alarm/AlarmType.java} (78%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/alarm/CauseType.java} (78%) copy apm-collector/apm-collector-storage/{collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsNamingListener.java => collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/application/Application.java} (60%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/application/ApplicationNode.java rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IApplicationMappingUIDAO.java => ui/application/ConjecturalNode.java} (76%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/common/Call.java copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/common/Duration.java} (61%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/common/Node.java} (62%) copy apm-collector/apm-collector-storage/{collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsNamingListener.java => collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/common/Pagination.java} (59%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IGlobalTraceUIDAO.java => ui/common/ResponseTimeTrend.java} (74%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IGlobalTraceUIDAO.java => ui/common/SLATrend.java} (74%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/common/Step.java} (78%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IGlobalTraceUIDAO.java => ui/common/ThroughputTrend.java} (67%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/common/Topology.java} (61%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/common/VisualUserNode.java} (78%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/NetworkAddressCacheService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/config/AlarmThreshold.java} (72%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/config/ExistedAlarmThresholdItem.java} (77%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/config/ExistedAlarmThresholds.java} (78%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/config/ExistedTTLConfigs.java} (78%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/config/TTL.java} (78%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/config/TTLConfigItem.java} (78%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IGlobalTraceUIDAO.java => ui/overview/AlarmTrend.java} (65%) copy apm-collector/apm-collector-storage/{collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsNamingListener.java => collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/overview/ApplicationTPS.java} (55%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/overview/ClusterBrief.java copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/overview/ConjecturalApp.java} (62%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IGlobalTraceUIDAO.java => ui/overview/ConjecturalAppBrief.java} (68%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/server/AppServerInfo.java copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/server/CPUTrend.java} (75%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IGlobalTraceUIDAO.java => ui/server/GCTrend.java} (65%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/server/MemoryTrend.java} (50%) copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/service/ServiceInfo.java} (70%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/service/ServiceMetric.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/service/ServiceNode.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/BasicTrace.java copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/KeyValue.java} (73%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/trace/LogEntity.java} (63%) copy apm-collector/apm-collector-storage/{collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsNamingListener.java => collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Ref.java} (50%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/RefType.java} (78%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Segment.java} (78%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Span.java rename apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/IGlobalTraceUIDAO.java => ui/trace/Trace.java} (71%) copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{dao/ISegmentCostUIDAO.java => ui/trace/TraceBrief.java} (62%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/TraceQueryCondition.java copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.java => apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/utils/DurationPoint.java} (67%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/utils/TimePyramidTableNameBuilder.java copy apm-collector/apm-collector-storage/collector-storage-define/src/{main/java/org/apache/skywalking/apm/collector/storage/table/register/InstanceTable.java => test/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefineTestCase.java} (56%) delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ApplicationReferenceMetricEsUIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/GCMetricEsUIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/InstanceMetricEsUIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/MemoryMetricEsUIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/SegmentCostEsUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{SegmentCostEsPersistenceDAO.java => SegmentDurationEsPersistenceDAO.java} (61%) delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsUIDAO.java copy apm-collector/apm-collector-storage/{collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ApplicationAlarmListH2PersistenceDAO.java => collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/AbstractApplicationAlarmListEsPersistenceDAO.java} (51%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ApplicationAlarmListEsDayPersistenceDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ApplicationAlarmListEsHourPersistenceDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ApplicationAlarmListEsMinutePersistenceDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ApplicationAlarmListEsMonthPersistenceDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/alarm/ApplicationAlarmListEsPersistenceDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationAlarmEsUIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationAlarmListEsUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{ => ui}/ApplicationComponentEsUIDAO.java (62%) rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{ => ui}/ApplicationMappingEsUIDAO.java (70%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMetricEsUIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationReferenceMetricEsUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{ => ui}/CpuMetricEsUIDAO.java (59%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/GCMetricEsUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{ => ui}/GlobalTraceEsUIDAO.java (96%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceAlarmEsUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{ => ui}/InstanceEsUIDAO.java (53%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceMetricEsUIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/MemoryMetricEsUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{ => ui}/MemoryPoolMetricEsUIDAO.java (91%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/NetworkAddressEsUIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/SegmentDurationEsUIDAO.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/{ => ui}/SegmentEsUIDAO.java (94%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceAlarmEsUIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceMetricEsUIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceNameServiceEsUIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceReferenceEsMetricUIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/SegmentCostEsTableDefine.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/SegmentDurationEsTableDefine.java rename apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/alarm/{ApplicationAlarmListEsTableDefine.java => AbstractApplicationAlarmListEsTableDefine.java} (85%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/alarm/ApplicationAlarmListDayEsTableDefine.java} (62%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/alarm/ApplicationAlarmListHourEsTableDefine.java} (62%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/alarm/ApplicationAlarmListMinuteEsTableDefine.java} (61%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/alarm/ApplicationAlarmListMonthEsTableDefine.java} (62%) delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ApplicationReferenceMetricH2UIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/GCMetricH2UIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/InstanceMetricH2UIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/MemoryMetricH2UIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/SegmentCostH2UIDAO.java rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{SegmentCostH2PersistenceDAO.java => SegmentDurationH2PersistenceDAO.java} (57%) delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2UIDAO.java rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/{ApplicationAlarmListH2PersistenceDAO.java => AbstractApplicationAlarmListH2PersistenceDAO.java} (78%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ApplicationAlarmListH2DayPersistenceDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ApplicationAlarmListH2HourPersistenceDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ApplicationAlarmListH2MinutePersistenceDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/alarm/ApplicationAlarmListH2MonthPersistenceDAO.java copy apm-collector/{apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/BooleanUtils.java => apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ApplicationAlarmH2UIDAO.java} (54%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ISegmentCostUIDAO.java => collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ApplicationAlarmListH2UIDAO.java} (57%) rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => ui}/ApplicationComponentH2UIDAO.java (63%) rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => ui}/ApplicationMappingH2UIDAO.java (66%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ApplicationMetricH2UIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ApplicationReferenceMetricH2UIDAO.java rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => ui}/CpuMetricH2UIDAO.java (55%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/GCMetricH2UIDAO.java rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => ui}/GlobalTraceH2UIDAO.java (96%) copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.java => apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/InstanceAlarmH2UIDAO.java} (57%) rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => ui}/InstanceH2UIDAO.java (65%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/InstanceMetricH2UIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/MemoryMetricH2UIDAO.java rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => ui}/MemoryPoolMetricH2UIDAO.java (92%) copy apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{SegmentH2UIDAO.java => ui/NetworkAddressH2UIDAO.java} (51%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/SegmentDurationH2UIDAO.java rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/{ => ui}/SegmentH2UIDAO.java (95%) copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.java => apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceAlarmH2UIDAO.java} (57%) create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceMetricH2UIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceNameServiceH2UIDAO.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceReferenceH2MetricUIDAO.java delete mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/SegmentCostH2TableDefine.java create mode 100644 apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/SegmentDurationH2TableDefine.java rename apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/{ApplicationAlarmListH2TableDefine.java => AbstractApplicationAlarmListH2TableDefine.java} (91%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/ApplicationAlarmListDayH2TableDefine.java} (65%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/ApplicationAlarmListHourH2TableDefine.java} (65%) copy apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/ApplicationAlarmListMinuteH2TableDefine.java} (65%) rename apm-collector/apm-collector-storage/{collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/alarm/IApplicationAlarmListPersistenceDAO.java => collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/define/alarm/ApplicationAlarmListMonthH2TableDefine.java} (65%) copy apm-collector/{apm-collector-cache/collector-cache-guava-provider => apm-collector-ui/collector-ui-graphql}/pom.xml (81%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-ui/collector-ui-graphql/src/main/java/org/apache/skywalking/apm/collector/ui/graphql/Mutation.java} (78%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-ui/collector-ui-graphql/src/main/java/org/apache/skywalking/apm/collector/ui/graphql/Query.java} (78%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-ui/collector-ui-graphql/src/main/java/org/apache/skywalking/apm/collector/ui/graphql/VersionMutation.java} (78%) copy apm-collector/{apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-ui/collector-ui-graphql/src/main/java/org/apache/skywalking/apm/collector/ui/graphql/VersionQuery.java} (78%) create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/GraphQLHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/SegmentTopGetHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/SpanGetHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/TraceDagGetHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/TraceStackGetHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/application/ApplicationsGetHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/instancehealth/InstanceHealthGetHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetOneTimeBucketHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/instancemetric/InstanceMetricGetRangeTimeBucketHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/servicetree/ServiceTreeGetByIdHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/time/AllInstanceLastTimeGetHandler.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/handler/time/OneInstanceLastTimeGetHandler.java copy apm-collector/{apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ISegmentCostUIDAO.java => apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/mutation/ConfigMutation.java} (63%) create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/AlarmQuery.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/ApplicationQuery.java rename apm-collector/{apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ISegmentCostUIDAO.java => apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/ConfigQuery.java} (60%) create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/OverViewLayerQuery.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/ServerQuery.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/ServiceQuery.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/TraceQuery.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/AlarmService.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ApplicationTopologyService.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ClusterTopologyService.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/InstanceHealthService.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/InstanceJVMService.java copy apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/{TimeSynchronousService.java => NetworkAddressService.java} (58%) create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/SecondBetweenService.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServerService.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServiceNameService.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServiceTopologyService.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/ServiceTreeService.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TopologyBuilder.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java delete mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceDagService.java copy apm-collector/{apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.java => apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/utils/ApdexCalculator.java} (65%) create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/utils/DurationUtils.java 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-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/ServiceIdCacheService.java => apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/utils/SLACalculator.java} (78%) create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/query/ApplicationQueryTestCase.java create mode 100644 apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/utils/DurationUtilsTestCase.java 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 160000 apm-protocol/apm-network/src/main/proto delete mode 100644 apm-protocol/apm-network/src/main/proto/ApplicationRegisterService.proto delete mode 100644 apm-protocol/apm-network/src/main/proto/Common.proto delete mode 100644 apm-protocol/apm-network/src/main/proto/DiscoveryService.proto delete mode 100644 apm-protocol/apm-network/src/main/proto/Downstream.proto delete mode 100644 apm-protocol/apm-network/src/main/proto/JVMMetricsService.proto delete mode 100644 apm-protocol/apm-network/src/main/proto/KeyWithIntegerValue.proto delete mode 100644 apm-protocol/apm-network/src/main/proto/KeyWithStringValue.proto delete mode 100644 apm-protocol/apm-network/src/main/proto/NetworkAddressRegisterService.proto delete mode 100644 apm-protocol/apm-network/src/main/proto/TraceSegmentService.proto create mode 100644 apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml copy apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsNamingListener.java => apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/EnhanceRequireObjectCache.java (51%) 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/{mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptor.java => hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandGetFallbackInterceptor.java} (63%) copy apm-sniffer/apm-sdk-plugin/{postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateCallableStatementInterceptor.java => hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/HystrixCommandRunInterceptor.java} (56%) 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-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/logback/v1/x/mdc/MDCConverterActivation.java => apm-sdk-plugin/hystrix-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/hystrix/v1/define/HystrixPluginsInstrumentation.java} (68%) 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%) create mode 100644 apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/AbstractMessageConsumeInterceptor.java copy apm-sniffer/apm-sdk-plugin/{spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageConcurrentlyConsumeInterceptor.java} (50%) copy apm-sniffer/apm-sdk-plugin/{spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageOrderlyConsumeInterceptor.java} (50%) create mode 100644 apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageSendInterceptor.java copy apm-sniffer/apm-sdk-plugin/{mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreateCallableStatementInterceptor.java => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnExceptionInterceptor.java} (58%) copy apm-sniffer/apm-sdk-plugin/{mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/CreatePreparedStatementInterceptor.java => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnSuccessInterceptor.java} (52%) copy apm-sniffer/apm-sdk-plugin/{spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/CreateAopProxyInterceptor.java => rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/UpdateNameServerInterceptor.java} (74%) 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-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsNamingListener.java => apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/define/SendCallBackEnhanceInfo.java (55%) 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 create mode 100644 apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/MessageSendInterceptorTest.java create mode 100644 apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnExceptionInterceptorTest.java create mode 100644 apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rocketMQ/v3/OnSuccessInterceptorTest.java create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml copy apm-sniffer/apm-sdk-plugin/{resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java => servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptor.java} (56%) copy apm-sniffer/apm-sdk-plugin/{resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java => servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptor.java} (51%) copy apm-sniffer/apm-sdk-plugin/{motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java => servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/ProducerOperationHandlerInstrumentation.java} (73%) copy apm-sniffer/apm-sdk-plugin/{dubbo-plugin/src/main/java/org/apache/skywalking/apm/plugin/dubbo/DubboInstrumentation.java => servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/define/TransportClientHandlerInstrumentation.java} (74%) create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/main/resources/skywalking-plugin.def create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/ProducerOperationHandlerInterceptorTest.java create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/TransportClientHandlerInterceptorTest.java create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml copy apm-sniffer/apm-sdk-plugin/{resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java => servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptor.java} (56%) copy apm-sniffer/apm-sdk-plugin/{resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java => servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptor.java} (51%) copy apm-sniffer/apm-sdk-plugin/{motan-plugin/src/main/java/org/apache/skywalking/apm/plugin/motan/define/MotanConsumerInstrumentation.java => servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/ProducerOperationHandlerInstrumentation.java} (72%) copy apm-sniffer/apm-sdk-plugin/{dubbo-plugin/src/main/java/org/apache/skywalking/apm/plugin/dubbo/DubboInstrumentation.java => servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/servicecomb/v1/define/TransportClientHandlerInstrumentation.java} (74%) create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/main/resources/skywalking-plugin.def create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/ProducerOperationHandlerInterceptorTest.java create mode 100644 apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/servicecomb/v1/TransportClientHandlerInterceptorTest.java create mode 100644 apm-webapp/pom.xml create mode 100644 apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/ApplicationStartUp.java rename apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/MetricSource.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 create mode 100644 apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/tools/HttpClientTools.java 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} (68%) 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} (55%) rename docs/en/{Deploy-collector-in-standalone-mode.md => Deploy-backend-in-standalone-mode.md} (60%) delete mode 100644 docs/en/Deploy-docker-image.md create mode 100644 docs/en/How-to-release.md create mode 160000 skywalking-ui -- To stop receiving notification emails like this one, please contact wush...@apache.org.