This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch wu-sheng-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
from 3789b41abb Remove QQ groups from official channels
add 267aba8fad Improve bytebuddy class enhance for retransform classes
(#561)
add b2cdd58c29 Merge branch 'main' into wu-sheng-patch-1
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 1 +
.../skywalking/apm/agent/core/conf/Config.java | 14 --
.../skywalking/apm/agent/core/conf/Constants.java | 6 +
.../plugin/bytebuddy/AnnotationTypeNameMatch.java | 11 ++
.../plugin/bytebuddy/ArgumentTypeNameMatch.java | 12 ++
.../bytebuddy/CacheableTransformerDecorator.java | 195 -------------------
.../core/plugin/bytebuddy/ClassCacheMode.java | 26 ---
.../core/plugin/bytebuddy/ReturnTypeNameMatch.java | 11 ++
.../interceptor/ConstructorInterceptPoint.java | 11 ++
.../interceptor/InstanceMethodsInterceptPoint.java | 11 ++
.../interceptor/StaticMethodsInterceptPoint.java | 11 ++
.../enhance/ClassEnhancePluginDefine.java | 12 +-
.../enhance/DelegateNamingResolver.java | 75 ++++++++
.../enhance/v2/ClassEnhancePluginDefineV2.java | 13 +-
.../v2/ConstructorInterceptV2Point.java | 11 ++
.../v2/InstanceMethodsInterceptV2Point.java | 11 ++
.../v2/StaticMethodsInterceptV2Point.java | 11 ++
.../match/MethodInheritanceAnnotationMatcher.java | 5 +
.../core/plugin/match/ProtectiveShieldMatcher.java | 5 +
.../apm/agent/core/bytebuddy/ClassScan.java | 106 +++++++++++
.../ElementMatcherSubclassVerifyTest.java | 90 +++++++++
apm-sniffer/apm-agent/pom.xml | 5 +
.../skywalking/apm/agent/SkyWalkingAgent.java | 40 ++--
.../apm-sdk-plugin/finagle-6.25.x-plugin/pom.xml | 2 +
.../{apm-test-tools => bytebuddy-patch}/pom.xml | 53 ++++--
.../agent/builder/SWAgentBuilderDefault.java | 84 ++++++++
.../agent/builder/SWNativeMethodStrategy.java} | 29 ++-
.../SWImplementationContextFactory.java | 61 ++++++
.../bytebuddy/SWAuxiliaryTypeNamingStrategy.java} | 23 ++-
.../agent/bytebuddy/SWMethodNameTransformer.java} | 31 +--
.../apm/agent/bytebuddy}/ConstructorInter.java | 41 ++--
.../apm/agent/bytebuddy/EnhanceHelper.java | 76 ++++++++
.../apm/agent/bytebuddy/InstMethodsInter.java | 63 ++++++
.../apache/skywalking/apm/agent/bytebuddy/Log.java | 59 ++++++
.../apm/agent/bytebuddy/SWAsmVisitorWrapper.java | 120 ++++++++++++
.../apm/agent/bytebuddy/SWClassFileLocator.java | 173 +++++++++++++++++
.../SWExtractionClassFileTransformer.java | 71 +++++++
.../skywalking/apm/agent/bytebuddy/biz/BizFoo.java | 30 ++-
.../apm/agent/bytebuddy/biz/ProjectDO.java | 13 +-
.../apm/agent/bytebuddy/biz/ProjectService.java} | 24 +--
.../bytebuddy/cases/AbstractInterceptTest.java | 212 +++++++++++++++++++++
.../bytebuddy/cases/AbstractReTransformTest.java | 55 ++++++
.../apm/agent/bytebuddy/cases/Intercept1Test.java} | 26 ++-
.../apm/agent/bytebuddy/cases/Intercept2Test.java} | 45 ++---
.../apm/agent/bytebuddy/cases/Intercept3Test.java} | 44 ++---
.../apm/agent/bytebuddy/cases/Intercept4Test.java | 29 +--
.../apm/agent/bytebuddy/cases/Intercept5Test.java | 47 +++++
.../apm/agent/bytebuddy/cases/Intercept6Test.java | 48 +++++
.../bytebuddy/cases/MultipleInterceptorTest.java | 101 ++++++++++
.../agent/bytebuddy/cases/ReTransform1Test.java | 86 +++++++++
.../agent/bytebuddy/cases/ReTransform2Test.java | 72 +++++++
apm-sniffer/config/agent.config | 9 -
apm-sniffer/pom.xml | 1 +
.../service-agent/java-agent/configurations.md | 2 -
pom.xml | 11 +-
.../retransform-class-scenario/bin/startup.sh | 3 -
.../retransform-class-scenario/configuration.yml | 1 +
.../configuration.yml | 4 +-
58 files changed, 1974 insertions(+), 468 deletions(-)
delete mode 100644
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/CacheableTransformerDecorator.java
delete mode 100644
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/bytebuddy/ClassCacheMode.java
create mode 100644
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance/DelegateNamingResolver.java
create mode 100644
apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/bytebuddy/ClassScan.java
create mode 100644
apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/bytebuddy/ElementMatcherSubclassVerifyTest.java
copy apm-sniffer/{apm-test-tools => bytebuddy-patch}/pom.xml (60%)
create mode 100644
apm-sniffer/bytebuddy-patch/src/main/java/net/bytebuddy/agent/builder/SWAgentBuilderDefault.java
copy
apm-sniffer/{apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/NoopExitSpan.java
=>
bytebuddy-patch/src/main/java/net/bytebuddy/agent/builder/SWNativeMethodStrategy.java}
(55%)
create mode 100644
apm-sniffer/bytebuddy-patch/src/main/java/net/bytebuddy/implementation/SWImplementationContextFactory.java
copy
apm-sniffer/{apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/IndirectMatch.java
=>
bytebuddy-patch/src/main/java/org/apache/skywalking/apm/agent/bytebuddy/SWAuxiliaryTypeNamingStrategy.java}
(50%)
copy
apm-sniffer/{apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/JDBCPreparedStatementNullSetterInstanceMethodsInterceptPoint.java
=>
bytebuddy-patch/src/main/java/org/apache/skywalking/apm/agent/bytebuddy/SWMethodNameTransformer.java}
(52%)
copy
apm-sniffer/{apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/interceptor/enhance
=>
bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy}/ConstructorInter.java
(50%)
create mode 100644
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/EnhanceHelper.java
create mode 100644
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/InstMethodsInter.java
create mode 100644
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/Log.java
create mode 100644
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/SWAsmVisitorWrapper.java
create mode 100644
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/SWClassFileLocator.java
create mode 100644
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/SWExtractionClassFileTransformer.java
copy
test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/model/Model1.java
=>
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/biz/BizFoo.java
(70%)
copy
test/plugin/scenarios/customize-scenario/src/main/java/test/apache/skywalking/apm/testcase/customize/model/Model1.java
=>
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/biz/ProjectDO.java
(85%)
copy
apm-sniffer/{apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/gc/G1GCModule.java
=>
bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/biz/ProjectService.java}
(65%)
create mode 100644
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/cases/AbstractInterceptTest.java
create mode 100644
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/cases/AbstractReTransformTest.java
copy
apm-sniffer/{apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/base64/Base64Test.java
=>
bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/cases/Intercept1Test.java}
(59%)
copy
apm-sniffer/{apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriterTest.java
=>
bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/cases/Intercept2Test.java}
(53%)
copy
apm-sniffer/{apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/logging/core/SystemOutWriterTest.java
=>
bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/cases/Intercept3Test.java}
(53%)
copy
apm-application-toolkit/apm-toolkit-meter/src/test/java/org/apache/skywalking/apm/toolkit/meter/MeterIdTest.java
=>
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/cases/Intercept4Test.java
(58%)
create mode 100644
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/cases/Intercept5Test.java
create mode 100644
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/cases/Intercept6Test.java
create mode 100644
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/cases/MultipleInterceptorTest.java
create mode 100644
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/cases/ReTransform1Test.java
create mode 100644
apm-sniffer/bytebuddy-patch/src/test/java/org/apache/skywalking/apm/agent/bytebuddy/cases/ReTransform2Test.java
