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/11 01:19:52 UTC
[incubator-skywalking] branch submodule/ui updated (898de4f ->
7dfdd28)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch submodule/ui
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 898de4f Update submodule skywalking-ui
add efad116 add system env for trace ignore plugin
add 9652d7e Merge branch 'master' into len
add 6b44fa7 Update submodule skywalking-ui (#1990)
add 93a0364 Make sure all mapping data loaded. (#1992)
add f13a06a Merge branch 'master' into len
add dc393b1 refactoring PropertyPlaceholderHelper class. (#1989)
add 7066aff Merge branch 'master' into len
add 1fa3091 Istio/namespace (#1994)
add 1ea977e Submodule/ui (#1995)
add fc79182 Make endpoint alarm setting not active in default (#1998)
add bd879fd Fix mapping update bug in H2, MySQL, TiDB storage (#1999)
add d75a147 Update How-to-build.md (#2002)
add 5f5be77 Fix the alarm being started too many times. (#2003)
add 2c1d28f Merge branch 'master' into len
add 5bc3ccd fix conflicts and test case.
add f2b1588 [OAL refactor step 1]Refactor dispatcher manager (#2006)
add b943265 Merge branch 'master' into len
add 1b1a9bf Remove unused Debug Switches
add 1587b05 Merge branch 'master' into clean
add f39c040 Merge pull request #2005 from JaredTan95/clean
add 1b66346 Merge branch 'master' into len
add 3f2fb8d Merge pull request #1981 from a198720/len
add 27c475f 1. Make storage and cluster using same name space. (#2014)
add c141376 fix https://github.com/apache/incubator-skywalking/issues/1820. (#2013)
add 40eb651 OAL tool module established (#2015)
add f8d384e fix classloader dead lock in jdk7+ (#2016)
add 45f4454 Support rabbitmq plugin (#2000)
add aa9a7c4 Fix the NPE about elasticsearch plugin (#1985)
add a38c128 Update Supported-list.md (#2020)
add d2b1f1a Add a document link in plugin contribution. (#2023)
add c12cfa5 No need to dependency to elasticsearch. (#2024)
add 7532583 Endpoint name need fuzzy query. (#2026)
add 1bc5de7 Support overwrite tag (#2021)
add ae80fc3 Changelog of beta. (#2028)
add 7dfdd28 Merge branch 'master' into submodule/ui
No new revisions were added by this update.
Summary of changes:
.gitignore | 2 +-
CHANGES.md | 60 +++++
.../apm/util/PropertyPlaceholderHelper.java | 25 +-
.../network/trace/component/ComponentsDefine.java | 8 +-
.../agent/core/conf/SnifferConfigInitializer.java | 19 +-
.../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 +
.../util/{KeyValuePair.java => TagValuePair.java} | 36 +--
.../agent/core/plugin/loader/AgentClassLoader.java | 27 ++
.../apm/agent/core/sampling/SamplingService.java | 2 +-
.../core/conf/SnifferConfigInitializerTest.java | 7 +-
.../apm/plugin/dubbo/DubboInterceptorTest.java | 4 +-
.../v5/ActionRequestBuilderInterceptor.java | 65 -----
.../v5/AddTransportAddressesInterceptor.java} | 25 +-
.../apm/plugin/elasticsearch/v5/Constants.java | 2 -
.../elasticsearch/v5/ElasticSearchEnhanceInfo.java | 17 +-
.../v5/GenericActionConstructorInterceptor.java} | 17 +-
.../v5/RemoveTransportAddressInterceptor.java} | 25 +-
.../v5/TransportActionNodeProxyInterceptor.java | 31 ++-
.../elasticsearch/v5/TransportAddressCache.java | 60 +++++
.../v5/TransportProxyClientInterceptor.java | 64 ++---
.../ActionRequestBuilderInstrumentation.java | 64 -----
.../v5/define/GenericActionInstrumentation.java} | 31 +--
.../TransportActionNodeProxyInstrumentation.java | 20 +-
...ransportClientNodesServiceInstrumentation.java} | 30 ++-
.../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 +
.../pom.xml | 16 +-
.../rabbitmq/RabbitMQConsumerInterceptor.java} | 48 ++--
...ProducerAndConsumerConstructorInterceptor.java} | 14 +-
.../rabbitmq/RabbitMQProducerInterceptor.java} | 76 +++---
.../define/RabbitMQConsumerInstrumentation.java} | 31 +--
.../define/RabbitMQProducerInstrumentation.java} | 31 +--
.../src/main/resources/skywalking-plugin.def | 3 +-
.../rabbitmq/RabbitMQConsumerInterceptorTest.java | 85 ++++++
...ducerAndConsumerConstructorInterceptorTest.java | 234 ++++++++++++++++
.../rabbitmq/RabbitMQProducerInterceptorTest.java} | 80 ++----
.../ProducerOperationHandlerInterceptorTest.java | 4 +-
.../TransportClientHandlerInterceptorTest.java | 4 +-
.../ProducerOperationHandlerInterceptorTest.java | 10 +-
.../v1/TransportClientHandlerInterceptorTest.java | 8 +-
.../sofarpc/SofaRpcConsumerInterceptorTest.java | 22 +-
.../sofarpc/SofaRpcProviderInterceptorTest.java | 7 +-
.../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/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-storage.md | 2 +-
.../service-agent/java-agent/Supported-list.md | 1 +
.../pom.xml | 49 +++-
.../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 | 13 +-
.../skywalking/oal/tool/parser/AnalysisResult.java | 145 ++++++++++
.../oal/tool/parser/ConditionExpression.java} | 15 +-
.../skywalking/oal/tool/parser/DataColumn.java} | 36 ++-
.../skywalking/oal/tool/parser/DeepAnalysis.java | 142 ++++++++++
.../skywalking/oal/tool/parser/EntryMethod.java} | 19 +-
.../oal/tool/parser/FilterExpression.java} | 16 +-
.../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} | 20 +-
.../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 | 26 +-
.../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 +-
.../{server-testing => generated-analysis}/pom.xml | 38 ++-
.../src/main/resources/official_analysis.oal | 0
oap-server/pom.xml | 2 +
.../oap/server/core/alarm/provider/AlarmCore.java | 2 +-
.../core/alarm/provider/AlarmModuleProvider.java | 4 +-
.../server/core/alarm/provider/NotifyHandler.java | 1 -
.../cluster-kubernetes-plugin/pom.xml | 19 +-
.../zookeeper/ClusterModuleZookeeperConfig.java | 3 +
.../zookeeper/ClusterModuleZookeeperProvider.java | 24 +-
.../oap/server/core/CoreModuleConfig.java | 1 +
.../oap/server/core/CoreModuleProvider.java | 11 +-
.../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 -------
.../ServiceInstanceJVMMemoryPoolDispatcher.java | 34 ---
.../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 +-
.../oap/server/core/source/SourceReceiverImpl.java | 5 +
.../oap/server/library/client/NameSpace.java | 35 ---
.../client/elasticsearch/ElasticSearchClient.java | 9 +-
.../util/PropertyPlaceholderHelperTest.java | 6 +-
.../provider/IstioTelemetryGRPCHandler.java | 7 +-
.../v6/grpc/TraceSegmentReportServiceHandler.java | 2 -
oap-server/server-starter/pom.xml | 18 +-
.../src/main/assembly/alarm-settings.yml | 19 +-
.../src/main/assembly/application.yml | 2 +-
.../starter/config/ApplicationConfigLoader.java | 10 +-
.../src/main/resources/application.yml | 9 +-
.../src/main/resources/component-libraries.yml | 11 +
.../StorageModuleElasticsearchProvider.java | 6 +-
.../cache/ServiceInventoryCacheEsDAO.java | 2 +-
.../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 2 +-
.../jdbc/h2/dao/H2ServiceInventoryCacheDAO.java | 18 +-
210 files changed, 3876 insertions(+), 9022 deletions(-)
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/util/{KeyValuePair.java => TagValuePair.java} (65%)
delete mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/ActionRequestBuilderInterceptor.java
copy apm-sniffer/apm-sdk-plugin/{postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreatePreparedStatementInterceptor.java => elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/AddTransportAddressesInterceptor.java} (67%)
copy apm-sniffer/apm-sdk-plugin/{h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2/PooledJdbcConnectionConstructorInterceptor.java => elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/GenericActionConstructorInterceptor.java} (67%)
copy apm-sniffer/apm-sdk-plugin/{postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreatePreparedStatementInterceptor.java => elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/RemoveTransportAddressInterceptor.java} (67%)
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/TransportAddressCache.java
delete mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/ActionRequestBuilderInstrumentation.java
copy apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/define/ProducerRecordInstrumentation.java => elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/GenericActionInstrumentation.java} (63%)
copy apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/CallbackInstrumentation.java => elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportClientNodesServiceInstrumentation.java} (67%)
copy apm-sniffer/apm-sdk-plugin/{grpc-1.x-plugin => rabbitmq-5.x-plugin}/pom.xml (83%)
copy apm-sniffer/apm-sdk-plugin/{activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQProducerInterceptor.java => rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java} (59%)
copy apm-sniffer/apm-sdk-plugin/{activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerConstructorInterceptor.java => rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerAndConsumerConstructorInterceptor.java} (72%)
copy apm-sniffer/apm-sdk-plugin/{activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/ActiveMQConsumerInterceptor.java => rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerInterceptor.java} (54%)
copy apm-sniffer/apm-sdk-plugin/{activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/define/ActiveMQConsumerInstrumentation.java => rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/define/RabbitMQConsumerInstrumentation.java} (72%)
copy apm-sniffer/apm-sdk-plugin/{activemq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/activemq/define/ActiveMQConsumerInstrumentation.java => rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/define/RabbitMQProducerInstrumentation.java} (72%)
copy apm-sniffer/apm-sdk-plugin/{dubbo-plugin => rabbitmq-5.x-plugin}/src/main/resources/skywalking-plugin.def (80%)
create mode 100644 apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptorTest.java
create mode 100644 apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerAndConsumerConstructorInterceptorTest.java
copy apm-sniffer/apm-sdk-plugin/{kafka-v1-plugin/src/test/java/org/apache/skywalking/apm/plugin/kafka/v11/KafkaProducerInterceptorTest.java => rabbitmq-5.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQProducerInterceptorTest.java} (51%)
create mode 100644 docs/en/guides/write-oal.md
copy oap-server/{server-receiver-plugin/zipkin-receiver-plugin => generate-tool}/pom.xml (53%)
create mode 100644 oap-server/generate-tool/src/main/antlr4/org/apache/skywalking/oal/tool/grammar/OALLexer.g4
create mode 100644 oap-server/generate-tool/src/main/antlr4/org/apache/skywalking/oal/tool/grammar/OALParser.g4
create mode 100644 oap-server/generate-tool/src/main/java/org/apache/skywalking/oal/tool/Main.java
create mode 100644 oap-server/generate-tool/src/main/java/org/apache/skywalking/oal/tool/output/DispatcherContext.java
create mode 100644 oap-server/generate-tool/src/main/java/org/apache/skywalking/oal/tool/output/FileGenerator.java
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/CarrierItemHead.java => oap-server/generate-tool/src/main/java/org/apache/skywalking/oal/tool/output/WriteWrapper.java (78%)
create mode 100644 oap-server/generate-tool/src/main/java/org/apache/skywalking/oal/tool/parser/AnalysisResult.java
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/KeyValue.java => generate-tool/src/main/java/org/apache/skywalking/oal/tool/parser/ConditionExpression.java} (78%)
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmMessage.java => generate-tool/src/main/java/org/apache/skywalking/oal/tool/parser/DataColumn.java} (57%)
create mode 100644 oap-server/generate-tool/src/main/java/org/apache/skywalking/oal/tool/parser/DeepAnalysis.java
copy oap-server/{server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Rules.java => generate-tool/src/main/java/org/apache/skywalking/oal/tool/parser/EntryMethod.java} (73%)
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Endpoint.java => generate-tool/src/main/java/org/apache/skywalking/oal/tool/parser/FilterExpression.java} (78%)
create mode 100644 oap-server/generate-tool/src/main/java/org/apache/skywalking/oal/tool/parser/Indicators.java
create mode 100644 oap-server/generate-tool/src/main/java/org/apache/skywalking/oal/tool/parser/OALListener.java
create mode 100644 oap-server/generate-tool/src/main/java/org/apache/skywalking/oal/tool/parser/PersistenceColumns.java
copy oap-server/{server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/Rules.java => generate-tool/src/main/java/org/apache/skywalking/oal/tool/parser/PersistenceField.java} (67%)
create mode 100644 oap-server/generate-tool/src/main/java/org/apache/skywalking/oal/tool/parser/ScriptParser.java
create mode 100644 oap-server/generate-tool/src/main/java/org/apache/skywalking/oal/tool/parser/SourceColumn.java
create mode 100644 oap-server/generate-tool/src/main/java/org/apache/skywalking/oal/tool/parser/SourceColumnsFactory.java
copy apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java => oap-server/generate-tool/src/main/java/org/apache/skywalking/oal/tool/util/ClassMethodUtil.java (61%)
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/ServiceInstanceJVMCPUDispatcher.java => generate-tool/src/main/resources/code-templates/AllDispatcherTemplate.ftl} (52%)
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/ServiceInstanceJVMCPUDispatcher.java => generate-tool/src/main/resources/code-templates/EndpointDispatcherTemplate.ftl} (51%)
rename oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationDispatcher.java => generate-tool/src/main/resources/code-templates/EndpointRelationDispatcherTemplate.ftl} (52%)
create mode 100644 oap-server/generate-tool/src/main/resources/code-templates/IndicatorImplementor.ftl
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/ServiceInstanceJVMCPUDispatcher.java => generate-tool/src/main/resources/code-templates/ServiceDispatcherTemplate.ftl} (51%)
rename oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceDispatcher.java => generate-tool/src/main/resources/code-templates/ServiceInstanceDispatcherTemplate.ftl} (53%)
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/ServiceInstanceJVMCPUDispatcher.java => generate-tool/src/main/resources/code-templates/ServiceInstanceJVMCPUDispatcherTemplate.ftl} (56%)
create mode 100644 oap-server/generate-tool/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl
create mode 100644 oap-server/generate-tool/src/main/resources/code-templates/ServiceInstanceJVMMemoryDispatcherTemplate.ftl
create mode 100644 oap-server/generate-tool/src/main/resources/code-templates/ServiceInstanceJVMMemoryPoolDispatcherTemplate.ftl
create mode 100644 oap-server/generate-tool/src/main/resources/code-templates/ServiceInstanceRelationDispatcherTemplate.ftl
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/ServiceInstanceJVMCPUDispatcher.java => generate-tool/src/main/resources/code-templates/ServiceRelationDispatcherTemplate.ftl} (50%)
create mode 100644 oap-server/generate-tool/src/test/java/org/apache/skywalking/oal/tool/output/FileGeneratorTest.java
create mode 100644 oap-server/generate-tool/src/test/java/org/apache/skywalking/oal/tool/parser/DeepAnalysisTest.java
create mode 100644 oap-server/generate-tool/src/test/java/org/apache/skywalking/oal/tool/parser/ScriptParserTest.java
rename oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java => generate-tool/src/test/resources/expectedFiles/IndicatorImplementorExpected.java} (81%)
rename oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/ServiceInstanceJVMCPUDispatcher.java => generate-tool/src/test/resources/expectedFiles/ServiceDispatcherExpected.java} (72%)
copy oap-server/{server-core/src/main/resources/official_analysis.oal => generate-tool/src/test/resources/oal_test.oal} (96%)
copy oap-server/{server-testing => generated-analysis}/pom.xml (50%)
rename oap-server/{server-core => generated-analysis}/src/main/resources/official_analysis.oal (100%)
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllDispatcher.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllHeatmapIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP50Indicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP75Indicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP90Indicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP95Indicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/all/AllP99Indicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointCpmIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointDispatcher.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP50Indicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP75Indicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP90Indicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP95Indicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointP99Indicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointSlaIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationCpmIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationRespTimeIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCpmIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceDispatcher.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP50Indicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP75Indicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP90Indicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP95Indicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceP99Indicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceRespTimeIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceSlaIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceCpmIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceSlaIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcCountIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmOldGcTimeIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcCountIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/ServiceInstanceJVMGCDispatcher.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryHeapMaxIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryNoheapMaxIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/ServiceInstanceJVMMemoryDispatcher.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/ServiceInstanceJVMMemoryPoolDispatcher.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationDispatcher.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationDispatcher.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java
delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java
rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/annotation/{IndicatorOperator.java => IndicatorFunction.java} (86%)
delete mode 100644 oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/NameSpace.java