You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2020/08/10 14:16:20 UTC
[skywalking] branch oal/filter-expression updated (9350989 ->
0750054)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch oal/filter-expression
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 9350989 Remove unused imports
add f33730b Address review comments
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 0750054 Merge remote-tracking branch 'origin/master' into oal/filter-expression
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.0.yaml | 1 +
.github/workflows/plugins-test.3.yaml | 2 +
.../apm/toolkit/trace/CallableWrapper.java | 6 +-
.../apm/toolkit/trace/SupplierWrapper.java | 4 +-
.../network/trace/component/ComponentsDefine.java | 2 +
.../apm/agent/core/logging/core/PatternLogger.java | 3 +
.../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} | 15 +--
.../plugin/kafka/define/SpringKafkaContext.java} | 23 ++--
apm-sniffer/apm-sdk-plugin/kafka-plugin/pom.xml | 11 +-
.../apm/plugin/kafka/KafkaConsumerInterceptor.java | 25 ++--
.../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} | 33 +++--
.../kafka/define/KafkaTemplateInstrumentation.java | 7 +-
.../define/ListenerConsumerInstrumentation.java} | 25 ++--
.../src/main/resources/skywalking-plugin.def | 8 +-
docs/en/FAQ/kafka-plugin.md | 2 +-
docs/en/concepts-and-designs/oal.md | 2 +-
docs/en/setup/backend/backend-storage.md | 4 +
.../service-agent/java-agent/Supported-list.md | 2 +
docs/powered-by.md | 1 +
.../skywalking/oal/rt/parser/DeepAnalysis.java | 12 +-
.../skywalking/oal/rt/parser/FilterMatchers.java | 32 +++--
.../skywalking/oal/rt/parser/MetricsHolder.java | 16 +--
.../src/main/resources/application.yml | 2 +
.../src/main/resources/component-libraries.yml | 6 +-
.../annotation/BooleanValueFilterMatcher.java | 19 +++
.../analysis/metrics/expression/BooleanMatch.java | 4 +-
.../metrics/expression/BooleanNotEqualMatch.java | 4 +-
.../analysis/metrics/expression/LikeMatch.java | 8 +-
.../analysis/metrics/expression/LikeMatchTest.java | 1 +
.../StorageModuleElasticsearchConfig.java | 5 +
.../StorageModuleElasticsearchProvider.java | 49 ++++----
.../plugin/elasticsearch/base/TimeSeriesUtils.java | 11 +-
.../elasticsearch/base/TimeSeriesUtilsTest.java | 40 ++++++
.../StorageModuleElasticsearch7Provider.java | 8 ++
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 ++-
.../scenarios/elasticjob-3.x-scenario/pom.xml | 137 +++++++++++++++++++++
.../src/main/assembly/assembly.xml | 43 ++++---
.../apm/testcase/elasticjob/Application.java | 25 ++--
.../elasticjob/controller/CaseController.java | 33 +++--
.../apm/testcase/elasticjob/job/DemoSimpleJob.java | 52 ++++++++
.../src/main/resources/application.yaml | 34 +++++
.../src/main/resources/log4j2.xml | 0
.../elasticjob-3.x-scenario/support-version.list | 11 +-
.../spring-kafka-2.2.x-scenario/bin/startup.sh | 11 +-
.../config/expectedData.yaml | 110 +++++++++++++++++
.../spring-kafka-2.2.x-scenario/configuration.yml | 29 ++++-
.../scenarios/spring-kafka-2.2.x-scenario/pom.xml | 134 ++++++++++++++++++++
.../src/main/assembly/assembly.xml | 43 ++++---
.../apm/testcase/spring/kafka/Application.java | 18 +--
.../spring/kafka/controller/CaseController.java | 127 +++++++++++++++++++
.../src/main/resources/application.properties | 19 +++
.../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 ++++-
.../scenarios/spring-kafka-2.3.x-scenario/pom.xml | 129 +++++++++++++++++++
.../src/main/assembly/assembly.xml | 43 ++++---
.../apm/testcase/spring/kafka/Application.java | 16 ++-
.../spring/kafka/controller/CaseController.java | 127 +++++++++++++++++++
.../src/main/resources/application.properties | 19 +++
.../src/main/resources/log4j2.xml | 0
.../support-version.list | 15 +--
79 files changed, 1712 insertions(+), 323 deletions(-)
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 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/Constants.java} (64%)
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/SpringKafkaContext.java} (64%)
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%)
rename 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} (58%)
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%)
rename 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%)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/annotation/BooleanValueFilterMatcher.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%)
create mode 100644 test/plugin/scenarios/elasticjob-3.x-scenario/pom.xml
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/analysis/metrics/expression/LikeMatch.java => test/plugin/scenarios/elasticjob-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticjob/Application.java (56%)
copy apm-application-toolkit/apm-toolkit-trace/src/main/java/org/apache/skywalking/apm/toolkit/trace/SupplierWrapper.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
create mode 100644 test/plugin/scenarios/elasticjob-3.x-scenario/src/main/resources/application.yaml
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 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%)
create mode 100644 test/plugin/scenarios/spring-kafka-2.2.x-scenario/pom.xml
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
create mode 100644 test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/resources/application.properties
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%)
create mode 100644 test/plugin/scenarios/spring-kafka-2.3.x-scenario/pom.xml
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-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/expression/BooleanMatch.java => test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/kafka/Application.java (66%)
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
create mode 100644 test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/resources/application.properties
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%)