You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2018/12/03 07:20:31 UTC
[incubator-skywalking] 01/02: Merge remote-tracking branch
'origin/master'
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch istio/namespace
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 60b0bf64a7aa428863709f15567ae12ddea8724d
Merge: 9604a89 dc393b1
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Mon Dec 3 14:35:35 2018 +0800
Merge remote-tracking branch 'origin/master'
.travis.yml | 8 +-
LICENSE | 2 +-
README.md | 36 +-
.../apm-toolkit-log4j-1.x/pom.xml | 2 +-
.../apm-toolkit-log4j-2.x/pom.xml | 2 +-
.../apm-toolkit-logback-1.x/pom.xml | 2 +-
.../apm-toolkit-opentracing/pom.xml | 2 +-
apm-application-toolkit/apm-toolkit-trace/pom.xml | 2 +-
apm-application-toolkit/pom.xml | 2 +-
apm-checkstyle/pom.xml | 2 +-
apm-commons/apm-datacarrier/pom.xml | 2 +-
apm-commons/apm-util/pom.xml | 3 +-
.../apm/util/PlaceholderConfigurerSupport.java | 21 +-
.../apm/util/PropertyPlaceholderHelper.java | 207 +++++++
.../org/apache/skywalking/apm/util/StringUtil.java | 12 +
apm-commons/pom.xml | 2 +-
apm-dist/bin/oapServiceInit.bat | 37 ++
apm-dist/bin/oapServiceInit.sh | 50 ++
apm-dist/pom.xml | 13 +-
apm-dist/release-docs/LICENSE | 17 +-
apm-dist/src/main/assembly/binary.xml | 1 +
apm-protocol/apm-network/pom.xml | 6 +-
apm-protocol/apm-network/src/main/proto | 2 +-
apm-protocol/pom.xml | 2 +-
apm-sniffer/apm-agent-core/pom.xml | 71 ++-
.../skywalking/apm/agent/core/base64/Base64.java | 188 ++++++
.../skywalking/apm/agent/core/conf/Config.java | 28 +-
.../agent/core/conf/RemoteDownstreamConfig.java | 4 +-
.../agent/core/conf/SnifferConfigInitializer.java | 81 ++-
.../apm/agent/core/context/ContextCarrier.java | 218 ++++---
.../apm/agent/core/context/ContextManager.java | 4 +-
.../apm/agent/core/context/ContextSnapshot.java | 10 +-
.../apm/agent/core/context/SW3CarrierItem.java | 4 +-
.../{SW3CarrierItem.java => SW6CarrierItem.java} | 13 +-
.../apm/agent/core/context/TracingContext.java | 85 ++-
.../agent/core/context/ids/GlobalIdGenerator.java | 4 +-
.../core/context/trace/AbstractTracingSpan.java | 5 +-
.../apm/agent/core/context/trace/ExitSpan.java | 7 +-
.../agent/core/context/trace/LogDataEntity.java | 11 +-
.../core/context/trace/StackBasedTracingSpan.java | 4 +-
.../apm/agent/core/context/trace/TraceSegment.java | 13 +-
.../agent/core/context/trace/TraceSegmentRef.java | 114 ++--
.../apm/agent/core/context/util/KeyValuePair.java | 6 +-
.../agent/core/dictionary/DictionaryManager.java | 6 +-
.../core/dictionary/EndpointNameDictionary.java | 170 ++++++
.../core/dictionary/NetworkAddressDictionary.java | 24 +-
.../core/dictionary/OperationNameDictionary.java | 155 -----
.../skywalking/apm/agent/core/jvm/JVMService.java | 40 +-
.../skywalking/apm/agent/core/os/OSUtil.java | 21 +-
.../plugin/AbstractClassEnhancePluginDefine.java | 17 +-
.../DeclaredInstanceMethodsInterceptPoint.java | 15 +-
.../enhance/ClassEnhancePluginDefine.java | 46 +-
.../enhance/InstanceConstructorInterceptor.java | 2 +-
.../core/remote/AppAndServiceRegisterClient.java | 158 -----
.../remote/ServiceAndEndpointRegisterClient.java | 160 +++++
.../core/remote/TraceSegmentServiceClient.java | 42 +-
...ache.skywalking.apm.agent.core.boot.BootService | 2 +-
.../apm/agent/core/boot/ServiceManagerTest.java | 2 +-
.../core/conf/SnifferConfigInitializerTest.java | 96 ++-
.../core/context/ContextCarrierV2HeaderTest.java | 195 ++++++
.../apm/agent/core/context/ContextManagerTest.java | 24 +-
.../core/context/IgnoredTracerContextTest.java | 6 +-
.../core/remote/TraceSegmentServiceClientTest.java | 43 +-
.../src/test/resources/config/agent.config | 2 +-
apm-sniffer/apm-agent/pom.xml | 4 +-
.../skywalking/apm/agent/SkyWalkingAgent.java | 37 +-
.../apm-sdk-plugin/activemq-5.x-plugin/pom.xml | 2 +-
.../activemq/ActiveMQConsumerInterceptor.java | 28 +-
.../activemq/ActiveMQConsumerInterceptorTest.java | 18 +-
apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml | 2 +-
.../apm/plugin/dubbo/DubboInterceptorTest.java | 11 +-
.../apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml | 2 +-
.../elasticsearch-5.x-plugin/pom.xml | 6 +-
.../feign-default-http-9.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml | 2 +-
.../jdbc/h2/define/DriverInstrumentation.java | 2 +-
.../h2/define/JdbcConnectionInstrumentation.java | 2 +-
.../h2/define/JdbcXAConnectionInstrumentation.java | 2 +-
.../apm-sdk-plugin/httpClient-4.x-plugin/pom.xml | 2 +-
.../httpasyncclient-4.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/hystrix-1.x-plugin/pom.xml | 6 +-
.../v1/HystrixConcurrencyStrategyInterceptor.java | 35 +-
.../hystrix/v1/HystrixPluginsInterceptor.java | 32 +-
.../HystrixConcurrencyStrategyInterceptorTest.java | 100 ++++
.../hystrix/v1/HystrixPluginsInterceptorTest.java | 100 ++++
apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml | 2 +-
.../apm-sdk-plugin/jedis-2.x-plugin/pom.xml | 2 +-
.../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 +-
.../jetty/v9/server/HandleInterceptorTest.java | 10 +-
apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml | 2 +-
.../plugin/kafka/v11/CallbackInterceptorTest.java | 2 +-
.../kafka/v11/KafkaConsumerInterceptorTest.java | 10 +-
.../apm-sdk-plugin/mongodb-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/mongodb-3.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml | 2 +-
.../plugin/motan/MotanProviderInterceptorTest.java | 11 +-
.../apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 2 +-
...eateJdbcConnectionProxyInstanceInterceptor.java | 54 ++
...BalancedConnectionProxyInstanceInterceptor.java | 53 ++
...licationConnectionProxyInstanceInterceptor.java | 53 ++
.../FailoverConnectionProxyInstrumentation.java | 57 ++
...LoadBalancedConnectionProxyInstrumentation.java | 55 ++
.../ReplicationConnectionProxyInstrumentation.java | 55 ++
.../mysql/wrapper/CallableStatementWrapper.java | 539 +++++++++++++++++
.../jdbc/mysql/wrapper/JdbcConnectionWrapper.java | 652 +++++++++++++++++++++
.../wrapper/LoadBalancedConnectionWrapper.java | 48 ++
.../mysql/wrapper/PreparedStatementWrapper.java | 303 ++++++++++
.../wrapper/ReplicationConnectionWrapper.java | 80 +++
.../jdbc/mysql/wrapper/StatementWrapper.java | 307 ++++++++++
.../plugin/jdbc/mysql/wrapper/TracingUtils.java | 53 ++
.../src/main/resources/skywalking-plugin.def | 3 +
.../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-sdk-plugin/oracle-10.x-plugin/pom.xml | 61 --
.../oracle-10.x-plugin/pom.xml.versionsBackup | 76 ---
.../apm/plugin/jdbc/oracle/Constants.java | 30 -
.../jdbc/oracle/CreateCallableInterceptor.java | 48 --
.../oracle/CreatePreparedStatementInterceptor.java | 47 --
.../jdbc/oracle/CreateStatementInterceptor.java | 47 --
...PreparedStatementExecuteMethodsInterceptor.java | 78 ---
.../oracle/StatementExecuteMethodsInterceptor.java | 78 ---
.../oracle/define/ConnectionInstrumentation.java | 116 ----
.../jdbc/oracle/define/DriverInstrumentation.java | 37 --
.../define/OracleCallableInstrumentation.java | 65 --
.../OraclePrepareStatementInstrumentation.java | 66 ---
.../define/OracleStatementInstrumentation.java | 69 ---
.../src/main/resources/skywalking-plugin.def | 21 -
apm-sniffer/apm-sdk-plugin/pom.xml | 41 +-
.../apm-sdk-plugin/postgresql-8.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/resin-3.x-plugin/pom.xml | 57 --
.../resin-3.x-plugin/pom.xml.versionsBackup | 75 ---
.../apm/plugin/resin/v3/ResinV3Interceptor.java | 94 ---
.../resin/v3/define/ResinV3Instrumentation.java | 73 ---
.../src/main/resources/skywalking-plugin.def | 17 -
.../plugin/resin/v3/ResinV3InterceptorTest.java | 154 -----
.../apm-sdk-plugin/resin-4.x-plugin/pom.xml | 57 --
.../resin-4.x-plugin/pom.xml.versionsBackup | 76 ---
.../apm/plugin/resin/v4/ResinV4Interceptor.java | 94 ---
.../resin/v4/define/ResinV4Instrumentation.java | 72 ---
.../src/main/resources/skywalking-plugin.def | 17 -
.../plugin/resin/v4/ResinV4InterceptorTest.java | 154 -----
.../apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/servicecomb-plugin/pom.xml | 6 +-
.../servicecomb-java-chassis-0.x-plugin/pom.xml | 6 +-
.../ProducerOperationHandlerInterceptorTest.java | 2 +-
.../TransportClientHandlerInterceptorTest.java | 2 +-
.../servicecomb-java-chassis-1.x-plugin/pom.xml | 6 +-
.../ProducerOperationHandlerInterceptorTest.java | 2 +-
.../v1/TransportClientHandlerInterceptorTest.java | 2 +-
.../sharding-jdbc-1.5.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml | 2 +-
.../sofarpc/SofaRpcConsumerInterceptorTest.java | 2 +-
.../sofarpc/SofaRpcProviderInterceptorTest.java | 17 +-
.../concurrent-util-4.x-plugin/pom.xml | 7 +-
.../concurrent/FailureCallbackInterceptor.java | 23 +-
.../concurrent/SuccessCallbackInterceptor.java | 21 +-
.../spring-plugins/core-patch/pom.xml | 2 +-
.../mvc-annotation-3.x-plugin/pom.xml | 2 +-
.../mvc/v3/define/ControllerInstrumentation.java | 7 +-
.../mvc-annotation-4.x-plugin/pom.xml | 2 +-
.../define/AbstractControllerInstrumentation.java | 9 +-
.../v4/RequestMappingMethodInterceptorTest.java | 2 +-
.../mvc/v4/RestMappingMethodInterceptorTest.java | 2 +-
.../spring-plugins/mvc-annotation-commons/pom.xml | 2 +-
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 3 +-
.../spring-plugins/resttemplate-4.x-plugin/pom.xml | 8 +-
.../async/ResponseCallBackInterceptor.java | 1 -
.../resttemplate/async/RestExecuteInterceptor.java | 9 +-
.../resttemplate/async/RestRequestInterceptor.java | 3 +-
.../spring-cloud/netflix-plugins/pom.xml | 2 +-
.../spring-cloud-feign-1.x-plugin/pom.xml | 2 +-
.../spring-plugins/spring-cloud/pom.xml | 2 +-
.../spring-plugins/spring-commons}/pom.xml | 9 +-
.../plugin/spring/commons/EnhanceCacheObjects.java | 64 ++
.../apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml | 2 +-
.../apm-sdk-plugin/struts2-2.x-plugin/pom.xml | 2 +-
.../apm/plugin/struts2/Struts2InterceptorTest.java | 10 +-
.../apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml | 2 +-
.../tomcat78x/TomcatInvokeInterceptorTest.java | 12 +-
.../apm-sdk-plugin/undertow-plugins/pom.xml | 6 +-
.../undertow-plugins/undertow-2.x-plugin/pom.xml | 6 +-
.../v2x/ExecuteRootHandlerInterceptorTest.java | 14 +-
.../apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml | 2 +-
apm-sniffer/apm-test-tools/pom.xml | 2 +-
.../apm/agent/test/helper/SegmentRefHelper.java | 4 +-
.../apm/agent/test/tools/AgentServiceRule.java | 4 +-
.../apm/agent/test/tools/SegmentRefAssert.java | 2 +-
.../apm-toolkit-log4j-1.x-activation/pom.xml | 2 +-
.../apm-toolkit-log4j-2.x-activation/pom.xml | 2 +-
.../apm-toolkit-logback-1.x-activation/pom.xml | 2 +-
.../apm-toolkit-opentracing-activation/pom.xml | 2 +-
.../opentracing/SkywalkingSpanActivationTest.java | 63 +-
.../apm-toolkit-trace-activation/pom.xml | 2 +-
apm-sniffer/apm-toolkit-activation/pom.xml | 2 +-
apm-sniffer/config/agent.config | 20 +-
.../optional-spring-plugins/pom.xml | 2 +-
.../spring-annotation-plugin/pom.xml | 2 +-
apm-sniffer/optional-plugins/pom.xml | 2 +-
.../optional-plugins/trace-ignore-plugin/pom.xml | 5 +-
apm-sniffer/pom.xml | 2 +-
apm-webapp/pom.xml | 10 +-
.../apm/webapp/proxy/RewritePathFilterTest.java | 60 --
docker/config/application.yml | 83 +--
docs/Screenshots.md | 36 +-
docs/en/concepts-and-designs/overview.md | 4 +-
docs/en/guides/How-to-build.md | 8 -
docs/en/guides/How-to-release.md | 16 +-
docs/en/guides/Java-Plugin-Development-Guide.md | 8 +-
docs/en/guides/storage-extention.md | 42 +-
docs/en/protocols/README.md | 21 +-
...ross-Process-Propagation-Headers-Protocol-v2.md | 43 ++
...-Data-Protocol.md => Trace-Data-Protocol-v1.md} | 20 +-
docs/en/protocols/Trace-Data-Protocol-v2.md | 55 ++
docs/en/setup/README.md | 6 +-
docs/en/setup/backend/backend-alarm.md | 11 +-
docs/en/setup/backend/backend-cluster.md | 9 +-
docs/en/setup/backend/backend-init-mode.md | 20 +
docs/en/setup/backend/backend-receivers.md | 16 +-
docs/en/setup/backend/backend-setting-override.md | 36 +-
docs/en/setup/backend/backend-setup.md | 4 +
docs/en/setup/backend/backend-storage.md | 69 ++-
docs/en/setup/backend/trace-sampling.md | 36 ++
docs/en/setup/backend/ui-setup.md | 7 +-
docs/en/setup/service-agent/java-agent/README.md | 40 +-
.../service-agent/java-agent/Setting-override.md | 65 +-
.../service-agent/java-agent/Supported-list.md | 3 +-
.../agent-optional-plugins/Oracle-Resin-plugins.md | 9 +-
docs/powered-by.md | 15 +-
oap-server/pom.xml | 53 +-
oap-server/server-alarm-plugin/pom.xml | 6 +-
.../oap/server/core/alarm/provider/AlarmCore.java | 12 +-
.../server/core/alarm/provider/NotifyHandler.java | 4 +
.../server/core/alarm/provider/RunningRule.java | 11 +-
.../core/alarm/provider/WebhookCallbackTest.java | 11 +-
.../cluster-kubernetes-plugin/pom.xml | 6 +-
.../ClusterModuleKubernetesProvider.java | 4 +-
.../plugin/kubernetes/KubernetesCoordinator.java | 30 +-
.../dependencies/NamespacedPodListWatch.java | 41 +-
.../kubernetes/KubernetesCoordinatorTest.java | 18 +-
.../cluster-standalone-plugin/pom.xml | 6 +-
.../plugin/standalone/StandaloneManager.java | 9 +-
.../plugin/standalone/StandaloneManagerTest.java | 5 +-
.../cluster-zookeeper-plugin/pom.xml | 6 +-
.../plugin/zookeeper/ZookeeperCoordinator.java | 15 +-
.../ClusterModuleZookeeperProviderTestCase.java | 7 +-
oap-server/server-cluster-plugin/pom.xml | 6 +-
oap-server/server-core/pom.xml | 16 +-
.../skywalking/oap/server/core/CoreModule.java | 8 +-
.../oap/server/core/CoreModuleProvider.java | 62 +-
.../oap/server/core/alarm/AlarmEntrance.java | 38 +-
.../oap/server/core/alarm/AlarmModule.java | 6 +-
.../oap/server/core/alarm/AlarmRecord.java | 11 +-
.../core/alarm/AlarmStandardPersistence.java | 2 +-
.../{AlarmModule.java => EndpointMetaInAlarm.java} | 35 +-
...Module.java => ServiceInstanceMetaInAlarm.java} | 35 +-
.../core/analysis/data/NonMergeDataCollection.java | 4 +-
.../core/analysis/generated/all/AllDispatcher.java | 2 +-
.../generated/all/AllHeatmapIndicator.java | 9 +-
.../analysis/generated/all/AllP50Indicator.java | 9 +-
.../analysis/generated/all/AllP75Indicator.java | 9 +-
.../analysis/generated/all/AllP90Indicator.java | 9 +-
.../analysis/generated/all/AllP95Indicator.java | 9 +-
.../analysis/generated/all/AllP99Indicator.java | 9 +-
.../generated/endpoint/EndpointAvgIndicator.java | 11 +-
.../generated/endpoint/EndpointCpmIndicator.java | 11 +-
.../generated/endpoint/EndpointDispatcher.java | 2 +-
.../generated/endpoint/EndpointP50Indicator.java | 11 +-
.../generated/endpoint/EndpointP75Indicator.java | 11 +-
.../generated/endpoint/EndpointP90Indicator.java | 11 +-
.../generated/endpoint/EndpointP95Indicator.java | 11 +-
.../generated/endpoint/EndpointP99Indicator.java | 11 +-
.../generated/endpoint/EndpointSlaIndicator.java | 11 +-
.../EndpointRelationCpmIndicator.java | 11 +-
.../EndpointRelationDispatcher.java | 2 +-
.../EndpointRelationRespTimeIndicator.java | 11 +-
.../generated/service/ServiceCpmIndicator.java | 11 +-
.../generated/service/ServiceDispatcher.java | 2 +-
.../generated/service/ServiceP50Indicator.java | 11 +-
.../generated/service/ServiceP75Indicator.java | 11 +-
.../generated/service/ServiceP90Indicator.java | 11 +-
.../generated/service/ServiceP95Indicator.java | 11 +-
.../generated/service/ServiceP99Indicator.java | 11 +-
.../service/ServiceRespTimeIndicator.java | 11 +-
.../generated/service/ServiceSlaIndicator.java | 11 +-
.../ServiceInstanceCpmIndicator.java | 11 +-
.../serviceinstance/ServiceInstanceDispatcher.java | 13 +-
.../ServiceInstanceRespTimeIndicator.java | 11 +-
.../ServiceInstanceSlaIndicator.java} | 43 +-
.../InstanceJvmCpuIndicator.java | 11 +-
.../ServiceInstanceJVMCPUDispatcher.java | 2 +-
.../InstanceJvmOldGcCountIndicator.java | 11 +-
.../InstanceJvmOldGcTimeIndicator.java | 11 +-
.../InstanceJvmYoungGcCountIndicator.java | 11 +-
.../InstanceJvmYoungGcTimeIndicator.java | 11 +-
.../ServiceInstanceJVMGCDispatcher.java | 2 +-
.../InstanceJvmMemoryHeapIndicator.java | 11 +-
.../InstanceJvmMemoryHeapMaxIndicator.java | 11 +-
.../InstanceJvmMemoryNoheapIndicator.java | 11 +-
.../InstanceJvmMemoryNoheapMaxIndicator.java | 11 +-
.../ServiceInstanceJVMMemoryDispatcher.java | 4 +-
.../ServiceInstanceJVMMemoryPoolDispatcher.java | 2 +-
.../ServiceInstanceRelationDispatcher.java | 2 +-
.../ServiceRelationClientCallSlaIndicator.java | 11 +-
.../ServiceRelationClientCpmIndicator.java | 11 +-
.../ServiceRelationClientRespTimeIndicator.java | 11 +-
.../servicerelation/ServiceRelationDispatcher.java | 2 +-
.../ServiceRelationServerCallSlaIndicator.java | 11 +-
.../ServiceRelationServerCpmIndicator.java | 11 +-
.../ServiceRelationServerRespTimeIndicator.java | 11 +-
.../EndpointRelationServerSideIndicator.java | 3 +-
.../analysis/manual/segment/SegmentDispatcher.java | 1 +
.../analysis/manual/segment/SegmentRecord.java | 18 +-
.../ServiceRelationClientSideIndicator.java | 3 +-
.../ServiceRelationServerSideIndicator.java | 4 +-
.../core/analysis/worker/IndicatorProcess.java | 2 +-
.../analysis/worker/IndicatorRemoteWorker.java | 2 +-
.../core/analysis/worker/IndicatorTransWorker.java | 10 +-
.../core/analysis/worker/PersistenceWorker.java | 2 +-
.../server/core/analysis/worker/RecordProcess.java | 2 +-
.../oap/server/core/cache/CacheUpdateTimer.java | 6 +-
.../server/core/cache/EndpointInventoryCache.java | 8 +-
.../core/cache/NetworkAddressInventoryCache.java | 2 +-
.../core/cache/ServiceInstanceInventoryCache.java | 2 +-
.../server/core/cache/ServiceInventoryCache.java | 2 +-
.../oap/server/core/cluster/ClusterModule.java | 6 +-
.../oap/server/core/cluster/RemoteInstance.java | 36 +-
.../server/core/query/AggregationQueryService.java | 12 +-
.../oap/server/core/query/AlarmQueryService.java | 2 +-
.../oap/server/core/query/DurationUtils.java | 132 +++--
.../server/core/query/MetadataQueryService.java | 6 +-
.../oap/server/core/query/MetricQueryService.java | 2 +-
.../oap/server/core/query/QueryModule.java | 4 +-
.../oap/server/core/query/TopologyBuilder.java | 4 +-
.../server/core/query/TopologyQueryService.java | 8 +-
.../oap/server/core/query/TraceQueryService.java | 133 ++++-
.../oap/server/core/query/entity/IntValues.java | 2 +-
.../oap/server/core/query/entity/KVInt.java | 2 +-
.../oap/server/core/query/entity/TopNEntity.java | 2 +-
.../server/core/register/EndpointInventory.java | 22 +-
.../core/register/NetworkAddressInventory.java | 4 +-
.../core/register/ServiceInstanceInventory.java | 4 +-
.../oap/server/core/register/ServiceInventory.java | 27 +-
.../core/register/annotation/InventoryType.java | 7 +-
.../service/EndpointInventoryRegister.java | 8 +-
.../service/IEndpointInventoryRegister.java | 2 +-
.../service/NetworkAddressInventoryRegister.java | 8 +-
.../service/ServiceInstanceInventoryRegister.java | 6 +-
.../register/service/ServiceInventoryRegister.java | 3 +-
.../core/register/worker/InventoryProcess.java | 27 +-
.../register/worker/RegisterPersistentWorker.java | 6 +-
.../core/register/worker/RegisterRemoteWorker.java | 2 +-
.../server/core/remote/RemoteSenderService.java | 2 +-
.../server/core/remote/RemoteServiceHandler.java | 23 +-
.../client/Address.java} | 45 +-
.../core/remote/client/GRPCRemoteClient.java | 183 +++---
.../server/core/remote/client/RemoteClient.java | 8 +-
.../core/remote/client/RemoteClientManager.java | 149 ++++-
.../core/remote/client/SelfRemoteClient.java | 24 +-
.../oap/server/core/source/DetectPoint.java | 2 +-
.../skywalking/oap/server/core/source/Scope.java | 4 +-
.../skywalking/oap/server/core/source/Segment.java | 1 +
.../oap/server/core/storage/PersistenceTimer.java | 2 +-
.../oap/server/core/storage/StorageModule.java | 6 +-
.../annotation/StorageAnnotationListener.java | 36 +-
.../core/storage/annotation/StorageEntity.java | 3 +
.../annotation/StorageEntityAnnotationUtils.java | 10 +
.../storage/cache/IEndpointInventoryCacheDAO.java | 2 +-
.../oap/server/core/storage/model/ColumnName.java | 21 +-
.../model/IModelOverride.java} | 17 +-
.../oap/server/core/storage/model/Model.java | 7 +-
.../server/core/storage/model/ModelInstaller.java | 21 +-
.../core/storage/ttl/DataTTLKeeperTimer.java | 31 +-
.../src/main/resources/official_analysis.oal | 1 +
.../core/remote/RemoteServiceHandlerTestCase.java | 142 +++++
.../remote/client/GRPCRemoteClientRealClient.java | 90 +++
.../remote/client/GRPCRemoteClientRealServer.java | 50 ++
.../remote/client/GRPCRemoteClientTestCase.java | 109 ++++
.../remote/client/RemoteClientManagerTestCase.java | 95 +++
oap-server/server-library/library-buffer/pom.xml | 23 +-
.../oap/server/library/buffer/BufferFileUtils.java | 3 +
.../server/library/buffer/DataStreamReader.java | 7 +-
.../server/library/buffer/DataStreamWriter.java | 1 +
.../library/buffer/BufferFileUtilsTestCase.java} | 31 +-
.../library-buffer/src/test/resources/log4j2.xml | 2 +-
oap-server/server-library/library-client/pom.xml | 6 +-
.../oap/server/library/client/Client.java | 3 +-
.../client/elasticsearch/ElasticSearchClient.java | 4 +-
.../oap/server/library/client/grpc/GRPCClient.java | 11 +-
.../client/jdbc/hikaricp/JDBCHikariCPClient.java | 82 ++-
.../elasticsearch/ElasticSearchClientTestCase.java | 2 +-
oap-server/server-library/library-module/pom.xml | 6 +-
.../oap/server/library/module/BootstrapFlow.java | 9 +-
.../library/module/DuplicateProviderException.java | 3 +-
.../oap/server/library/module/ModuleDefine.java | 28 +-
...viderException.java => ModuleDefineHolder.java} | 13 +-
.../oap/server/library/module/ModuleManager.java | 9 +-
.../oap/server/library/module/ModuleProvider.java | 43 +-
...derException.java => ModuleProviderHolder.java} | 11 +-
.../library/module/ModuleServiceHolder.java} | 15 +-
.../library/module/ProviderNotFoundException.java | 2 +-
.../module/ServiceNotProvidedException.java | 2 +-
.../oap/server/library/module/BaseModuleA.java | 7 +-
.../oap/server/library/module/BaseModuleB.java | 6 +-
.../server/library/module/ModuleManagerTest.java | 4 +-
.../oap/server/library/module/TestModule.java | 6 +-
oap-server/server-library/library-server/pom.xml | 6 +-
oap-server/server-library/library-util/pom.xml | 22 +-
.../util/PropertyPlaceholderHelperTest.java | 88 +++
.../src/test/resources/application.yml | 82 +++
oap-server/server-library/pom.xml | 6 +-
oap-server/server-query-plugin/pom.xml | 6 +-
.../query-graphql-plugin/pom.xml | 6 +-
.../oap/query/graphql/GraphQLQueryProvider.java | 2 +-
.../query/graphql/resolver/AggregationQuery.java | 2 +-
.../oap/query/graphql/resolver/AlarmQuery.java | 6 +-
.../oap/query/graphql/resolver/MetadataQuery.java | 18 +-
.../oap/query/graphql/resolver/MetricQuery.java | 2 +-
.../oap/query/graphql/resolver/TopologyQuery.java | 6 +-
.../oap/query/graphql/resolver/TraceQuery.java | 2 +-
.../src/main/resources/query-protocol | 2 +-
oap-server/server-receiver-plugin/pom.xml | 6 +-
.../pom.xml | 6 +-
.../module/IstioTelemetryReceiverModule.java | 6 +-
.../provider/IstioTelemetryReceiverProvider.java | 7 +-
.../src/main/proto/policy/v1beta1/value_type.proto | 4 +-
.../skywalking-jvm-receiver-plugin/pom.xml | 6 +-
.../oap/server/receiver/jvm/module/JVMModule.java | 6 +-
.../receiver/jvm/provider/JVMModuleProvider.java | 8 +-
.../handler/JVMMetricReportServiceHandler.java | 59 ++
.../provider/handler/JVMMetricsServiceHandler.java | 115 +---
...erviceHandler.java => JVMSourceDispatcher.java} | 55 +-
.../skywalking-mesh-receiver-plugin/pom.xml | 6 +-
.../server/receiver/mesh/CoreRegisterLinker.java | 6 +-
.../server/receiver/mesh/MeshReceiverModule.java | 4 +-
.../server/receiver/mesh/MeshReceiverProvider.java | 7 +-
.../mesh/ServiceMeshMetricDataDecorator.java | 22 +-
.../receiver/mesh/TelemetryDataDispatcher.java | 45 +-
.../skywalking-register-receiver-plugin/pom.xml | 6 +-
.../receiver/register/module/RegisterModule.java | 6 +-
.../register/provider/RegisterModuleProvider.java | 23 +-
.../v5/grpc/ApplicationRegisterHandler.java | 2 +-
.../v5/grpc/InstanceDiscoveryServiceHandler.java | 10 +-
.../grpc/NetworkAddressRegisterServiceHandler.java | 2 +-
.../v5/grpc/ServiceNameDiscoveryHandler.java | 2 +-
.../v5/rest/ApplicationRegisterServletHandler.java | 2 +-
.../v5/rest/InstanceDiscoveryServletHandler.java | 4 +-
.../v5/rest/InstanceHeartBeatServletHandler.java | 16 +-
.../rest/NetworkAddressRegisterServletHandler.java | 4 +-
.../rest/ServiceNameDiscoveryServiceHandler.java | 2 +-
.../handler/v6/grpc/RegisterServiceHandler.java | 220 +++++++
.../v6/grpc/ServiceInstancePingServiceHandler.java | 67 +++
.../skywalking-trace-receiver-plugin/pom.xml | 6 +-
.../server/receiver/trace/module/TraceModule.java | 8 +-
.../trace/provider/TraceModuleProvider.java | 50 +-
.../trace/provider/TraceServiceModuleConfig.java | 5 +
.../v6/grpc/TraceSegmentReportServiceHandler.java | 65 ++
.../parser/ISegmentParserListenerManager.java} | 15 +-
.../provider/parser/ISegmentParserService.java} | 16 +-
.../trace/provider/parser/SegmentParse.java | 38 +-
.../{SegmentParse.java => SegmentParseV2.java} | 70 ++-
.../parser/SegmentParserListenerManager.java | 6 +-
...CoreInfo.java => SegmentParserServiceImpl.java} | 29 +-
.../trace/provider/parser/SegmentSource.java} | 10 +-
.../parser/decorator/ReferenceDecorator.java | 133 +++--
.../provider/parser/decorator/SegmentCoreInfo.java | 5 +-
.../parser/decorator/SegmentDecorator.java | 48 +-
.../provider/parser/decorator/SpanDecorator.java | 143 +++--
.../listener/endpoint/MultiScopesSpanListener.java | 70 ++-
.../parser/listener/endpoint/SourceBuilder.java | 4 +
.../listener/segment/SegmentSpanListener.java | 64 +-
.../listener/segment/TraceSegmentSampler.java | 57 ++
.../service/ServiceMappingSpanListener.java | 8 +-
.../standardization/ReferenceIdExchanger.java | 33 +-
.../parser/standardization/SpanIdExchanger.java | 6 +-
.../server/receiver/trace/mock/AgentDataMock.java | 16 +-
.../server/receiver/trace/mock/ServiceBMock.java | 3 +-
.../server/receiver/trace/mock/ServiceCMock.java | 2 +-
.../listener/segment/TraceSegmentSamplerTest.java | 47 ++
.../zipkin-receiver-plugin/pom.xml | 29 +-
.../receiver/zipkin}/CoreRegisterLinker.java | 19 +-
.../receiver/zipkin/Receiver2AnalysisBridge.java | 48 ++
.../receiver/zipkin/ZipkinReceiverConfig.java | 74 +++
.../receiver/zipkin/ZipkinReceiverModule.java} | 17 +-
.../receiver/zipkin/ZipkinReceiverProvider.java} | 61 +-
.../receiver/zipkin/ZipkinTraceOSInfoBuilder.java} | 13 +-
.../receiver/zipkin/cache/CacheFactory.java} | 35 +-
.../server/receiver/zipkin/cache/ISpanCache.java} | 12 +-
.../zipkin/cache/caffeine/CaffeineSpanCache.java | 98 ++++
.../receiver/zipkin/data/SkyWalkingTrace.java | 57 ++
.../server/receiver/zipkin/data/ZipkinTrace.java} | 45 +-
.../receiver/zipkin/handler/SpanProcessor.java | 76 +++
.../zipkin/handler/SpanV1JettyHandler.java | 66 +++
.../zipkin/handler/SpanV2JettyHandler.java | 68 +++
.../receiver/zipkin/transform/SegmentBuilder.java | 489 ++++++++++++++++
.../zipkin/transform/SegmentListener.java} | 11 +-
.../transform/Zipkin2SkyWalkingTransfer.java | 53 ++
...walking.oap.server.library.module.ModuleDefine} | 2 +-
...alking.oap.server.library.module.ModuleProvider | 2 +-
.../transform/SpringSleuthSegmentBuilderTest.java | 201 +++++++
oap-server/server-starter/pom.xml | 12 +-
.../src/main/assembly/alarm-settings.yml | 26 +-
.../src/main/assembly/application.yml | 84 +--
.../server-starter/src/main/assembly/assembly.xml | 1 +
.../main/assembly/datasource-settings.properties | 20 +-
.../server-starter/src/main/assembly/log4j2.xml | 2 +-
.../oap/server/starter/OAPServerStartUp.java | 9 +-
.../starter/config/ApplicationConfigLoader.java | 20 +-
.../src/main/resources/application.yml | 84 +--
.../main/resources/datasource-settings.properties | 20 +-
.../server-starter/src/main/resources/log4j2.xml | 1 +
oap-server/server-storage-plugin/pom.xml | 6 +-
.../storage-elasticsearch-plugin/pom.xml | 6 +-
.../StorageModuleElasticsearchProvider.java | 2 +-
.../elasticsearch/base/HistoryDeleteEsDAO.java | 6 +-
.../cache/EndpointInventoryCacheEsDAO.java | 4 +-
.../cache/NetworkAddressInventoryCacheEsDAO.java | 10 +-
.../cache/ServiceInstanceInventoryCacheDAO.java | 8 +-
.../cache/ServiceInventoryCacheEsDAO.java | 14 +-
.../elasticsearch/lock/RegisterLockDAOImpl.java | 2 +-
.../elasticsearch/lock/RegisterLockInstaller.java | 16 +-
.../elasticsearch/query/AggregationQueryEsDAO.java | 2 +-
.../elasticsearch/query/MetadataQueryEsDAO.java | 7 +-
.../elasticsearch/query/MetricQueryEsDAO.java | 10 +-
.../elasticsearch/query/TraceQueryEsDAO.java | 18 +-
.../storage-jdbc-hikaricp-plugin/pom.xml | 11 +-
.../server/storage/plugin/jdbc/SQLExecutor.java | 6 +
.../plugin/jdbc/h2/H2RegisterLockInstaller.java | 44 --
.../storage/plugin/jdbc/h2/H2StorageProvider.java | 16 +-
.../plugin/jdbc/h2/dao/H2AggregationQueryDAO.java | 35 +-
.../plugin/jdbc/h2/dao/H2AlarmQueryDAO.java | 67 ++-
.../jdbc/h2/dao/H2EndpointInventoryCacheDAO.java | 7 +-
.../plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java | 17 +
.../plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 155 ++---
.../plugin/jdbc/h2/dao/H2MetricQueryDAO.java | 22 +-
.../storage/plugin/jdbc/h2/dao/H2RegisterDAO.java | 17 +-
.../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 22 +-
.../jdbc/h2/dao/H2ServiceInventoryCacheDAO.java | 24 +-
.../plugin/jdbc/h2/dao/H2TableInstaller.java | 16 +-
.../plugin/jdbc/h2/dao/H2TopologyQueryDAO.java | 28 +-
.../plugin/jdbc/h2/dao/H2TraceQueryDAO.java | 26 +-
.../jdbc/mysql/MySQLAggregationQueryDAO.java | 79 +++
.../plugin/jdbc/mysql/MySQLAlarmQueryDAO.java | 98 ++++
.../jdbc/mysql/MySQLRegisterLockInstaller.java | 97 +++
.../jdbc/mysql/MySQLRegisterTableLockDAO.java | 85 +++
.../MySQLStorageProvider.java} | 88 +--
.../plugin/jdbc/mysql/MySQLTableInstaller.java | 193 ++++++
.../MySQLTraceQueryDAO.java} | 59 +-
...alking.oap.server.library.module.ModuleProvider | 3 +-
.../PreventRedistributionMySQLDriverTest.java} | 25 +-
.../pom.xml | 8 +-
.../testing/module/ModuleDefineTesting.java} | 16 +-
.../testing/module/ModuleManagerTesting.java} | 20 +-
.../testing/module/ModuleProviderTesting.java} | 25 +-
.../testing/module/ModuleManagerTestCase.java} | 32 +-
.../src/test/resources/log4j2.xml | 2 +-
pom.xml | 96 +--
skywalking-ui | 2 +-
564 files changed, 11200 insertions(+), 5295 deletions(-)