You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/11/06 06:17:09 UTC
[incubator-skywalking] branch sw6-header updated (1263e3d ->
87c8482)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch sw6-header
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 1263e3d Add sw6 header document.
add b426390 Support metrics downsampling. (#1765)
add c467e5c Fixed JVM handler error. Forgot to use break in switch case code. (#1766)
add 72f2b1c Provide rest protocol for register and trace receiver. (#1774)
add f78abfb Fixed the bug of service topology and global topology. (#1775)
add c838d16 Update InterceptPoint.java (#1776)
add b367c36 Fixed the endpoint topology bug. (#1778)
add a12e8ba Provide new getEndpointInfo service in query protocol. (#1780)
add 1a16f29 Update powered-by.md (#1781)
add cb0b817 Fix indicator merge failue. (#1782)
add 4e99e89 Set instance attributes into return value. (#1783)
add 064595e Fixed the segment parse bug. Each use requires the creation of a new instance. (#1784)
add 4063397 Trigger service heartbeat when received service instance heartbeat. (#1785)
add ee10c23 Update powered-by.md (#1787)
add c60946c Update byte-buddy lib version to 1.9.2 (#1788)
add ad63d1c Update submodule skywalking-ui (#1795)
add 7bb577a Provide auto delete history data service. (#1797)
add 6c92fc5 1. Delete service component indicator. (#1809)
add 24e958f 1. Fixed the bug of inventory equals method. (#1814)
add d9556c3 Make Mesh and Istio receivers ready (#1821)
add 9b3192f Set span layer into network inventory for distinguish what the network address is. MQ? DB? ... (#1824)
add 072ee39 Fix issue that the oap package miss configure file (#1826)
add b11d479 Add service and instance reset function (#1790)
add a9489b7 H2 storage (#1712)
add 0c6a784 Modify webapp for v6 (#1829)
add 4598f45 Webapp/proxy (#1831)
add 2dd4f54 Add some missing documents for v6 (#1830)
add 8cd327d Revert #1790 reset feature and provide default alarm settings. (#1833)
add e7526ac Deploy docker (#1834)
add 56fbb0d Update ui (#1835)
add 974192e Keep service instance register based on UUID, but change name to a meaning string. (#1836)
add 2b1ad22 Update powered-by.md (#1839)
add 33c1db4 添加北京国槐信息科技有限公司 (#1840)
add 90bb8c6 Fix k8s api bugs (#1842)
add 7214329 Add docker scripts (#1843)
add 948ef6d Fixed the bugs of the OAP server running in cluster mode. (#1844)
add b6241b2 Optimize collector settings and indicator (#1841)
add 041ed43 Add documents of kubernetes (#1810)
add dbf0444 Fix NPE in protobuf and illegal query parameter. (#1847)
add f2828e7 Update submodule ui (#1846)
add 279c81e Fix k8s api connection leak (#1848)
add 07e799e Fix bugs (#1854)
add 08f634b Update overview.md (#1855)
add 13f8825 Bug fix (#1857)
add 7b36c79 Update powered-by.md (#1858)
add 7cd805a Make setting and doc consistent with backend default settings. (#1860)
add c36ffb0 Update backend-storage docs (#1861)
add 4d17c45 Submodule/ui (#1856)
add 6b1014c Fixed the collector OOM bug. (#1862)
add 75e4c67 Endpoint register to client and server side based on detect point. (#1866)
add 76e4c59 avoid NPE. (#1869)
add a6c3e6c Update powered-by.md (#1871)
add 13c417c Update README.md (#1872)
add e9d4c52 Make sure heartbeat working always. (#1873)
add 884dd8c Add detect point to be a part of unique key of the endpoint id. (#1874)
add 5f867ad Update screenshot. (#1877)
add 4399c66 Make metric value to long to avoid too big integer issue. (#1876)
add dc379fd Fix issue that H2 plugin is ineffective (#1878)
add 7537af0 Fix the test case. (#1879)
add 87c8482 Merge branch 'master' into sw6-header
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 2 +-
README.md | 21 +-
.../apm/commons/datacarrier/DataCarrier.java | 10 +-
.../commons/datacarrier/consumer/ConsumerPool.java | 9 +-
.../datacarrier/consumer/ConsumerPoolTest.java | 4 +-
apm-dist/release-docs/LICENSE | 10 +-
apm-protocol/apm-network/pom.xml | 4 +
.../network/trace/component/ComponentsDefine.java | 2 +-
apm-sniffer/apm-agent-core/pom.xml | 93 ++++---
.../apm/agent/core/plugin/WitnessClassFinder.java | 2 +-
.../core/remote/AppAndServiceRegisterClient.java | 69 +++--
.../apm/agent/core/boot/ServiceManagerTest.java | 2 +-
apm-sniffer/apm-agent/pom.xml | 2 +
.../h2/define/JdbcXAConnectionInstrumentation.java | 2 +-
.../plugin/mongodb/v2/define/InterceptPoint.java | 2 +-
apm-sniffer/config/agent.config | 2 +-
apm-webapp/src/main/assembly/webapp.yml | 5 +-
.../apm/webapp/proxy/CollectorServerList.java | 89 ------
.../skywalking/apm/webapp/proxy/MvcConfig.java | 66 +++++
apm-webapp/src/main/resources/application.yml | 6 +-
.../apm/webapp/proxy/NIWSServerListTest.java | 95 -------
docker/Makefile | 13 +-
docker/README.md | 8 +-
.../resources => docker/config}/alarm-settings.yml | 0
.../resources => docker/config}/application.yml | 22 +-
.../config}/component-libraries.yml | 7 +-
docker/{snapshot => config}/log4j2.xml | 0
docker/{stack.yml => docker-compose.yml} | 16 +-
docker/{snapshot => oap}/Dockerfile | 5 +-
docker/{snapshot => oap}/docker-entrypoint.sh | 7 +-
docker/{snapshot => oap}/log4j2.xml | 0
docker/{snapshot => ui}/Dockerfile | 9 +-
.../ui/docker-entrypoint.sh | 6 +-
.../logback-spring.xml => docker/ui/logback.xml | 7 +-
docs/Screenshots.md | 36 ++-
docs/en/concepts-and-designs/overview.md | 4 +-
docs/en/concepts-and-designs/scope-definitions.md | 3 +
docs/en/protocols/Trace-Data-Protocol.md | 2 +-
docs/en/setup/backend/backend-cluster.md | 4 -
docs/en/setup/backend/backend-k8s.md | 6 +-
docs/en/setup/backend/backend-receivers.md | 4 +
docs/en/setup/backend/backend-storage.md | 12 +-
docs/en/setup/backend/ui-setup.md | 20 ++
docs/en/setup/istio/README.md | 18 ++
docs/powered-by.md | 86 +++---
kubernetes/elasticsearch/01-storageclass.yml | 25 --
kubernetes/elasticsearch/02-service.yml | 32 ---
kubernetes/elasticsearch/03-statefulset.yml | 117 --------
kubernetes/istio/01-metrictemplete.yml | 24 --
kubernetes/istio/02-skywalingadapter.yml | 26 --
kubernetes/istio/03-operator_cfg.yml | 63 -----
kubernetes/namespace.yml | 22 --
kubernetes/oap/01-service.yml | 32 ---
kubernetes/oap/02-deployment.yml | 49 ----
oap-server/pom.xml | 17 ++
.../server/core/alarm/provider/RunningRule.java | 31 ++-
.../core/alarm/provider/WebhookCallbackTest.java | 11 +-
.../plugin/kubernetes/KubernetesCoordinator.java | 4 +
.../dependencies/NamespacedPodListWatch.java | 43 ++-
...alking.oap.server.library.module.ModuleProvider | 0
.../plugin/zookeeper/ZookeeperCoordinator.java | 40 ++-
.../skywalking/oap/server/core/CoreModule.java | 3 +-
.../oap/server/core/CoreModuleConfig.java | 34 ++-
.../oap/server/core/CoreModuleProvider.java | 68 ++++-
.../core/{query/entity/KVInt.java => DataTTL.java} | 11 +-
.../oap/server/core/alarm/AlarmMeta.java | 3 +-
.../server/core/analysis/DispatcherManager.java | 4 -
.../core/analysis/generated/all/AllDispatcher.java | 2 +-
.../generated/all/AllHeatmapIndicator.java | 35 +--
.../analysis/generated/all/AllP50Indicator.java | 35 +--
.../analysis/generated/all/AllP75Indicator.java | 35 +--
.../analysis/generated/all/AllP90Indicator.java | 35 +--
.../analysis/generated/all/AllP95Indicator.java | 35 +--
.../analysis/generated/all/AllP99Indicator.java | 35 +--
.../generated/endpoint/EndpointAvgIndicator.java | 35 +--
.../generated/endpoint/EndpointCpmIndicator.java | 33 +--
.../generated/endpoint/EndpointDispatcher.java | 2 +-
.../generated/endpoint/EndpointP50Indicator.java | 45 +--
.../generated/endpoint/EndpointP75Indicator.java | 45 +--
.../generated/endpoint/EndpointP90Indicator.java | 45 +--
.../generated/endpoint/EndpointP95Indicator.java | 45 +--
.../generated/endpoint/EndpointP99Indicator.java | 45 +--
.../generated/endpoint/EndpointSlaIndicator.java | 35 +--
.../EndpointRelationCpmIndicator.java | 37 ++-
.../EndpointRelationDispatcher.java | 2 +-
.../EndpointRelationRespTimeIndicator.java | 39 ++-
.../generated/service/ServiceCpmIndicator.java | 29 +-
.../generated/service/ServiceDispatcher.java | 2 +-
.../generated/service/ServiceP50Indicator.java | 41 +--
.../generated/service/ServiceP75Indicator.java | 41 +--
.../generated/service/ServiceP90Indicator.java | 41 +--
.../generated/service/ServiceP95Indicator.java | 41 +--
.../generated/service/ServiceP99Indicator.java | 41 +--
.../service/ServiceRespTimeIndicator.java | 31 +--
.../generated/service/ServiceSlaIndicator.java | 31 +--
.../ServiceInstanceCpmIndicator.java | 31 +--
.../serviceinstance/ServiceInstanceDispatcher.java | 2 +-
.../ServiceInstanceRespTimeIndicator.java | 33 +--
.../InstanceJvmCpuIndicator.java | 33 +--
.../ServiceInstanceJVMCPUDispatcher.java | 2 +-
.../InstanceJvmOldGcCountIndicator.java | 29 +-
.../InstanceJvmOldGcTimeIndicator.java | 33 +--
.../InstanceJvmYoungGcCountIndicator.java | 29 +-
.../InstanceJvmYoungGcTimeIndicator.java | 33 +--
.../ServiceInstanceJVMGCDispatcher.java | 2 +-
.../InstanceJvmMemoryHeapIndicator.java | 33 +--
.../InstanceJvmMemoryHeapMaxIndicator.java | 33 +--
.../InstanceJvmMemoryNoheapIndicator.java | 33 +--
.../InstanceJvmMemoryNoheapMaxIndicator.java | 33 +--
.../ServiceInstanceJVMMemoryDispatcher.java | 4 +-
.../ServiceInstanceJVMMemoryPoolDispatcher.java | 2 +-
.../ServiceInstanceRelationDispatcher.java | 2 +-
.../ServiceRelationClientCallSlaIndicator.java | 31 +--
.../ServiceRelationClientCpmIndicator.java | 29 +-
.../ServiceRelationClientRespTimeIndicator.java | 31 +--
.../servicerelation/ServiceRelationDispatcher.java | 2 +-
.../ServiceRelationServerCallSlaIndicator.java | 31 +--
.../ServiceRelationServerCpmIndicator.java | 29 +-
.../ServiceRelationServerRespTimeIndicator.java | 31 +--
.../server/core/analysis/indicator/Indicator.java | 7 +-
.../core/analysis/indicator/IntKeyLongValue.java | 6 +
.../analysis/indicator/IntKeyLongValueArray.java | 13 +
.../core/analysis/indicator/PercentIndicator.java | 2 +-
.../analysis/indicator/ThermodynamicIndicator.java | 18 +-
...ConstOne.java => IndicatorAnnotationUtils.java} | 10 +-
.../EndpointCallRelationDispatcher.java | 15 +-
.../EndpointRelationClientSideIndicator.java | 151 -----------
.../EndpointRelationServerSideIndicator.java | 31 ++-
.../analysis/manual/segment/SegmentRecord.java | 2 +-
.../manual/service/ServiceComponentDispatcher.java | 42 ---
.../manual/service/ServiceComponentIndicator.java | 157 -----------
.../manual/service/ServiceMappingDispatcher.java | 42 ---
.../manual/service/ServiceMappingIndicator.java | 160 -----------
.../ServiceCallRelationDispatcher.java | 4 +
.../ServiceRelationClientSideIndicator.java | 31 ++-
.../ServiceRelationServerSideIndicator.java | 31 ++-
.../analysis/worker/IndicatorAggregateWorker.java | 16 +-
.../analysis/worker/IndicatorPersistentWorker.java | 63 ++++-
.../core/analysis/worker/IndicatorProcess.java | 41 ++-
.../analysis/worker/IndicatorRemoteWorker.java | 8 +-
.../core/analysis/worker/IndicatorTransWorker.java | 68 +++++
.../core/analysis/worker/PersistenceWorker.java | 2 +-
.../analysis/worker/RecordPersistentWorker.java | 35 +++
.../oap/server/core/cache/CacheUpdateTimer.java | 71 +++++
.../server/core/cache/EndpointInventoryCache.java | 6 +-
.../core/cache/ServiceInstanceInventoryCache.java | 8 +-
.../oap/server/core/cluster/RemoteInstance.java | 2 +-
.../config/ComponentLibraryCatalogService.java | 6 +-
.../core/config/DownsamplingConfigService.java | 57 ++++
.../config/IComponentLibraryCatalogService.java | 2 +-
.../server/core/query/MetadataQueryService.java | 32 ++-
.../oap/server/core/query/MetricQueryService.java | 5 +
.../oap/server/core/query/TopologyBuilder.java | 175 +++++-------
.../server/core/query/TopologyQueryService.java | 122 ++++++---
.../oap/server/core/query/TraceQueryService.java | 1 +
.../oap/server/core/query/entity/Attribute.java | 8 +
.../oap/server/core/query/entity/Call.java | 1 +
.../oap/server/core/query/entity/Endpoint.java | 2 +-
.../query/entity/{Node.java => EndpointInfo.java} | 6 +-
.../oap/server/core/query/entity/IntValues.java | 19 +-
.../oap/server/core/query/entity/KVInt.java | 2 +-
.../oap/server/core/query/entity/Service.java | 2 +-
.../server/core/query/entity/Thermodynamic.java | 23 +-
.../oap/server/core/query/entity/TopNEntity.java | 2 +-
.../server/core/register/EndpointInventory.java | 26 +-
.../core/register/NetworkAddressInventory.java | 27 +-
.../oap/server/core/register/RegisterSource.java | 2 +-
.../core/register/ServiceInstanceInventory.java | 58 ++--
.../oap/server/core/register/ServiceInventory.java | 52 +++-
.../service/EndpointInventoryRegister.java | 6 +-
.../service/IEndpointInventoryRegister.java | 2 +-
.../service/INetworkAddressInventoryRegister.java | 4 +-
.../service/IServiceInstanceInventoryRegister.java | 2 +-
.../service/IServiceInventoryRegister.java | 4 +-
.../service/NetworkAddressInventoryRegister.java | 37 ++-
.../service/ServiceInstanceInventoryRegister.java | 7 +-
.../register/service/ServiceInventoryRegister.java | 20 +-
.../register/worker/RegisterDistinctWorker.java | 6 +-
.../register/worker/RegisterPersistentWorker.java | 57 +++-
.../server/core/remote/RemoteSenderService.java | 5 +-
.../core/remote/client/GRPCRemoteClient.java | 74 ++---
.../core/remote/client/RemoteClientManager.java | 25 +-
.../oap/server/core/source/DetectPoint.java | 2 +-
.../oap/server/core/source/EndpointRelation.java | 7 +-
.../skywalking/oap/server/core/source/Scope.java | 1 -
.../oap/server/core/source/ServiceComponent.java | 43 ---
.../core/source/ServiceInstanceRelation.java | 3 +-
.../oap/server/core/source/ServiceMapping.java | 42 ---
.../oap/server/core/source/ServiceRelation.java | 23 +-
...lder.java => DownSamplingModelNameBuilder.java} | 14 +-
.../{TimePyramid.java => Downsampling.java} | 4 +-
.../{IBatchDAO.java => IHistoryDeleteDAO.java} | 6 +-
.../oap/server/core/storage/IIndicatorDAO.java | 2 -
.../oap/server/core/storage/IRecordDAO.java | 2 -
.../oap/server/core/storage/StorageException.java | 4 +
.../oap/server/core/storage/StorageModule.java | 1 +
.../annotation/StorageAnnotationListener.java | 6 +-
.../core/storage/annotation/StorageEntity.java | 2 +
.../annotation/StorageEntityAnnotationUtils.java | 9 +
.../storage/cache/IEndpointInventoryCacheDAO.java | 2 +-
.../cache/IServiceInstanceInventoryCacheDAO.java | 2 +-
.../storage/cache/IServiceInventoryCacheDAO.java | 3 +
.../oap/server/core/storage/model/Model.java | 10 +-
.../server/core/storage/model/ModelInstaller.java | 28 +-
.../core/storage/query/ITopologyQueryDAO.java | 8 -
.../core/storage/ttl/DataTTLKeeperTimer.java | 131 +++++++++
.../server/core/storage/type/StorageDataType.java | 2 +
.../analysis/indicator/PercentIndicatorTest.java | 6 +-
.../indicator/ThermodynamicIndicatorTest.java | 10 +-
.../config/ComponentLibraryCatalogFileTest.java | 2 +-
oap-server/server-library/library-buffer/pom.xml | 17 +-
oap-server/server-library/library-client/pom.xml | 4 +-
.../client/elasticsearch/ElasticSearchClient.java | 11 +-
.../oap/server/library/client/h2/H2Client.java | 113 --------
.../server/library/client/h2/H2ClientConfig.java | 53 ----
.../library/client/h2/H2ClientException.java | 35 ---
.../library/client/jdbc/JDBCClientException.java | 15 +-
.../client/jdbc/hikaricp/JDBCHikariCPClient.java | 128 +++++++++
.../client/shardingjdbc/ShardingjdbcClient.java | 150 ----------
.../shardingjdbc/ShardingjdbcClientConfig.java | 73 -----
.../shardingjdbc/ShardingjdbcClientException.java | 35 ---
.../oap/server/library/server/grpc/GRPCServer.java | 13 +
.../oap/server/library/util/StringUtils.java | 4 +
.../oap/query/graphql/resolver/MetadataQuery.java | 4 +
.../oap/query/graphql/resolver/TopologyQuery.java | 8 +-
.../src/main/resources/query-protocol | 2 +-
.../handler/IstioTelemetryHandlerMainTest.java | 86 ++++++
.../fixture/01-ingress-reviewsv1-policy.msg | 193 +++++++++++++
.../fixture/02-productpage-details-policy.msg | 193 +++++++++++++
.../resources/fixture/03-productpage-details.msg | 193 +++++++++++++
.../resources/fixture/04-productpage-details.msg | 105 +++++++
.../resources/fixture/05-productpage-reviews.msg | 105 +++++++
.../resources/fixture/06-productpage-reviews.msg | 105 +++++++
.../resources/fixture/07-ingress-productpage.msg | 105 +++++++
.../resources/fixture/08-ingress-productpage.msg | 105 +++++++
.../test/resources/fixture/09-policy-telemetry.msg | 105 +++++++
.../test/resources/fixture/10-policy-telemetry.msg | 105 +++++++
.../resources/fixture/11-details-telemetry.msg | 105 +++++++
.../fixture/12-ingress-productpage-telemetry.msg | 193 +++++++++++++
.../resources/fixture/13-productpage-telemetry.msg | 105 +++++++
.../fixture/14-reviews-productpage-telemetry.msg | 193 +++++++++++++
.../provider/handler/JVMMetricsServiceHandler.java | 13 +-
.../handler/JVMMetricsServiceHandlerMainTest.java | 7 +-
.../receiver/mesh/MeshDataBufferFileCache.java | 2 +-
.../mesh/ServiceMeshMetricDataDecorator.java | 34 ++-
.../receiver/mesh/TelemetryDataDispatcher.java | 88 +++++-
.../register/provider/RegisterModuleProvider.java | 15 +-
.../v5/{ => grpc}/ApplicationRegisterHandler.java | 2 +-
.../InstanceDiscoveryServiceHandler.java | 35 ++-
.../NetworkAddressRegisterServiceHandler.java | 2 +-
.../v5/{ => grpc}/ServiceNameDiscoveryHandler.java | 2 +-
.../v5/rest/ApplicationRegisterServletHandler.java | 71 +++++
.../v5/rest/InstanceDiscoveryServletHandler.java | 99 +++++++
.../v5/rest/InstanceHeartBeatServletHandler.java | 82 ++++++
.../rest/NetworkAddressRegisterServletHandler.java | 76 ++++++
.../rest/ServiceNameDiscoveryServiceHandler.java | 86 ++++++
.../trace/provider/TraceModuleProvider.java | 18 +-
.../handler/{ => v5/grpc}/SegmentCounter.java | 2 +-
.../{ => v5/grpc}/TraceSegmentServiceHandler.java | 10 +-
.../v5/rest/TraceSegmentServletHandler.java | 78 ++++++
.../rest/reader/KeyWithStringValueJsonReader.java | 54 ++++
.../handler/v5/rest/reader/LogJsonReader.java | 60 ++++
.../v5/rest/reader/ReferenceJsonReader.java | 92 +++++++
.../handler/v5/rest/reader/SegmentJsonReader.java | 77 ++++++
.../handler/v5/rest/reader/SpanJsonReader.java | 126 +++++++++
.../v5/rest/reader/StreamJsonReader.java} | 15 +-
.../v5/rest/reader/TraceSegment.java} | 25 +-
.../v5/rest/reader/TraceSegmentJsonReader.java | 64 +++++
.../v5/rest/reader/UniqueIdJsonReader.java} | 19 +-
.../trace/provider/parser/SegmentParse.java | 32 ++-
.../listener/endpoint/MultiScopesSpanListener.java | 14 +-
.../parser/listener/endpoint/SourceBuilder.java | 4 +
.../listener/segment/SegmentSpanListener.java | 2 +-
.../service/ServiceComponentSpanListener.java | 77 ------
.../service/ServiceMappingSpanListener.java | 41 +--
.../standardization/ReferenceIdExchanger.java | 5 +-
.../SegmentStandardizationWorker.java | 6 +-
.../parser/standardization/SpanIdExchanger.java | 3 +-
.../server/receiver/trace/mock/AgentDataMock.java | 41 ++-
.../server/receiver/trace/mock/RegisterMock.java | 117 ++------
.../mock/{ConsumerMock.java => ServiceAMock.java} | 103 ++-----
.../mock/{ProviderMock.java => ServiceBMock.java} | 91 +++++--
.../mock/{ProviderMock.java => ServiceCMock.java} | 97 +++----
oap-server/server-starter/pom.xml | 4 +-
.../src/main/assembly/alarm-settings.yml | 44 ++-
.../main/{resources => assembly}/application.yml | 40 +--
.../src/main/resources/application.yml | 20 +-
.../src/main/resources/component-libraries.yml | 6 +
.../server-starter/src/main/resources/log4j2.xml | 7 +-
oap-server/server-storage-plugin/pom.xml | 2 +-
.../StorageModuleElasticsearchProvider.java | 1 +
.../elasticsearch/base/BatchProcessEsDAO.java | 2 +
.../{StorageEsDAO.java => HistoryDeleteEsDAO.java} | 28 +-
.../plugin/elasticsearch/base/IndicatorEsDAO.java | 6 +-
.../plugin/elasticsearch/base/RecordEsDAO.java | 3 -
.../cache/EndpointInventoryCacheEsDAO.java | 8 +-
.../cache/NetworkAddressInventoryCacheEsDAO.java | 2 +-
.../cache/ServiceInstanceInventoryCacheDAO.java | 4 +-
.../cache/ServiceInventoryCacheEsDAO.java | 29 +-
.../elasticsearch/query/AggregationQueryEsDAO.java | 14 +-
.../elasticsearch/query/MetadataQueryEsDAO.java | 37 ++-
.../elasticsearch/query/MetricQueryEsDAO.java | 41 +--
.../elasticsearch/query/TopologyQueryEsDAO.java | 156 +++--------
.../storage-h2-plugin/pom.xml | 33 ---
.../pom.xml | 9 +-
.../server/storage/plugin/jdbc/SQLBuilder.java} | 37 ++-
.../server/storage/plugin/jdbc/SQLExecutor.java | 31 ++-
.../server/storage/plugin/jdbc/TableMetaInfo.java | 19 +-
.../plugin/jdbc/h2/H2RegisterLockInstaller.java} | 29 +-
.../storage/plugin/jdbc/h2/H2StorageConfig.java} | 18 +-
.../storage/plugin/jdbc/h2/H2StorageProvider.java | 143 ++++++++++
.../plugin/jdbc/h2/dao/H2AggregationQueryDAO.java | 127 +++++++++
.../plugin/jdbc/h2/dao/H2AlarmQueryDAO.java} | 20 +-
.../storage/plugin/jdbc/h2/dao/H2BatchDAO.java | 63 +++++
.../jdbc/h2/dao/H2EndpointInventoryCacheDAO.java | 51 ++++
.../plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java | 14 +-
.../storage/plugin/jdbc/h2/dao/H2IndicatorDAO.java | 51 ++++
.../plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 301 +++++++++++++++++++++
.../plugin/jdbc/h2/dao/H2MetricQueryDAO.java | 240 ++++++++++++++++
.../h2/dao/H2NetworkAddressInventoryCacheDAO.java | 52 ++++
.../storage/plugin/jdbc/h2/dao/H2RecordDAO.java | 43 +++
.../storage/plugin/jdbc/h2/dao/H2RegisterDAO.java | 89 ++++++
.../plugin/jdbc/h2/dao/H2RegisterLockDAO.java} | 17 +-
.../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 169 ++++++++++++
.../h2/dao/H2ServiceInstanceInventoryCacheDAO.java | 61 +++++
.../jdbc/h2/dao/H2ServiceInventoryCacheDAO.java | 96 +++++++
.../storage/plugin/jdbc/h2/dao/H2StorageDAO.java} | 25 +-
.../plugin/jdbc/h2/dao/H2TableInstaller.java | 115 ++++++++
.../plugin/jdbc/h2/dao/H2TopologyQueryDAO.java | 156 +++++++++++
.../plugin/jdbc/h2/dao/H2TraceQueryDAO.java | 173 ++++++++++++
...alking.oap.server.library.module.ModuleProvider | 2 +-
pom.xml | 6 +-
skywalking-ui | 2 +-
333 files changed, 8437 insertions(+), 3973 deletions(-)
delete mode 100644 apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/CollectorServerList.java
create mode 100644 apm-webapp/src/main/java/org/apache/skywalking/apm/webapp/proxy/MvcConfig.java
delete mode 100644 apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/proxy/NIWSServerListTest.java
copy {oap-server/server-starter/src/main/resources => docker/config}/alarm-settings.yml (100%)
copy {oap-server/server-starter/src/main/resources => docker/config}/application.yml (86%)
copy {oap-server/server-core/src/test/resources => docker/config}/component-libraries.yml (98%)
copy docker/{snapshot => config}/log4j2.xml (100%)
rename docker/{stack.yml => docker-compose.yml} (79%)
copy docker/{snapshot => oap}/Dockerfile (85%)
rename docker/{snapshot => oap}/docker-entrypoint.sh (84%)
rename docker/{snapshot => oap}/log4j2.xml (100%)
rename docker/{snapshot => ui}/Dockerfile (82%)
copy apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/main/resources/skywalking-plugin.def => docker/ui/docker-entrypoint.sh (88%)
mode change 100644 => 100755
copy apm-webapp/src/main/resources/logback-spring.xml => docker/ui/logback.xml (75%)
delete mode 100644 kubernetes/elasticsearch/01-storageclass.yml
delete mode 100644 kubernetes/elasticsearch/02-service.yml
delete mode 100644 kubernetes/elasticsearch/03-statefulset.yml
delete mode 100644 kubernetes/istio/01-metrictemplete.yml
delete mode 100644 kubernetes/istio/02-skywalingadapter.yml
delete mode 100644 kubernetes/istio/03-operator_cfg.yml
delete mode 100644 kubernetes/namespace.yml
delete mode 100644 kubernetes/oap/01-service.yml
delete mode 100644 kubernetes/oap/02-deployment.yml
rename oap-server/server-cluster-plugin/cluster-kubernetes-plugin/src/main/resources/{ => META-INF}/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (100%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{query/entity/KVInt.java => DataTTL.java} (78%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/annotation/{ConstOne.java => IndicatorAnnotationUtils.java} (84%)
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpointrelation/EndpointRelationClientSideIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceComponentDispatcher.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceComponentIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceMappingDispatcher.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceMappingIndicator.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/IndicatorTransWorker.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/CacheUpdateTimer.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/config/DownsamplingConfigService.java
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/{Node.java => EndpointInfo.java} (91%)
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceComponent.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceMapping.java
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{TimePyramidTableNameBuilder.java => DownSamplingModelNameBuilder.java} (73%)
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{TimePyramid.java => Downsampling.java} (94%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{IBatchDAO.java => IHistoryDeleteDAO.java} (82%)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DataTTLKeeperTimer.java
delete mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/h2/H2Client.java
delete mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/h2/H2ClientConfig.java
delete mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/h2/H2ClientException.java
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/conf/ConfigNotFoundException.java => oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/JDBCClientException.java (77%)
create mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/hikaricp/JDBCHikariCPClient.java
delete mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/shardingjdbc/ShardingjdbcClient.java
delete mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/shardingjdbc/ShardingjdbcClientConfig.java
delete mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/shardingjdbc/ShardingjdbcClientException.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/handler/IstioTelemetryHandlerMainTest.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/resources/fixture/01-ingress-reviewsv1-policy.msg
create mode 100644 oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/resources/fixture/02-productpage-details-policy.msg
create mode 100644 oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/resources/fixture/03-productpage-details.msg
create mode 100644 oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/resources/fixture/04-productpage-details.msg
create mode 100644 oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/resources/fixture/05-productpage-reviews.msg
create mode 100644 oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/resources/fixture/06-productpage-reviews.msg
create mode 100644 oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/resources/fixture/07-ingress-productpage.msg
create mode 100644 oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/resources/fixture/08-ingress-productpage.msg
create mode 100644 oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/resources/fixture/09-policy-telemetry.msg
create mode 100644 oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/resources/fixture/10-policy-telemetry.msg
create mode 100644 oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/resources/fixture/11-details-telemetry.msg
create mode 100644 oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/resources/fixture/12-ingress-productpage-telemetry.msg
create mode 100644 oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/resources/fixture/13-productpage-telemetry.msg
create mode 100644 oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/test/resources/fixture/14-reviews-productpage-telemetry.msg
rename oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/{ => grpc}/ApplicationRegisterHandler.java (99%)
rename oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/{ => grpc}/InstanceDiscoveryServiceHandler.java (62%)
rename oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/{ => grpc}/NetworkAddressRegisterServiceHandler.java (99%)
rename oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/{ => grpc}/ServiceNameDiscoveryHandler.java (99%)
create mode 100644 oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/rest/ApplicationRegisterServletHandler.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/rest/InstanceDiscoveryServletHandler.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/rest/InstanceHeartBeatServletHandler.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/rest/NetworkAddressRegisterServletHandler.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/rest/ServiceNameDiscoveryServiceHandler.java
rename oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/{ => v5/grpc}/SegmentCounter.java (98%)
rename oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/{ => v5/grpc}/TraceSegmentServiceHandler.java (90%)
create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v5/rest/TraceSegmentServletHandler.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v5/rest/reader/KeyWithStringValueJsonReader.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v5/rest/reader/LogJsonReader.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v5/rest/reader/ReferenceJsonReader.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v5/rest/reader/SegmentJsonReader.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v5/rest/reader/SpanJsonReader.java
copy oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/{parser/listener/SpanListener.java => handler/v5/rest/reader/StreamJsonReader.java} (83%)
copy oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/{parser/SegmentParserListenerManager.java => handler/v5/rest/reader/TraceSegment.java} (60%)
create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v5/rest/reader/TraceSegmentJsonReader.java
copy oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/{parser/listener/GlobalTraceIdsListener.java => handler/v5/rest/reader/UniqueIdJsonReader.java} (66%)
delete mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/service/ServiceComponentSpanListener.java
rename oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/{ConsumerMock.java => ServiceAMock.java} (54%)
copy oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/{ProviderMock.java => ServiceBMock.java} (63%)
rename oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/mock/{ProviderMock.java => ServiceCMock.java} (60%)
copy oap-server/server-starter/src/main/{resources => assembly}/application.yml (66%)
copy oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/{StorageEsDAO.java => HistoryDeleteEsDAO.java} (58%)
delete mode 100644 oap-server/server-storage-plugin/storage-h2-plugin/pom.xml
copy oap-server/server-storage-plugin/{storage-elasticsearch-plugin => storage-jdbc-hikaricp-plugin}/pom.xml (86%)
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/expression/BinaryMatchExpression.java => server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/SQLBuilder.java} (56%)
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/ParallelGCModule.java => oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/SQLExecutor.java (56%)
copy apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/TextMapContext.java => oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/TableMetaInfo.java (67%)
copy oap-server/{server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/TimestampUtils.java => server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2RegisterLockInstaller.java} (54%)
copy oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryConfig.java => server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageConfig.java} (74%)
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/H2StorageProvider.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IAlarmQueryDAO.java => server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java} (63%)
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BatchDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2EndpointInventoryCacheDAO.java
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/cpu/NoSupportedCPUAccessor.java => oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java (70%)
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2IndicatorDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetricQueryDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2NetworkAddressInventoryCacheDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RecordDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterDAO.java
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IRegisterLockDAO.java => server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2RegisterLockDAO.java} (64%)
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2SQLExecutor.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInstanceInventoryCacheDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInventoryCacheDAO.java
copy oap-server/server-storage-plugin/{storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/StorageEsDAO.java => storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2StorageDAO.java} (60%)
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TableInstaller.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopologyQueryDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TraceQueryDAO.java
copy oap-server/{server-core => server-storage-plugin/storage-jdbc-hikaricp-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (91%)