You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2022/12/16 16:36:01 UTC
[shardingsphere] branch master updated: Rename interceptor to advice (#22928)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 1015aca0311 Rename interceptor to advice (#22928)
1015aca0311 is described below
commit 1015aca03114e5fff9618eecec6ceed512907334
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Dec 17 00:35:51 2022 +0800
Rename interceptor to advice (#22928)
* Rename interceptor to advice
* Refactor StaticMethodAdvice
* Refactor StaticMethodAdvice
---
.../ConstructorAdvice.java} | 14 ++++----
.../InstanceMethodAdvice.java} | 40 ++++++++++------------
.../StaticMethodAdvice.java} | 40 ++++++++++------------
.../executor/ConstructorAdviceExecutor.java | 2 +-
.../executor/InstanceMethodAdviceExecutor.java | 2 +-
.../executor/StaticMethodAdviceExecutor.java | 2 +-
.../builder/type/ConstructorAdvisorBuilder.java | 6 ++--
.../builder/type/InstanceMethodAdvisorBuilder.java | 6 ++--
.../builder/type/StaticMethodAdvisorBuilder.java | 6 ++--
.../mock/advice/MockConstructorAdviceExecutor.java | 2 +-
.../advice/MockInstanceMethodAdviceExecutor.java | 2 +-
.../MockInstanceMethodRepeatedAdviceExecutor.java | 2 +-
.../advice/MockStaticMethodAdviceExecutor.java | 2 +-
.../ConstructorYamlAdvisorConfigurationTest.java | 4 +--
...ceMethodAroundYamlAdvisorConfigurationTest.java | 4 +--
...icMethodAroundYamlAdvisorConfigurationTest.java | 6 ++--
.../MetaDataContextsFactoryAdviceExecutor.java | 2 +-
.../api/advice/ChannelHandlerAdviceExecutor.java | 2 +-
.../advice/CommandExecutorTaskAdviceExecutor.java | 2 +-
.../api/advice/SQLParserEngineAdviceExecutor.java | 2 +-
.../api/advice/SQLRouteEngineAdviceExecutor.java | 2 +-
.../api/advice/TransactionAdviceExecutor.java | 2 +-
.../tracing/core/advice/TracingAdviceEngine.java | 2 +-
.../core/advice/adviser/TracingAdviser.java | 2 +-
.../adviser/impl/CommandExecutorTaskAdviser.java | 2 +-
.../adviser/impl/JDBCExecutorCallbackAdviser.java | 2 +-
.../adviser/impl/SQLParserEngineAdviser.java | 2 +-
.../advice/CommandExecutorTaskAdviceExecutor.java | 2 +-
.../advice/JDBCExecutorCallbackAdviceExecutor.java | 2 +-
.../advice/SQLParserEngineAdviceExecutor.java | 2 +-
.../advice/CommandExecutorTaskAdviceExecutor.java | 2 +-
.../advice/JDBCExecutorCallbackAdviceExecutor.java | 2 +-
.../advice/SQLParserEngineAdviceExecutor.java | 2 +-
.../advice/CommandExecutorTaskAdviceExecutor.java | 2 +-
.../advice/JDBCExecutorCallbackAdviceExecutor.java | 2 +-
.../advice/SQLParserEngineAdviceExecutor.java | 2 +-
.../advice/CommandExecutorTaskAdviceExecutor.java | 2 +-
.../advice/JDBCExecutorCallbackAdviceExecutor.java | 2 +-
.../advice/SQLParserEngineAdviceExecutor.java | 2 +-
39 files changed, 89 insertions(+), 97 deletions(-)
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorAdvice.java
similarity index 83%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorAdvice.java
index 08132109806..7de8d423467 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorAdvice.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.interceptor;
+package org.apache.shardingsphere.agent.core.plugin.advice;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.implementation.bind.annotation.AllArguments;
import net.bytebuddy.implementation.bind.annotation.RuntimeType;
import net.bytebuddy.implementation.bind.annotation.This;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.ConstructorAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.ConstructorAdviceExecutor;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
@@ -30,20 +30,20 @@ import org.apache.shardingsphere.agent.core.plugin.PluginContext;
import java.util.Collection;
/**
- * Proxy class for ByteBuddy to intercept methods of target and weave post-method after constructor.
+ * Constructor advice.
*/
@RequiredArgsConstructor
-public class ConstructorInterceptor {
+public final class ConstructorAdvice {
- private static final Logger LOGGER = LoggerFactory.getLogger(ConstructorInterceptor.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ConstructorAdvice.class);
private final Collection<ConstructorAdviceExecutor> executors;
/**
* Intercept constructor.
*
- * @param target the target object
- * @param args the all constructor arguments
+ * @param target target object
+ * @param args all constructor arguments
*/
@RuntimeType
public void intercept(@This final TargetAdviceObject target, @AllArguments final Object[] args) {
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAdvice.java
similarity index 75%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAdvice.java
index b0be2604b3a..3f265d6b7b7 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAdvice.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.interceptor;
+package org.apache.shardingsphere.agent.core.plugin.advice;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
@@ -28,41 +28,40 @@ import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.concurrent.Callable;
/**
- * Proxy class for ByteBuddy to intercept methods of target and weave pre- and post-method around the target method.
+ * Instance method advice.
*/
@RequiredArgsConstructor
-public class InstanceMethodAroundInterceptor {
+public final class InstanceMethodAdvice {
- private static final LoggerFactory.Logger LOGGER = LoggerFactory.getLogger(InstanceMethodAroundInterceptor.class);
+ private static final LoggerFactory.Logger LOGGER = LoggerFactory.getLogger(InstanceMethodAdvice.class);
private final Collection<InstanceMethodAdviceExecutor> executors;
/**
- * Only intercept instance method.
+ * Intercept instance method.
*
- * @param target the target object
- * @param method the intercepted method
- * @param args the all arguments of method
- * @param callable the origin method invocation
- * @return the return value of target invocation
+ * @param target target object
+ * @param method intercepted method
+ * @param args all arguments of method
+ * @param callable origin method invocation
+ * @return return value of target invocation
*/
@RuntimeType
@SneakyThrows
public Object intercept(@This final TargetAdviceObject target, @Origin final Method method, @AllArguments final Object[] args, @SuperCall final Callable<?> callable) {
- MethodInvocationResult methodResult = new MethodInvocationResult();
- Object result;
+ MethodInvocationResult invocationResult = new MethodInvocationResult();
boolean adviceEnabled = PluginContext.isPluginEnabled();
try {
if (adviceEnabled) {
for (InstanceMethodAdviceExecutor each : executors) {
- each.beforeMethod(target, method, args, methodResult);
+ each.beforeMethod(target, method, args, invocationResult);
}
}
// CHECKSTYLE:OFF
@@ -70,13 +69,10 @@ public class InstanceMethodAroundInterceptor {
// CHECKSTYLE:ON
LOGGER.error("Failed to execute the pre-method of method[{}] in class[{}]", method.getName(), target.getClass(), ex);
}
+ Object result;
try {
- if (methodResult.isRebased()) {
- result = methodResult.getResult();
- } else {
- result = callable.call();
- }
- methodResult.rebase(result);
+ result = invocationResult.isRebased() ? invocationResult.getResult() : callable.call();
+ invocationResult.rebase(result);
// CHECKSTYLE:OFF
} catch (final Throwable ex) {
// CHECKSTYLE:ON
@@ -96,7 +92,7 @@ public class InstanceMethodAroundInterceptor {
try {
if (adviceEnabled) {
for (InstanceMethodAdviceExecutor each : executors) {
- each.afterMethod(target, method, args, methodResult);
+ each.afterMethod(target, method, args, invocationResult);
}
}
// CHECKSTYLE:OFF
@@ -105,6 +101,6 @@ public class InstanceMethodAroundInterceptor {
LOGGER.error("Failed to execute the post-method of method[{}] in class[{}]", method.getName(), target.getClass(), ex);
}
}
- return methodResult.isRebased() ? methodResult.getResult() : result;
+ return invocationResult.isRebased() ? invocationResult.getResult() : result;
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAdvice.java
similarity index 74%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAdvice.java
index 3f2d2f8e530..9e30d9ef18f 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAdvice.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.interceptor;
+package org.apache.shardingsphere.agent.core.plugin.advice;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
@@ -26,41 +26,40 @@ import net.bytebuddy.implementation.bind.annotation.SuperCall;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.StaticMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.StaticMethodAdviceExecutor;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.concurrent.Callable;
/**
- * Proxy class for ByteBuddy to intercept methods of target and weave pre- and post-method around the target method.
+ * Static method advice.
*/
@RequiredArgsConstructor
-public class StaticMethodAroundInterceptor {
+public final class StaticMethodAdvice {
- private static final LoggerFactory.Logger LOGGER = LoggerFactory.getLogger(StaticMethodAroundInterceptor.class);
+ private static final LoggerFactory.Logger LOGGER = LoggerFactory.getLogger(StaticMethodAdvice.class);
private final Collection<StaticMethodAdviceExecutor> executors;
/**
- * Only intercept static method.
+ * Intercept static method.
*
- * @param klass the class of target
- * @param method the intercepted method
- * @param args the all arguments of method
- * @param callable the origin method invocation
- * @return the return value of target invocation
+ * @param klass target class
+ * @param method intercepted method
+ * @param args all arguments of method
+ * @param callable origin method invocation
+ * @return return value of target invocation
*/
@RuntimeType
@SneakyThrows
public Object intercept(@Origin final Class<?> klass, @Origin final Method method, @AllArguments final Object[] args, @SuperCall final Callable<?> callable) {
- MethodInvocationResult methodResult = new MethodInvocationResult();
- Object result;
+ MethodInvocationResult invocationResult = new MethodInvocationResult();
boolean adviceEnabled = PluginContext.isPluginEnabled();
try {
if (adviceEnabled) {
for (StaticMethodAdviceExecutor each : executors) {
- each.beforeMethod(klass, method, args, methodResult);
+ each.beforeMethod(klass, method, args, invocationResult);
}
}
// CHECKSTYLE:OFF
@@ -68,13 +67,10 @@ public class StaticMethodAroundInterceptor {
// CHECKSTYLE:ON
LOGGER.error("Failed to execute the pre-method of method[{}] in class[{}]", method.getName(), klass, ex);
}
+ Object result;
try {
- if (methodResult.isRebased()) {
- result = methodResult.getResult();
- } else {
- result = callable.call();
- }
- methodResult.rebase(result);
+ result = invocationResult.isRebased() ? invocationResult.getResult() : callable.call();
+ invocationResult.rebase(result);
// CHECKSTYLE:OFF
} catch (final Throwable ex) {
// CHECKSTYLE:ON
@@ -94,7 +90,7 @@ public class StaticMethodAroundInterceptor {
try {
if (adviceEnabled) {
for (StaticMethodAdviceExecutor each : executors) {
- each.afterMethod(klass, method, args, methodResult);
+ each.afterMethod(klass, method, args, invocationResult);
}
}
// CHECKSTYLE:OFF
@@ -103,6 +99,6 @@ public class StaticMethodAroundInterceptor {
LOGGER.error("Failed to execute the post-method of method[{}] in class[{}]", method.getName(), klass, ex);
}
}
- return methodResult.isRebased() ? methodResult.getResult() : result;
+ return invocationResult.isRebased() ? invocationResult.getResult() : result;
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/ConstructorAdviceExecutor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/executor/ConstructorAdviceExecutor.java
similarity index 94%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/ConstructorAdviceExecutor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/executor/ConstructorAdviceExecutor.java
index 0f633764785..98acb7ff4d1 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/ConstructorAdviceExecutor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/executor/ConstructorAdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.interceptor.executor;
+package org.apache.shardingsphere.agent.core.plugin.advice.executor;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/InstanceMethodAdviceExecutor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/executor/InstanceMethodAdviceExecutor.java
similarity index 97%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/InstanceMethodAdviceExecutor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/executor/InstanceMethodAdviceExecutor.java
index e0a1f5e1587..3a8d474f30f 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/InstanceMethodAdviceExecutor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/executor/InstanceMethodAdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.interceptor.executor;
+package org.apache.shardingsphere.agent.core.plugin.advice.executor;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/StaticMethodAdviceExecutor.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/executor/StaticMethodAdviceExecutor.java
similarity index 97%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/StaticMethodAdviceExecutor.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/executor/StaticMethodAdviceExecutor.java
index b53a9323f1f..033e4c69f00 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/StaticMethodAdviceExecutor.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/executor/StaticMethodAdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.interceptor.executor;
+package org.apache.shardingsphere.agent.core.plugin.advice.executor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/ConstructorAdvisorBuilder.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/ConstructorAdvisorBuilder.java
index 76d446fc1da..6b06f6b3d0c 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/ConstructorAdvisorBuilder.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/ConstructorAdvisorBuilder.java
@@ -24,8 +24,8 @@ import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.implementation.SuperMethodCall;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.ConstructorAdviceExecutor;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.ConstructorInterceptor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.ConstructorAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.ConstructorAdvice;
import org.apache.shardingsphere.agent.core.transformer.MethodAdvisor;
import org.apache.shardingsphere.agent.core.transformer.build.advise.AdviceFactory;
import org.apache.shardingsphere.agent.core.transformer.build.builder.MethodAdvisorBuilder;
@@ -57,6 +57,6 @@ public final class ConstructorAdvisorBuilder implements MethodAdvisorBuilder {
public MethodAdvisor getMethodAdvisor(final InDefinedShape methodDescription, final List<MethodAdvisorConfiguration> advisorConfigs) {
Collection<ConstructorAdviceExecutor> adviceExecutors = advisorConfigs
.stream().map(MethodAdvisorConfiguration::getAdviceClassName).map(each -> (ConstructorAdviceExecutor) adviceFactory.getAdvice(each)).collect(Collectors.toList());
- return new MethodAdvisor(methodDescription, new ConstructorInterceptor(adviceExecutors));
+ return new MethodAdvisor(methodDescription, new ConstructorAdvice(adviceExecutors));
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/InstanceMethodAdvisorBuilder.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/InstanceMethodAdvisorBuilder.java
index f55806094d8..17d57b0d711 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/InstanceMethodAdvisorBuilder.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/InstanceMethodAdvisorBuilder.java
@@ -23,8 +23,8 @@ import net.bytebuddy.dynamic.DynamicType.Builder;
import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.InstanceMethodAroundInterceptor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAdvice;
import org.apache.shardingsphere.agent.core.transformer.MethodAdvisor;
import org.apache.shardingsphere.agent.core.transformer.build.advise.AdviceFactory;
import org.apache.shardingsphere.agent.core.transformer.build.builder.MethodAdvisorBuilder;
@@ -55,6 +55,6 @@ public final class InstanceMethodAdvisorBuilder implements MethodAdvisorBuilder
public MethodAdvisor getMethodAdvisor(final InDefinedShape methodDescription, final List<MethodAdvisorConfiguration> advisorConfigs) {
Collection<InstanceMethodAdviceExecutor> adviceExecutors = advisorConfigs
.stream().<InstanceMethodAdviceExecutor>map(each -> adviceFactory.getAdvice(each.getAdviceClassName())).collect(Collectors.toList());
- return new MethodAdvisor(methodDescription, new InstanceMethodAroundInterceptor(adviceExecutors));
+ return new MethodAdvisor(methodDescription, new InstanceMethodAdvice(adviceExecutors));
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/StaticMethodAdvisorBuilder.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/StaticMethodAdvisorBuilder.java
index 7d6a2355a1e..859041fb72e 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/StaticMethodAdvisorBuilder.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/StaticMethodAdvisorBuilder.java
@@ -23,8 +23,8 @@ import net.bytebuddy.dynamic.DynamicType.Builder;
import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.StaticMethodAdviceExecutor;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.StaticMethodAroundInterceptor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.StaticMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.StaticMethodAdvice;
import org.apache.shardingsphere.agent.core.transformer.MethodAdvisor;
import org.apache.shardingsphere.agent.core.transformer.build.advise.AdviceFactory;
import org.apache.shardingsphere.agent.core.transformer.build.builder.MethodAdvisorBuilder;
@@ -55,6 +55,6 @@ public final class StaticMethodAdvisorBuilder implements MethodAdvisorBuilder {
public MethodAdvisor getMethodAdvisor(final InDefinedShape methodDescription, final List<MethodAdvisorConfiguration> advisorConfigs) {
Collection<StaticMethodAdviceExecutor> adviceExecutors = advisorConfigs
.stream().<StaticMethodAdviceExecutor>map(each -> adviceFactory.getAdvice(each.getAdviceClassName())).collect(Collectors.toList());
- return new MethodAdvisor(methodDescription, new StaticMethodAroundInterceptor(adviceExecutors));
+ return new MethodAdvisor(methodDescription, new StaticMethodAdvice(adviceExecutors));
}
}
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockConstructorAdviceExecutor.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockConstructorAdviceExecutor.java
index 33ab0b2decf..164fc3ad0fe 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockConstructorAdviceExecutor.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockConstructorAdviceExecutor.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.agent.core.mock.advice;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.ConstructorAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.ConstructorAdviceExecutor;
import java.util.List;
import java.util.Optional;
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAdviceExecutor.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAdviceExecutor.java
index 1f31fc45cd5..481fb82ea12 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAdviceExecutor.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAdviceExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.core.mock.advice;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodRepeatedAdviceExecutor.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodRepeatedAdviceExecutor.java
index 55595051870..dc78f0a1343 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodRepeatedAdviceExecutor.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodRepeatedAdviceExecutor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.core.mock.advice;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockStaticMethodAdviceExecutor.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockStaticMethodAdviceExecutor.java
index dd89eaf8e2c..264ead168f8 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockStaticMethodAdviceExecutor.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockStaticMethodAdviceExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.core.mock.advice;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.StaticMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.StaticMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import java.lang.reflect.Method;
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorYamlAdvisorConfigurationTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorYamlAdvisorConfigurationTest.java
similarity index 95%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorYamlAdvisorConfigurationTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorYamlAdvisorConfigurationTest.java
index c4fdec8625e..b01eaa11a7c 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorYamlAdvisorConfigurationTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorYamlAdvisorConfigurationTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.interceptor;
+package org.apache.shardingsphere.agent.core.plugin.advice;
import net.bytebuddy.ByteBuddy;
import net.bytebuddy.agent.ByteBuddyAgent;
@@ -70,7 +70,7 @@ public final class ConstructorYamlAdvisorConfigurationTest {
.intercept(FieldAccessor.ofField(EXTRA_DATA))
.constructor(ElementMatchers.isConstructor())
.intercept(SuperMethodCall.INSTANCE.andThen(MethodDelegation.withDefaultConfiguration()
- .to(new ConstructorInterceptor(Collections.singleton(new MockConstructorAdviceExecutor(QUEUE))))));
+ .to(new ConstructorAdvice(Collections.singleton(new MockConstructorAdviceExecutor(QUEUE))))));
}
return builder;
})
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundYamlAdvisorConfigurationTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAroundYamlAdvisorConfigurationTest.java
similarity index 96%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundYamlAdvisorConfigurationTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAroundYamlAdvisorConfigurationTest.java
index 69d733385d1..2753afdcdc1 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundYamlAdvisorConfigurationTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAroundYamlAdvisorConfigurationTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.interceptor;
+package org.apache.shardingsphere.agent.core.plugin.advice;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.ByteBuddy;
@@ -96,7 +96,7 @@ public final class InstanceMethodAroundYamlAdvisorConfigurationTest {
InstanceMaterial material = new ByteBuddy()
.subclass(InstanceMaterial.class)
.method(ElementMatchers.named(methodName))
- .intercept(MethodDelegation.withDefaultConfiguration().to(new InstanceMethodAroundInterceptor(Collections.singleton(new MockInstanceMethodAdviceExecutor(rebase)))))
+ .intercept(MethodDelegation.withDefaultConfiguration().to(new InstanceMethodAdvice(Collections.singleton(new MockInstanceMethodAdviceExecutor(rebase)))))
.make()
.load(new MockClassLoader())
.getLoaded()
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundYamlAdvisorConfigurationTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundYamlAdvisorConfigurationTest.java
similarity index 93%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundYamlAdvisorConfigurationTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundYamlAdvisorConfigurationTest.java
index 4eb8e1b8625..0fa230aa3b7 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundYamlAdvisorConfigurationTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundYamlAdvisorConfigurationTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.interceptor;
+package org.apache.shardingsphere.agent.core.plugin.advice;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.ByteBuddy;
@@ -83,9 +83,9 @@ public final class StaticMethodAroundYamlAdvisorConfigurationTest {
.implement(TargetAdviceObject.class)
.intercept(FieldAccessor.ofField(EXTRA_DATA))
.method(ElementMatchers.named("staticMockWithException"))
- .intercept(MethodDelegation.withDefaultConfiguration().to(new StaticMethodAroundInterceptor(Collections.singleton(new MockStaticMethodAdviceExecutor(false)))))
+ .intercept(MethodDelegation.withDefaultConfiguration().to(new StaticMethodAdvice(Collections.singleton(new MockStaticMethodAdviceExecutor(false)))))
.method(ElementMatchers.named("staticMock"))
- .intercept(MethodDelegation.withDefaultConfiguration().to(new StaticMethodAroundInterceptor(Collections.singleton(new MockStaticMethodAdviceExecutor(true)))));
+ .intercept(MethodDelegation.withDefaultConfiguration().to(new StaticMethodAdvice(Collections.singleton(new MockStaticMethodAdviceExecutor(true)))));
}
return builder;
})
diff --git a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdviceExecutor.java b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdviceExecutor.java
index a4962193267..d474878d048 100644
--- a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdviceExecutor.java
+++ b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdviceExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.logging.base.advice;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.StaticMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.StaticMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.logging.base.threadlocal.ElapsedTimeThreadLocal;
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdviceExecutor.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdviceExecutor.java
index e703555e591..46b3becff70 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdviceExecutor.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdviceExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.MetricsWrapper;
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdviceExecutor.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdviceExecutor.java
index 7794a62bb66..675738f36ba 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdviceExecutor.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdviceExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.MetricsWrapper;
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdviceExecutor.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdviceExecutor.java
index e805a5c98c8..56350545861 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdviceExecutor.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdviceExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.MetricsWrapper;
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdviceExecutor.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdviceExecutor.java
index f7fe36402aa..1667fcd7fca 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdviceExecutor.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdviceExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.MetricsWrapper;
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdviceExecutor.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdviceExecutor.java
index 0a6870cf26b..38ed1975628 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdviceExecutor.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdviceExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.MetricsWrapper;
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingAdviceEngine.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingAdviceEngine.java
index cb8a18861d2..3c443ec3577 100644
--- a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingAdviceEngine.java
+++ b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingAdviceEngine.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.core.advice;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.impl.CommandExecutorTaskAdviser;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.impl.JDBCExecutorCallbackAdviser;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.impl.SQLParserEngineAdviser;
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/TracingAdviser.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/TracingAdviser.java
index d966ebfd01a..bf2874df926 100644
--- a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/TracingAdviser.java
+++ b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/TracingAdviser.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
/**
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java
index f7ecba1bd9f..c0f9a56dcec 100644
--- a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java
+++ b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.TracingAdviser;
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java
index e46fe5e01db..2a386f24c20 100644
--- a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java
+++ b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.TracingAdviser;
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java
index aa855b86a97..257b50f279e 100644
--- a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java
+++ b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.TracingAdviser;
diff --git a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceExecutor.java b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceExecutor.java
index 907bf29fce6..b4e8d6c5dfa 100644
--- a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceExecutor.java
+++ b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceExecutor.java
@@ -22,7 +22,7 @@ import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import lombok.SneakyThrows;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.span.JaegerErrorSpan;
diff --git a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceExecutor.java b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceExecutor.java
index 7a8be976eb1..3600b49db31 100644
--- a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceExecutor.java
+++ b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceExecutor.java
@@ -24,7 +24,7 @@ import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import lombok.SneakyThrows;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.span.JaegerErrorSpan;
diff --git a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceExecutor.java b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceExecutor.java
index 50d47d80c99..ead69e9d3e6 100644
--- a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceExecutor.java
+++ b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceExecutor.java
@@ -21,7 +21,7 @@ import io.opentracing.Scope;
import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.span.JaegerErrorSpan;
diff --git a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceExecutor.java b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceExecutor.java
index fe8b0178ae6..a4d54c9d9fd 100644
--- a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceExecutor.java
+++ b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceExecutor.java
@@ -23,7 +23,7 @@ import io.opentelemetry.api.trace.SpanBuilder;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.StatusCode;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
diff --git a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceExecutor.java b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceExecutor.java
index e87f26df153..68a4cd1ab3b 100644
--- a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceExecutor.java
+++ b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceExecutor.java
@@ -25,7 +25,7 @@ import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
import lombok.SneakyThrows;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
diff --git a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceExecutor.java b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceExecutor.java
index 3121f3648d8..314b457f646 100644
--- a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceExecutor.java
+++ b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceExecutor.java
@@ -24,7 +24,7 @@ import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
diff --git a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceExecutor.java b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceExecutor.java
index 1749fbb2d6b..c4e85ac103c 100644
--- a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceExecutor.java
+++ b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceExecutor.java
@@ -21,7 +21,7 @@ import io.opentracing.Scope;
import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.constant.ShardingSphereTags;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.span.OpenTracingErrorSpan;
diff --git a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceExecutor.java b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceExecutor.java
index 3f65f3b0cac..5bc338d32bd 100644
--- a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceExecutor.java
+++ b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceExecutor.java
@@ -23,7 +23,7 @@ import io.opentracing.Tracer;
import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.constant.ShardingSphereTags;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.span.OpenTracingErrorSpan;
diff --git a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceExecutor.java b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceExecutor.java
index a751b947aa0..33042a62661 100644
--- a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceExecutor.java
+++ b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceExecutor.java
@@ -22,7 +22,7 @@ import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.constant.ShardingSphereTags;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.span.OpenTracingErrorSpan;
diff --git a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceExecutor.java b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceExecutor.java
index ba14d2ea0e9..441260daadd 100644
--- a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceExecutor.java
+++ b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceExecutor.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice;
import brave.Span;
import brave.Tracing;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
diff --git a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceExecutor.java b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceExecutor.java
index f09d466fce6..af3b31bf183 100644
--- a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceExecutor.java
+++ b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceExecutor.java
@@ -21,7 +21,7 @@ import brave.Span;
import brave.Tracing;
import lombok.SneakyThrows;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
diff --git a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceExecutor.java b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceExecutor.java
index fd453e1f1e4..59dd574ffd9 100644
--- a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceExecutor.java
+++ b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceExecutor.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice;
import brave.Span;
import brave.Tracing;
import brave.propagation.TraceContext;
-import org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
+import org.apache.shardingsphere.agent.core.plugin.advice.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;