This is an automated email from the ASF dual-hosted git repository.
jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 59851443f45 Rename AgentAdviceExecutor (#22927)
59851443f45 is described below
commit 59851443f452e51cc0330a85a4a6c7cffeccaf60
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Dec 17 00:13:09 2022 +0800
Rename AgentAdviceExecutor (#22927)
* Rename AgentAdviceExecutor
* Rename AgentAdviceExecutor
* Remove AgentAdviceExecutor
---
.../agent/core/plugin/advice/AgentAdvice.java | 24 ----------------------
.../plugin/interceptor/ConstructorInterceptor.java | 6 +++---
.../InstanceMethodAroundInterceptor.java | 10 ++++-----
.../interceptor/StaticMethodAroundInterceptor.java | 10 ++++-----
.../executor/ConstructorAdviceExecutor.java} | 6 +++---
.../executor/InstanceMethodAdviceExecutor.java} | 6 +++---
.../executor/StaticMethodAdviceExecutor.java} | 6 +++---
.../builder/type/ConstructorAdvisorBuilder.java | 8 ++++----
.../builder/type/InstanceMethodAdvisorBuilder.java | 8 ++++----
.../builder/type/StaticMethodAdvisorBuilder.java | 7 ++++---
...ice.java => MockConstructorAdviceExecutor.java} | 8 ++++----
....java => MockInstanceMethodAdviceExecutor.java} | 6 +++---
... MockInstanceMethodRepeatedAdviceExecutor.java} | 4 ++--
...ce.java => MockStaticMethodAdviceExecutor.java} | 6 +++---
.../ConstructorYamlAdvisorConfigurationTest.java | 4 ++--
...ceMethodAroundYamlAdvisorConfigurationTest.java | 4 ++--
...icMethodAroundYamlAdvisorConfigurationTest.java | 6 +++---
.../core/transformer/AgentTransformerTest.java | 18 ++++++++--------
... => MetaDataContextsFactoryAdviceExecutor.java} | 6 +++---
.../BaseLoggingAdvisorDefinitionService.java | 4 ++--
...vice.java => ChannelHandlerAdviceExecutor.java} | 6 +++---
...java => CommandExecutorTaskAdviceExecutor.java} | 6 +++---
...ice.java => SQLParserEngineAdviceExecutor.java} | 6 +++---
...vice.java => SQLRouteEngineAdviceExecutor.java} | 6 +++---
...nAdvice.java => TransactionAdviceExecutor.java} | 6 +++---
.../api/advice/ChannelHandlerAdviceTest.java | 8 ++++----
.../api/advice/CommandExecutorTaskAdviceTest.java | 6 +++---
.../api/advice/SQLParserEngineAdviceTest.java | 2 +-
.../api/advice/SQLRouteEngineAdviceTest.java | 2 +-
.../metrics/api/advice/TransactionAdviceTest.java | 6 +++---
.../tracing/core/advice/TracingAdviceEngine.java | 20 +++++++++---------
.../core/advice/adviser/TracingAdviser.java | 6 +++---
.../adviser/impl/CommandExecutorTaskAdviser.java | 6 +++---
.../adviser/impl/JDBCExecutorCallbackAdviser.java | 6 +++---
.../adviser/impl/SQLParserEngineAdviser.java | 6 +++---
...java => CommandExecutorTaskAdviceExecutor.java} | 6 +++---
...ava => JDBCExecutorCallbackAdviceExecutor.java} | 6 +++---
...ice.java => SQLParserEngineAdviceExecutor.java} | 6 +++---
.../definition/JaegerAdvisorDefinitionService.java | 6 +++---
.../advice/CommandExecutorTaskAdviceTest.java | 2 +-
.../advice/JDBCExecutorCallbackAdviceTest.java | 2 +-
.../jaeger/advice/SQLParserEngineAdviceTest.java | 2 +-
...java => CommandExecutorTaskAdviceExecutor.java} | 6 +++---
...ava => JDBCExecutorCallbackAdviceExecutor.java} | 6 +++---
...ice.java => SQLParserEngineAdviceExecutor.java} | 6 +++---
...enTelemetryTracingAdvisorDefinitionService.java | 6 +++---
.../advice/CommandExecutorTaskAdviceTest.java | 4 ++--
.../advice/JDBCExecutorCallbackAdviceTest.java | 4 ++--
.../advice/SQLParserEngineAdviceTest.java | 4 ++--
...java => CommandExecutorTaskAdviceExecutor.java} | 6 +++---
...ava => JDBCExecutorCallbackAdviceExecutor.java} | 6 +++---
...ice.java => SQLParserEngineAdviceExecutor.java} | 11 +++++-----
.../OpenTracingAdvisorDefinitionService.java | 6 +++---
.../advice/CommandExecutorTaskAdviceTest.java | 2 +-
.../advice/JDBCExecutorCallbackAdviceTest.java | 2 +-
.../advice/SQLParserEngineAdviceTest.java | 2 +-
...java => CommandExecutorTaskAdviceExecutor.java} | 6 +++---
...ava => JDBCExecutorCallbackAdviceExecutor.java} | 6 +++---
...ice.java => SQLParserEngineAdviceExecutor.java} | 6 +++---
.../definition/ZipkinAdvisorDefinitionService.java | 6 +++---
.../advice/CommandExecutorTaskAdviceTest.java | 4 ++--
.../advice/JDBCExecutorCallbackAdviceTest.java | 4 ++--
.../zipkin/advice/SQLParserEngineAdviceTest.java | 4 ++--
63 files changed, 185 insertions(+), 207 deletions(-)
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/AgentAdvice.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/AgentAdvice.java
deleted file mode 100644
index aeeb099e697..00000000000
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/AgentAdvice.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.agent.core.plugin.advice;
-
-/**
- * Agent advice.
- */
-public interface AgentAdvice {
-}
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 e1deb155fc8..08132109806 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
@@ -22,7 +22,7 @@ import
net.bytebuddy.implementation.bind.annotation.AllArguments;
import net.bytebuddy.implementation.bind.annotation.RuntimeType;
import net.bytebuddy.implementation.bind.annotation.This;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import org.apache.shardingsphere.agent.core.plugin.advice.ConstructorAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.ConstructorAdviceExecutor;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
@@ -37,7 +37,7 @@ public class ConstructorInterceptor {
private static final Logger LOGGER =
LoggerFactory.getLogger(ConstructorInterceptor.class);
- private final Collection<ConstructorAdvice> advices;
+ private final Collection<ConstructorAdviceExecutor> executors;
/**
* Intercept constructor.
@@ -50,7 +50,7 @@ public class ConstructorInterceptor {
boolean adviceEnabled = PluginContext.isPluginEnabled();
try {
if (adviceEnabled) {
- for (ConstructorAdvice each : advices) {
+ for (ConstructorAdviceExecutor each : executors) {
each.onConstructor(target, args);
}
}
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptor.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundInterceptor.java
index 051fcaaafda..b0be2604b3a 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
@@ -28,7 +28,7 @@ import
org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import java.lang.reflect.Method;
import java.util.Collection;
@@ -42,7 +42,7 @@ public class InstanceMethodAroundInterceptor {
private static final LoggerFactory.Logger LOGGER =
LoggerFactory.getLogger(InstanceMethodAroundInterceptor.class);
- private final Collection<InstanceMethodAroundAdvice> advices;
+ private final Collection<InstanceMethodAdviceExecutor> executors;
/**
* Only intercept instance method.
@@ -61,7 +61,7 @@ public class InstanceMethodAroundInterceptor {
boolean adviceEnabled = PluginContext.isPluginEnabled();
try {
if (adviceEnabled) {
- for (InstanceMethodAroundAdvice each : advices) {
+ for (InstanceMethodAdviceExecutor each : executors) {
each.beforeMethod(target, method, args, methodResult);
}
}
@@ -82,7 +82,7 @@ public class InstanceMethodAroundInterceptor {
// CHECKSTYLE:ON
try {
if (adviceEnabled) {
- for (InstanceMethodAroundAdvice each : advices) {
+ for (InstanceMethodAdviceExecutor each : executors) {
each.onThrowing(target, method, args, ex);
}
}
@@ -95,7 +95,7 @@ public class InstanceMethodAroundInterceptor {
} finally {
try {
if (adviceEnabled) {
- for (InstanceMethodAroundAdvice each : advices) {
+ for (InstanceMethodAdviceExecutor each : executors) {
each.afterMethod(target, method, args, methodResult);
}
}
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 a6d39e3ec2e..3f2d2f8e530 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
@@ -26,7 +26,7 @@ import net.bytebuddy.implementation.bind.annotation.SuperCall;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.core.plugin.PluginContext;
-import
org.apache.shardingsphere.agent.core.plugin.advice.StaticMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.StaticMethodAdviceExecutor;
import java.lang.reflect.Method;
import java.util.Collection;
@@ -40,7 +40,7 @@ public class StaticMethodAroundInterceptor {
private static final LoggerFactory.Logger LOGGER =
LoggerFactory.getLogger(StaticMethodAroundInterceptor.class);
- private final Collection<StaticMethodAroundAdvice> advices;
+ private final Collection<StaticMethodAdviceExecutor> executors;
/**
* Only intercept static method.
@@ -59,7 +59,7 @@ public class StaticMethodAroundInterceptor {
boolean adviceEnabled = PluginContext.isPluginEnabled();
try {
if (adviceEnabled) {
- for (StaticMethodAroundAdvice each : advices) {
+ for (StaticMethodAdviceExecutor each : executors) {
each.beforeMethod(klass, method, args, methodResult);
}
}
@@ -80,7 +80,7 @@ public class StaticMethodAroundInterceptor {
// CHECKSTYLE:ON
try {
if (adviceEnabled) {
- for (StaticMethodAroundAdvice each : advices) {
+ for (StaticMethodAdviceExecutor each : executors) {
each.onThrowing(klass, method, args, ex);
}
}
@@ -93,7 +93,7 @@ public class StaticMethodAroundInterceptor {
} finally {
try {
if (adviceEnabled) {
- for (StaticMethodAroundAdvice each : advices) {
+ for (StaticMethodAdviceExecutor each : executors) {
each.afterMethod(klass, method, args, methodResult);
}
}
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorAdvice.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/ConstructorAdviceExecutor.java
similarity index 86%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorAdvice.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/ConstructorAdviceExecutor.java
index 3a750328122..0f633764785 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/ConstructorAdvice.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/ConstructorAdviceExecutor.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advice;
+package org.apache.shardingsphere.agent.core.plugin.interceptor.executor;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
/**
- * Weaving the advice around the constructor of target class.
+ * Constructor advice executor.
*/
-public interface ConstructorAdvice extends AgentAdvice {
+public interface ConstructorAdviceExecutor {
/**
* Intercept the target's constructor.
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAroundAdvice.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/InstanceMethodAdviceExecutor.java
similarity index 93%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAroundAdvice.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/InstanceMethodAdviceExecutor.java
index a8f5671bc5b..e0a1f5e1587 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/InstanceMethodAroundAdvice.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/InstanceMethodAdviceExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advice;
+package org.apache.shardingsphere.agent.core.plugin.interceptor.executor;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
@@ -23,9 +23,9 @@ import
org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import java.lang.reflect.Method;
/**
- * Weaving the advice around the target method.
+ * Instance method advice executor.
*/
-public interface InstanceMethodAroundAdvice extends AgentAdvice {
+public interface InstanceMethodAdviceExecutor {
/**
* Intercept the target method and weave the method before origin method.
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundAdvice.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/StaticMethodAdviceExecutor.java
similarity index 92%
rename from
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundAdvice.java
rename to
agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/StaticMethodAdviceExecutor.java
index d5687cc3fd6..b53a9323f1f 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advice/StaticMethodAroundAdvice.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/interceptor/executor/StaticMethodAdviceExecutor.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin.advice;
+package org.apache.shardingsphere.agent.core.plugin.interceptor.executor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import java.lang.reflect.Method;
/**
- * Weaving the advice around the static methods of target class.
+ * Static method advice executor.
*/
-public interface StaticMethodAroundAdvice extends AgentAdvice {
+public interface StaticMethodAdviceExecutor {
/**
* Intercept the target method and weave the method before origin method.
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/ConstructorAdvisorBuilder.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/ConstructorAdvisorBuilder.java
index bcb283ac44f..76d446fc1da 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/ConstructorAdvisorBuilder.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/ConstructorAdvisorBuilder.java
@@ -24,7 +24,7 @@ import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.implementation.SuperMethodCall;
import net.bytebuddy.matcher.ElementMatchers;
import
org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.plugin.advice.ConstructorAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.ConstructorAdviceExecutor;
import
org.apache.shardingsphere.agent.core.plugin.interceptor.ConstructorInterceptor;
import org.apache.shardingsphere.agent.core.transformer.MethodAdvisor;
import
org.apache.shardingsphere.agent.core.transformer.build.advise.AdviceFactory;
@@ -55,8 +55,8 @@ public final class ConstructorAdvisorBuilder implements
MethodAdvisorBuilder {
@Override
public MethodAdvisor getMethodAdvisor(final InDefinedShape
methodDescription, final List<MethodAdvisorConfiguration> advisorConfigs) {
- Collection<ConstructorAdvice> advices = advisorConfigs
-
.stream().map(MethodAdvisorConfiguration::getAdviceClassName).map(each ->
(ConstructorAdvice) adviceFactory.getAdvice(each)).collect(Collectors.toList());
- return new MethodAdvisor(methodDescription, new
ConstructorInterceptor(advices));
+ Collection<ConstructorAdviceExecutor> adviceExecutors = advisorConfigs
+
.stream().map(MethodAdvisorConfiguration::getAdviceClassName).map(each ->
(ConstructorAdviceExecutor)
adviceFactory.getAdvice(each)).collect(Collectors.toList());
+ return new MethodAdvisor(methodDescription, new
ConstructorInterceptor(adviceExecutors));
}
}
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/InstanceMethodAdvisorBuilder.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/InstanceMethodAdvisorBuilder.java
index 70dc1cb8250..f55806094d8 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/InstanceMethodAdvisorBuilder.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/InstanceMethodAdvisorBuilder.java
@@ -23,7 +23,7 @@ import net.bytebuddy.dynamic.DynamicType.Builder;
import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.matcher.ElementMatchers;
import
org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import
org.apache.shardingsphere.agent.core.plugin.interceptor.InstanceMethodAroundInterceptor;
import org.apache.shardingsphere.agent.core.transformer.MethodAdvisor;
import
org.apache.shardingsphere.agent.core.transformer.build.advise.AdviceFactory;
@@ -53,8 +53,8 @@ public final class InstanceMethodAdvisorBuilder implements
MethodAdvisorBuilder
@Override
public MethodAdvisor getMethodAdvisor(final InDefinedShape
methodDescription, final List<MethodAdvisorConfiguration> advisorConfigs) {
- Collection<InstanceMethodAroundAdvice> advices = advisorConfigs
- .stream().<InstanceMethodAroundAdvice>map(each ->
adviceFactory.getAdvice(each.getAdviceClassName())).collect(Collectors.toList());
- return new MethodAdvisor(methodDescription, new
InstanceMethodAroundInterceptor(advices));
+ Collection<InstanceMethodAdviceExecutor> adviceExecutors =
advisorConfigs
+ .stream().<InstanceMethodAdviceExecutor>map(each ->
adviceFactory.getAdvice(each.getAdviceClassName())).collect(Collectors.toList());
+ return new MethodAdvisor(methodDescription, new
InstanceMethodAroundInterceptor(adviceExecutors));
}
}
diff --git
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/StaticMethodAdvisorBuilder.java
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/StaticMethodAdvisorBuilder.java
index 8a57e43e5d7..7d6a2355a1e 100644
---
a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/StaticMethodAdvisorBuilder.java
+++
b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/build/builder/type/StaticMethodAdvisorBuilder.java
@@ -23,7 +23,7 @@ import net.bytebuddy.dynamic.DynamicType.Builder;
import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.matcher.ElementMatchers;
import
org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.advice.StaticMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.StaticMethodAdviceExecutor;
import
org.apache.shardingsphere.agent.core.plugin.interceptor.StaticMethodAroundInterceptor;
import org.apache.shardingsphere.agent.core.transformer.MethodAdvisor;
import
org.apache.shardingsphere.agent.core.transformer.build.advise.AdviceFactory;
@@ -53,7 +53,8 @@ public final class StaticMethodAdvisorBuilder implements
MethodAdvisorBuilder {
@Override
public MethodAdvisor getMethodAdvisor(final InDefinedShape
methodDescription, final List<MethodAdvisorConfiguration> advisorConfigs) {
- Collection<StaticMethodAroundAdvice> advices =
advisorConfigs.stream().<StaticMethodAroundAdvice>map(each ->
adviceFactory.getAdvice(each.getAdviceClassName())).collect(Collectors.toList());
- return new MethodAdvisor(methodDescription, new
StaticMethodAroundInterceptor(advices));
+ Collection<StaticMethodAdviceExecutor> adviceExecutors = advisorConfigs
+ .stream().<StaticMethodAdviceExecutor>map(each ->
adviceFactory.getAdvice(each.getAdviceClassName())).collect(Collectors.toList());
+ return new MethodAdvisor(methodDescription, new
StaticMethodAroundInterceptor(adviceExecutors));
}
}
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/MockConstructorAdviceExecutor.java
similarity index 86%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockConstructorAdvice.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockConstructorAdviceExecutor.java
index 8feb9bcc451..33ab0b2decf 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/MockConstructorAdviceExecutor.java
@@ -17,19 +17,19 @@
package org.apache.shardingsphere.agent.core.mock.advice;
-import java.util.Optional;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.agent.core.plugin.advice.ConstructorAdvice;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.ConstructorAdviceExecutor;
import java.util.List;
+import java.util.Optional;
@RequiredArgsConstructor
-public final class MockConstructorAdvice implements ConstructorAdvice {
+public final class MockConstructorAdviceExecutor implements
ConstructorAdviceExecutor {
private final List<String> queues;
- public MockConstructorAdvice() {
+ public MockConstructorAdviceExecutor() {
this(null);
}
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/MockInstanceMethodAdviceExecutor.java
similarity index 89%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAroundAdvice.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAdviceExecutor.java
index 4fe80f982d0..1f31fc45cd5 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/MockInstanceMethodAdviceExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.core.mock.advice;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
@@ -27,11 +27,11 @@ import java.util.List;
@RequiredArgsConstructor
@SuppressWarnings("unchecked")
-public final class MockInstanceMethodAroundAdvice implements
InstanceMethodAroundAdvice {
+public final class MockInstanceMethodAdviceExecutor implements
InstanceMethodAdviceExecutor {
private final boolean rebase;
- public MockInstanceMethodAroundAdvice() {
+ public MockInstanceMethodAdviceExecutor() {
this(false);
}
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/MockInstanceMethodRepeatedAdviceExecutor.java
similarity index 90%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodAroundRepeatedAdvice.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockInstanceMethodRepeatedAdviceExecutor.java
index 36d12ac3cc7..55595051870 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/MockInstanceMethodRepeatedAdviceExecutor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.core.mock.advice;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
@@ -25,7 +25,7 @@ import java.lang.reflect.Method;
import java.util.List;
@SuppressWarnings("unchecked")
-public final class MockInstanceMethodAroundRepeatedAdvice implements
InstanceMethodAroundAdvice {
+public final class MockInstanceMethodRepeatedAdviceExecutor implements
InstanceMethodAdviceExecutor {
@Override
public void beforeMethod(final TargetAdviceObject target, final Method
method, final Object[] args, final MethodInvocationResult result) {
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/MockStaticMethodAdviceExecutor.java
similarity index 89%
rename from
agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockStaticMethodAroundAdvice.java
rename to
agent/core/src/test/java/org/apache/shardingsphere/agent/core/mock/advice/MockStaticMethodAdviceExecutor.java
index 2fb3820c89e..dd89eaf8e2c 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/MockStaticMethodAdviceExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.core.mock.advice;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.agent.core.plugin.advice.StaticMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.StaticMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import java.lang.reflect.Method;
@@ -26,11 +26,11 @@ import java.util.List;
@RequiredArgsConstructor
@SuppressWarnings("unchecked")
-public final class MockStaticMethodAroundAdvice implements
StaticMethodAroundAdvice {
+public final class MockStaticMethodAdviceExecutor implements
StaticMethodAdviceExecutor {
private final boolean rebase;
- public MockStaticMethodAroundAdvice() {
+ public MockStaticMethodAdviceExecutor() {
this(false);
}
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorYamlAdvisorConfigurationTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorYamlAdvisorConfigurationTest.java
index 73466a78ea8..c4fdec8625e 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorYamlAdvisorConfigurationTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/ConstructorYamlAdvisorConfigurationTest.java
@@ -29,7 +29,7 @@ import net.bytebuddy.jar.asm.Opcodes;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.logging.LoggingListener;
-import org.apache.shardingsphere.agent.core.mock.advice.MockConstructorAdvice;
+import
org.apache.shardingsphere.agent.core.mock.advice.MockConstructorAdviceExecutor;
import org.apache.shardingsphere.agent.core.mock.material.ConstructorMaterial;
import org.junit.After;
import org.junit.AfterClass;
@@ -70,7 +70,7 @@ public final class ConstructorYamlAdvisorConfigurationTest {
.intercept(FieldAccessor.ofField(EXTRA_DATA))
.constructor(ElementMatchers.isConstructor())
.intercept(SuperMethodCall.INSTANCE.andThen(MethodDelegation.withDefaultConfiguration()
- .to(new
ConstructorInterceptor(Collections.singleton(new
MockConstructorAdvice(QUEUE))))));
+ .to(new
ConstructorInterceptor(Collections.singleton(new
MockConstructorAdviceExecutor(QUEUE))))));
}
return builder;
})
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundYamlAdvisorConfigurationTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundYamlAdvisorConfigurationTest.java
index 11d43c31803..69d733385d1 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundYamlAdvisorConfigurationTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/InstanceMethodAroundYamlAdvisorConfigurationTest.java
@@ -28,7 +28,7 @@ import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.jar.asm.Opcodes;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.mock.advice.MockInstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.mock.advice.MockInstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.mock.material.InstanceMaterial;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -96,7 +96,7 @@ public final class
InstanceMethodAroundYamlAdvisorConfigurationTest {
InstanceMaterial material = new ByteBuddy()
.subclass(InstanceMaterial.class)
.method(ElementMatchers.named(methodName))
- .intercept(MethodDelegation.withDefaultConfiguration().to(new
InstanceMethodAroundInterceptor(Collections.singleton(new
MockInstanceMethodAroundAdvice(rebase)))))
+ .intercept(MethodDelegation.withDefaultConfiguration().to(new
InstanceMethodAroundInterceptor(Collections.singleton(new
MockInstanceMethodAdviceExecutor(rebase)))))
.make()
.load(new MockClassLoader())
.getLoaded()
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundYamlAdvisorConfigurationTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundYamlAdvisorConfigurationTest.java
index 811dc959f39..4eb8e1b8625 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundYamlAdvisorConfigurationTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/interceptor/StaticMethodAroundYamlAdvisorConfigurationTest.java
@@ -28,7 +28,7 @@ import net.bytebuddy.implementation.MethodDelegation;
import net.bytebuddy.jar.asm.Opcodes;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.mock.advice.MockStaticMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.mock.advice.MockStaticMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.mock.material.StaticMaterial;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -83,9 +83,9 @@ public final class
StaticMethodAroundYamlAdvisorConfigurationTest {
.implement(TargetAdviceObject.class)
.intercept(FieldAccessor.ofField(EXTRA_DATA))
.method(ElementMatchers.named("staticMockWithException"))
-
.intercept(MethodDelegation.withDefaultConfiguration().to(new
StaticMethodAroundInterceptor(Collections.singleton(new
MockStaticMethodAroundAdvice(false)))))
+
.intercept(MethodDelegation.withDefaultConfiguration().to(new
StaticMethodAroundInterceptor(Collections.singleton(new
MockStaticMethodAdviceExecutor(false)))))
.method(ElementMatchers.named("staticMock"))
-
.intercept(MethodDelegation.withDefaultConfiguration().to(new
StaticMethodAroundInterceptor(Collections.singleton(new
MockStaticMethodAroundAdvice(true)))));
+
.intercept(MethodDelegation.withDefaultConfiguration().to(new
StaticMethodAroundInterceptor(Collections.singleton(new
MockStaticMethodAdviceExecutor(true)))));
}
return builder;
})
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
index ea7c6626513..598c663c574 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
@@ -27,10 +27,10 @@ import
org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import
org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
import org.apache.shardingsphere.agent.core.classloader.AgentClassLoader;
import org.apache.shardingsphere.agent.core.logging.LoggingListener;
-import org.apache.shardingsphere.agent.core.mock.advice.MockConstructorAdvice;
-import
org.apache.shardingsphere.agent.core.mock.advice.MockInstanceMethodAroundAdvice;
-import
org.apache.shardingsphere.agent.core.mock.advice.MockInstanceMethodAroundRepeatedAdvice;
-import
org.apache.shardingsphere.agent.core.mock.advice.MockStaticMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.mock.advice.MockConstructorAdviceExecutor;
+import
org.apache.shardingsphere.agent.core.mock.advice.MockInstanceMethodAdviceExecutor;
+import
org.apache.shardingsphere.agent.core.mock.advice.MockInstanceMethodRepeatedAdviceExecutor;
+import
org.apache.shardingsphere.agent.core.mock.advice.MockStaticMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.mock.material.Material;
import
org.apache.shardingsphere.agent.core.mock.material.RepeatedAdviceMaterial;
import org.junit.After;
@@ -76,16 +76,16 @@ public final class AgentTransformerTest {
private static AdvisorConfiguration createAdvisorConfiguration() {
AdvisorConfiguration result = new
AdvisorConfiguration("org.apache.shardingsphere.agent.core.mock.material.Material");
- result.getConstructorAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.takesArguments(1),
MockConstructorAdvice.class.getTypeName()));
- result.getInstanceMethodAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.named("mock"),
MockInstanceMethodAroundAdvice.class.getTypeName()));
- result.getStaticMethodAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.named("staticMock"),
MockStaticMethodAroundAdvice.class.getTypeName()));
+ result.getConstructorAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.takesArguments(1),
MockConstructorAdviceExecutor.class.getTypeName()));
+ result.getInstanceMethodAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.named("mock"),
MockInstanceMethodAdviceExecutor.class.getTypeName()));
+ result.getStaticMethodAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.named("staticMock"),
MockStaticMethodAdviceExecutor.class.getTypeName()));
return result;
}
private static AdvisorConfiguration createAdvisorConfigurationInTwice() {
AdvisorConfiguration result = new
AdvisorConfiguration("org.apache.shardingsphere.agent.core.mock.material.RepeatedAdviceMaterial");
- result.getInstanceMethodAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.named("mock"),
MockInstanceMethodAroundAdvice.class.getTypeName()));
- result.getInstanceMethodAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.named("mock"),
MockInstanceMethodAroundRepeatedAdvice.class.getTypeName()));
+ result.getInstanceMethodAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.named("mock"),
MockInstanceMethodAdviceExecutor.class.getTypeName()));
+ result.getInstanceMethodAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.named("mock"),
MockInstanceMethodRepeatedAdviceExecutor.class.getTypeName()));
return result;
}
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/MetaDataContextsFactoryAdviceExecutor.java
similarity index 88%
rename from
agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdvice.java
rename to
agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdviceExecutor.java
index efd44ec7a3e..a4962193267 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/MetaDataContextsFactoryAdviceExecutor.java
@@ -18,17 +18,17 @@
package org.apache.shardingsphere.agent.plugin.logging.base.advice;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.shardingsphere.agent.core.plugin.advice.StaticMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.StaticMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import
org.apache.shardingsphere.agent.plugin.logging.base.threadlocal.ElapsedTimeThreadLocal;
import java.lang.reflect.Method;
/**
- * Schema meta data loader advice.
+ * Schema meta data loader advice executor.
*/
@Slf4j
-public final class MetaDataContextsFactoryAdvice implements
StaticMethodAroundAdvice {
+public final class MetaDataContextsFactoryAdviceExecutor implements
StaticMethodAdviceExecutor {
@Override
public void beforeMethod(final Class<?> clazz, final Method method, final
Object[] args, final MethodInvocationResult result) {
diff --git
a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingAdvisorDefinitionService.java
b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingAdvisorDefinitionService.java
index 9ea2aebc250..907f32a5f8e 100644
---
a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingAdvisorDefinitionService.java
+++
b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingAdvisorDefinitionService.java
@@ -21,7 +21,7 @@ import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import
org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
-import
org.apache.shardingsphere.agent.plugin.logging.base.advice.MetaDataContextsFactoryAdvice;
+import
org.apache.shardingsphere.agent.plugin.logging.base.advice.MetaDataContextsFactoryAdviceExecutor;
import org.apache.shardingsphere.agent.spi.advisor.AdvisorDefinitionService;
import java.util.Collection;
@@ -36,7 +36,7 @@ public final class BaseLoggingAdvisorDefinitionService
implements AdvisorDefinit
private static final String SCHEMA_METADATA_LOADER_METHOD_NAME = "create";
- private static final String SCHEMA_METADATA_LOADER_ADVICE_CLASS =
MetaDataContextsFactoryAdvice.class.getName();
+ private static final String SCHEMA_METADATA_LOADER_ADVICE_CLASS =
MetaDataContextsFactoryAdviceExecutor.class.getName();
@Override
public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
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/ChannelHandlerAdviceExecutor.java
similarity index 90%
rename from
agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdvice.java
rename to
agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/ChannelHandlerAdviceExecutor.java
index 153f41e1149..e703555e591 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/ChannelHandlerAdviceExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.MetricsWrapper;
@@ -27,9 +27,9 @@ import
org.apache.shardingsphere.agent.metrics.api.constant.MetricIds;
import java.lang.reflect.Method;
/**
- * Channel handler advice.
+ * Channel handler advice executor.
*/
-public final class ChannelHandlerAdvice implements InstanceMethodAroundAdvice {
+public final class ChannelHandlerAdviceExecutor implements
InstanceMethodAdviceExecutor {
public static final String CHANNEL_READ = "channelRead";
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/CommandExecutorTaskAdviceExecutor.java
similarity index 91%
rename from
agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdvice.java
rename to
agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/CommandExecutorTaskAdviceExecutor.java
index 29d219c5da2..7794a62bb66 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/CommandExecutorTaskAdviceExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.MetricsWrapper;
@@ -28,9 +28,9 @@ import
org.apache.shardingsphere.agent.metrics.api.threadlocal.ElapsedTimeThread
import java.lang.reflect.Method;
/**
- * Command executor task advice.
+ * Command executor task advice executor.
*/
-public final class CommandExecutorTaskAdvice implements
InstanceMethodAroundAdvice {
+public final class CommandExecutorTaskAdviceExecutor implements
InstanceMethodAdviceExecutor {
public static final String COMMAND_EXECUTOR_RUN = "run";
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/SQLParserEngineAdviceExecutor.java
similarity index 95%
rename from
agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdvice.java
rename to
agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLParserEngineAdviceExecutor.java
index 7b594e7389f..e805a5c98c8 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/SQLParserEngineAdviceExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.MetricsWrapper;
@@ -39,9 +39,9 @@ import
org.apache.shardingsphere.sql.parser.sql.common.statement.tcl.TCLStatemen
import java.lang.reflect.Method;
/**
- * SQL parse engine advice.
+ * SQL parse engine advice executor.
*/
-public final class SQLParserEngineAdvice implements InstanceMethodAroundAdvice
{
+public final class SQLParserEngineAdviceExecutor implements
InstanceMethodAdviceExecutor {
static {
MetricsPool.create(MetricIds.PARSE_SQL_INSERT);
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/SQLRouteEngineAdviceExecutor.java
similarity index 94%
rename from
agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdvice.java
rename to
agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdviceExecutor.java
index d1876f43ca3..f7fe36402aa 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/SQLRouteEngineAdviceExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.MetricsWrapper;
@@ -37,9 +37,9 @@ import java.lang.reflect.Method;
import java.util.Collection;
/**
- * SQL route engine advice.
+ * SQL route engine advice executor.
*/
-public final class SQLRouteEngineAdvice implements InstanceMethodAroundAdvice {
+public final class SQLRouteEngineAdviceExecutor implements
InstanceMethodAdviceExecutor {
static {
MetricsPool.create(MetricIds.ROUTE_SQL_INSERT);
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/TransactionAdviceExecutor.java
similarity index 90%
rename from
agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdvice.java
rename to
agent/plugins/metrics/api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/TransactionAdviceExecutor.java
index 1a0a4622bc6..0a6870cf26b 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/TransactionAdviceExecutor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.metrics.api.advice;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import org.apache.shardingsphere.agent.metrics.api.MetricsPool;
import org.apache.shardingsphere.agent.metrics.api.MetricsWrapper;
@@ -27,9 +27,9 @@ import
org.apache.shardingsphere.agent.metrics.api.constant.MetricIds;
import java.lang.reflect.Method;
/**
- * Transaction advice.
+ * Transaction advice executor.
*/
-public final class TransactionAdvice implements InstanceMethodAroundAdvice {
+public final class TransactionAdviceExecutor implements
InstanceMethodAdviceExecutor {
public static final String COMMIT = "commit";
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 14bf18cbeb6..d565c64c3d8 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
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public final class ChannelHandlerAdviceTest extends MetricsAdviceBaseTest {
- private final ChannelHandlerAdvice channelHandlerAdvice = new
ChannelHandlerAdvice();
+ private final ChannelHandlerAdviceExecutor channelHandlerAdvice = new
ChannelHandlerAdviceExecutor();
@Mock
private Method channelRead;
@@ -49,9 +49,9 @@ public final class ChannelHandlerAdviceTest extends
MetricsAdviceBaseTest {
@Test
public void assertMethod() {
-
when(channelRead.getName()).thenReturn(ChannelHandlerAdvice.CHANNEL_READ);
-
when(channelActive.getName()).thenReturn(ChannelHandlerAdvice.CHANNEL_ACTIVE);
-
when(channelInactive.getName()).thenReturn(ChannelHandlerAdvice.CHANNEL_INACTIVE);
+
when(channelRead.getName()).thenReturn(ChannelHandlerAdviceExecutor.CHANNEL_READ);
+
when(channelActive.getName()).thenReturn(ChannelHandlerAdviceExecutor.CHANNEL_ACTIVE);
+
when(channelInactive.getName()).thenReturn(ChannelHandlerAdviceExecutor.CHANNEL_INACTIVE);
MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
channelHandlerAdvice.beforeMethod(targetObject, channelRead, 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 9054662373e..cbee1e48d9e 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
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public final class CommandExecutorTaskAdviceTest extends MetricsAdviceBaseTest
{
- private final CommandExecutorTaskAdvice commandExecutorTaskAdvice = new
CommandExecutorTaskAdvice();
+ private final CommandExecutorTaskAdviceExecutor commandExecutorTaskAdvice
= new CommandExecutorTaskAdviceExecutor();
@Mock
private Method run;
@@ -46,7 +46,7 @@ public final class CommandExecutorTaskAdviceTest extends
MetricsAdviceBaseTest {
@Test
public void assertExecuteLatency() {
-
when(run.getName()).thenReturn(CommandExecutorTaskAdvice.COMMAND_EXECUTOR_RUN);
+
when(run.getName()).thenReturn(CommandExecutorTaskAdviceExecutor.COMMAND_EXECUTOR_RUN);
MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
commandExecutorTaskAdvice.beforeMethod(targetObject, run, new
Object[]{}, new MethodInvocationResult());
try {
@@ -62,7 +62,7 @@ public final class CommandExecutorTaskAdviceTest extends
MetricsAdviceBaseTest {
@Test
public void assertExecuteErrorTotal() {
-
when(processException.getName()).thenReturn(CommandExecutorTaskAdvice.COMMAND_EXECUTOR_EXCEPTION);
+
when(processException.getName()).thenReturn(CommandExecutorTaskAdviceExecutor.COMMAND_EXECUTOR_EXCEPTION);
MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
commandExecutorTaskAdvice.afterMethod(targetObject, processException,
new Object[]{}, new MethodInvocationResult());
FixtureWrapper requestWrapper = (FixtureWrapper)
MetricsPool.get(MetricIds.PROXY_EXECUTE_ERROR).get();
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 2747f4f4915..09fbcb05ff4 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
@@ -105,7 +105,7 @@ public final class SQLParserEngineAdviceTest extends
MetricsAdviceBaseTest {
MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
MethodInvocationResult result = new MethodInvocationResult();
result.rebase(sqlStatement);
- new SQLParserEngineAdvice().afterMethod(targetObject,
mock(Method.class), new Object[]{}, result);
+ new SQLParserEngineAdviceExecutor().afterMethod(targetObject,
mock(Method.class), new Object[]{}, result);
assertTrue(MetricsPool.get(metricIds).isPresent());
assertThat(((FixtureWrapper)
MetricsPool.get(metricIds).get()).getFixtureValue(), is(1.0));
}
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 ddcb8688bf1..fc1a9823151 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
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.mock;
public final class SQLRouteEngineAdviceTest extends MetricsAdviceBaseTest {
- private final SQLRouteEngineAdvice sqlRouteEngineAdvice = new
SQLRouteEngineAdvice();
+ private final SQLRouteEngineAdviceExecutor sqlRouteEngineAdvice = new
SQLRouteEngineAdviceExecutor();
@Test
public void assertInsertRoute() {
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 986e00090a6..4379b003e85 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
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public final class TransactionAdviceTest extends MetricsAdviceBaseTest {
- private final TransactionAdvice transactionAdvice = new
TransactionAdvice();
+ private final TransactionAdviceExecutor transactionAdvice = new
TransactionAdviceExecutor();
@Mock
private Method commit;
@@ -46,8 +46,8 @@ public final class TransactionAdviceTest extends
MetricsAdviceBaseTest {
@Test
public void assertMethod() {
- when(commit.getName()).thenReturn(TransactionAdvice.COMMIT);
- when(rollback.getName()).thenReturn(TransactionAdvice.ROLLBACK);
+ when(commit.getName()).thenReturn(TransactionAdviceExecutor.COMMIT);
+
when(rollback.getName()).thenReturn(TransactionAdviceExecutor.ROLLBACK);
MockTargetAdviceObject targetObject = new MockTargetAdviceObject();
transactionAdvice.beforeMethod(targetObject, commit, new Object[]{},
new MethodInvocationResult());
transactionAdvice.beforeMethod(targetObject, rollback, new Object[]{},
new MethodInvocationResult());
diff --git
a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingAdviceEngine.java
b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingAdviceEngine.java
index cbf227526c1..cb8a18861d2 100644
---
a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingAdviceEngine.java
+++
b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/TracingAdviceEngine.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.agent.plugin.tracing.core.advice;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import
org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.impl.CommandExecutorTaskAdviser;
import
org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.impl.JDBCExecutorCallbackAdviser;
import
org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.impl.SQLParserEngineAdviser;
@@ -39,19 +39,19 @@ public final class TracingAdviceEngine {
/**
* Get proxy tracing advisor configurations.
*
- * @param commandExecutorTaskAdvice command executor task advice
- * @param sqlParserEngineAdvice SQL parser engine advice
- * @param jdbcExecutorCallbackAdvice JDBC executor callback advice
+ * @param commandExecutorTaskAdviceExecutor command executor task advice
executor
+ * @param sqlParserEngineAdviceExecutor SQL parser engine advice executor
+ * @param jdbcExecutorCallbackAdviceExecutor JDBC executor callback advice
executor
* @return got configurations
*/
- public Collection<AdvisorConfiguration>
getProxyAdvisorConfigurations(final Class<? extends InstanceMethodAroundAdvice>
commandExecutorTaskAdvice,
-
final Class<? extends InstanceMethodAroundAdvice> sqlParserEngineAdvice,
-
final Class<? extends InstanceMethodAroundAdvice> jdbcExecutorCallbackAdvice) {
+ public Collection<AdvisorConfiguration>
getProxyAdvisorConfigurations(final Class<? extends
InstanceMethodAdviceExecutor> commandExecutorTaskAdviceExecutor,
+
final Class<? extends InstanceMethodAdviceExecutor>
sqlParserEngineAdviceExecutor,
+
final Class<? extends InstanceMethodAdviceExecutor>
jdbcExecutorCallbackAdviceExecutor) {
// TODO load from YAML, please ref metrics
Collection<AdvisorConfiguration> result = new LinkedList<>();
- result.add(new
CommandExecutorTaskAdviser(type).getAdvisorConfiguration(commandExecutorTaskAdvice));
- result.add(new
SQLParserEngineAdviser(type).getAdvisorConfiguration(sqlParserEngineAdvice));
- result.add(new
JDBCExecutorCallbackAdviser(type).getAdvisorConfiguration(jdbcExecutorCallbackAdvice));
+ result.add(new
CommandExecutorTaskAdviser(type).getAdvisorConfiguration(commandExecutorTaskAdviceExecutor));
+ result.add(new
SQLParserEngineAdviser(type).getAdvisorConfiguration(sqlParserEngineAdviceExecutor));
+ result.add(new
JDBCExecutorCallbackAdviser(type).getAdvisorConfiguration(jdbcExecutorCallbackAdviceExecutor));
return result;
}
diff --git
a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/TracingAdviser.java
b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/TracingAdviser.java
index 7109b32a1e7..d966ebfd01a 100644
---
a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/TracingAdviser.java
+++
b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/TracingAdviser.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
/**
@@ -28,8 +28,8 @@ public interface TracingAdviser {
/**
* Get advisor configuration.
*
- * @param instanceMethodAroundAdvice instance method around advice
+ * @param adviceExecutorClass instance method around advice class
* @return advisor configuration
*/
- AdvisorConfiguration getAdvisorConfiguration(Class<? extends
InstanceMethodAroundAdvice> instanceMethodAroundAdvice);
+ AdvisorConfiguration getAdvisorConfiguration(Class<? extends
InstanceMethodAdviceExecutor> adviceExecutorClass);
}
diff --git
a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java
b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java
index 9b6f628589b..f7ecba1bd9f 100644
---
a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java
+++
b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/CommandExecutorTaskAdviser.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import
org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
import
org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.TracingAdviser;
@@ -38,9 +38,9 @@ public final class CommandExecutorTaskAdviser implements
TracingAdviser {
private final String type;
@Override
- public AdvisorConfiguration getAdvisorConfiguration(final Class<? extends
InstanceMethodAroundAdvice> commandExecutorTaskAdvice) {
+ public AdvisorConfiguration getAdvisorConfiguration(final Class<? extends
InstanceMethodAdviceExecutor> adviceExecutorClass) {
AdvisorConfiguration result =
AdvisorConfigurationRegistryFactory.getRegistry(type).getAdvisorConfiguration(TARGET_CLASS);
- result.getInstanceMethodAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.named(TARGET_METHOD),
commandExecutorTaskAdvice.getName()));
+ result.getInstanceMethodAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.named(TARGET_METHOD),
adviceExecutorClass.getName()));
return result;
}
}
diff --git
a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java
b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java
index 08d8e47d172..e46fe5e01db 100644
---
a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java
+++
b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import
org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
import
org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.TracingAdviser;
@@ -40,10 +40,10 @@ public final class JDBCExecutorCallbackAdviser implements
TracingAdviser {
private final String type;
@Override
- public AdvisorConfiguration getAdvisorConfiguration(final Class<? extends
InstanceMethodAroundAdvice> jdbcExecutorCallbackAdvice) {
+ public AdvisorConfiguration getAdvisorConfiguration(final Class<? extends
InstanceMethodAdviceExecutor> adviceExecutorClass) {
AdvisorConfiguration result =
AdvisorConfigurationRegistryFactory.getRegistry(type).getAdvisorConfiguration(TARGET_CLASS);
result.getInstanceMethodAdvisors().add(new MethodAdvisorConfiguration(
-
ElementMatchers.named(TARGET_METHOD).and(ElementMatchers.takesArgument(0,
ElementMatchers.named(TARGET_METHOD_FIRST_PARAM))),
jdbcExecutorCallbackAdvice.getName()));
+
ElementMatchers.named(TARGET_METHOD).and(ElementMatchers.takesArgument(0,
ElementMatchers.named(TARGET_METHOD_FIRST_PARAM))),
adviceExecutorClass.getName()));
return result;
}
}
diff --git
a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java
b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java
index d6c60cbdec9..aa855b86a97 100644
---
a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java
+++
b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import
org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import
org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
import
org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.TracingAdviser;
@@ -38,9 +38,9 @@ public final class SQLParserEngineAdviser implements
TracingAdviser {
private final String type;
@Override
- public AdvisorConfiguration getAdvisorConfiguration(final Class<? extends
InstanceMethodAroundAdvice> sqlParserEngineAdvice) {
+ public AdvisorConfiguration getAdvisorConfiguration(final Class<? extends
InstanceMethodAdviceExecutor> adviceExecutorClass) {
AdvisorConfiguration result =
AdvisorConfigurationRegistryFactory.getRegistry(type).getAdvisorConfiguration(TARGET_CLASS);
- result.getInstanceMethodAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.named(TARGET_METHOD),
sqlParserEngineAdvice.getName()));
+ result.getInstanceMethodAdvisors().add(new
MethodAdvisorConfiguration(ElementMatchers.named(TARGET_METHOD),
adviceExecutorClass.getName()));
return result;
}
}
diff --git
a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java
b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceExecutor.java
similarity index 93%
rename from
agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java
rename to
agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceExecutor.java
index c9754e385dd..907bf29fce6 100644
---
a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdvice.java
+++
b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceExecutor.java
@@ -22,7 +22,7 @@ import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import lombok.SneakyThrows;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import
org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
import
org.apache.shardingsphere.agent.plugin.tracing.jaeger.span.JaegerErrorSpan;
@@ -35,9 +35,9 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
/**
- * Command executor task advice.
+ * Command executor task advice executor.
*/
-public final class CommandExecutorTaskAdvice implements
InstanceMethodAroundAdvice {
+public final class CommandExecutorTaskAdviceExecutor implements
InstanceMethodAdviceExecutor {
private static final String OPERATION_NAME = "/ShardingSphere/rootInvoke/";
diff --git
a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceExecutor.java
similarity index 94%
rename from
agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
rename to
agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceExecutor.java
index 0302be3c72a..7a8be976eb1 100644
---
a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdvice.java
+++
b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceExecutor.java
@@ -24,7 +24,7 @@ import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import lombok.SneakyThrows;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import
org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
import
org.apache.shardingsphere.agent.plugin.tracing.jaeger.span.JaegerErrorSpan;
@@ -40,9 +40,9 @@ import java.sql.SQLException;
import java.util.Map;
/**
- * JDBC executor callback advice.
+ * JDBC executor callback advice executor.
*/
-public final class JDBCExecutorCallbackAdvice implements
InstanceMethodAroundAdvice {
+public final class JDBCExecutorCallbackAdviceExecutor implements
InstanceMethodAdviceExecutor {
private static final String OPERATION_NAME = "/ShardingSphere/executeSQL/";
diff --git
a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdvice.java
b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceExecutor.java
similarity index 91%
rename from
agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdvice.java
rename to
agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceExecutor.java
index 24977011cf1..50d47d80c99 100644
---
a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdvice.java
+++
b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceExecutor.java
@@ -21,7 +21,7 @@ import io.opentracing.Scope;
import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import
org.apache.shardingsphere.agent.plugin.tracing.jaeger.constant.JaegerConstants;
import
org.apache.shardingsphere.agent.plugin.tracing.jaeger.span.JaegerErrorSpan;
@@ -29,9 +29,9 @@ import
org.apache.shardingsphere.agent.plugin.tracing.jaeger.span.JaegerErrorSpa
import java.lang.reflect.Method;
/**
- * SQL parser engine advice.
+ * SQL parser engine advice executor.
*/
-public final class SQLParserEngineAdvice implements InstanceMethodAroundAdvice
{
+public final class SQLParserEngineAdviceExecutor implements
InstanceMethodAdviceExecutor {
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
diff --git
a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerAdvisorDefinitionService.java
b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerAdvisorDefinitionService.java
index f1b44cbbc83..f888ebb726f 100644
---
a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerAdvisorDefinitionService.java
+++
b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerAdvisorDefinitionService.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.agent.plugin.tracing.jaeger.definition;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import
org.apache.shardingsphere.agent.plugin.tracing.core.advice.TracingAdviceEngine;
-import
org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice.CommandExecutorTaskAdvice;
-import
org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice.JDBCExecutorCallbackAdvice;
+import
org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice.CommandExecutorTaskAdviceExecutor;
+import
org.apache.shardingsphere.agent.plugin.tracing.jaeger.advice.JDBCExecutorCallbackAdviceExecutor;
import org.apache.shardingsphere.agent.spi.advisor.AdvisorDefinitionService;
import java.util.Collection;
@@ -34,7 +34,7 @@ public final class JaegerAdvisorDefinitionService implements
AdvisorDefinitionSe
@Override
public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
- return
engine.getProxyAdvisorConfigurations(CommandExecutorTaskAdvice.class,
CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
+ return
engine.getProxyAdvisorConfigurations(CommandExecutorTaskAdviceExecutor.class,
CommandExecutorTaskAdviceExecutor.class,
JDBCExecutorCallbackAdviceExecutor.class);
}
@Override
diff --git
a/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
b/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
index 50135bca37c..d501d56f4b8 100644
---
a/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
+++
b/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/CommandExecutorTaskAdviceTest.java
@@ -43,7 +43,7 @@ public final class CommandExecutorTaskAdviceTest extends
AbstractCommandExecutor
@ClassRule
public static final JaegerCollector COLLECTOR = new JaegerCollector();
- private static final CommandExecutorTaskAdvice ADVICE = new
CommandExecutorTaskAdvice();
+ private static final CommandExecutorTaskAdviceExecutor ADVICE = new
CommandExecutorTaskAdviceExecutor();
private static final Map<String, Object> EXPECTED = new HashMap<>(2, 1);
diff --git
a/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceTest.java
b/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceTest.java
index d2c083f3fe7..0f23b09f245 100644
---
a/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceTest.java
+++
b/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/JDBCExecutorCallbackAdviceTest.java
@@ -39,7 +39,7 @@ public final class JDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCa
@ClassRule
public static final JaegerCollector COLLECTOR = new JaegerCollector();
- private static final JDBCExecutorCallbackAdvice ADVICE = new
JDBCExecutorCallbackAdvice();
+ private static final JDBCExecutorCallbackAdviceExecutor ADVICE = new
JDBCExecutorCallbackAdviceExecutor();
@Before
public void setup() {
diff --git
a/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceTest.java
b/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceTest.java
index 33c320486ee..f0873be8360 100644
---
a/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceTest.java
+++
b/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/advice/SQLParserEngineAdviceTest.java
@@ -38,7 +38,7 @@ public final class SQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdvi
@ClassRule
public static final JaegerCollector COLLECTOR = new JaegerCollector();
- private static final SQLParserEngineAdvice ADVICE = new
SQLParserEngineAdvice();
+ private static final SQLParserEngineAdviceExecutor ADVICE = new
SQLParserEngineAdviceExecutor();
@Test
public void assertMethod() {
diff --git
a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdvice.java
b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceExecutor.java
similarity index 92%
rename from
agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdvice.java
rename to
agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceExecutor.java
index d6b53edbcbd..fe8b0178ae6 100644
---
a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdvice.java
+++
b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceExecutor.java
@@ -23,7 +23,7 @@ import io.opentelemetry.api.trace.SpanBuilder;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.StatusCode;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import
org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
@@ -31,9 +31,9 @@ import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
import java.lang.reflect.Method;
/**
- * Command executor task advice.
+ * Command executor task advice executor.
*/
-public class CommandExecutorTaskAdvice implements InstanceMethodAroundAdvice {
+public class CommandExecutorTaskAdviceExecutor implements
InstanceMethodAdviceExecutor {
private static final String OPERATION_NAME = "/ShardingSphere/rootInvoke/";
diff --git
a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceExecutor.java
similarity index 95%
rename from
agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
rename to
agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceExecutor.java
index 32922d93424..e87f26df153 100644
---
a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdvice.java
+++
b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceExecutor.java
@@ -25,7 +25,7 @@ import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
import lombok.SneakyThrows;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import
org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
@@ -39,9 +39,9 @@ import java.sql.DatabaseMetaData;
import java.util.Map;
/**
- * JDBC executor callback advice.
+ * JDBC executor callback advice executor.
*/
-public class JDBCExecutorCallbackAdvice implements InstanceMethodAroundAdvice {
+public class JDBCExecutorCallbackAdviceExecutor implements
InstanceMethodAdviceExecutor {
private static final String OPERATION_NAME = "/ShardingSphere/executeSQL/";
diff --git
a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdvice.java
b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceExecutor.java
similarity index 92%
rename from
agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdvice.java
rename to
agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceExecutor.java
index 5aab502b3d6..3121f3648d8 100644
---
a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdvice.java
+++
b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceExecutor.java
@@ -24,7 +24,7 @@ import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import
org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
@@ -32,9 +32,9 @@ import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
import java.lang.reflect.Method;
/**
- * SQL parser engine advice.
+ * SQL parser engine advice executor.
*/
-public class SQLParserEngineAdvice implements InstanceMethodAroundAdvice {
+public class SQLParserEngineAdviceExecutor implements
InstanceMethodAdviceExecutor {
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
diff --git
a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingAdvisorDefinitionService.java
b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingAdvisorDefinitionService.java
index 7721ecf5bbc..b711b0d5cef 100644
---
a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingAdvisorDefinitionService.java
+++
b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingAdvisorDefinitionService.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.definition;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import
org.apache.shardingsphere.agent.plugin.tracing.core.advice.TracingAdviceEngine;
-import
org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.advice.CommandExecutorTaskAdvice;
-import
org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.advice.JDBCExecutorCallbackAdvice;
+import
org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.advice.CommandExecutorTaskAdviceExecutor;
+import
org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.advice.JDBCExecutorCallbackAdviceExecutor;
import org.apache.shardingsphere.agent.spi.advisor.AdvisorDefinitionService;
import java.util.Collection;
@@ -34,7 +34,7 @@ public final class
OpenTelemetryTracingAdvisorDefinitionService implements Advis
@Override
public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
- return
engine.getProxyAdvisorConfigurations(CommandExecutorTaskAdvice.class,
CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
+ return
engine.getProxyAdvisorConfigurations(CommandExecutorTaskAdviceExecutor.class,
CommandExecutorTaskAdviceExecutor.class,
JDBCExecutorCallbackAdviceExecutor.class);
}
@Override
diff --git
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceTest.java
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceTest.java
index 65d25aa8c50..8303d45c4fc 100644
---
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceTest.java
+++
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/CommandExecutorTaskAdviceTest.java
@@ -40,11 +40,11 @@ public final class CommandExecutorTaskAdviceTest extends
AbstractCommandExecutor
@ClassRule
public static final OpenTelemetryCollector COLLECTOR = new
OpenTelemetryCollector();
- private CommandExecutorTaskAdvice advice;
+ private CommandExecutorTaskAdviceExecutor advice;
@Before
public void setup() {
- advice = new CommandExecutorTaskAdvice();
+ advice = new CommandExecutorTaskAdviceExecutor();
}
@Test
diff --git
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceTest.java
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceTest.java
index d6d384c16fe..b7a87facd16 100644
---
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceTest.java
+++
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/JDBCExecutorCallbackAdviceTest.java
@@ -40,11 +40,11 @@ public final class JDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCa
@ClassRule
public static final OpenTelemetryCollector COLLECTOR = new
OpenTelemetryCollector();
- private JDBCExecutorCallbackAdvice advice;
+ private JDBCExecutorCallbackAdviceExecutor advice;
@Before
public void setup() {
- advice = new JDBCExecutorCallbackAdvice();
+ advice = new JDBCExecutorCallbackAdviceExecutor();
}
@Test
diff --git
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceTest.java
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceTest.java
index 364ba2f9db3..eddcd17675e 100644
---
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceTest.java
+++
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceTest.java
@@ -46,7 +46,7 @@ public final class SQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdvi
private static final String SQL_STATEMENT = "select 1";
- private SQLParserEngineAdvice advice;
+ private SQLParserEngineAdviceExecutor advice;
private Span parentSpan;
@@ -56,7 +56,7 @@ public final class SQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdvi
.spanBuilder("parent")
.startSpan();
ExecutorDataMap.getValue().put(OpenTelemetryConstants.ROOT_SPAN,
parentSpan);
- advice = new SQLParserEngineAdvice();
+ advice = new SQLParserEngineAdviceExecutor();
}
@Test
diff --git
a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdvice.java
b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceExecutor.java
similarity index 91%
rename from
agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdvice.java
rename to
agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceExecutor.java
index 5502dbca214..1749fbb2d6b 100644
---
a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdvice.java
+++
b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceExecutor.java
@@ -21,7 +21,7 @@ import io.opentracing.Scope;
import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import
org.apache.shardingsphere.agent.plugin.tracing.opentracing.constant.ShardingSphereTags;
import
org.apache.shardingsphere.agent.plugin.tracing.opentracing.span.OpenTracingErrorSpan;
@@ -30,9 +30,9 @@ import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
import java.lang.reflect.Method;
/**
- * Command executor task advice.
+ * Command executor task advice executor.
*/
-public final class CommandExecutorTaskAdvice implements
InstanceMethodAroundAdvice {
+public final class CommandExecutorTaskAdviceExecutor implements
InstanceMethodAdviceExecutor {
private static final String OPERATION_NAME = "/ShardingSphere/rootInvoke/";
diff --git
a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdvice.java
b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceExecutor.java
similarity index 93%
rename from
agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdvice.java
rename to
agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceExecutor.java
index 675645e1f9a..3f65f3b0cac 100644
---
a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdvice.java
+++
b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceExecutor.java
@@ -23,7 +23,7 @@ import io.opentracing.Tracer;
import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import
org.apache.shardingsphere.agent.plugin.tracing.opentracing.constant.ShardingSphereTags;
import
org.apache.shardingsphere.agent.plugin.tracing.opentracing.span.OpenTracingErrorSpan;
@@ -34,9 +34,9 @@ import java.lang.reflect.Method;
import java.util.Map;
/**
- * JDBC executor callback advice.
+ * JDBC executor callback advice executor.
*/
-public final class JDBCExecutorCallbackAdvice implements
InstanceMethodAroundAdvice {
+public final class JDBCExecutorCallbackAdviceExecutor implements
InstanceMethodAdviceExecutor {
private static final String OPERATION_NAME = "/ShardingSphere/executeSQL/";
diff --git
a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdvice.java
b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceExecutor.java
similarity index 91%
rename from
agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdvice.java
rename to
agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceExecutor.java
index 7a9ed325fe1..a751b947aa0 100644
---
a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdvice.java
+++
b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceExecutor.java
@@ -20,17 +20,18 @@ package
org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice;
import io.opentracing.Scope;
import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer;
-import java.lang.reflect.Method;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
-import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
+import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import
org.apache.shardingsphere.agent.plugin.tracing.opentracing.constant.ShardingSphereTags;
import
org.apache.shardingsphere.agent.plugin.tracing.opentracing.span.OpenTracingErrorSpan;
+import java.lang.reflect.Method;
+
/**
- * SQL parser engine advice.
+ * SQL parser engine advice executor.
*/
-public final class SQLParserEngineAdvice implements InstanceMethodAroundAdvice
{
+public final class SQLParserEngineAdviceExecutor implements
InstanceMethodAdviceExecutor {
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
diff --git
a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingAdvisorDefinitionService.java
b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingAdvisorDefinitionService.java
index 518659eb08b..73f51a64623 100644
---
a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingAdvisorDefinitionService.java
+++
b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingAdvisorDefinitionService.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.agent.plugin.tracing.opentracing.definition;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import
org.apache.shardingsphere.agent.plugin.tracing.core.advice.TracingAdviceEngine;
-import
org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice.CommandExecutorTaskAdvice;
-import
org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice.JDBCExecutorCallbackAdvice;
+import
org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice.CommandExecutorTaskAdviceExecutor;
+import
org.apache.shardingsphere.agent.plugin.tracing.opentracing.advice.JDBCExecutorCallbackAdviceExecutor;
import org.apache.shardingsphere.agent.spi.advisor.AdvisorDefinitionService;
import java.util.Collection;
@@ -34,7 +34,7 @@ public final class OpenTracingAdvisorDefinitionService
implements AdvisorDefinit
@Override
public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
- return
engine.getProxyAdvisorConfigurations(CommandExecutorTaskAdvice.class,
CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
+ return
engine.getProxyAdvisorConfigurations(CommandExecutorTaskAdviceExecutor.class,
CommandExecutorTaskAdviceExecutor.class,
JDBCExecutorCallbackAdviceExecutor.class);
}
@Override
diff --git
a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceTest.java
b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceTest.java
index 71551376b7f..735e4f648cc 100644
---
a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceTest.java
+++
b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/CommandExecutorTaskAdviceTest.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue;
public final class CommandExecutorTaskAdviceTest {
- private static final CommandExecutorTaskAdvice ADVICE = new
CommandExecutorTaskAdvice();
+ private static final CommandExecutorTaskAdviceExecutor ADVICE = new
CommandExecutorTaskAdviceExecutor();
private static MockTracer tracer;
diff --git
a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceTest.java
b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceTest.java
index 3e5ebea67ed..cb0bb62119b 100644
---
a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceTest.java
+++
b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/JDBCExecutorCallbackAdviceTest.java
@@ -45,7 +45,7 @@ import static org.mockito.Mockito.when;
public final class JDBCExecutorCallbackAdviceTest {
- private static final JDBCExecutorCallbackAdvice ADVICE = new
JDBCExecutorCallbackAdvice();
+ private static final JDBCExecutorCallbackAdviceExecutor ADVICE = new
JDBCExecutorCallbackAdviceExecutor();
private static MockTracer tracer;
diff --git
a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceTest.java
b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceTest.java
index 48952417899..d2f4710eaec 100644
---
a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceTest.java
+++
b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/SQLParserEngineAdviceTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertTrue;
public final class SQLParserEngineAdviceTest {
- private static final SQLParserEngineAdvice ADVICE = new
SQLParserEngineAdvice();
+ private static final SQLParserEngineAdviceExecutor ADVICE = new
SQLParserEngineAdviceExecutor();
private static MockTracer tracer;
diff --git
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceExecutor.java
similarity index 92%
rename from
agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java
rename to
agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceExecutor.java
index 76cfa5dd1bc..ba14d2ea0e9 100644
---
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdvice.java
+++
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceExecutor.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice;
import brave.Span;
import brave.Tracing;
import lombok.SneakyThrows;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
@@ -33,9 +33,9 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
/**
- * Command executor task advice.
+ * Command executor task advice executor.
*/
-public final class CommandExecutorTaskAdvice implements
InstanceMethodAroundAdvice {
+public final class CommandExecutorTaskAdviceExecutor implements
InstanceMethodAdviceExecutor {
private static final String OPERATION_NAME = "/ShardingSphere/rootInvoke/";
diff --git
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceExecutor.java
similarity index 94%
rename from
agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
rename to
agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceExecutor.java
index 303ac02582f..f09d466fce6 100644
---
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdvice.java
+++
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceExecutor.java
@@ -21,7 +21,7 @@ import brave.Span;
import brave.Tracing;
import lombok.SneakyThrows;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
@@ -36,9 +36,9 @@ import java.sql.SQLException;
import java.util.Map;
/**
- * JDBC executor callback advice.
+ * JDBC executor callback advice executor.
*/
-public final class JDBCExecutorCallbackAdvice implements
InstanceMethodAroundAdvice {
+public final class JDBCExecutorCallbackAdviceExecutor implements
InstanceMethodAdviceExecutor {
private static final String OPERATION_NAME = "/ShardingSphere/executeSQL/";
diff --git
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdvice.java
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceExecutor.java
similarity index 91%
rename from
agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdvice.java
rename to
agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceExecutor.java
index 831f09a6afc..fd453e1f1e4 100644
---
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdvice.java
+++
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceExecutor.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice;
import brave.Span;
import brave.Tracing;
import brave.propagation.TraceContext;
-import
org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
+import
org.apache.shardingsphere.agent.core.plugin.interceptor.executor.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.TargetAdviceObject;
import org.apache.shardingsphere.agent.core.plugin.MethodInvocationResult;
import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.constant.ZipkinConstants;
@@ -29,9 +29,9 @@ import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
import java.lang.reflect.Method;
/**
- * SQL parser engine advice.
+ * SQL parser engine advice executor.
*/
-public final class SQLParserEngineAdvice implements InstanceMethodAroundAdvice
{
+public final class SQLParserEngineAdviceExecutor implements
InstanceMethodAdviceExecutor {
private static final String OPERATION_NAME = "/ShardingSphere/parseSQL/";
diff --git
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinAdvisorDefinitionService.java
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinAdvisorDefinitionService.java
index 0636fb3078b..f9042ad1a57 100644
---
a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinAdvisorDefinitionService.java
+++
b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinAdvisorDefinitionService.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.agent.plugin.tracing.zipkin.definition;
import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import
org.apache.shardingsphere.agent.plugin.tracing.core.advice.TracingAdviceEngine;
-import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice.CommandExecutorTaskAdvice;
-import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice.JDBCExecutorCallbackAdvice;
+import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice.CommandExecutorTaskAdviceExecutor;
+import
org.apache.shardingsphere.agent.plugin.tracing.zipkin.advice.JDBCExecutorCallbackAdviceExecutor;
import org.apache.shardingsphere.agent.spi.advisor.AdvisorDefinitionService;
import java.util.Collection;
@@ -34,7 +34,7 @@ public final class ZipkinAdvisorDefinitionService implements
AdvisorDefinitionSe
@Override
public Collection<AdvisorConfiguration> getProxyAdvisorConfigurations() {
- return
engine.getProxyAdvisorConfigurations(CommandExecutorTaskAdvice.class,
CommandExecutorTaskAdvice.class, JDBCExecutorCallbackAdvice.class);
+ return
engine.getProxyAdvisorConfigurations(CommandExecutorTaskAdviceExecutor.class,
CommandExecutorTaskAdviceExecutor.class,
JDBCExecutorCallbackAdviceExecutor.class);
}
@Override
diff --git
a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
index 2c37a841a9b..f08c1794da2 100644
---
a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
+++
b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/CommandExecutorTaskAdviceTest.java
@@ -37,11 +37,11 @@ public final class CommandExecutorTaskAdviceTest extends
AbstractCommandExecutor
@ClassRule
public static final ZipkinCollector COLLECTOR = new ZipkinCollector();
- private CommandExecutorTaskAdvice advice;
+ private CommandExecutorTaskAdviceExecutor advice;
@Before
public void setup() {
- advice = new CommandExecutorTaskAdvice();
+ advice = new CommandExecutorTaskAdviceExecutor();
}
@Test
diff --git
a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
index e38268b854a..4e822d85319 100644
---
a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
+++
b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/JDBCExecutorCallbackAdviceTest.java
@@ -38,12 +38,12 @@ public final class JDBCExecutorCallbackAdviceTest extends
AbstractJDBCExecutorCa
@ClassRule
public static final ZipkinCollector COLLECTOR = new ZipkinCollector();
- private JDBCExecutorCallbackAdvice advice;
+ private JDBCExecutorCallbackAdviceExecutor advice;
@Before
public void setup() {
getExtraMap().put(ZipkinConstants.ROOT_SPAN, null);
- advice = new JDBCExecutorCallbackAdvice();
+ advice = new JDBCExecutorCallbackAdviceExecutor();
}
@Test
diff --git
a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
index 16cc33c2a91..1baa9fd69a2 100644
---
a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
+++
b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
@@ -42,7 +42,7 @@ public final class SQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdvi
private static final String SQL_STATEMENT = "select 1";
- private SQLParserEngineAdvice advice;
+ private SQLParserEngineAdviceExecutor advice;
private Span parentSpan;
@@ -50,7 +50,7 @@ public final class SQLParserEngineAdviceTest extends
AbstractSQLParserEngineAdvi
public void setup() {
parentSpan = Tracing.currentTracer().newTrace().name("parent").start();
ExecutorDataMap.getValue().put(ZipkinConstants.ROOT_SPAN, parentSpan);
- advice = new SQLParserEngineAdvice();
+ advice = new SQLParserEngineAdviceExecutor();
}
@Test
