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 2020/09/22 14:29:08 UTC
[skywalking] branch meter-mal updated (0d1936e -> 5177620)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch meter-mal
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 0d1936e Merge branch 'master' into meter-mal
add c3edd3d Better witness class for mongo3.8.x (#5524)
add 1ff25ac Support mongo driver 4.x version. (#5512)
add c33a55c Test for mongo3.x support version (#5539)
add 5177620 Merge branch 'master' into meter-mal
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.1.yaml | 3 +-
.../MongoDBOperationExecutorInstrumentation.java | 2 +-
.../plugin/mongodb/v3/support/MongoSpanHelper.java | 2 +-
.../v3/interceptor/v30/MongoDBInterceptorTest.java | 2 +-
.../MongoDBOperationExecutorInterceptorTest.java | 2 +-
.../pom.xml | 8 +-
.../MongoDBClientDelegateInstrumentation.java | 17 +--
.../MongoDBOperationExecutorInstrumentation.java | 11 +-
.../MongoDBClientDelegateInterceptor.java | 12 +-
.../MongoDBOperationExecutorInterceptor.java | 8 +-
.../plugin/mongodb/v4}/support/MongoConstants.java | 2 +-
.../mongodb/v4}/support/MongoOperationHelper.java | 55 ++++----
.../mongodb/v4/support}/MongoPluginConfig.java | 2 +-
.../mongodb/v4}/support/MongoRemotePeerHelper.java | 11 +-
.../mongodb/v4}/support/MongoSpanHelper.java | 11 +-
.../src/main}/resources/skywalking-plugin.def | 4 +-
.../v4}/MongoDBClientDelegateInterceptorTest.java | 3 +-
.../MongoDBOperationExecutorInterceptorTest.java | 22 ++--
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
.../setup/service-agent/java-agent/Plugin-list.md | 1 +
.../service-agent/java-agent/Supported-list.md | 2 +-
.../scenarios/mongodb-3.x-scenario/bin/startup.sh | 2 +-
.../mongodb-3.x-scenario/config/expectedData.yaml | 7 +
.../mongodb-3.x-scenario/support-version.list | 19 ++-
.../bin/startup.sh | 2 +-
.../mongodb-4.x-scenario/config/expectedData.yaml | 141 +++++++++++++++++++++
.../configuration.yml | 4 +-
.../pom.xml | 56 ++++----
.../src/main/assembly/assembly.xml | 2 +-
.../apm/testcase/mongodb}/Application.java | 2 +-
.../mongodb/controller/CaseController.java | 22 ++--
.../src/main/resources/application.yaml | 4 +-
.../src/main/resources/log4j2.xml | 0
.../support-version.list | 11 +-
34 files changed, 315 insertions(+), 138 deletions(-)
copy apm-sniffer/apm-sdk-plugin/{mongodb-3.x-plugin => mongodb-4.x-plugin}/pom.xml (87%)
copy apm-sniffer/apm-sdk-plugin/{mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v37 => mongodb-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v4/define}/MongoDBClientDelegateInstrumentation.java (87%)
copy apm-sniffer/apm-sdk-plugin/{mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/define/v38 => mongodb-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v4/define}/MongoDBOperationExecutorInstrumentation.java (88%)
copy apm-sniffer/apm-sdk-plugin/{mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37 => mongodb-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v4/interceptor}/MongoDBClientDelegateInterceptor.java (86%)
copy apm-sniffer/apm-sdk-plugin/{mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37 => mongodb-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v4/interceptor}/MongoDBOperationExecutorInterceptor.java (91%)
copy apm-sniffer/apm-sdk-plugin/{mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3 => mongodb-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v4}/support/MongoConstants.java (94%)
copy apm-sniffer/apm-sdk-plugin/{mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3 => mongodb-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v4}/support/MongoOperationHelper.java (79%)
copy apm-sniffer/apm-sdk-plugin/{mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3 => mongodb-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v4/support}/MongoPluginConfig.java (96%)
copy apm-sniffer/apm-sdk-plugin/{mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3 => mongodb-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v4}/support/MongoRemotePeerHelper.java (86%)
copy apm-sniffer/apm-sdk-plugin/{mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3 => mongodb-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v4}/support/MongoSpanHelper.java (85%)
copy apm-sniffer/{apm-agent-core/src/test => apm-sdk-plugin/mongodb-4.x-plugin/src/main}/resources/skywalking-plugin.def (78%)
copy apm-sniffer/apm-sdk-plugin/{mongodb-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37 => mongodb-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v4}/MongoDBClientDelegateInterceptorTest.java (94%)
copy apm-sniffer/apm-sdk-plugin/{mongodb-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v3/interceptor/v37 => mongodb-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/mongodb/v4}/MongoDBOperationExecutorInterceptorTest.java (91%)
copy test/plugin/scenarios/{apm-toolkit-trace-scenario => mongodb-4.x-scenario}/bin/startup.sh (88%)
create mode 100644 test/plugin/scenarios/mongodb-4.x-scenario/config/expectedData.yaml
copy test/plugin/scenarios/{mongodb-3.x-scenario => mongodb-4.x-scenario}/configuration.yml (85%)
copy test/plugin/scenarios/{xxl-job-2.x-scenario => mongodb-4.x-scenario}/pom.xml (79%)
copy test/plugin/scenarios/{graphql-8.x-scenario => mongodb-4.x-scenario}/src/main/assembly/assembly.xml (96%)
copy test/plugin/scenarios/{canal-scenario/src/main/java/org/apache/skywalking/apm/testcase/canal => mongodb-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/mongodb}/Application.java (95%)
copy test/plugin/scenarios/{mongodb-3.x-scenario => mongodb-4.x-scenario}/src/main/java/org/apache/skywalking/apm/testcase/mongodb/controller/CaseController.java (82%)
copy test/plugin/scenarios/{elasticsearch-7.x-scenario => mongodb-4.x-scenario}/src/main/resources/application.yaml (90%)
copy test/plugin/scenarios/{zookeeper-scenario => mongodb-4.x-scenario}/src/main/resources/log4j2.xml (100%)
copy test/plugin/scenarios/{httpasyncclient-scenario => mongodb-4.x-scenario}/support-version.list (96%)