You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/12/11 10:53:58 UTC
[shardingsphere] branch master updated: Add AgentAdvice interface (#22805)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 645637dc40b Add AgentAdvice interface (#22805)
645637dc40b is described below
commit 645637dc40b0837a3180c3e3439d59c059374f57
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Dec 11 18:53:52 2022 +0800
Add AgentAdvice interface (#22805)
* Add AgentAdvice interface
* Add AgentAdvice interface
---
.../api/{result => }/MethodInvocationResult.java | 2 +-
.../api/{advice => }/OverrideArgsInvoker.java | 2 +-
...ceTargetObject.java => TargetAdviceObject.java} | 4 ++--
.../{OverrideArgsInvoker.java => AgentAdvice.java} | 13 ++++++-----
.../agent/api/advice/ConstructorAdvice.java | 18 +++++----------
.../api/advice/InstanceMethodAroundAdvice.java | 26 +++++++++-------------
.../agent/api/advice/StaticMethodAroundAdvice.java | 19 +++++-----------
.../transformer/ShardingSphereTransformer.java | 6 ++---
.../advice/ComposeConstructorAdvice.java | 4 ++--
.../advice/ComposeInstanceMethodAroundAdvice.java | 10 ++++-----
.../advice/ComposeStaticMethodAroundAdvice.java | 2 +-
.../plugin/interceptor/ConstructorInterceptor.java | 7 +++---
.../InstanceMethodAroundInterceptor.java | 6 ++---
.../InstanceMethodInterceptorArgsOverride.java | 8 +++----
.../interceptor/StaticMethodAroundInterceptor.java | 2 +-
.../StaticMethodInterceptorArgsOverride.java | 4 ++--
.../advice/ComposeConstructorAdviceTest.java | 6 ++---
.../ComposeStaticMethodAroundAdviceTest.java | 2 +-
.../core/mock/advice/MockConstructorAdvice.java | 4 ++--
.../advice/MockInstanceMethodAroundAdvice.java | 10 ++++-----
.../MockInstanceMethodAroundRepeatedAdvice.java | 10 ++++-----
.../mock/advice/MockStaticMethodAroundAdvice.java | 2 +-
.../interceptor/ConstructorInterceptorTest.java | 6 ++---
.../InstanceMethodAroundInterceptorTest.java | 4 ++--
.../StaticMethodAroundInterceptorTest.java | 4 ++--
.../base/advice/MetaDataContextsFactoryAdvice.java | 2 +-
.../metrics/api/advice/ChannelHandlerAdvice.java | 6 ++---
.../api/advice/CommandExecutorTaskAdvice.java | 8 +++----
.../metrics/api/advice/SQLParserEngineAdvice.java | 6 ++---
.../metrics/api/advice/SQLRouteEngineAdvice.java | 8 +++----
.../metrics/api/advice/TransactionAdvice.java | 6 ++---
.../api/advice/ChannelHandlerAdviceTest.java | 4 ++--
.../api/advice/CommandExecutorTaskAdviceTest.java | 6 ++---
...rgetObject.java => MockTargetAdviceObject.java} | 4 ++--
.../api/advice/SQLParserEngineAdviceTest.java | 4 ++--
.../api/advice/SQLRouteEngineAdviceTest.java | 6 ++---
.../metrics/api/advice/TransactionAdviceTest.java | 4 ++--
.../jaeger/advice/CommandExecutorTaskAdvice.java | 10 ++++-----
.../jaeger/advice/JDBCExecutorCallbackAdvice.java | 10 ++++-----
.../jaeger/advice/SQLParserEngineAdvice.java | 10 ++++-----
.../advice/CommandExecutorTaskAdviceTest.java | 2 +-
.../advice/JDBCExecutorCallbackAdviceTest.java | 2 +-
.../jaeger/advice/SQLParserEngineAdviceTest.java | 2 +-
.../advice/CommandExecutorTaskAdvice.java | 10 ++++-----
.../advice/JDBCExecutorCallbackAdvice.java | 10 ++++-----
.../advice/SQLParserEngineAdvice.java | 10 ++++-----
.../advice/CommandExecutorTaskAdviceTest.java | 2 +-
.../advice/JDBCExecutorCallbackAdviceTest.java | 2 +-
.../advice/SQLParserEngineAdviceTest.java | 2 +-
.../advice/CommandExecutorTaskAdvice.java | 10 ++++-----
.../advice/JDBCExecutorCallbackAdvice.java | 10 ++++-----
.../opentracing/advice/SQLParserEngineAdvice.java | 10 ++++-----
.../advice/CommandExecutorTaskAdviceTest.java | 6 ++---
.../advice/JDBCExecutorCallbackAdviceTest.java | 6 ++---
...rgetObject.java => MockTargetAdviceObject.java} | 4 ++--
.../advice/SQLParserEngineAdviceTest.java | 6 ++---
.../agent/plugin/tracing/AgentRunner.java | 4 ++--
.../AbstractCommandExecutorTaskAdviceTest.java | 6 ++---
.../AbstractJDBCExecutorCallbackAdviceTest.java | 6 ++---
.../advice/AbstractSQLParserEngineAdviceTest.java | 6 ++---
.../zipkin/advice/CommandExecutorTaskAdvice.java | 10 ++++-----
.../zipkin/advice/JDBCExecutorCallbackAdvice.java | 10 ++++-----
.../zipkin/advice/SQLParserEngineAdvice.java | 10 ++++-----
.../advice/CommandExecutorTaskAdviceTest.java | 2 +-
.../advice/JDBCExecutorCallbackAdviceTest.java | 2 +-
.../zipkin/advice/SQLParserEngineAdviceTest.java | 2 +-
66 files changed, 205 insertions(+), 222 deletions(-)
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/result/MethodInvocationResult.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/MethodInvocationResult.java
similarity index 95%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/api/result/MethodInvocationResult.java
rename to agent/api/src/main/java/org/apache/shardingsphere/agent/api/MethodInvocationResult.java
index 10b42fee711..874c0e080c0 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/result/MethodInvocationResult.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/MethodInvocationResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.api.result;
+package org.apache.shardingsphere.agent.api;
import lombok.Getter;
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/OverrideArgsInvoker.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/OverrideArgsInvoker.java
similarity index 95%
copy from agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/OverrideArgsInvoker.java
copy to agent/api/src/main/java/org/apache/shardingsphere/agent/api/OverrideArgsInvoker.java
index 3cd7037b018..e80346db161 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/OverrideArgsInvoker.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/OverrideArgsInvoker.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.api.advice;
+package org.apache.shardingsphere.agent.api;
/**
* Super(origin) method invoker for ByteBuddy only.
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/AdviceTargetObject.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/TargetAdviceObject.java
similarity index 92%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/AdviceTargetObject.java
rename to agent/api/src/main/java/org/apache/shardingsphere/agent/api/TargetAdviceObject.java
index f2635506d50..1efaa69ca7b 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/AdviceTargetObject.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/TargetAdviceObject.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.api.advice;
+package org.apache.shardingsphere.agent.api;
/**
* Wrapped class for target and provide a context to store variable during invocation.
*/
-public interface AdviceTargetObject {
+public interface TargetAdviceObject {
/**
* Get the variable from context.
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/OverrideArgsInvoker.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/AgentAdvice.java
similarity index 75%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/OverrideArgsInvoker.java
rename to agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/AgentAdvice.java
index 3cd7037b018..be54789ed25 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/OverrideArgsInvoker.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/AgentAdvice.java
@@ -18,15 +18,16 @@
package org.apache.shardingsphere.agent.api.advice;
/**
- * Super(origin) method invoker for ByteBuddy only.
+ * Agent advice.
*/
-public interface OverrideArgsInvoker {
+public interface AgentAdvice {
/**
- * Call invocation origin method.
+ * Check if disable the check process when interceptor are trying to call the advice. Then the advice will be called by skipping checks.
*
- * @param args the origin method arguments
- * @return the result of the origin method
+ * @return disable or not
*/
- Object call(Object[] args);
+ default boolean disableCheck() {
+ return false;
+ }
}
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/ConstructorAdvice.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/ConstructorAdvice.java
index 3e9c3971192..4decfccf91f 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/ConstructorAdvice.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/ConstructorAdvice.java
@@ -17,25 +17,19 @@
package org.apache.shardingsphere.agent.api.advice;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
+
/**
* Weaving the advice around the constructor of target class.
*/
-public interface ConstructorAdvice {
-
- /**
- * Check if disable the check process when interceptor are trying to call the advice. Then the advice will be called by skipping checks.
- *
- * @return disable or not
- */
- default boolean disableCheck() {
- return false;
- }
+public interface ConstructorAdvice extends AgentAdvice {
/**
- * Intercept the target's constructor. This method is weaved after the constructor execution.
+ * Intercept the target's constructor.
+ * This method is weaved after the constructor execution.
*
* @param target intercepted target object
* @param args all arguments of the intercepted constructor
*/
- void onConstructor(AdviceTargetObject target, Object[] args);
+ void onConstructor(TargetAdviceObject target, Object[] args);
}
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/InstanceMethodAroundAdvice.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/InstanceMethodAroundAdvice.java
index 18a62433072..3c860f62224 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/InstanceMethodAroundAdvice.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/InstanceMethodAroundAdvice.java
@@ -17,44 +17,38 @@
package org.apache.shardingsphere.agent.api.advice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import java.lang.reflect.Method;
/**
* Weaving the advice around the target method.
*/
-public interface InstanceMethodAroundAdvice {
+public interface InstanceMethodAroundAdvice extends AgentAdvice {
/**
- * Check if disable the check process when interceptor are trying to call the advice. Then the advice will be called by skipping checks.
- *
- * @return disable or not
- */
- default boolean disableCheck() {
- return false;
- }
-
- /**
- * Intercept the target method and weave the method before origin method. It will invoke before the origin calling.
+ * Intercept the target method and weave the method before origin method.
+ * It will invoke before the origin calling.
*
* @param target the target object
* @param method the target method
* @param args all method arguments
* @param result wrapped class of result to detect whether or not to execute the origin method
*/
- default void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ default void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
}
/**
- * Intercept the target method and weave the method after origin method. It will invoke after the origin calling
+ * Intercept the target method and weave the method after origin method.
+ * It will invoke after the origin calling
*
* @param target the target object
* @param method the target method
* @param args all method arguments
* @param result wrapped class of result to detect whether or not to execute the origin method.
*/
- default void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ default void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
}
/**
@@ -65,6 +59,6 @@ public interface InstanceMethodAroundAdvice {
* @param args all method arguments
* @param throwable exception from target method
*/
- default void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ default void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
}
}
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/StaticMethodAroundAdvice.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/StaticMethodAroundAdvice.java
index e1b7fb38ca9..bdf8079ffb3 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/StaticMethodAroundAdvice.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/api/advice/StaticMethodAroundAdvice.java
@@ -17,26 +17,18 @@
package org.apache.shardingsphere.agent.api.advice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import java.lang.reflect.Method;
/**
* Weaving the advice around the static methods of target class.
*/
-public interface StaticMethodAroundAdvice {
+public interface StaticMethodAroundAdvice extends AgentAdvice {
/**
- * Check if disable the check process when interceptor are trying to call the advice. Then the advice will be called by skipping checks.
- *
- * @return disable or not
- */
- default boolean disableCheck() {
- return false;
- }
-
- /**
- * Intercept the target method and weave the method before origin method. It will invoke before the origin calling.
+ * Intercept the target method and weave the method before origin method.
+ * It will invoke before the origin calling.
*
* @param clazz the target class
* @param method the target method
@@ -47,7 +39,8 @@ public interface StaticMethodAroundAdvice {
}
/**
- * Intercept the target method and weave the method after origin method. It will invoke after the origin calling.
+ * Intercept the target method and weave the method after origin method.
+ * It will invoke after the origin calling.
*
* @param clazz the target class
* @param method the target method
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformer.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformer.java
index 88c938b3398..e4492e972cb 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformer.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/ShardingSphereTransformer.java
@@ -30,11 +30,11 @@ import net.bytebuddy.implementation.bind.annotation.Morph;
import net.bytebuddy.jar.asm.Opcodes;
import net.bytebuddy.matcher.ElementMatchers;
import net.bytebuddy.utility.JavaModule;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.api.advice.ConstructorAdvice;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.advice.OverrideArgsInvoker;
+import org.apache.shardingsphere.agent.api.OverrideArgsInvoker;
import org.apache.shardingsphere.agent.api.pointcut.StaticMethodPointcut;
import org.apache.shardingsphere.agent.api.pointcut.ConstructorPointcut;
import org.apache.shardingsphere.agent.api.pointcut.InstanceMethodPointcut;
@@ -75,7 +75,7 @@ public final class ShardingSphereTransformer implements Transformer {
if (!pluginLoader.containsType(typeDescription)) {
return builder;
}
- Builder<?> result = builder.defineField(EXTRA_DATA, Object.class, Opcodes.ACC_PRIVATE | Opcodes.ACC_VOLATILE).implement(AdviceTargetObject.class).intercept(FieldAccessor.ofField(EXTRA_DATA));
+ Builder<?> result = builder.defineField(EXTRA_DATA, Object.class, Opcodes.ACC_PRIVATE | Opcodes.ACC_VOLATILE).implement(TargetAdviceObject.class).intercept(FieldAccessor.ofField(EXTRA_DATA));
PluginPointcuts pluginPointcuts = pluginLoader.loadPluginInterceptorPoint(typeDescription);
result = interceptConstructor(typeDescription, pluginPointcuts.getConstructorPointcuts(), result, classLoader);
result = interceptStaticMethod(typeDescription, pluginPointcuts.getStaticMethodPointcuts(), result, classLoader);
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeConstructorAdvice.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeConstructorAdvice.java
index 6da2a26d2a2..e83bcb6b3e4 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeConstructorAdvice.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeConstructorAdvice.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.core.bytebuddy.transformer.advice;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.ConstructorAdvice;
import java.util.Collection;
@@ -32,7 +32,7 @@ public final class ComposeConstructorAdvice implements ConstructorAdvice {
private final Collection<ConstructorAdvice> advices;
@Override
- public void onConstructor(final AdviceTargetObject target, final Object[] args) {
+ public void onConstructor(final TargetAdviceObject target, final Object[] args) {
advices.forEach(each -> each.onConstructor(target, args));
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeInstanceMethodAroundAdvice.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeInstanceMethodAroundAdvice.java
index c169e8d91fa..7a306bdea08 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeInstanceMethodAroundAdvice.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeInstanceMethodAroundAdvice.java
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.agent.core.bytebuddy.transformer.advice;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import java.lang.reflect.Method;
import java.util.Collection;
@@ -34,17 +34,17 @@ public final class ComposeInstanceMethodAroundAdvice implements InstanceMethodAr
private final Collection<InstanceMethodAroundAdvice> advices;
@Override
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
advices.forEach(each -> each.beforeMethod(target, method, args, result));
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
advices.forEach(each -> each.afterMethod(target, method, args, result));
}
@Override
- public void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ public void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
advices.forEach(each -> each.onThrowing(target, method, args, throwable));
}
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeStaticMethodAroundAdvice.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeStaticMethodAroundAdvice.java
index 4392b758a95..07e516d4903 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeStaticMethodAroundAdvice.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeStaticMethodAroundAdvice.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.agent.core.bytebuddy.transformer.advice;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import java.lang.reflect.Method;
import java.util.Collection;
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/interceptor/ConstructorInterceptor.java
index 29dcb225738..65b1b3d0157 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/interceptor/ConstructorInterceptor.java
@@ -21,9 +21,10 @@ 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.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.ConstructorAdvice;
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;
/**
@@ -32,7 +33,7 @@ import org.apache.shardingsphere.agent.core.plugin.PluginContext;
@RequiredArgsConstructor
public class ConstructorInterceptor {
- private static final LoggerFactory.Logger LOGGER = LoggerFactory.getLogger(ConstructorInterceptor.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ConstructorInterceptor.class);
private final ConstructorAdvice constructorAdvice;
@@ -43,7 +44,7 @@ public class ConstructorInterceptor {
* @param args the all constructor arguments
*/
@RuntimeType
- public void intercept(@This final AdviceTargetObject target, @AllArguments final Object[] args) {
+ public void intercept(@This final TargetAdviceObject target, @AllArguments final Object[] args) {
try {
boolean adviceEnabled = constructorAdvice.disableCheck() || PluginContext.isPluginEnabled();
if (adviceEnabled) {
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/interceptor/InstanceMethodAroundInterceptor.java
index b658b88d433..264cf633b4b 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/interceptor/InstanceMethodAroundInterceptor.java
@@ -24,9 +24,9 @@ import net.bytebuddy.implementation.bind.annotation.Origin;
import net.bytebuddy.implementation.bind.annotation.RuntimeType;
import net.bytebuddy.implementation.bind.annotation.SuperCall;
import net.bytebuddy.implementation.bind.annotation.This;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
@@ -55,7 +55,7 @@ public class InstanceMethodAroundInterceptor {
@RuntimeType
@SneakyThrows
public Object intercept(@This final Object target, @Origin final Method method, @AllArguments final Object[] args, @SuperCall final Callable<?> callable) {
- AdviceTargetObject instance = (AdviceTargetObject) target;
+ TargetAdviceObject instance = (TargetAdviceObject) target;
MethodInvocationResult methodResult = new MethodInvocationResult();
Object result;
boolean adviceEnabled = instanceMethodAroundAdvice.disableCheck() || PluginContext.isPluginEnabled();
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodInterceptorArgsOverride.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodInterceptorArgsOverride.java
index eab6271670f..295a33c57b2 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodInterceptorArgsOverride.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodInterceptorArgsOverride.java
@@ -23,10 +23,10 @@ import net.bytebuddy.implementation.bind.annotation.Morph;
import net.bytebuddy.implementation.bind.annotation.Origin;
import net.bytebuddy.implementation.bind.annotation.RuntimeType;
import net.bytebuddy.implementation.bind.annotation.This;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.advice.OverrideArgsInvoker;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.OverrideArgsInvoker;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
@@ -53,7 +53,7 @@ public class InstanceMethodInterceptorArgsOverride {
*/
@RuntimeType
public Object intercept(@This final Object target, @Origin final Method method, @AllArguments final Object[] args, @Morph final OverrideArgsInvoker callable) {
- AdviceTargetObject instance = (AdviceTargetObject) target;
+ TargetAdviceObject instance = (TargetAdviceObject) target;
MethodInvocationResult methodResult = new MethodInvocationResult();
Object result;
boolean adviceEnabled = instanceMethodAroundAdvice.disableCheck() || PluginContext.isPluginEnabled();
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/interceptor/StaticMethodAroundInterceptor.java
index c31e0024b5a..a4a5d63a06d 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/interceptor/StaticMethodAroundInterceptor.java
@@ -24,7 +24,7 @@ import net.bytebuddy.implementation.bind.annotation.Origin;
import net.bytebuddy.implementation.bind.annotation.RuntimeType;
import net.bytebuddy.implementation.bind.annotation.SuperCall;
import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodInterceptorArgsOverride.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodInterceptorArgsOverride.java
index 331406f240a..b0a4f87aeea 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodInterceptorArgsOverride.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodInterceptorArgsOverride.java
@@ -23,8 +23,8 @@ import net.bytebuddy.implementation.bind.annotation.Morph;
import net.bytebuddy.implementation.bind.annotation.Origin;
import net.bytebuddy.implementation.bind.annotation.RuntimeType;
import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.advice.OverrideArgsInvoker;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.OverrideArgsInvoker;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeConstructorAdviceTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeConstructorAdviceTest.java
index 1af5532e549..72ecd1a7c89 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeConstructorAdviceTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeConstructorAdviceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.core.bytebuddy.transformer.advice;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.ConstructorAdvice;
import org.apache.shardingsphere.agent.core.mock.advice.MockConstructorAdvice;
import org.junit.Before;
@@ -44,9 +44,9 @@ public final class ComposeConstructorAdviceTest {
@Test
public void assertOnConstructor() {
- AdviceTargetObject adviceTargetObject = mock(AdviceTargetObject.class);
+ TargetAdviceObject targetAdviceObject = mock(TargetAdviceObject.class);
Object[] args = new Object[2];
args[0] = new LinkedList<String>();
- actual.onConstructor(adviceTargetObject, args);
+ actual.onConstructor(targetAdviceObject, args);
}
}
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeStaticMethodAroundAdviceTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeStaticMethodAroundAdviceTest.java
index c121e1ad7c3..11f3ff22373 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeStaticMethodAroundAdviceTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/bytebuddy/transformer/advice/ComposeStaticMethodAroundAdviceTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.core.bytebuddy.transformer.advice;
import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockConstructorAdvice.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockConstructorAdvice.java
index 2b6c92bd1d5..0fbf7c7ddcb 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockConstructorAdvice.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockConstructorAdvice.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.core.mock.advice;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.agent.api.advice.ConstructorAdvice;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import java.util.List;
@@ -35,7 +35,7 @@ public final class MockConstructorAdvice implements ConstructorAdvice {
@Override
@SuppressWarnings("unchecked")
- public void onConstructor(final AdviceTargetObject target, final Object[] args) {
+ public void onConstructor(final TargetAdviceObject target, final Object[] args) {
if (null != args && args.length > 0) {
List<String> list = Optional.ofNullable(queues).orElse((List<String>) args[0]);
list.add("on constructor");
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAroundAdvice.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAroundAdvice.java
index 3e66357054f..56cd4d52bdc 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAroundAdvice.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAroundAdvice.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.agent.core.mock.advice;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import java.lang.reflect.Method;
import java.util.List;
@@ -36,7 +36,7 @@ public final class MockInstanceMethodAroundAdvice implements InstanceMethodAroun
}
@Override
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
List<String> queues = (List<String>) args[0];
queues.add("before");
if (rebase) {
@@ -45,13 +45,13 @@ public final class MockInstanceMethodAroundAdvice implements InstanceMethodAroun
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
List<String> queues = (List<String>) args[0];
queues.add("after");
}
@Override
- public void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ public void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
List<String> queues = (List<String>) args[0];
queues.add("exception");
}
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAroundRepeatedAdvice.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAroundRepeatedAdvice.java
index d2fbed7a9bb..97fdd5de1d0 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAroundRepeatedAdvice.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAroundRepeatedAdvice.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.agent.core.mock.advice;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import java.lang.reflect.Method;
import java.util.List;
@@ -28,19 +28,19 @@ import java.util.List;
public final class MockInstanceMethodAroundRepeatedAdvice implements InstanceMethodAroundAdvice {
@Override
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
List<String> queues = (List<String>) args[0];
queues.add("twice_before");
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
List<String> queues = (List<String>) args[0];
queues.add("twice_after");
}
@Override
- public void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ public void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
List<String> queues = (List<String>) args[0];
queues.add("twice_exception");
}
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockStaticMethodAroundAdvice.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockStaticMethodAroundAdvice.java
index d62866e87e6..978658659d4 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockStaticMethodAroundAdvice.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockStaticMethodAroundAdvice.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.agent.core.mock.advice;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import java.lang.reflect.Method;
import java.util.List;
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptorTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptorTest.java
index e538eb0aabd..4a6f44acf8b 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptorTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorInterceptorTest.java
@@ -27,7 +27,7 @@ import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.implementation.SuperMethodCall;
import net.bytebuddy.jar.asm.Opcodes;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.bytebuddy.listener.LoggingListener;
import org.apache.shardingsphere.agent.core.mock.advice.MockConstructorAdvice;
import org.apache.shardingsphere.agent.core.mock.material.ConstructorMaterial;
@@ -65,7 +65,7 @@ public final class ConstructorInterceptorTest {
.transform((builder, typeDescription, classLoader, module) -> {
if (CLASS_PATH.equals(typeDescription.getTypeName())) {
return builder.defineField(EXTRA_DATA, Object.class, Opcodes.ACC_PRIVATE | Opcodes.ACC_VOLATILE)
- .implement(AdviceTargetObject.class)
+ .implement(TargetAdviceObject.class)
.intercept(FieldAccessor.ofField(EXTRA_DATA))
.constructor(ElementMatchers.isConstructor())
.intercept(SuperMethodCall.INSTANCE.andThen(MethodDelegation.withDefaultConfiguration().to(new ConstructorInterceptor(new MockConstructorAdvice(QUEUE)))));
@@ -78,7 +78,7 @@ public final class ConstructorInterceptorTest {
@Test
public void assertNoArgConstructor() {
- assertThat(new ConstructorMaterial(), instanceOf(AdviceTargetObject.class));
+ assertThat(new ConstructorMaterial(), instanceOf(TargetAdviceObject.class));
}
@Test
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptorTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptorTest.java
index 66f3b785d90..0f2096af7b9 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptorTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptorTest.java
@@ -27,7 +27,7 @@ import net.bytebuddy.implementation.FieldAccessor;
import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.jar.asm.Opcodes;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.mock.advice.MockInstanceMethodAroundAdvice;
import org.apache.shardingsphere.agent.core.mock.material.InstanceMaterial;
import org.junit.AfterClass;
@@ -82,7 +82,7 @@ public final class InstanceMethodAroundInterceptorTest {
.transform((builder, typeDescription, classLoader, module) -> {
if (CLASS_PATH.equals(typeDescription.getTypeName())) {
return builder.defineField(EXTRA_DATA, Object.class, Opcodes.ACC_PRIVATE | Opcodes.ACC_VOLATILE)
- .implement(AdviceTargetObject.class)
+ .implement(TargetAdviceObject.class)
.intercept(FieldAccessor.ofField(EXTRA_DATA));
}
return builder;
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptorTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptorTest.java
index 23fd3c47bbb..45e6e4b118f 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptorTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundInterceptorTest.java
@@ -27,7 +27,7 @@ import net.bytebuddy.implementation.FieldAccessor;
import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.jar.asm.Opcodes;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.mock.advice.MockStaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.core.mock.material.StaticMaterial;
import org.junit.AfterClass;
@@ -79,7 +79,7 @@ public final class StaticMethodAroundInterceptorTest {
.transform((builder, typeDescription, classLoader, module) -> {
if (CLASS_PATH.equals(typeDescription.getTypeName())) {
return builder.defineField(EXTRA_DATA, Object.class, Opcodes.ACC_PRIVATE | Opcodes.ACC_VOLATILE)
- .implement(AdviceTargetObject.class)
+ .implement(TargetAdviceObject.class)
.intercept(FieldAccessor.ofField(EXTRA_DATA))
.method(ElementMatchers.named("staticMockWithException"))
.intercept(MethodDelegation.withDefaultConfiguration().to(new StaticMethodAroundInterceptor(new MockStaticMethodAroundAdvice(false))))
diff --git a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdvice.java b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdvice.java
index e5937700575..0ab9629082f 100644
--- a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdvice.java
+++ b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdvice.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.agent.plugin.logging.base.advice;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.agent.api.advice.StaticMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.logging.base.threadlocal.ElapsedTimeThreadLocal;
import java.lang.reflect.Method;
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdvice.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdvice.java
index a587673678e..cbefd41a695 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdvice.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdvice.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.MetricsWrapper;
import org.apache.shardingsphere.agent.metrics.api.constant.MetricIds;
@@ -43,7 +43,7 @@ public final class ChannelHandlerAdvice implements InstanceMethodAroundAdvice {
}
@Override
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
switch (method.getName()) {
case CHANNEL_READ:
MetricsPool.get(MetricIds.PROXY_REQUEST).ifPresent(MetricsWrapper::inc);
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdvice.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdvice.java
index 4b5e35099df..ab445a0ffff 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdvice.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdvice.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.MetricsWrapper;
import org.apache.shardingsphere.agent.metrics.api.constant.MetricIds;
@@ -42,14 +42,14 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAroundAdvi
}
@Override
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
if (COMMAND_EXECUTOR_RUN.equals(method.getName())) {
ElapsedTimeThreadLocal.INSTANCE.set(System.currentTimeMillis());
}
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
if (COMMAND_EXECUTOR_RUN.equals(method.getName())) {
try {
long elapsedTime = System.currentTimeMillis() - ElapsedTimeThreadLocal.INSTANCE.get();
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdvice.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdvice.java
index c6061302700..5eac3540741 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdvice.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdvice.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.MetricsWrapper;
import org.apache.shardingsphere.agent.metrics.api.constant.MetricIds;
@@ -58,7 +58,7 @@ public final class SQLParserEngineAdvice implements InstanceMethodAroundAdvice {
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
SQLStatement sqlStatement = (SQLStatement) result.getResult();
countSQL(sqlStatement);
countDistSQL(sqlStatement);
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdvice.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdvice.java
index a1f3c4044e5..40416ad45e9 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdvice.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdvice.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.MetricsWrapper;
import org.apache.shardingsphere.agent.metrics.api.constant.MetricIds;
@@ -51,7 +51,7 @@ public final class SQLRouteEngineAdvice implements InstanceMethodAroundAdvice {
}
@Override
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
QueryContext queryContext = (QueryContext) args[1];
SQLStatement sqlStatement = queryContext.getSqlStatementContext().getSqlStatement();
if (sqlStatement instanceof InsertStatement) {
@@ -66,7 +66,7 @@ public final class SQLRouteEngineAdvice implements InstanceMethodAroundAdvice {
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
RouteContext routeContext = (RouteContext) result.getResult();
if (null != routeContext) {
Collection<RouteUnit> routeUnits = routeContext.getRouteUnits();
diff --git a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdvice.java b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdvice.java
index e3e78891939..f6e4bbc345e 100644
--- a/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdvice.java
+++ b/agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdvice.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.MetricsWrapper;
import org.apache.shardingsphere.agent.metrics.api.constant.MetricIds;
@@ -41,7 +41,7 @@ public final class TransactionAdvice implements InstanceMethodAroundAdvice {
}
@Override
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
String methodName = method.getName();
if (COMMIT.equals(methodName)) {
MetricsPool.get(MetricIds.TRANSACTION_COMMIT).ifPresent(MetricsWrapper::inc);
diff --git a/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdviceTest.java b/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdviceTest.java
index 2eaacc9a430..ad256a5a502 100644
--- a/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdviceTest.java
+++ b/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdviceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.constant.MetricIds;
import org.apache.shardingsphere.agent.metrics.api.fixture.FixtureWrapper;
@@ -52,7 +52,7 @@ public final class ChannelHandlerAdviceTest extends MetricsAdviceBaseTest {
when(channelRead.getName()).thenReturn(ChannelHandlerAdvice.CHANNEL_READ);
when(channelActive.getName()).thenReturn(ChannelHandlerAdvice.CHANNEL_ACTIVE);
when(channelInactive.getName()).thenReturn(ChannelHandlerAdvice.CHANNEL_INACTIVE);
- MockAdviceTargetObject targetObject = new MockAdviceTargetObject();
+ MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
channelHandlerAdvice.beforeMethod(targetObject, channelRead, new Object[]{}, new MethodInvocationResult());
channelHandlerAdvice.beforeMethod(targetObject, channelActive, new Object[]{}, new MethodInvocationResult());
channelHandlerAdvice.beforeMethod(targetObject, channelActive, new Object[]{}, new MethodInvocationResult());
diff --git a/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdviceTest.java b/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdviceTest.java
index e8bb8e00cf3..5316d7060c4 100644
--- a/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdviceTest.java
+++ b/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdviceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.constant.MetricIds;
import org.apache.shardingsphere.agent.metrics.api.fixture.FixtureWrapper;
@@ -47,7 +47,7 @@ public final class CommandExecutorTaskAdviceTest extends MetricsAdviceBaseTest {
@Test
public void assertExecuteLatency() {
when(run.getName()).thenReturn(CommandExecutorTaskAdvice.COMMAND_EXECUTOR_RUN);
- MockAdviceTargetObject targetObject = new MockAdviceTargetObject();
+ MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
commandExecutorTaskAdvice.beforeMethod(targetObject, run, new Object[]{}, new MethodInvocationResult());
try {
Thread.sleep(500L);
@@ -63,7 +63,7 @@ public final class CommandExecutorTaskAdviceTest extends MetricsAdviceBaseTest {
@Test
public void assertExecuteErrorTotal() {
when(processException.getName()).thenReturn(CommandExecutorTaskAdvice.COMMAND_EXECUTOR_EXCEPTION);
- MockAdviceTargetObject targetObject = new MockAdviceTargetObject();
+ MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
commandExecutorTaskAdvice.afterMethod(targetObject, processException, new Object[]{}, new MethodInvocationResult());
FixtureWrapper requestWrapper = (FixtureWrapper) MetricsPool.get(MetricIds.PROXY_EXECUTE_ERROR).get();
assertTrue(MetricsPool.get(MetricIds.PROXY_EXECUTE_ERROR).isPresent());
diff --git a/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/MockAdviceTargetObject.java b/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/MockTargetAdviceObject.java
similarity index 88%
rename from agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/MockAdviceTargetObject.java
rename to agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/MockTargetAdviceObject.java
index 645764dfe39..6d4b40aaf5e 100644
--- a/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/MockAdviceTargetObject.java
+++ b/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/MockTargetAdviceObject.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
-public final class MockAdviceTargetObject implements AdviceTargetObject {
+public final class MockTargetAdviceObject implements TargetAdviceObject {
private Object object;
diff --git a/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdviceTest.java b/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdviceTest.java
index f93ad00dcfb..5ab739b3be7 100644
--- a/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdviceTest.java
+++ b/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdviceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.constant.MetricIds;
import org.apache.shardingsphere.agent.metrics.api.fixture.FixtureWrapper;
@@ -102,7 +102,7 @@ public final class SQLParserEngineAdviceTest extends MetricsAdviceBaseTest {
}
private void assertParse(final String metricIds, final SQLStatement sqlStatement) {
- MockAdviceTargetObject targetObject = new MockAdviceTargetObject();
+ MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
MethodInvocationResult result = new MethodInvocationResult();
result.rebase(sqlStatement);
new SQLParserEngineAdvice().afterMethod(targetObject, mock(Method.class), new Object[]{}, result);
diff --git a/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdviceTest.java b/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdviceTest.java
index 611bd9491f0..a62f0d98a61 100644
--- a/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdviceTest.java
+++ b/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdviceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.constant.MetricIds;
import org.apache.shardingsphere.agent.metrics.api.fixture.FixtureWrapper;
@@ -70,7 +70,7 @@ public final class SQLRouteEngineAdviceTest extends MetricsAdviceBaseTest {
}
public void assertRoute(final String metricIds, final QueryContext queryContext) {
- MockAdviceTargetObject targetObject = new MockAdviceTargetObject();
+ MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
sqlRouteEngineAdvice.beforeMethod(targetObject, mock(Method.class), new Object[]{new ConnectionContext(), queryContext}, new MethodInvocationResult());
FixtureWrapper wrapper = (FixtureWrapper) MetricsPool.get(metricIds).get();
assertTrue(MetricsPool.get(metricIds).isPresent());
@@ -79,7 +79,7 @@ public final class SQLRouteEngineAdviceTest extends MetricsAdviceBaseTest {
@Test
public void assertRouteDataSourceAndTable() {
- MockAdviceTargetObject targetObject = new MockAdviceTargetObject();
+ MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
RouteContext routeContext = new RouteContext();
RouteMapper dsMapper = new RouteMapper("logic_db", "ds_0");
RouteMapper tbMapper = new RouteMapper("t_order", "t_order_0");
diff --git a/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdviceTest.java b/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdviceTest.java
index ddf751d41f9..5e6edb4b79b 100644
--- a/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdviceTest.java
+++ b/agent/plugins/metrics/api/src/test/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdviceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.constant.MetricIds;
import org.apache.shardingsphere.agent.metrics.api.fixture.FixtureWrapper;
@@ -48,7 +48,7 @@ public final class TransactionAdviceTest extends MetricsAdviceBaseTest {
public void assertMethod() {
when(commit.getName()).thenReturn(TransactionAdvice.COMMIT);
when(rollback.getName()).thenReturn(TransactionAdvice.ROLLBACK);
- MockAdviceTargetObject targetObject = new MockAdviceTargetObject();
+ MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
transactionAdvice.beforeMethod(targetObject, commit, new Object[]{}, new MethodInvocationResult());
transactionAdvice.beforeMethod(targetObject, rollback, new Object[]{}, new MethodInvocationResult());
FixtureWrapper commitWrapper = (FixtureWrapper) MetricsPool.get(MetricIds.TRANSACTION_COMMIT).get();
diff --git a/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java b/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java
index 7002ead7b5c..476370ed6b5 100644
--- a/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java
+++ b/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java
@@ -21,9 +21,9 @@ import io.opentracing.Scope;
import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.span.JaegerErrorSpan;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
@@ -42,7 +42,7 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAroundAdvi
private static final String OPERATION_NAME = "/ShardingSphere/rootInvoke/";
@Override
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
Scope scope = GlobalTracer.get().buildSpan(OPERATION_NAME)
.withTag(Tags.COMPONENT.getKey(), JaegerConstants.COMPONENT_NAME)
.startActive(true);
@@ -51,7 +51,7 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAroundAdvi
@Override
@SneakyThrows(ReflectiveOperationException.class)
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
ExecutorDataMap.getValue().remove(JaegerConstants.ROOT_SPAN);
Field field = CommandExecutorTask.class.getDeclaredField("connectionSession");
field.setAccessible(true);
@@ -62,7 +62,7 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAroundAdvi
}
@Override
- public void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ public void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
JaegerErrorSpan.setError(GlobalTracer.get().activeSpan(), throwable);
}
}
diff --git a/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java b/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
index f23a1f39d2c..0a179516076 100644
--- a/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
+++ b/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
@@ -23,9 +23,9 @@ import io.opentracing.Tracer;
import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.span.JaegerErrorSpan;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
@@ -49,7 +49,7 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAroundAdv
@Override
@SneakyThrows({ReflectiveOperationException.class, SQLException.class})
@SuppressWarnings("unchecked")
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
Span root = (Span) ((Map<String, Object>) args[2]).get(JaegerConstants.ROOT_SPAN);
Tracer.SpanBuilder builder = GlobalTracer.get().buildSpan(OPERATION_NAME);
if (null != root) {
@@ -73,12 +73,12 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAroundAdv
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
((Scope) target.getAttachment()).close();
}
@Override
- public void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ public void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
JaegerErrorSpan.setError(GlobalTracer.get().activeSpan(), throwable);
}
}
diff --git a/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdvice.java b/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdvice.java
index 185aefb9c17..78e1d399cc7 100644
--- a/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdvice.java
+++ b/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdvice.java
@@ -20,9 +20,9 @@ package org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice;
import io.opentracing.Scope;
import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.span.JaegerErrorSpan;
@@ -36,7 +36,7 @@ public final class SQLParserEngineAdvice implements InstanceMethodAroundAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
@Override
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
Scope scope = GlobalTracer.get().buildSpan(OPERATION_NAME)
.withTag(Tags.COMPONENT.getKey(), JaegerConstants.COMPONENT_NAME)
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT)
@@ -46,12 +46,12 @@ public final class SQLParserEngineAdvice implements InstanceMethodAroundAdvice {
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
((Scope) target.getAttachment()).close();
}
@Override
- public void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ public void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
JaegerErrorSpan.setError(GlobalTracer.get().activeSpan(), throwable);
}
}
diff --git a/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java b/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
index 8f9df7d5a49..818d3c26b6d 100644
--- a/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
+++ b/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice;
import io.opentracing.mock.MockSpan;
import io.opentracing.mock.MockSpan.LogEntry;
import io.opentracing.tag.Tags;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.advice.AbstractCommandExecutorTaskAdviceTest;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.collector.JaegerCollector;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
diff --git a/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceTest.java b/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceTest.java
index d6d809c1430..bd47a499cae 100644
--- a/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceTest.java
+++ b/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice;
import io.opentracing.mock.MockSpan;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.advice.AbstractJDBCExecutorCallbackAdviceTest;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.collector.JaegerCollector;
diff --git a/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceTest.java b/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceTest.java
index f3437aff247..f44368105b2 100644
--- a/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceTest.java
+++ b/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice;
import io.opentracing.mock.MockSpan;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.advice.AbstractSQLParserEngineAdviceTest;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
import org.apache.shardingsphere.agent.plugin.tracing.jaeger.collector.JaegerCollector;
diff --git a/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdvice.java b/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdvice.java
index 334054b161a..8bda490ec2b 100644
--- a/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdvice.java
+++ b/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdvice.java
@@ -22,9 +22,9 @@ import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanBuilder;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.StatusCode;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
@@ -38,7 +38,7 @@ public class CommandExecutorTaskAdvice implements InstanceMethodAroundAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/rootInvoke/";
@Override
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
SpanBuilder spanBuilder = GlobalOpenTelemetry.getTracer("shardingsphere-agent")
.spanBuilder(OPERATION_NAME)
.setAttribute(OpenTelemetryConstants.COMPONENT, OpenTelemetryConstants.COMPONENT_NAME)
@@ -49,13 +49,13 @@ public class CommandExecutorTaskAdvice implements InstanceMethodAroundAdvice {
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
((Span) target.getAttachment()).end();
ExecutorDataMap.getValue().remove(OpenTelemetryConstants.ROOT_SPAN);
}
@Override
- public void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ public void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
((Span) target.getAttachment()).setStatus(StatusCode.ERROR).recordException(throwable);
}
}
diff --git a/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java b/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
index 89fdbfaa0ab..29a41a9980e 100644
--- a/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
+++ b/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
@@ -24,9 +24,9 @@ import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
@@ -48,7 +48,7 @@ public class JDBCExecutorCallbackAdvice implements InstanceMethodAroundAdvice {
@Override
@SneakyThrows
@SuppressWarnings("unchecked")
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
Span root = (Span) ((Map<String, Object>) args[2]).get(OpenTelemetryConstants.ROOT_SPAN);
Tracer tracer = GlobalOpenTelemetry.getTracer("shardingsphere-agent");
SpanBuilder spanBuilder = tracer.spanBuilder(OPERATION_NAME);
@@ -72,12 +72,12 @@ public class JDBCExecutorCallbackAdvice implements InstanceMethodAroundAdvice {
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
((Span) target.getAttachment()).end();
}
@Override
- public void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ public void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
((Span) target.getAttachment()).setStatus(StatusCode.ERROR).recordException(throwable);
}
}
diff --git a/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdvice.java b/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdvice.java
index 61845ff8b89..485ffd158ce 100644
--- a/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdvice.java
+++ b/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdvice.java
@@ -23,9 +23,9 @@ import io.opentelemetry.api.trace.SpanBuilder;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
@@ -39,7 +39,7 @@ public class SQLParserEngineAdvice implements InstanceMethodAroundAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
@Override
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
Span root = (Span) ExecutorDataMap.getValue().get(OpenTelemetryConstants.ROOT_SPAN);
Tracer tracer = GlobalOpenTelemetry.getTracer("shardingsphere-agent");
SpanBuilder spanBuilder = tracer.spanBuilder(OPERATION_NAME)
@@ -53,12 +53,12 @@ public class SQLParserEngineAdvice implements InstanceMethodAroundAdvice {
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
((Span) target.getAttachment()).end();
}
@Override
- public void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ public void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
((Span) target.getAttachment()).setStatus(StatusCode.ERROR).recordException(throwable);
}
}
diff --git a/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceTest.java b/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceTest.java
index 4724d6e1443..6116081cbdd 100644
--- a/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceTest.java
+++ b/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceTest.java
@@ -21,7 +21,7 @@ import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.sdk.trace.data.SpanData;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.advice.AbstractCommandExecutorTaskAdviceTest;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.collector.OpenTelemetryCollector;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
diff --git a/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceTest.java b/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceTest.java
index 65b3b4573ec..72ad9c75bba 100644
--- a/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceTest.java
+++ b/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceTest.java
@@ -21,7 +21,7 @@ import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.sdk.trace.data.SpanData;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.advice.AbstractJDBCExecutorCallbackAdviceTest;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.collector.OpenTelemetryCollector;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
diff --git a/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceTest.java b/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceTest.java
index e46abac8c97..1b72ebe43fc 100644
--- a/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceTest.java
+++ b/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceTest.java
@@ -23,7 +23,7 @@ import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.sdk.trace.data.SpanData;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.advice.AbstractSQLParserEngineAdviceTest;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.collector.OpenTelemetryCollector;
import org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
diff --git a/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdvice.java b/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdvice.java
index 0397d7507c3..ab93294ed9b 100644
--- a/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdvice.java
+++ b/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdvice.java
@@ -20,9 +20,9 @@ package org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice;
import io.opentracing.Scope;
import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.constant.ShardingSphereTags;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.span.OpenTracingErrorSpan;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
@@ -39,7 +39,7 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAroundAdvi
private static final String ROOT_SPAN = "ot_root_span_";
@Override
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
Scope scope = GlobalTracer.get().buildSpan(OPERATION_NAME)
.withTag(Tags.COMPONENT.getKey(), ShardingSphereTags.COMPONENT_NAME)
.startActive(true);
@@ -47,13 +47,13 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAroundAdvi
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
GlobalTracer.get().scopeManager().active().close();
ExecutorDataMap.getValue().remove(ROOT_SPAN);
}
@Override
- public void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ public void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
OpenTracingErrorSpan.setError(GlobalTracer.get().activeSpan(), throwable);
}
}
diff --git a/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdvice.java b/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdvice.java
index a523936da69..3ab75bde6c6 100644
--- a/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdvice.java
+++ b/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdvice.java
@@ -22,9 +22,9 @@ import io.opentracing.Span;
import io.opentracing.Tracer;
import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.constant.ShardingSphereTags;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.span.OpenTracingErrorSpan;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
@@ -42,7 +42,7 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAroundAdv
@Override
@SuppressWarnings("unchecked")
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
Span root = (Span) ((Map<String, Object>) args[2]).get("ot_root_span_");
Tracer.SpanBuilder builder = GlobalTracer.get().buildSpan(OPERATION_NAME);
if ((boolean) args[1]) {
@@ -61,12 +61,12 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAroundAdv
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
((Scope) target.getAttachment()).close();
}
@Override
- public void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ public void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
OpenTracingErrorSpan.setError(GlobalTracer.get().activeSpan(), throwable);
}
}
diff --git a/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdvice.java b/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdvice.java
index e610e5d972d..d3dda3ed347 100644
--- a/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdvice.java
+++ b/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdvice.java
@@ -22,8 +22,8 @@ import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import java.lang.reflect.Method;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.constant.ShardingSphereTags;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.span.OpenTracingErrorSpan;
@@ -35,7 +35,7 @@ public final class SQLParserEngineAdvice implements InstanceMethodAroundAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
@Override
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
Scope scope = GlobalTracer.get().buildSpan(OPERATION_NAME)
.withTag(Tags.COMPONENT.getKey(), ShardingSphereTags.COMPONENT_NAME)
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT)
@@ -45,12 +45,12 @@ public final class SQLParserEngineAdvice implements InstanceMethodAroundAdvice {
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
((Scope) target.getAttachment()).close();
}
@Override
- public void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ public void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
OpenTracingErrorSpan.setError(GlobalTracer.get().activeSpan(), throwable);
}
}
diff --git a/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceTest.java b/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceTest.java
index b4298156adb..ba729c49e34 100644
--- a/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceTest.java
+++ b/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceTest.java
@@ -22,7 +22,7 @@ import io.opentracing.mock.MockSpan;
import io.opentracing.mock.MockSpan.LogEntry;
import io.opentracing.mock.MockTracer;
import io.opentracing.util.GlobalTracer;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.db.protocol.payload.PacketPayload;
import org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask;
import org.junit.Before;
@@ -65,7 +65,7 @@ public final class CommandExecutorTaskAdviceTest {
@Test
public void assertMethod() {
- MockAdviceTargetObject targetObject = new MockAdviceTargetObject();
+ MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
ADVICE.beforeMethod(targetObject, executeCommandMethod, new Object[]{}, new MethodInvocationResult());
ADVICE.afterMethod(targetObject, executeCommandMethod, new Object[]{}, new MethodInvocationResult());
List<MockSpan> spans = tracer.finishedSpans();
@@ -76,7 +76,7 @@ public final class CommandExecutorTaskAdviceTest {
@Test
public void assertExceptionHandle() {
- MockAdviceTargetObject targetObject = new MockAdviceTargetObject();
+ MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
ADVICE.beforeMethod(targetObject, executeCommandMethod, new Object[]{}, new MethodInvocationResult());
ADVICE.onThrowing(targetObject, executeCommandMethod, new Object[]{}, new IOException());
ADVICE.afterMethod(targetObject, executeCommandMethod, new Object[]{}, new MethodInvocationResult());
diff --git a/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceTest.java b/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceTest.java
index f56c9a531a2..1cae301d4ff 100644
--- a/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceTest.java
+++ b/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice;
import io.opentracing.mock.MockSpan;
import io.opentracing.mock.MockTracer;
import io.opentracing.util.GlobalTracer;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.constant.ErrorLogTagKeys;
import org.apache.shardingsphere.infra.executor.sql.context.ExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.context.SQLUnit;
@@ -68,7 +68,7 @@ public final class JDBCExecutorCallbackAdviceTest {
@Test
public void assertMethod() {
- MockAdviceTargetObject targetObject = new MockAdviceTargetObject();
+ MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
Map<String, Object> extraMap = Collections.singletonMap("_root_span_", null);
JDBCExecutionUnit executionUnit = mock(JDBCExecutionUnit.class);
when(executionUnit.getExecutionUnit()).thenReturn(new ExecutionUnit("mock.db", new SQLUnit("select 1", Collections.emptyList())));
@@ -88,7 +88,7 @@ public final class JDBCExecutorCallbackAdviceTest {
@Test
public void assertExceptionHandle() {
- MockAdviceTargetObject targetObject = new MockAdviceTargetObject();
+ MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
Map<String, Object> extraMap = Collections.singletonMap("_root_span_", null);
JDBCExecutionUnit executionUnit = mock(JDBCExecutionUnit.class);
when(executionUnit.getExecutionUnit()).thenReturn(new ExecutionUnit("mock.db", new SQLUnit("select 1", Collections.emptyList())));
diff --git a/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/MockAdviceTargetObject.java b/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/MockTargetAdviceObject.java
similarity index 88%
rename from agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/MockAdviceTargetObject.java
rename to agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/MockTargetAdviceObject.java
index 075abb3aac7..be9a9607105 100644
--- a/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/MockAdviceTargetObject.java
+++ b/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/MockTargetAdviceObject.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
-public final class MockAdviceTargetObject implements AdviceTargetObject {
+public final class MockTargetAdviceObject implements TargetAdviceObject {
private Object object;
diff --git a/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceTest.java b/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceTest.java
index b948bbdeb13..21b6d14e8bc 100644
--- a/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceTest.java
+++ b/agent/plugins/tracing/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice;
import io.opentracing.mock.MockSpan;
import io.opentracing.mock.MockTracer;
import io.opentracing.util.GlobalTracer;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.opentracing.constant.ErrorLogTagKeys;
import org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine;
import org.junit.Before;
@@ -62,7 +62,7 @@ public final class SQLParserEngineAdviceTest {
@Test
public void assertMethod() {
- MockAdviceTargetObject targetObject = new MockAdviceTargetObject();
+ MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
ADVICE.beforeMethod(targetObject, parserMethod, new Object[]{"select 1"}, new MethodInvocationResult());
ADVICE.afterMethod(targetObject, parserMethod, new Object[]{}, new MethodInvocationResult());
List<MockSpan> spans = tracer.finishedSpans();
@@ -73,7 +73,7 @@ public final class SQLParserEngineAdviceTest {
@Test
public void assertExceptionHandle() {
- MockAdviceTargetObject targetObject = new MockAdviceTargetObject();
+ MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
ADVICE.beforeMethod(targetObject, parserMethod, new Object[]{"select 1"}, new MethodInvocationResult());
ADVICE.onThrowing(targetObject, parserMethod, new Object[]{}, new IOException());
ADVICE.afterMethod(targetObject, parserMethod, new Object[]{}, new MethodInvocationResult());
diff --git a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/AgentRunner.java b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/AgentRunner.java
index 46fb450ffc0..dc6ead69f74 100644
--- a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/AgentRunner.java
+++ b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/AgentRunner.java
@@ -25,7 +25,7 @@ import net.bytebuddy.dynamic.scaffold.TypeValidation;
import net.bytebuddy.implementation.FieldAccessor;
import net.bytebuddy.jar.asm.Opcodes;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.plugin.tracing.advice.AdviceTestBase;
import org.apache.shardingsphere.agent.plugin.tracing.rule.CollectorRule;
import org.junit.rules.TestRule;
@@ -67,7 +67,7 @@ public final class AgentRunner extends BlockJUnit4ClassRunner {
.transform((builder, typeDescription, classLoader, module) -> {
if (classes.contains(typeDescription.getTypeName())) {
return builder.defineField(EXTRA_DATA, Object.class, Opcodes.ACC_PRIVATE | Opcodes.ACC_VOLATILE)
- .implement(AdviceTargetObject.class)
+ .implement(TargetAdviceObject.class)
.intercept(FieldAccessor.ofField(EXTRA_DATA));
}
return builder;
diff --git a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractCommandExecutorTaskAdviceTest.java b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractCommandExecutorTaskAdviceTest.java
index 738729e6dc3..f1a2a5d2996 100644
--- a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractCommandExecutorTaskAdviceTest.java
+++ b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractCommandExecutorTaskAdviceTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.advice;
import io.netty.util.DefaultAttributeMap;
import lombok.Getter;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.plugin.tracing.AgentRunner;
import org.apache.shardingsphere.agent.plugin.tracing.ProxyContextRestorer;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.mock;
public abstract class AbstractCommandExecutorTaskAdviceTest extends ProxyContextRestorer implements AdviceTestBase {
@Getter
- private AdviceTargetObject targetObject;
+ private TargetAdviceObject targetObject;
@SuppressWarnings("ConstantConditions")
@Override
@@ -45,6 +45,6 @@ public abstract class AbstractCommandExecutorTaskAdviceTest extends ProxyContext
ProxyContext.init(mock(ContextManager.class, RETURNS_DEEP_STUBS));
ConnectionSession connectionSession = new ConnectionSession(mock(MySQLDatabaseType.class), TransactionType.BASE, new DefaultAttributeMap());
Object executorTask = new CommandExecutorTask(null, connectionSession, null, null);
- targetObject = (AdviceTargetObject) executorTask;
+ targetObject = (TargetAdviceObject) executorTask;
}
}
diff --git a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
index f4a07c620b2..2c6923c8492 100644
--- a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
+++ b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.advice;
import lombok.Getter;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.plugin.tracing.AgentRunner;
import org.apache.shardingsphere.agent.plugin.tracing.MockDataSourceMetaData;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
@@ -49,7 +49,7 @@ import static org.mockito.Mockito.when;
public abstract class AbstractJDBCExecutorCallbackAdviceTest implements AdviceTestBase {
@Getter
- private AdviceTargetObject targetObject;
+ private TargetAdviceObject targetObject;
private Object attachment;
@@ -88,6 +88,6 @@ public abstract class AbstractJDBCExecutorCallbackAdviceTest implements AdviceTe
Map<String, DatabaseType> storageTypes = new LinkedHashMap<>(1, 1);
storageTypes.put("mock.db", new MySQLDatabaseType());
ReflectiveUtil.setField(mock, "storageTypes", storageTypes);
- targetObject = (AdviceTargetObject) mock;
+ targetObject = (TargetAdviceObject) mock;
}
}
diff --git a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractSQLParserEngineAdviceTest.java b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractSQLParserEngineAdviceTest.java
index c0a1302ceda..2fceabb4e71 100644
--- a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractSQLParserEngineAdviceTest.java
+++ b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractSQLParserEngineAdviceTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.advice;
import lombok.Getter;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.plugin.tracing.AgentRunner;
import org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine;
import org.junit.runner.RunWith;
@@ -29,7 +29,7 @@ import static org.mockito.Mockito.mock;
public abstract class AbstractSQLParserEngineAdviceTest implements AdviceTestBase {
@Getter
- private AdviceTargetObject targetObject;
+ private TargetAdviceObject targetObject;
private Object attachment;
@@ -47,6 +47,6 @@ public abstract class AbstractSQLParserEngineAdviceTest implements AdviceTestBas
return invocation.callRealMethod();
}
});
- targetObject = (AdviceTargetObject) parserEngine;
+ targetObject = (TargetAdviceObject) parserEngine;
}
}
diff --git a/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java b/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java
index 8e36ec44376..0a33f3e617c 100644
--- a/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java
+++ b/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java
@@ -21,8 +21,8 @@ import brave.Span;
import brave.Tracing;
import lombok.SneakyThrows;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.JDBCBackendConnection;
@@ -40,7 +40,7 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAroundAdvi
private static final String OPERATION_NAME = "/ShardingSphere/rootInvoke/";
@Override
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
Span span = Tracing.currentTracer().newTrace().name(OPERATION_NAME);
span.tag(ZipkinConstants.Tags.COMPONENT, ZipkinConstants.COMPONENT_NAME).kind(Span.Kind.CLIENT)
.tag(ZipkinConstants.Tags.DB_TYPE, ZipkinConstants.DB_TYPE_VALUE).start();
@@ -49,7 +49,7 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAroundAdvi
@SneakyThrows(ReflectiveOperationException.class)
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
Field field = CommandExecutorTask.class.getDeclaredField("connectionSession");
field.setAccessible(true);
JDBCBackendConnection connection = (JDBCBackendConnection) ((ConnectionSession) field.get(target)).getBackendConnection();
@@ -59,7 +59,7 @@ public final class CommandExecutorTaskAdvice implements InstanceMethodAroundAdvi
}
@Override
- public void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ public void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
((Span) ExecutorDataMap.getValue().get(ZipkinConstants.ROOT_SPAN)).error(throwable);
}
}
diff --git a/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java b/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
index 7d0ebf320a1..477a778dbd3 100644
--- a/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
+++ b/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
@@ -20,9 +20,9 @@ package org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice;
import brave.Span;
import brave.Tracing;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
@@ -45,7 +45,7 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAroundAdv
@Override
@SneakyThrows({ReflectiveOperationException.class, SQLException.class})
@SuppressWarnings("unchecked")
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
Span root = (Span) ((Map<String, Object>) args[2]).get(ZipkinConstants.ROOT_SPAN);
Span span = null == root ? Tracing.currentTracer().nextSpan().name(OPERATION_NAME) : Tracing.currentTracer().newChild(root.context()).name(OPERATION_NAME);
span.tag(ZipkinConstants.Tags.COMPONENT, ZipkinConstants.COMPONENT_NAME);
@@ -66,12 +66,12 @@ public final class JDBCExecutorCallbackAdvice implements InstanceMethodAroundAdv
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
((Span) target.getAttachment()).finish();
}
@Override
- public void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ public void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
((Span) target.getAttachment()).error(throwable);
}
}
diff --git a/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdvice.java b/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdvice.java
index 9079e6d0259..14e5bdbf8bb 100644
--- a/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdvice.java
+++ b/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdvice.java
@@ -21,8 +21,8 @@ import brave.Span;
import brave.Tracing;
import brave.propagation.TraceContext;
import org.apache.shardingsphere.agent.api.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.api.advice.AdviceTargetObject;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.TargetAdviceObject;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
@@ -36,7 +36,7 @@ public final class SQLParserEngineAdvice implements InstanceMethodAroundAdvice {
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
@Override
- public void beforeMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void beforeMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
TraceContext parentContext = ((Span) ExecutorDataMap.getValue().get(ZipkinConstants.ROOT_SPAN)).context();
Span span = Tracing.currentTracer().newChild(parentContext).name(OPERATION_NAME);
span.tag(ZipkinConstants.Tags.COMPONENT, ZipkinConstants.COMPONENT_NAME);
@@ -47,12 +47,12 @@ public final class SQLParserEngineAdvice implements InstanceMethodAroundAdvice {
}
@Override
- public void afterMethod(final AdviceTargetObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
+ public void afterMethod(final TargetAdviceObject target, final Method method, final Object[] args, final MethodInvocationResult result) {
((Span) target.getAttachment()).finish();
}
@Override
- public void onThrowing(final AdviceTargetObject target, final Method method, final Object[] args, final Throwable throwable) {
+ public void onThrowing(final TargetAdviceObject target, final Method method, final Object[] args, final Throwable throwable) {
((Span) target.getAttachment()).error(throwable);
}
}
diff --git a/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java b/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
index 55e56f24d99..f24c52f4453 100644
--- a/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
+++ b/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.advice.AbstractCommandExecutorTaskAdviceTest;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.collector.ZipkinCollector;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
diff --git a/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java b/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
index 9b5f2bd921e..849f065d62f 100644
--- a/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
+++ b/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.advice.AbstractJDBCExecutorCallbackAdviceTest;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.collector.ZipkinCollector;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
diff --git a/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java b/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
index 1672cb9bdc5..a33e7f88be5 100644
--- a/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
+++ b/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice;
import brave.Span;
import brave.Tracing;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+import org.apache.shardingsphere.agent.api.MethodInvocationResult;
import org.apache.shardingsphere.agent.plugin.tracing.advice.AbstractSQLParserEngineAdviceTest;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.collector.ZipkinCollector;
import org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;