This is an automated email from the ASF dual-hosted git repository. hanahmily pushed a change to branch labeled-alarm in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 3ec59c3 Merge branch 'master' into labeled-alarm add b8e5ff5 Remove Buffer redundant strategy judgment code. (#5277) add 29a9d1c Add iQIYI.COM at the powered by page (#5279) add b1305ba fix:fix NullPointerException for replaceParam when message is null (#5280) add 69297b9 Support Apache ShardingSphere-Elasticjob (#5153) add fdd242e Update HttpClientExecuteInterceptor.java (#5283) add 2df3c68 Super Size Dataset record index es rolling step (#5282) add e37fc2e Support spring-kafka (#5254) add 5a2c91c [optimize] Raw use of parameterized class (#5286) add 7f7e96b [IMPORTANT] Query traces with tags as condition (#5270) add ecc18b9 Support !=, like filter expressions in OAL (#5269) add 3d0522f Add OALListener missing code (#5296) add 532384e fix bug when extend the scope and recommend to start with 10000 or the scope greater than 1000 (#5299) add a7e7783 disable kafka property in agent.config (#5305) add d3e0dbb Remove duplicate settings telemetry related context id in nacos. (#5306) add ab5555f Support @KafkaPollAndInvoke annotation to replace @Trace when just using the Kafka scenario agent plugin (#5304) add 522e095 Update elasticsearch Python Plugin Component (#5303) add b588b5f Fix spring-kafka test unstable (#5310) add 68317dd Add agent plugins selector (#5293) add 391dcbc ui sync (#5312) add 197ef1e Improve Es trace basic query performance (#5132) add 0c1c390 Correct the yaml config. (#5318) add 68eba15 Add latest function (#5321) add f731c25 Miss topic in the KafkaServiceManagementServiceClient (#5326) add a6e45d0 spring annotation enhance (#5320) add ed71efd Fix spring-kafka test unstable (#5313) add b173cde Upgrade the byte-buddy to 1.10.14 with asm (#5338) add 6000ee7 Merge branch 'master' into labeled-alarm add 950a6a8 Fix some nits add 04374d5 Merge branch 'labeled-alarm' of github.com:apache/skywalking into labeled-alarm No new revisions were added by this update. Summary of changes: .github/workflows/ci-it.yaml | 2 + .github/workflows/plugins-test.0.yaml | 1 + .github/workflows/plugins-test.3.yaml | 2 + .gitignore | 7 +- apm-application-toolkit/apm-toolkit-kafka/pom.xml | 33 ++++ .../apm/toolkit/kafka/KafkaPollAndInvoke.java | 12 +- .../apm/toolkit/trace/CallableWrapper.java | 6 +- .../apm/toolkit/trace/SupplierWrapper.java | 4 +- apm-application-toolkit/pom.xml | 1 + .../apm/commons/datacarrier/buffer/Buffer.java | 12 +- .../network/trace/component/ComponentsDefine.java | 2 + apm-sniffer/apm-agent-core/pom.xml | 2 +- .../skywalking/apm/agent/core/conf/Config.java | 5 + .../apm/agent/core/logging/core/PatternLogger.java | 3 + .../apm/agent/core/plugin/PluginCfg.java | 6 +- .../apm/agent/core/plugin/PluginDefine.java | 4 + .../apm/agent/core/plugin/PluginSelector.java | 48 ++++++ .../core/plugin/match/ClassAnnotationMatch.java | 2 +- .../apm/agent/core/plugin/match/RegexMatch.java | 67 ++++++++ .../apm/agent/core/plugin/PluginSelectorTest.java | 57 +++++++ .../apm/agent/core/plugin/match/MatchTest.java | 84 ++++++++++ .../core/plugin/match/MatchTestAnnotation.java | 12 +- .../pom.xml | 24 +-- .../elasticjob/ElasticJobExecutorInterceptor.java | 59 +++++++ .../define/ElasticJobExecutorInstrumentation.java | 74 +++++++++ .../src/main/resources/skywalking-plugin.def | 7 +- .../v3/HttpClientExecuteInterceptor.java | 2 +- .../{kafka-plugin => kafka-commons}/pom.xml | 14 +- .../apm/plugin/kafka/CallbackAdapter.java | 0 .../AbstractKafkaTemplateInstrumentation.java | 0 .../apm/plugin/kafka/define/Constants.java | 11 +- .../apm/plugin/kafka/define/InterceptorMethod.java | 48 ++++++ .../apm/plugin/kafka/define/KafkaContext.java} | 33 ++-- apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml | 11 +- .../apm/plugin/kafka/KafkaConsumerInterceptor.java | 26 +-- .../src/main/resources/skywalking-plugin.def | 1 - apm-sniffer/apm-sdk-plugin/pom.xml | 2 + apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml | 1 + .../spring-kafka-2.x-plugin}/pom.xml | 24 ++- .../kafka/KafkaTemplateCallbackInterceptor.java | 10 +- .../kafka/PollAndInvokeMethodInterceptor.java} | 26 +-- .../kafka/define/KafkaTemplateInstrumentation.java | 7 +- .../define/ListenerConsumerInstrumentation.java} | 25 ++- .../src/main/resources/skywalking-plugin.def | 8 +- .../apm-toolkit-kafka-activation}/pom.xml | 42 ++--- ...KafkaOnMessageAnnotationMethodInterceptor.java} | 26 +-- .../KafkaOnMessageAnnotationInstrumentation.java} | 29 ++-- .../src/main/resources/skywalking-plugin.def | 7 +- apm-sniffer/apm-toolkit-activation/pom.xml | 1 + apm-sniffer/config/agent.config | 8 +- .../AbstractSpringBeanInstrumentation.java | 26 ++- .../spring/annotations/SpringAnnotationConfig.java | 27 ++-- .../bean/SpringBeanInstrumentation.java | 7 +- .../component/SpringComponentInstrumentation.java | 7 +- .../SpringRepositoryInstrumentation.java | 7 +- .../services/SpringServicesInstrumentation.java | 7 +- .../kafka/KafkaServiceManagementServiceClient.java | 2 +- dist-material/release-docs/LICENSE | 4 +- docs/en/FAQ/kafka-plugin.md | 2 +- docs/en/concepts-and-designs/oal.md | 6 +- docs/en/setup/backend/backend-alarm.md | 2 + docs/en/setup/backend/backend-storage.md | 4 + docs/en/setup/backend/configuration-vocabulary.md | 9 +- .../setup/service-agent/java-agent/Plugin-list.md | 102 ++++++++++++ docs/en/setup/service-agent/java-agent/README.md | 3 + .../service-agent/java-agent/Supported-list.md | 2 + docs/powered-by.md | 1 + .../parser/listener/SegmentAnalysisListener.java | 30 +++- .../apache/skywalking/oal/rt/grammar/OALLexer.g4 | 4 +- .../apache/skywalking/oal/rt/grammar/OALParser.g4 | 16 +- .../org/apache/skywalking/oal/rt/OALRuntime.java | 7 - .../oal/rt/parser/ConditionExpression.java | 4 + .../skywalking/oal/rt/parser/DeepAnalysis.java | 92 +++-------- .../skywalking/oal/rt/parser/FilterMatchers.java | 95 +++++++++++ .../skywalking/oal/rt/parser/MetricsHolder.java | 22 ++- .../skywalking/oal/rt/parser/OALListener.java | 15 ++ .../code-templates/dispatcher/doMetrics.ftl | 4 +- .../resources/code-templates/metrics/getMeta.ftl | 2 +- .../skywalking/oal/rt/parser/DeepAnalysisTest.java | 56 ++++++- .../skywalking/oal/rt/parser/ScriptParserTest.java | 2 - .../server/core/alarm/provider/RunningRule.java | 4 + .../src/main/resources/application.yml | 10 +- .../src/main/resources/component-libraries.yml | 8 +- .../cluster/plugin/nacos/NacosCoordinator.java | 2 - .../apache/skywalking/oap/server/core/Const.java | 1 + .../oap/server/core/CoreModuleConfig.java | 24 +++ .../analysis/manual/segment/SegmentDispatcher.java | 2 + .../analysis/manual/segment/SegmentRecord.java | 15 ++ .../manual/segment/SpanTag.java} | 39 +++-- .../analysis/meter/function/LatestFunction.java | 180 +++++++++++++++++++++ .../annotation/BooleanValueFilterMatcher.java | 23 +-- .../analysis/metrics/annotation/FilterMatcher.java | 40 +++++ .../analysis/metrics/expression/BooleanMatch.java} | 17 +- .../metrics/expression/BooleanNotEqualMatch.java} | 17 +- .../analysis/metrics/expression/EqualMatch.java | 42 +---- .../metrics/expression/GreaterEqualMatch.java | 3 + .../analysis/metrics/expression/GreaterMatch.java | 3 + .../metrics/expression/LessEqualMatch.java | 3 + .../analysis/metrics/expression/LessMatch.java | 3 + .../expression/{LessMatch.java => LikeMatch.java} | 45 ++---- .../metrics/expression/NotEqualMatch.java} | 16 +- .../oap/server/core/config/ConfigService.java | 2 + .../promethues/PrometheusMetricConverter.java | 20 ++- .../oap/server/core/query/MetricsQueryService.java | 2 +- .../oap/server/core/query/TraceQueryService.java | 7 +- .../core/query/input/TraceQueryCondition.java | 3 + .../oap/server/core/query/sql/Function.java | 2 +- .../oap/server/core/query/type/IntValues.java | 5 + .../skywalking/oap/server/core/source/Segment.java | 6 + .../server/core/storage/model/DataTypeMapping.java | 8 +- .../oap/server/core/storage/model/ModelColumn.java | 15 +- .../server/core/storage/model/StorageModels.java | 4 +- .../core/storage/query/IMetricsQueryDAO.java | 5 +- .../server/core/storage/query/ITraceQueryDAO.java | 18 ++- .../meter/function/LatestFunctionTest.java | 82 ++++++++++ .../metrics/expression/LikeMatchTest.java} | 17 +- .../server/core/storage/model/ModelColumnTest.java | 10 +- .../client/elasticsearch/ElasticSearchClient.java | 22 ++- .../client/elasticsearch/IndexNameMaker.java} | 10 +- .../oap/query/graphql/resolver/MetricsQuery.java | 2 +- .../oap/query/graphql/resolver/TraceQuery.java | 2 +- .../src/main/resources/query-protocol | 2 +- .../server/receiver/trace/mock/ServiceAMock.java | 6 +- .../StorageModuleElasticsearchConfig.java | 5 + .../StorageModuleElasticsearchProvider.java | 49 +++--- .../elasticsearch/base/ColumnTypeEsMapping.java | 8 +- .../elasticsearch/base/StorageEsInstaller.java | 4 +- .../base/TimeRangeIndexNameMaker.java} | 31 ++-- .../plugin/elasticsearch/base/TimeSeriesUtils.java | 50 +++++- .../elasticsearch/query/MetricsQueryEsDAO.java | 16 +- .../elasticsearch/query/TraceQueryEsDAO.java | 25 ++- .../ElasticSearchColumnTypeMappingTestCase.java | 22 ++- .../elasticsearch/base/TimeSeriesUtilsTest.java | 40 +++++ .../base/TimeSeriesUtilsTestCase.java | 19 +++ .../StorageModuleElasticsearch7Provider.java | 8 + .../client/ElasticSearch7Client.java | 6 +- .../elasticsearch7/query/MetricsQueryEs7DAO.java | 20 ++- .../elasticsearch7/query/TraceQueryEs7DAO.java | 23 ++- .../storage/plugin/influxdb/TableMetaInfo.java | 5 + .../plugin/influxdb/base/InfluxInsertRequest.java | 9 ++ .../storage/plugin/influxdb/base/RecordDAO.java | 21 +++ .../plugin/influxdb/query/MetricsQuery.java | 10 +- .../storage/plugin/influxdb/query/TraceQuery.java | 13 +- .../elasticsearch/JaegerTraceQueryEsDAO.java | 4 +- .../storage/plugin/jdbc/h2/H2StorageConfig.java | 29 ++++ .../storage/plugin/jdbc/h2/H2StorageProvider.java | 47 ++++-- .../plugin/jdbc/h2/dao/H2MetricsQueryDAO.java | 10 +- .../storage/plugin/jdbc/h2/dao/H2RecordDAO.java | 41 ++++- .../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 33 +++- .../plugin/jdbc/h2/dao/H2SegmentRecordBuilder.java | 149 +++++++++++++++++ .../storage/plugin/jdbc/h2/dao/H2StorageDAO.java | 15 +- .../plugin/jdbc/h2/dao/H2TableInstaller.java | 50 ++++-- .../plugin/jdbc/h2/dao/H2TraceQueryDAO.java | 54 ++++++- .../plugin/jdbc/mysql/MySQLStorageConfig.java | 16 +- .../plugin/jdbc/mysql/MySQLStorageProvider.java | 43 ++++- .../plugin/jdbc/mysql/MySQLTableInstaller.java | 58 ++++--- .../plugin/jdbc/mysql/MySQLTraceQueryDAO.java | 8 +- .../elasticsearch/ZipkinTraceQueryEsDAO.java | 4 +- .../profile/exporter/test/ProfileTraceDAO.java | 4 +- pom.xml | 4 + skywalking-ui | 2 +- test/e2e/e2e-test/docker/kafka/Dockerfile.provider | 2 + test/plugin/agent-test-tools/pom.xml | 2 +- .../elasticjob-3.x-scenario/bin/startup.sh | 11 +- .../config/expectedData.yaml | 53 ++++++ .../elasticjob-3.x-scenario/configuration.yml | 18 ++- .../pom.xml | 98 ++++++----- .../src/main/assembly/assembly.xml | 43 +++-- .../apm/testcase/elasticjob/Application.java | 28 ++-- .../elasticjob/controller/CaseController.java | 45 +++--- .../apm/testcase/elasticjob/job/DemoSimpleJob.java | 52 ++++++ .../src/main/resources/application.yaml} | 43 +++-- .../src/main/resources/log4j2.xml | 0 .../elasticjob-3.x-scenario/support-version.list | 11 +- .../kafka-scenario/config/expectedData.yaml | 37 +++++ test/plugin/scenarios/kafka-scenario/pom.xml | 6 + .../apm/toolkit/kafka/KafkaPollAndInvoke.java | 12 +- .../testcase/kafka/controller/CaseController.java | 54 ++++--- .../spring-kafka-2.2.x-scenario/bin/startup.sh | 11 +- .../config/expectedData.yaml | 110 +++++++++++++ .../spring-kafka-2.2.x-scenario/configuration.yml | 29 +++- .../pom.xml | 69 ++++---- .../src/main/assembly/assembly.xml | 43 +++-- .../apm/testcase/spring/kafka/Application.java | 18 +-- .../spring/kafka/controller/CaseController.java | 136 ++++++++++++++++ .../src/main/resources/application.properties} | 28 +--- .../src/main/resources/log4j2.xml | 0 .../support-version.list | 15 +- .../spring-kafka-2.3.x-scenario/bin/startup.sh | 11 +- .../config/expectedData.yaml | 110 +++++++++++++ .../spring-kafka-2.3.x-scenario/configuration.yml | 29 +++- .../pom.xml | 68 ++++---- .../src/main/assembly/assembly.xml | 43 +++-- .../apm/testcase/spring/kafka/Application.java | 15 +- .../spring/kafka/controller/CaseController.java | 136 ++++++++++++++++ .../src/main/resources/application.properties} | 28 +--- .../src/main/resources/log4j2.xml | 0 .../support-version.list | 15 +- tools/plugin/check-javaagent-plugin-list.sh | 45 ++++++ 199 files changed, 3594 insertions(+), 1047 deletions(-) create mode 100644 apm-application-toolkit/apm-toolkit-kafka/pom.xml copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/DataTypeMapping.java => apm-application-toolkit/apm-toolkit-kafka/src/main/java/org/apache/skywalking/apm/toolkit/kafka/KafkaPollAndInvoke.java (72%) create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginSelector.java create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/RegexMatch.java create mode 100644 apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/PluginSelectorTest.java create mode 100644 apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/match/MatchTest.java copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/DataTypeMapping.java => apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/plugin/match/MatchTestAnnotation.java (74%) copy apm-sniffer/apm-sdk-plugin/{kafka-plugin => elastic-job-3.x-plugin}/pom.xml (62%) create mode 100644 apm-sniffer/apm-sdk-plugin/elastic-job-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticjob/ElasticJobExecutorInterceptor.java create mode 100644 apm-sniffer/apm-sdk-plugin/elastic-job-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticjob/define/ElasticJobExecutorInstrumentation.java copy apm-sniffer/apm-sdk-plugin/{kafka-plugin => elastic-job-3.x-plugin}/src/main/resources/skywalking-plugin.def (57%) copy apm-sniffer/apm-sdk-plugin/{kafka-plugin => kafka-commons}/pom.xml (78%) copy apm-sniffer/apm-sdk-plugin/{kafka-plugin => kafka-commons}/src/main/java/org/apache/skywalking/apm/plugin/kafka/CallbackAdapter.java (100%) copy apm-sniffer/apm-sdk-plugin/{kafka-plugin => kafka-commons}/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaTemplateInstrumentation.java (100%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/DataTypeMapping.java => apm-sniffer/apm-sdk-plugin/kafka-commons/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/Constants.java (72%) create mode 100644 apm-sniffer/apm-sdk-plugin/kafka-commons/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/InterceptorMethod.java copy apm-sniffer/apm-sdk-plugin/{kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaTemplateInstrumentation.java => kafka-commons/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaContext.java} (58%) copy apm-sniffer/apm-sdk-plugin/{kafka-plugin => spring-plugins/spring-kafka-2.x-plugin}/pom.xml (59%) copy apm-sniffer/apm-sdk-plugin/{kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin => spring-plugins/spring-kafka-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring}/kafka/KafkaTemplateCallbackInterceptor.java (84%) copy apm-sniffer/apm-sdk-plugin/{kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/KafkaTemplateCallbackInterceptor.java => spring-plugins/spring-kafka-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/kafka/PollAndInvokeMethodInterceptor.java} (66%) copy apm-sniffer/apm-sdk-plugin/{kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin => spring-plugins/spring-kafka-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring}/kafka/define/KafkaTemplateInstrumentation.java (90%) copy apm-sniffer/apm-sdk-plugin/{kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaTemplateInstrumentation.java => spring-plugins/spring-kafka-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/kafka/define/ListenerConsumerInstrumentation.java} (73%) copy apm-sniffer/apm-sdk-plugin/{kafka-plugin => spring-plugins/spring-kafka-2.x-plugin}/src/main/resources/skywalking-plugin.def (57%) copy apm-sniffer/{apm-sdk-plugin/kafka-plugin => apm-toolkit-activation/apm-toolkit-kafka-activation}/pom.xml (62%) rename apm-sniffer/{apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/KafkaTemplateCallbackInterceptor.java => apm-toolkit-activation/apm-toolkit-kafka-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/kafka/KafkaOnMessageAnnotationMethodInterceptor.java} (65%) rename apm-sniffer/{apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/KafkaTemplateInstrumentation.java => apm-toolkit-activation/apm-toolkit-kafka-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/kafka/define/KafkaOnMessageAnnotationInstrumentation.java} (64%) copy apm-sniffer/{apm-sdk-plugin/kafka-plugin => apm-toolkit-activation/apm-toolkit-kafka-activation}/src/main/resources/skywalking-plugin.def (57%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/IntValues.java => apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/SpringAnnotationConfig.java (63%) create mode 100644 docs/en/setup/service-agent/java-agent/Plugin-list.md create mode 100644 oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/parser/FilterMatchers.java copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{query/type/IntValues.java => analysis/manual/segment/SpanTag.java} (50%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/LatestFunction.java copy apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaTemplateInstrumentation.java => oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/BooleanValueFilterMatcher.java (58%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/FilterMatcher.java copy oap-server/{server-storage-plugin/storage-elasticsearch-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeSeriesUtilsTestCase.java => server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/BooleanMatch.java} (66%) copy oap-server/{server-storage-plugin/storage-elasticsearch-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeSeriesUtilsTestCase.java => server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/BooleanNotEqualMatch.java} (66%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/{LessMatch.java => LikeMatch.java} (55%) copy oap-server/{server-storage-plugin/storage-elasticsearch-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeSeriesUtilsTestCase.java => server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/NotEqualMatch.java} (70%) create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/meter/function/LatestFunctionTest.java copy oap-server/{server-storage-plugin/storage-elasticsearch-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeSeriesUtilsTestCase.java => server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/LikeMatchTest.java} (60%) copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Function.java => server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/IndexNameMaker.java} (79%) copy oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/{test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ElasticSearchColumnTypeMappingTestCase.java => main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeRangeIndexNameMaker.java} (56%) 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/H2SegmentRecordBuilder.java copy apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/elasticjob-3.x-scenario/bin/startup.sh (57%) create mode 100644 test/plugin/scenarios/elasticjob-3.x-scenario/config/expectedData.yaml copy apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/elasticjob-3.x-scenario/configuration.yml (57%) copy test/plugin/scenarios/{kafka-scenario => elasticjob-3.x-scenario}/pom.xml (65%) copy apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml => test/plugin/scenarios/elasticjob-3.x-scenario/src/main/assembly/assembly.xml (50%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/IntValues.java => test/plugin/scenarios/elasticjob-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticjob/Application.java (57%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/GreaterMatch.java => test/plugin/scenarios/elasticjob-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticjob/controller/CaseController.java (51%) create mode 100644 test/plugin/scenarios/elasticjob-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticjob/job/DemoSimpleJob.java copy test/{e2e/e2e-test/docker/kafka/Dockerfile.provider => plugin/scenarios/elasticjob-3.x-scenario/src/main/resources/application.yaml} (54%) copy test/plugin/scenarios/{quasar-scenario => elasticjob-3.x-scenario}/src/main/resources/log4j2.xml (100%) copy apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/elasticjob-3.x-scenario/support-version.list (53%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/DataTypeMapping.java => test/plugin/scenarios/kafka-scenario/src/main/java/org/apache/skywalking/apm/toolkit/kafka/KafkaPollAndInvoke.java (72%) copy apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/spring-kafka-2.2.x-scenario/bin/startup.sh (57%) create mode 100644 test/plugin/scenarios/spring-kafka-2.2.x-scenario/config/expectedData.yaml copy apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/spring-kafka-2.2.x-scenario/configuration.yml (52%) copy test/plugin/scenarios/{kafka-scenario => spring-kafka-2.2.x-scenario}/pom.xml (74%) copy apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml => test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/assembly/assembly.xml (50%) rename apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/define/AbstractKafkaTemplateInstrumentation.java => test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/Application.java (60%) create mode 100644 test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java copy test/{e2e/e2e-test/docker/kafka/Dockerfile.provider => plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/resources/application.properties} (54%) copy test/plugin/scenarios/{spring-4.3.x-scenario => spring-kafka-2.2.x-scenario}/src/main/resources/log4j2.xml (100%) copy apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/spring-kafka-2.2.x-scenario/support-version.list (53%) copy apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/spring-kafka-2.3.x-scenario/bin/startup.sh (57%) create mode 100644 test/plugin/scenarios/spring-kafka-2.3.x-scenario/config/expectedData.yaml copy apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/spring-kafka-2.3.x-scenario/configuration.yml (52%) copy test/plugin/scenarios/{kafka-scenario => spring-kafka-2.3.x-scenario}/pom.xml (72%) copy apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml => test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/assembly/assembly.xml (50%) copy oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/test/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/TimeSeriesUtilsTestCase.java => test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/Application.java (70%) create mode 100644 test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java copy test/{e2e/e2e-test/docker/kafka/Dockerfile.provider => plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/resources/application.properties} (54%) copy test/plugin/scenarios/{spring-4.3.x-scenario => spring-kafka-2.3.x-scenario}/src/main/resources/log4j2.xml (100%) copy apm-sniffer/apm-sdk-plugin/kafka-plugin/src/main/resources/skywalking-plugin.def => test/plugin/scenarios/spring-kafka-2.3.x-scenario/support-version.list (53%) create mode 100755 tools/plugin/check-javaagent-plugin-list.sh