This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch feature/envoy-tcp-log
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 6763424 Add null check for K8SServiceRegistry
add b934a14 Add `okhttp-4.x` plugin (#6899)
add 751f016 Merge branch 'master' into feature/envoy-tcp-log
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 1 +
.../apm-sdk-plugin/okhttp-3.x-plugin/pom.xml | 6 +++++
.../v3/define/AbstractOkhttpInstrumentation.java} | 6 ++---
.../okhttp/v3/define/AsyncCallInstrumentation.java | 7 +++---
.../okhttp/v3/define/CallbackInstrumentation.java | 7 +++---
.../okhttp/v3/define/RealCallInstrumentation.java | 7 +++---
.../plugin/okhttp/v3/RealCallInterceptorTest.java | 1 +
.../pom.xml | 27 +++++++++-------------
.../v4/define/AbstractOkhttpInstrumentation.java} | 6 ++---
.../v4}/define/AsyncCallInstrumentation.java | 13 +++++------
.../okhttp/v4}/define/CallbackInstrumentation.java | 9 ++++----
.../okhttp/v4}/define/RealCallInstrumentation.java | 11 ++++-----
.../src/main/resources/skywalking-plugin.def | 6 ++---
.../{okhttp-3.x-plugin => okhttp-common}/pom.xml | 22 ++++++++++++++----
.../okhttp/common}/AsyncCallInterceptor.java | 7 +++---
.../plugin/okhttp/common}/EnhanceRequiredInfo.java | 2 +-
.../plugin/okhttp/common}/EnqueueInterceptor.java | 5 ++--
.../okhttp/common}/OnFailureInterceptor.java | 5 ++--
.../okhttp/common}/OnResponseInterceptor.java | 5 ++--
.../plugin/okhttp/common}/RealCallInterceptor.java | 13 ++++++-----
apm-sniffer/apm-sdk-plugin/pom.xml | 2 ++
.../setup/service-agent/java-agent/Plugin-list.md | 1 +
.../service-agent/java-agent/Supported-list.md | 2 +-
.../scenarios/okhttp-scenario/support-version.list | 8 ++++++-
24 files changed, 101 insertions(+), 78 deletions(-)
copy
apm-sniffer/apm-sdk-plugin/{spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/AbstractSpring5Instrumentation.java
=>
okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3/define/AbstractOkhttpInstrumentation.java}
(79%)
copy apm-sniffer/apm-sdk-plugin/{jsonrpc4j-1.x-plugin =>
okhttp-4.x-plugin}/pom.xml (75%)
copy
apm-sniffer/apm-sdk-plugin/{spring-plugins/mvc-annotation-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v5/define/AbstractSpring5Instrumentation.java
=>
okhttp-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v4/define/AbstractOkhttpInstrumentation.java}
(79%)
copy
apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3
=>
okhttp-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v4}/define/AsyncCallInstrumentation.java
(86%)
copy
apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3
=>
okhttp-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v4}/define/CallbackInstrumentation.java
(89%)
copy
apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3
=>
okhttp-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v4}/define/RealCallInstrumentation.java
(89%)
copy apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin =>
okhttp-4.x-plugin}/src/main/resources/skywalking-plugin.def (81%)
copy apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin => okhttp-common}/pom.xml
(73%)
rename
apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3
=>
okhttp-common/src/main/java/org/apache/skywalking/apm/plugin/okhttp/common}/AsyncCallInterceptor.java
(98%)
rename
apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3
=>
okhttp-common/src/main/java/org/apache/skywalking/apm/plugin/okhttp/common}/EnhanceRequiredInfo.java
(96%)
rename
apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3
=>
okhttp-common/src/main/java/org/apache/skywalking/apm/plugin/okhttp/common}/EnqueueInterceptor.java
(98%)
rename
apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3
=>
okhttp-common/src/main/java/org/apache/skywalking/apm/plugin/okhttp/common}/OnFailureInterceptor.java
(97%)
rename
apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3
=>
okhttp-common/src/main/java/org/apache/skywalking/apm/plugin/okhttp/common}/OnResponseInterceptor.java
(97%)
rename
apm-sniffer/apm-sdk-plugin/{okhttp-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/okhttp/v3
=>
okhttp-common/src/main/java/org/apache/skywalking/apm/plugin/okhttp/common}/RealCallInterceptor.java
(93%)
