[skywalking] branch remove_time updated (5cb8524 -> 0689c35)

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch remove_time
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from 5cb8524  remove unused time range query parameter.
     add 2e2616d  [test/plugin] spring async scenario optimize (#3723)
     add be3db67  Add E2E test for MySQL storage. (#3648)
     add 7f69a73  Add postgresql agent sql query param show  (#3695)
     add d9fcda1  Refactor:extract common module postgresql-common (#3725)
     add a407819  [plugin]support log4j2 AsyncLogger (#3715)
     add f48e11c  Revert "Refactor:extract common module postgresql-common (#3725)" (#3728)
     add b3da85b  1.update pg image to 10.5-alpine;2.update test support list. (#3727)
     add 0689c35  Merge branch 'master' into remove_time

No new revisions were added by this update.

Summary of changes:
 Jenkinsfile-E2E                                    |  6 +++
 .../skywalking/apm/agent/core/conf/Config.java     | 16 ++++++
 .../PSSetterDefinitionOfJDBCInstrumentation.java   |  2 +-
 .../plugin/jdbc/define/StatementEnhanceInfos.java  |  5 +-
 .../CreateCallableStatementInterceptor.java        |  0
 .../CreatePreparedStatementInterceptor.java        |  0
 .../postgresql/CreateStatementInterceptor.java     |  0
 ...PrepareStatementWithStringArrayInterceptor.java |  0
 ...PreparedStatementExecuteMethodsInterceptor.java | 33 +++++++++++++
 .../StatementExecuteMethodsInterceptor.java        |  0
 .../apm/plugin/jdbc/postgresql/Variables.java      |  0
 .../AbstractJdbc2StatementInstrumentation.java     |  0
 .../define/ConnectionInstrumentation.java          |  0
 .../plugin/jdbc/postgresql/define/Constants.java   |  1 -
 .../postgresql/define/DriverInstrumentation.java   |  0
 .../define/Jdbc3ConnectionInstrumentation.java     |  0
 .../define/Jdbc4ConnectionInstrumentation.java     |  0
 .../define/PgCallableStatementInstrumentation.java |  0
 .../define/PgPreparedStatementInstrumentation.java |  0
 .../PgPreparedStatementSetterInstrumentation.java} |  8 ++-
 .../define/PgStatementInstrumentation.java         |  0
 .../src/main/resources/skywalking-plugin.def       |  1 +
 .../RingBufferLogEventInstrumentation.java}        | 16 +++---
 .../RingBufferLogEventMethodInterceptor.java}      | 17 +++----
 .../src/main/resources/skywalking-plugin.def       |  1 +
 .../java-agent/Application-toolkit-log4j-2.x.md    | 53 +++++++++++++++++++-
 docs/en/setup/service-agent/java-agent/README.md   |  2 +
 test/e2e/{e2e-single-service => e2e-mysql}/pom.xml | 29 ++++++++++-
 .../src/docker/rc.d/rc0-prepare.sh                 | 21 ++++----
 .../src/docker/rc.d/rc1-startup.sh                 |  0
 .../e2e/sample/client/SampleClientApplication.java |  0
 .../e2e/sample/client/TestController.java          |  0
 .../apache/skywalking/e2e/sample/client/User.java  |  0
 .../skywalking/e2e/sample/client/UserRepo.java     |  0
 .../src/main/resources/application.yml             |  0
 .../skywalking/e2e/SampleVerificationITCase.java   |  0
 ...king.e2e.SampleVerificationITCase.endpoints.yml |  0
 ...king.e2e.SampleVerificationITCase.instances.yml |  0
 ...lking.e2e.SampleVerificationITCase.services.yml |  0
 ...kywalking.e2e.SampleVerificationITCase.topo.yml |  0
 ...walking.e2e.SampleVerificationITCase.traces.yml |  0
 test/e2e/pom.xml                                   |  2 +
 test/e2e/run.sh                                    |  2 +-
 .../bin/startup.sh                                 |  2 +-
 .../config/expectedData.yaml                       |  1 +
 .../configuration.yml                              |  2 +-
 .../support-version.list                           | 13 +++++
 .../postgresql-scenario/configuration.yml          |  2 +-
 .../spring-async-scenario/config/expectedData.yaml | 57 ++++++++++++++++------
 .../apm/testcase/spring/async/AsyncBean.java       |  4 +-
 .../{HealthCheckServlet.java => AsyncServlet.java} |  4 +-
 .../src/main/webapp/WEB-INF/web.xml                |  9 ++++
 52 files changed, 244 insertions(+), 65 deletions(-)
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateCallableStatementInterceptor.java
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreatePreparedStatementInterceptor.java
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/CreateStatementInterceptor.java
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/JDBCPrepareStatementWithStringArrayInterceptor.java
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/PreparedStatementExecuteMethodsInterceptor.java
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/StatementExecuteMethodsInterceptor.java
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/Variables.java
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/AbstractJdbc2StatementInstrumentation.java
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/ConnectionInstrumentation.java
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Constants.java
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/DriverInstrumentation.java
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc3ConnectionInstrumentation.java
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc4ConnectionInstrumentation.java
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgCallableStatementInstrumentation.java
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgPreparedStatementInstrumentation.java
 copy apm-sniffer/apm-sdk-plugin/{mysql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/v8/define/PreparedStatementSetterInstrumentation.java => postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgPreparedStatementSetterInstrumentation.java} (87%)
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/PgStatementInstrumentation.java
 mode change 100644 => 100755 apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/resources/skywalking-plugin.def
 copy apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/{TraceIdConverterActivation.java => async/RingBufferLogEventInstrumentation.java} (86%)
 copy apm-sniffer/{apm-sdk-plugin/spring-plugins/async-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/async/DoSubmitMethodInterceptor.java => apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/log/log4j/v2/x/async/RingBufferLogEventMethodInterceptor.java} (83%)
 copy test/e2e/{e2e-single-service => e2e-mysql}/pom.xml (79%)
 copy test/e2e/{e2e-ttl/e2e-ttl-es => e2e-mysql}/src/docker/rc.d/rc0-prepare.sh (52%)
 copy test/e2e/{e2e-single-service => e2e-mysql}/src/docker/rc.d/rc1-startup.sh (100%)
 copy test/e2e/{e2e-single-service => e2e-mysql}/src/main/java/org/apache/skywalking/e2e/sample/client/SampleClientApplication.java (100%)
 copy test/e2e/{e2e-single-service => e2e-mysql}/src/main/java/org/apache/skywalking/e2e/sample/client/TestController.java (100%)
 copy test/e2e/{e2e-single-service => e2e-mysql}/src/main/java/org/apache/skywalking/e2e/sample/client/User.java (100%)
 copy test/e2e/{e2e-single-service => e2e-mysql}/src/main/java/org/apache/skywalking/e2e/sample/client/UserRepo.java (100%)
 copy test/e2e/{e2e-single-service => e2e-mysql}/src/main/resources/application.yml (100%)
 copy test/e2e/{e2e-single-service => e2e-mysql}/src/test/java/org/apache/skywalking/e2e/SampleVerificationITCase.java (100%)
 copy test/e2e/{e2e-single-service => e2e-mysql}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.endpoints.yml (100%)
 copy test/e2e/{e2e-single-service => e2e-mysql}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.instances.yml (100%)
 copy test/e2e/{e2e-single-service => e2e-mysql}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.services.yml (100%)
 copy test/e2e/{e2e-single-service => e2e-mysql}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.topo.yml (100%)
 copy test/e2e/{e2e-single-service => e2e-mysql}/src/test/resources/expected-data/org.apache.skywalking.e2e.SampleVerificationITCase.traces.yml (100%)
 copy test/plugin/scenarios/spring-async-scenario/src/main/java/org/apache/skywalking/apm/testcase/spring/async/{HealthCheckServlet.java => AsyncServlet.java} (92%)