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 2019/01/03 00:44:35 UTC
[incubator-skywalking] 01/04: Merge branch 'master' of
https://github.com/apache/incubator-skywalking
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch submodule/ui
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit a00e701128481c4583dd7564bf98e325830696fb
Merge: 60b0bf6 0284293
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Dec 14 14:26:25 2018 +0800
Merge branch 'master' of https://github.com/apache/incubator-skywalking
.gitignore | 2 +-
CHANGES.md | 59 ++++
apm-dist/release-docs/LICENSE | 2 +
.../licenses/LICENSE-consul-client.txt | 13 +
apm-dist/release-docs/licenses/LICENSE-okhttp.txt | 202 ++++++++++++++
.../network/trace/component/ComponentsDefine.java | 8 +-
.../core/conf/RuntimeContextConfiguration.java | 3 +-
.../apm/agent/core/context/tag/AbstractTag.java | 24 +-
.../apm/agent/core/context/tag/StringTag.java | 14 +-
.../apm/agent/core/context/tag/Tags.java | 24 +-
.../apm/agent/core/context/trace/AbstractSpan.java | 9 +
.../core/context/trace/AbstractTracingSpan.java | 30 ++-
.../apm/agent/core/context/trace/ExitSpan.java | 16 +-
.../apm/agent/core/context/trace/NoopSpan.java | 5 +
.../apm/agent/core/context/util/TagValuePair.java | 56 ++++
.../agent/core/plugin/loader/AgentClassLoader.java | 27 ++
.../apm/agent/core/sampling/SamplingService.java | 2 +-
.../apm/plugin/dubbo/DubboInterceptorTest.java | 4 +-
.../v5/ActionRequestBuilderInterceptor.java | 65 -----
.../v5/AddTransportAddressesInterceptor.java | 49 ++++
.../apm/plugin/elasticsearch/v5/Constants.java | 2 -
.../elasticsearch/v5/ElasticSearchEnhanceInfo.java | 17 +-
.../v5/GenericActionConstructorInterceptor.java} | 21 +-
.../v5/RemoveTransportAddressInterceptor.java | 49 ++++
.../v5/TransportActionNodeProxyInterceptor.java | 31 ++-
.../elasticsearch/v5/TransportAddressCache.java | 60 +++++
.../v5/TransportProxyClientInterceptor.java | 64 ++---
...tion.java => GenericActionInstrumentation.java} | 45 ++--
.../TransportActionNodeProxyInstrumentation.java | 20 +-
...TransportClientNodesServiceInstrumentation.java | 74 +++++
.../TransportProxyClientInstrumentation.java | 26 +-
.../src/main/resources/skywalking-plugin.def | 3 +-
.../http/v9/DefaultHttpClientInterceptorTest.java | 20 +-
.../v4/HttpClientExecuteInterceptorTest.java | 26 +-
.../v4/HttpAsyncClientInterceptorTest.java | 24 +-
.../apm/plugin/jdbc/AbstractStatementTest.java | 8 +-
.../jedis/v2/JedisMethodInterceptorTest.java | 8 +-
.../client/SyncHttpRequestSendInterceptorTest.java | 8 +-
.../client/SyncHttpRequestSendInterceptorTest.java | 6 +-
.../v2/MongoDBCollectionMethodInterceptorTest.java | 16 +-
.../mongodb/v3/MongoDBMethodInterceptorTest.java | 14 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
.../rabbitmq-5.x-plugin}/pom.xml | 28 +-
.../rabbitmq/RabbitMQConsumerInterceptor.java} | 62 ++---
...QProducerAndConsumerConstructorInterceptor.java | 22 +-
.../rabbitmq/RabbitMQProducerInterceptor.java | 103 +++++++
.../define/RabbitMQConsumerInstrumentation.java | 76 ++++++
.../define/RabbitMQProducerInstrumentation.java | 76 ++++++
.../src/main/resources/skywalking-plugin.def} | 9 +-
.../rabbitmq/RabbitMQConsumerInterceptorTest.java | 85 ++++++
...ducerAndConsumerConstructorInterceptorTest.java | 234 ++++++++++++++++
.../rabbitmq/RabbitMQProducerInterceptorTest.java | 92 +++++++
.../ProducerOperationHandlerInterceptorTest.java | 4 +-
.../TransportClientHandlerInterceptorTest.java | 4 +-
.../ProducerOperationHandlerInterceptorTest.java | 10 +-
.../v1/TransportClientHandlerInterceptorTest.java | 8 +-
.../sofarpc/SofaRpcConsumerInterceptorTest.java | 22 +-
.../sofarpc/SofaRpcProviderInterceptorTest.java | 7 +-
.../v4/define/AbstractSpring4Instrumentation.java | 4 +-
.../mvc-annotation-5.x-plugin}/pom.xml | 43 ++-
.../mvc/v5/ControllerConstructorInterceptor.java | 58 ++++
.../plugin/spring/mvc/v5/GetBeanInterceptor.java | 59 ++++
.../define/AbstractControllerInstrumentation.java | 113 ++++++++
.../v5/define/AbstractSpring5Instrumentation.java} | 13 +-
.../mvc/v5/define/ControllerInstrumentation.java | 23 +-
.../v5/define/HandlerMethodInstrumentation.java} | 36 ++-
.../v5/define/RestControllerInstrumentation.java | 16 +-
.../src/main/resources/skywalking-plugin.def} | 10 +-
.../apm/plugin/spring/mvc/commons/Constants.java | 2 +
apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 2 +
.../spring-plugins/webflux-5.x-plugin}/pom.xml | 41 +--
.../webflux/v5/AbstractMethodInterceptor.java | 102 +++++++
.../spring/webflux/v5/ConstructorInterceptor.java | 33 +++
.../v5/ConstructorWithHttpRequestInterceptor.java | 33 +++
.../v5/ControllerConstructorInterceptor.java | 57 ++++
.../webflux/v5/OnInboundNextInterceptor.java | 66 +++++
.../webflux/v5/OnOutboundCompleteInterceptor.java | 50 ++++
.../webflux/v5/OnOutboundErrorInterceptor.java | 51 ++++
.../v5/RequestMappingMethodInterceptor.java | 42 +++
.../webflux/v5/RestMappingMethodInterceptor.java | 77 ++++++
.../spring/webflux/v5/StatusInterceptor.java | 50 ++++
.../define/AbstractControllerInstrumentation.java | 114 ++++++++
.../AbstractSpringWebflux5Instrumentation.java} | 13 +-
.../v5/define/ControllerInstrumentation.java | 23 +-
.../HttpServerOperations20xInstrumentation.java | 107 ++++++++
.../HttpServerOperations21xInstrumentation.java | 107 ++++++++
.../v5/define/RestControllerInstrumentation.java | 23 +-
.../src/main/resources/skywalking-plugin.def} | 11 +-
.../v2/MemcachedMethodInterceptorTest.java | 10 +-
.../v2x/ExecuteRootHandlerInterceptorTest.java | 20 +-
.../v2/XMemcachedMethodInterceptorTest.java | 14 +-
apm-sniffer/apm-test-tools/pom.xml | 9 +-
.../apm/agent/test/helper/SpanHelper.java | 10 +-
.../activation/trace/TraceAnnotationTest.java | 22 +-
.../apm-trace-ignore-plugin.config | 2 +-
.../optional-plugins/trace-ignore-plugin/pom.xml | 16 +-
.../trace/ignore/conf/IgnoreConfigInitializer.java | 34 ++-
.../apm/plugin/trace/ignore/TraceIgnoreTest.java | 26 +-
docker/config/alarm-settings.yml | 60 +++--
docker/config/application.yml | 5 +
docker/config/component-libraries.yml | 11 +
docs/en/guides/How-to-build.md | 8 +-
docs/en/guides/Java-Plugin-Development-Guide.md | 7 +-
docs/en/guides/README.md | 2 +-
docs/en/guides/backend-oal-scripts.md | 2 +-
docs/en/guides/write-oal.md | 15 ++
docs/en/setup/backend/backend-cluster.md | 16 +-
docs/en/setup/backend/backend-storage.md | 2 +-
.../service-agent/java-agent/Supported-list.md | 4 +-
oap-server/generate-tool/pom.xml | 77 ++++++
.../apache/skywalking/oal/tool/grammar/OALLexer.g4 | 109 ++++++++
.../skywalking/oal/tool/grammar/OALParser.g4 | 104 +++++++
.../java/org/apache/skywalking/oal/tool/Main.java | 50 ++++
.../oal/tool/output/DispatcherContext.java | 39 +++
.../skywalking/oal/tool/output/FileGenerator.java | 209 +++++++++++++++
.../skywalking/oal/tool/output/WriteWrapper.java} | 16 +-
.../skywalking/oal/tool/parser/AnalysisResult.java | 145 ++++++++++
.../oal/tool/parser/ConditionExpression.java} | 17 +-
.../skywalking/oal/tool/parser/DataColumn.java | 26 +-
.../skywalking/oal/tool/parser/DeepAnalysis.java | 142 ++++++++++
.../skywalking/oal/tool/parser/EntryMethod.java} | 24 +-
.../oal/tool/parser/FilterExpression.java} | 19 +-
.../skywalking/oal/tool/parser/Indicators.java | 52 ++++
.../skywalking/oal/tool/parser/OALListener.java | 134 +++++++++
.../oal/tool/parser/PersistenceColumns.java | 69 +++++
.../oal/tool/parser/PersistenceField.java} | 27 +-
.../skywalking/oal/tool/parser/ScriptParser.java | 62 +++++
.../skywalking/oal/tool/parser/SourceColumn.java | 54 ++++
.../oal/tool/parser/SourceColumnsFactory.java | 97 +++++++
.../skywalking/oal/tool/util/ClassMethodUtil.java} | 22 +-
.../code-templates/AllDispatcherTemplate.ftl} | 40 ++-
.../code-templates/EndpointDispatcherTemplate.ftl} | 41 ++-
.../EndpointRelationDispatcherTemplate.ftl} | 50 ++--
.../code-templates/IndicatorImplementor.ftl | 298 +++++++++++++++++++++
.../code-templates/ServiceDispatcherTemplate.ftl} | 40 ++-
.../ServiceInstanceDispatcherTemplate.ftl} | 54 ++--
.../ServiceInstanceJVMCPUDispatcherTemplate.ftl} | 32 ++-
.../ServiceInstanceJVMGCDispatcherTemplate.ftl | 66 +++++
.../ServiceInstanceJVMMemoryDispatcherTemplate.ftl | 66 +++++
...viceInstanceJVMMemoryPoolDispatcherTemplate.ftl | 66 +++++
.../ServiceInstanceRelationDispatcherTemplate.ftl | 66 +++++
.../ServiceRelationDispatcherTemplate.ftl} | 40 ++-
.../oal/tool/output/FileGeneratorTest.java | 104 +++++++
.../oal/tool/parser/DeepAnalysisTest.java | 114 ++++++++
.../oal/tool/parser/ScriptParserTest.java | 99 +++++++
.../IndicatorImplementorExpected.java} | 31 ++-
.../expectedFiles/ServiceDispatcherExpected.java} | 21 +-
.../src/test/resources/oal_test.oal} | 5 +-
oap-server/generated-analysis/pom.xml | 72 +++++
.../src/main/resources/official_analysis.oal | 0
oap-server/pom.xml | 8 +
.../oap/server/core/alarm/provider/AlarmCore.java | 2 +-
.../core/alarm/provider/AlarmModuleProvider.java | 4 +-
.../server/core/alarm/provider/NotifyHandler.java | 1 -
.../cluster-consul-plugin}/pom.xml | 39 +--
.../plugin/consul/ClusterModuleConsulConfig.java} | 11 +-
.../consul/ClusterModuleConsulProvider.java} | 73 +++--
.../cluster/plugin/consul/ConsulCoordinator.java | 91 +++++++
...alking.oap.server.library.module.ModuleProvider | 19 ++
.../cluster-kubernetes-plugin/pom.xml | 19 +-
.../zookeeper/ClusterModuleZookeeperConfig.java | 7 +-
.../zookeeper/ClusterModuleZookeeperProvider.java | 24 +-
oap-server/server-cluster-plugin/pom.xml | 3 +-
.../oap/server/core/CoreModuleConfig.java | 1 +
.../oap/server/core/CoreModuleProvider.java | 13 +-
.../oap/server/core/alarm/AlarmEntrance.java | 1 -
.../oap/server/core/alarm/IndicatorNotify.java | 2 -
.../server/core/analysis/DispatcherManager.java | 104 ++++---
.../core/analysis/generated/all/AllDispatcher.java | 89 ------
.../generated/all/AllHeatmapIndicator.java | 163 -----------
.../analysis/generated/all/AllP50Indicator.java | 163 -----------
.../analysis/generated/all/AllP75Indicator.java | 163 -----------
.../analysis/generated/all/AllP90Indicator.java | 163 -----------
.../analysis/generated/all/AllP95Indicator.java | 163 -----------
.../analysis/generated/all/AllP99Indicator.java | 163 -----------
.../generated/endpoint/EndpointAvgIndicator.java | 185 -------------
.../generated/endpoint/EndpointCpmIndicator.java | 178 ------------
.../generated/endpoint/EndpointDispatcher.java | 139 ----------
.../generated/endpoint/EndpointP50Indicator.java | 194 --------------
.../generated/endpoint/EndpointP75Indicator.java | 194 --------------
.../generated/endpoint/EndpointP90Indicator.java | 194 --------------
.../generated/endpoint/EndpointP95Indicator.java | 194 --------------
.../generated/endpoint/EndpointP99Indicator.java | 194 --------------
.../generated/endpoint/EndpointSlaIndicator.java | 185 -------------
.../EndpointRelationCpmIndicator.java | 194 --------------
.../EndpointRelationRespTimeIndicator.java | 201 --------------
.../generated/service/ServiceCpmIndicator.java | 162 -----------
.../generated/service/ServiceDispatcher.java | 115 --------
.../generated/service/ServiceP50Indicator.java | 178 ------------
.../generated/service/ServiceP75Indicator.java | 178 ------------
.../generated/service/ServiceP90Indicator.java | 178 ------------
.../generated/service/ServiceP95Indicator.java | 178 ------------
.../generated/service/ServiceP99Indicator.java | 178 ------------
.../service/ServiceRespTimeIndicator.java | 169 ------------
.../generated/service/ServiceSlaIndicator.java | 169 ------------
.../ServiceInstanceCpmIndicator.java | 170 ------------
.../ServiceInstanceRespTimeIndicator.java | 177 ------------
.../ServiceInstanceSlaIndicator.java | 177 ------------
.../InstanceJvmCpuIndicator.java | 177 ------------
.../InstanceJvmOldGcCountIndicator.java | 163 -----------
.../InstanceJvmOldGcTimeIndicator.java | 177 ------------
.../InstanceJvmYoungGcCountIndicator.java | 163 -----------
.../InstanceJvmYoungGcTimeIndicator.java | 177 ------------
.../ServiceInstanceJVMGCDispatcher.java | 92 -------
.../InstanceJvmMemoryHeapIndicator.java | 177 ------------
.../InstanceJvmMemoryHeapMaxIndicator.java | 177 ------------
.../InstanceJvmMemoryNoheapIndicator.java | 177 ------------
.../InstanceJvmMemoryNoheapMaxIndicator.java | 177 ------------
.../ServiceInstanceJVMMemoryDispatcher.java | 92 -------
.../ServiceInstanceRelationDispatcher.java | 34 ---
.../ServiceRelationClientCallSlaIndicator.java | 169 ------------
.../ServiceRelationClientCpmIndicator.java | 162 -----------
.../servicerelation/ServiceRelationDispatcher.java | 114 --------
.../ServiceRelationServerCallSlaIndicator.java | 169 ------------
.../ServiceRelationServerCpmIndicator.java | 162 -----------
.../ServiceRelationServerRespTimeIndicator.java | 169 ------------
.../core/analysis/indicator/CPMIndicator.java | 2 +-
.../core/analysis/indicator/CountIndicator.java | 2 +-
.../analysis/indicator/DoubleAvgIndicator.java | 2 +-
.../core/analysis/indicator/LongAvgIndicator.java | 2 +-
.../core/analysis/indicator/P50Indicator.java | 3 +
.../core/analysis/indicator/P75Indicator.java | 3 +
.../core/analysis/indicator/P90Indicator.java | 3 +
.../core/analysis/indicator/P95Indicator.java | 3 +
.../core/analysis/indicator/P99Indicator.java | 3 +
.../core/analysis/indicator/PercentIndicator.java | 2 +-
.../core/analysis/indicator/PxxIndicator.java | 1 -
.../core/analysis/indicator/SumIndicator.java | 2 +-
.../analysis/indicator/ThermodynamicIndicator.java | 7 +-
...dicatorOperator.java => IndicatorFunction.java} | 7 +-
.../analysis/manual/segment/SegmentRecord.java | 13 +-
.../core/cache/NetworkAddressInventoryCache.java | 5 +-
.../server/core/query/TopologyQueryService.java | 7 +-
.../server/core/register/EndpointInventory.java | 4 +-
.../core/register/NetworkAddressInventory.java | 4 +-
.../core/register/ServiceInstanceInventory.java | 12 +-
.../oap/server/core/register/ServiceInventory.java | 13 +-
.../remote/health/HealthCheckServiceHandler.java | 52 ++++
.../oap/server/core/source/SourceReceiverImpl.java | 5 +
.../HealthCheckService.proto} | 31 ++-
.../client/elasticsearch/ElasticSearchClient.java | 9 +-
.../oap/server/library/server/grpc/GRPCServer.java | 1 +
oap-server/server-library/library-util/pom.xml | 5 +-
.../oap/server/library/util/Address.java} | 12 +-
.../library/util/ConnectStringParseException.java} | 16 +-
.../oap/server/library/util/ConnectUtils.java | 66 +++++
.../server/library/util/ConnectUtilTestCase.java | 77 ++++++
.../oap/query/graphql/resolver/TraceQuery.java | 5 +-
.../provider/IstioTelemetryGRPCHandler.java | 7 +-
.../v5/grpc/InstanceDiscoveryServiceHandler.java | 10 +-
.../v5/rest/InstanceDiscoveryServletHandler.java | 11 +-
.../handler/v6/grpc/RegisterServiceHandler.java | 37 +--
.../v5/ApplicationRegisterHandlerTestCase.java | 5 +
.../v6/grpc/TraceSegmentReportServiceHandler.java | 2 -
.../standardization/ReferenceIdExchanger.java | 8 +-
.../parser/standardization/SpanIdExchanger.java | 8 +-
.../receiver/zipkin/transform/SegmentBuilder.java | 43 ++-
oap-server/server-starter/pom.xml | 25 +-
.../src/main/assembly/alarm-settings.yml | 19 +-
.../src/main/assembly/application.yml | 23 +-
.../src/main/resources/application.yml | 27 +-
.../src/main/resources/component-libraries.yml | 11 +
.../StorageModuleElasticsearchProvider.java | 6 +-
.../elasticsearch/query/AlarmQueryEsDAO.java | 4 +-
.../elasticsearch/query/MetadataQueryEsDAO.java | 11 +-
.../elasticsearch/query/TraceQueryEsDAO.java | 22 +-
.../plugin/jdbc/h2/dao/H2AlarmQueryDAO.java | 14 +-
.../plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 29 +-
.../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 2 +-
.../jdbc/h2/dao/H2ServiceInventoryCacheDAO.java | 16 +-
.../plugin/jdbc/h2/dao/H2TraceQueryDAO.java | 21 +-
.../plugin/jdbc/mysql/MySQLAlarmQueryDAO.java | 14 +-
.../plugin/jdbc/mysql/MySQLTraceQueryDAO.java | 20 +-
skywalking-ui | 2 +-
274 files changed, 6427 insertions(+), 9119 deletions(-)