This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 3fbaec4 Move to 6.6.0 SNAPSHOT (#3839) add e11d207 Add elasticsearch 6.x plugin & elasticsearch 6.x test scenario (#3803) No new revisions were added by this update. Summary of changes: Jenkinsfile-Agent-Test | 1 + Jenkinsfile-Agent-Test-4 | 8 +- .../network/trace/component/ComponentsDefine.java | 2 + .../pom.xml | 21 +- .../plugin/elasticsearch/v6/RemotePeerCache.java | 36 ++-- .../elasticsearch/v6/RestClientEnhanceInfo.java | 25 +-- .../v6/define/IndicesClientInstrumentation.java} | 53 +++-- .../define/RestHighLevelClientInstrumentation.java | 177 +++++++++++++++++ .../elasticsearch/v6/interceptor/Constants.java | 43 ++++ .../IndicesClientCreateMethodsInterceptor.java} | 61 ++++-- .../IndicesClientDeleteMethodsInterceptor.java} | 56 ++++-- .../RestHighLevelClientConInterceptor.java} | 34 ++-- .../RestHighLevelClientGetMethodsInterceptor.java} | 41 ++-- ...estHighLevelClientIndexMethodsInterceptor.java} | 41 ++-- ...tHighLevelClientIndicesMethodsInterceptor.java} | 22 ++- ...stHighLevelClientSearchMethodsInterceptor.java} | 42 ++-- ...stHighLevelClientUpdateMethodsInterceptor.java} | 41 ++-- .../src/main}/resources/skywalking-plugin.def | 3 +- .../IndicesClientCreateMethodsInterceptorTest.java | 137 +++++++++++++ .../IndicesClientDeleteMethodsInterceptorTest.java | 126 ++++++++++++ .../RestHighLevelClientConInterceptorTest.java | 96 +++++++++ ...stHighLevelClientGetMethodsInterceptorTest.java | 132 +++++++++++++ ...HighLevelClientIndexMethodsInterceptorTest.java | 132 +++++++++++++ ...ighLevelClientSearchMethodsInterceptorTest.java | 134 +++++++++++++ ...ighLevelClientUpdateMethodsInterceptorTest.java | 132 +++++++++++++ .../v4/SessionRequestConstructorInterceptor.java | 4 + apm-sniffer/apm-sdk-plugin/pom.xml | 1 + docs/en/guides/Plugin-test.md | 19 +- .../service-agent/java-agent/Supported-list.md | 1 + .../src/main/resources/component-libraries.yml | 6 +- .../bin/startup.sh | 3 +- .../config/expectedData.yaml | 80 +++----- .../configuration.yml | 5 +- .../pom.xml | 19 +- .../src/main/assembly/assembly.xml | 2 +- .../apm/testcase/elasticsearch}/Application.java | 2 +- .../elasticsearch/config/ElasticsearchConfig.java | 58 ++++++ .../elasticsearch/controller/CaseController.java | 217 +++++++++++++++++++++ .../src/main/resource}/application.yml | 0 .../src/main/resource}/log4j2.xml | 0 .../support-version.list | 9 +- 41 files changed, 1724 insertions(+), 298 deletions(-) copy apm-sniffer/apm-sdk-plugin/{elastic-job-2.x-plugin => elasticsearch-6.x-plugin}/pom.xml (79%) copy apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/apache/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java => apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RemotePeerCache.java (58%) copy apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java => apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/RestClientEnhanceInfo.java (66%) copy apm-sniffer/apm-sdk-plugin/{netty-socketio-plugin/src/main/java/org/apache/skywalking/apm/plugin/netty/socketio/define/NettySocketIOPluginNameSpaceInstrumentation.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/IndicesClientInstrumentation.java} (65%) create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/RestHighLevelClientInstrumentation.java create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/Constants.java copy apm-sniffer/apm-sdk-plugin/{jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientCreateMethodsInterceptor.java} (50%) copy apm-sniffer/apm-sdk-plugin/{jedis-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v2/JedisMethodInterceptor.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientDeleteMethodsInterceptor.java} (53%) copy apm-sniffer/apm-sdk-plugin/{kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ProducerConstructorMapInterceptor.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptor.java} (51%) copy apm-sniffer/apm-sdk-plugin/{ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheLockInterceptor.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientGetMethodsInterceptor.java} (60%) copy apm-sniffer/apm-sdk-plugin/{ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheLockInterceptor.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndexMethodsInterceptor.java} (60%) copy apm-sniffer/{apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/span/SpanSetOperationNameInterceptor.java => apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndicesMethodsInterceptor.java} (74%) copy apm-sniffer/apm-sdk-plugin/{ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheLockInterceptor.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientSearchMethodsInterceptor.java} (59%) copy apm-sniffer/apm-sdk-plugin/{ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheLockInterceptor.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientUpdateMethodsInterceptor.java} (60%) copy apm-sniffer/{apm-agent-core/src/test => apm-sdk-plugin/elasticsearch-6.x-plugin/src/main}/resources/skywalking-plugin.def (78%) create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientCreateMethodsInterceptorTest.java create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/IndicesClientDeleteMethodsInterceptorTest.java create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientConInterceptorTest.java create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientGetMethodsInterceptorTest.java create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientIndexMethodsInterceptorTest.java create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientSearchMethodsInterceptorTest.java create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/RestHighLevelClientUpdateMethodsInterceptorTest.java copy test/plugin/scenarios/{apm-toolkit-trace-scenario => elasticsearch-6.x-scenario}/bin/startup.sh (87%) copy test/plugin/scenarios/{elasticsearch-5.x-scenario => elasticsearch-6.x-scenario}/config/expectedData.yaml (66%) copy test/plugin/scenarios/{elasticsearch-5.x-scenario => elasticsearch-6.x-scenario}/configuration.yml (91%) copy test/plugin/scenarios/{elasticsearch-5.x-scenario => elasticsearch-6.x-scenario}/pom.xml (89%) copy test/plugin/scenarios/{elasticsearch-5.x-scenario => elasticsearch-6.x-scenario}/src/main/assembly/assembly.xml (96%) copy test/plugin/scenarios/{postgresql-above9.4.1207-scenario/src/main/java/org/apache/skywalking/apm/testcase/postgresql => elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch}/Application.java (95%) create mode 100644 test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java create mode 100644 test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/controller/CaseController.java copy test/plugin/scenarios/{postgresql-scenario/src/main/resources => elasticsearch-6.x-scenario/src/main/resource}/application.yml (100%) copy test/plugin/scenarios/{solrj-7.x-scenario/src/main/resources => elasticsearch-6.x-scenario/src/main/resource}/log4j2.xml (100%) copy test/plugin/scenarios/{customize-scenario => elasticsearch-6.x-scenario}/support-version.list (94%)