You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/03/27 06:56:20 UTC
[skywalking] branch remove-endpoint-register updated (4258775 ->
213cb02)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch remove-endpoint-register
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 4258775 Fix formats.
add a45fb30 Syntax, grammar and basic cleanup. (#4575)
add 54d8c95 Add sf express to the powered by page. (#4577)
add 2030974 Set the trustStorePath default value to empty (#4579)
add 1bc4082 fix elasticsearch-5.x-plugin when use es6.x TransportClient error (#4517)
add 213cb02 Merge branch 'master' into remove-endpoint-register
No new revisions were added by this update.
Summary of changes:
.../skywalking/apm/agent/core/conf/Config.java | 2 +
.../apm/plugin/elasticsearch/v5/Constants.java | 4 +-
.../v5/define/GenericActionInstrumentation.java | 7 +
...PlainListenableActionFutureInstrumentation.java | 7 +
.../TransportActionNodeProxyInstrumentation.java | 7 +
...TransportClientNodesServiceInstrumentation.java | 7 +
.../TransportProxyClientInstrumentation.java | 7 +
.../elasticsearch/v6}/TransportAddressCache.java | 19 +-
...rCache.java => TransportClientEnhanceInfo.java} | 36 +--
.../AdapterActionFutureInstrumentation.java} | 16 +-
.../TransportActionNodeProxyInstrumentation.java | 20 +-
...TransportClientNodesServiceInstrumentation.java | 72 ++++--
.../define/TransportServiceInstrumentation.java} | 14 +-
...terActionFutureActionGetMethodsInterceptor.java | 167 ++++++++++++++
.../elasticsearch/v6/interceptor/Constants.java | 16 ++
...rtActionNodeProxyExecuteMethodsInterceptor.java | 160 +++++++++++++
.../TransportClientNodesServiceInterceptor.java | 117 ++++++++++
.../TransportServiceConInterceptor.java} | 25 ++-
.../src/main/resources/skywalking-plugin.def | 4 +
...tionFutureActionGetMethodsInterceptorTest.java} | 99 ++++----
...tionNodeProxyExecuteMethodsInterceptorTest.java | 248 +++++++++++++++++++++
.../v6/interceptor/TransportAddressCacheTest.java | 54 +++++
...ava => TransportServiceConInterceptorTest.java} | 46 ++--
dist-material/application.yml | 2 +-
docs/en/concepts-and-designs/overview.md | 63 +++---
.../service-agent/java-agent/Supported-list.md | 3 +-
docs/powered-by.md | 1 +
.../config/expectedData.yaml | 136 ++++++++++-
.../scenarios/elasticsearch-6.x-scenario/pom.xml | 8 +-
...ontroller.java => RestHighLevelClientCase.java} | 31 ++-
.../elasticsearch/TransportClientCase.java | 101 +++++++++
.../config/TransportClientConfig.java} | 42 ++--
.../elasticsearch/controller/CaseController.java | 176 +--------------
33 files changed, 1336 insertions(+), 381 deletions(-)
copy apm-sniffer/apm-sdk-plugin/{elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5 => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6}/TransportAddressCache.java (83%)
copy apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/{RemotePeerCache.java => TransportClientEnhanceInfo.java} (55%)
copy apm-sniffer/apm-sdk-plugin/{elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/PlainListenableActionFutureInstrumentation.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/AdapterActionFutureInstrumentation.java} (81%)
copy apm-sniffer/apm-sdk-plugin/{elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5 => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6}/define/TransportActionNodeProxyInstrumentation.java (81%)
copy apm-sniffer/apm-sdk-plugin/{elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5 => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6}/define/TransportClientNodesServiceInstrumentation.java (50%)
copy apm-sniffer/apm-sdk-plugin/{elasticsearch-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v5/define/TransportProxyClientInstrumentation.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/define/TransportServiceInstrumentation.java} (82%)
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/AdapterActionFutureActionGetMethodsInterceptor.java
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/TransportActionNodeProxyExecuteMethodsInterceptor.java
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/TransportClientNodesServiceInterceptor.java
copy apm-sniffer/apm-sdk-plugin/{kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ConsumerConstructorInterceptor.java => elasticsearch-6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/TransportServiceConInterceptor.java} (58%)
copy apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/{RestHighLevelClientGetMethodsInterceptorTest.java => AdapterActionFutureActionGetMethodsInterceptorTest.java} (56%)
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/TransportActionNodeProxyExecuteMethodsInterceptorTest.java
create mode 100644 apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/TransportAddressCacheTest.java
copy apm-sniffer/apm-sdk-plugin/elasticsearch-6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/elasticsearch/v6/interceptor/{RestHighLevelClientConInterceptorTest.java => TransportServiceConInterceptorTest.java} (59%)
copy test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/{controller/CaseController.java => RestHighLevelClientCase.java} (92%)
create mode 100644 test/plugin/scenarios/elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/TransportClientCase.java
copy test/plugin/scenarios/{elasticsearch-7.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/ElasticsearchConfig.java => elasticsearch-6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/elasticsearch/config/TransportClientConfig.java} (57%)