This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch tidb_provider
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 774d9f6 Merge remote-tracking branch 'origin/master' into
tidb_provider
add 7220643 Add the plugin for mssql-jtds 1.x plugin. (#5842)
add 8325824 Fix the default ignore mechanism isn't accurate enough bug
(#5839)
add 48479b7 test: fix flaky test in comsumerTest (#5846)
add c211afd Merge branch 'master' into tidb_provider
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-test.1.yaml | 1 +
CHANGES.md | 2 +
.../commons/datacarrier/consumer/ConsumerTest.java | 2 +
.../network/trace/component/ComponentsDefine.java | 2 +
.../core/context/ContextManagerExtendService.java | 9 +-
...t.java => ContextManagerExtendServiceTest.java} | 43 +++------
...MysqlURLParser.java => MssqlJtdsURLParser.java} | 73 ++++++++------
.../jdbc/connectionurl/parser/URLParser.java | 3 +
.../pom.xml | 18 ++--
.../define/AbstractConnectionInstrumentation.java | 10 +-
.../jtds/v1/define/ConnectionInstrumentation.java} | 15 ++-
.../jtds/v1}/define/DriverInstrumentation.java | 6 +-
.../src/main/resources/skywalking-plugin.def | 4 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 1 +
.../setup/service-agent/java-agent/Plugin-list.md | 1 +
.../service-agent/java-agent/Supported-list.md | 1 +
.../src/main/resources/component-libraries.yml | 8 +-
.../bin/startup.sh | 2 +-
.../mssql-jtds-scenario/config/expectedData.yaml | 106 +++++++++++++++++++++
.../configuration.yml | 18 ++--
.../pom.xml | 12 +--
.../src/main/assembly/assembly.xml | 2 +-
.../apm/testcase/mssql}/Application.java | 2 +-
.../apm/testcase/mssql/MssqlConfig.java} | 14 +--
.../apm/testcase/mssql}/SQLExecutor.java | 8 +-
.../testcase/mssql}/controller/CaseController.java | 16 +---
.../src/main/resources/application.yaml | 2 +-
.../src/main/resources/jdbc.properties | 6 +-
.../src/main/resources/log4j2.xml | 0
.../support-version.list | 9 +-
30 files changed, 256 insertions(+), 140 deletions(-)
copy
apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/context/{TracingContextTest.java
=> ContextManagerExtendServiceTest.java} (54%)
copy
apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/{MysqlURLParser.java
=> MssqlJtdsURLParser.java} (51%)
copy apm-sniffer/apm-sdk-plugin/{kafka-plugin =>
mssql-jtds-1.x-plugin}/pom.xml (78%)
copy
apm-sniffer/apm-sdk-plugin/{h2-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/h2
=>
mssql-jtds-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mssql/jtds/v1}/define/AbstractConnectionInstrumentation.java
(95%)
copy
apm-sniffer/apm-sdk-plugin/{mariadb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mariadb/v2/define/DriverInstrumentation.java
=>
mssql-jtds-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mssql/jtds/v1/define/ConnectionInstrumentation.java}
(60%)
copy
apm-sniffer/apm-sdk-plugin/{mariadb-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mariadb/v2
=>
mssql-jtds-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mssql/jtds/v1}/define/DriverInstrumentation.java
(86%)
copy apm-sniffer/apm-sdk-plugin/{canal-1.x-plugin =>
mssql-jtds-1.x-plugin}/src/main/resources/skywalking-plugin.def (80%)
copy test/plugin/scenarios/{baidu-brpc-scenario =>
mssql-jtds-scenario}/bin/startup.sh (92%)
create mode 100644
test/plugin/scenarios/mssql-jtds-scenario/config/expectedData.yaml
copy test/plugin/scenarios/{dbcp-2.x-scenario =>
mssql-jtds-scenario}/configuration.yml (72%)
mode change 100755 => 100644
copy test/plugin/scenarios/{mysql-scenario => mssql-jtds-scenario}/pom.xml
(93%)
copy test/plugin/scenarios/{postgresql-scenario =>
mssql-jtds-scenario}/src/main/assembly/assembly.xml (96%)
copy
test/plugin/scenarios/{avro-scenario/avro-client/src/main/java/org/apache/skywalking/apm/testcase/avro
=>
mssql-jtds-scenario/src/main/java/org/apache/skywalking/apm/testcase/mssql}/Application.java
(95%)
copy
test/plugin/scenarios/{mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql/MysqlConfig.java
=>
mssql-jtds-scenario/src/main/java/org/apache/skywalking/apm/testcase/mssql/MssqlConfig.java}
(78%)
copy
test/plugin/scenarios/{mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql
=>
mssql-jtds-scenario/src/main/java/org/apache/skywalking/apm/testcase/mssql}/SQLExecutor.java
(91%)
copy
test/plugin/scenarios/{mysql-scenario/src/main/java/org/apache/skywalking/apm/testcase/mysql
=>
mssql-jtds-scenario/src/main/java/org/apache/skywalking/apm/testcase/mssql}/controller/CaseController.java
(78%)
copy test/plugin/{archetypes/jvm/src/main/resources/archetype-resources =>
scenarios/mssql-jtds-scenario}/src/main/resources/application.yaml (92%)
copy test/plugin/scenarios/{dbcp-2.x-scenario =>
mssql-jtds-scenario}/src/main/resources/jdbc.properties (87%)
mode change 100755 => 100644
copy test/plugin/scenarios/{zookeeper-scenario =>
mssql-jtds-scenario}/src/main/resources/log4j2.xml (100%)
copy test/plugin/scenarios/{kotlin-coroutine-scenario =>
mssql-jtds-scenario}/support-version.list (95%)
