You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/12/14 16:17:28 UTC
[shardingsphere] branch master updated: Move advisor package into plugin package (#22875)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 e5a7c50d41c Move advisor package into plugin package (#22875)
e5a7c50d41c is described below
commit e5a7c50d41c4319e16bc46b2edd8a34ba84b9835
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Dec 15 00:17:18 2022 +0800
Move advisor package into plugin package (#22875)
* Move advisor package into plugin package
* for checkstyle
---
.../shardingsphere/agent/bootstrap/ShardingSphereAgent.java | 2 +-
.../agent/core/plugin/{ => advisor}/AgentAdvisors.java | 3 ++-
.../agent/core/{ => plugin}/advisor/ClassAdvisorRegistry.java | 2 +-
.../core/{ => plugin}/advisor/ClassAdvisorRegistryFactory.java | 2 +-
.../core/{ => plugin}/yaml/entity/YamlAdvisorConfiguration.java | 2 +-
.../core/{ => plugin}/yaml/entity/YamlAdvisorsConfiguration.java | 2 +-
.../core/{ => plugin}/yaml/entity/YamlPointcutConfiguration.java | 2 +-
.../yaml/swapper/YamlAdvisorsConfigurationSwapper.java | 4 ++--
.../shardingsphere/agent/core/transformer/AgentTransformer.java | 2 +-
.../agent/core/plugin/{ => advisor}/AgentAdvisorsTest.java | 2 +-
.../{ => plugin}/advisor/ClassAdvisorRegistryFactoryTest.java | 4 ++--
.../agent/core/{ => plugin}/advisor/ClassAdvisorRegistryTest.java | 6 +++---
.../yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java | 8 ++++----
.../agent/core/transformer/AgentTransformerTest.java | 2 +-
.../base/definition/BaseLoggingAdvisorDefinitionService.java | 2 +-
.../prometheus/definition/PrometheusAdvisorDefinitionService.java | 8 ++++----
.../core/advice/adviser/impl/CommandExecutorTaskAdviser.java | 2 +-
.../core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java | 2 +-
.../tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java | 2 +-
19 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java b/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java
index 28b2069fb16..c09fe2fc902 100644
--- a/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java
+++ b/agent/bootstrap/src/main/java/org/apache/shardingsphere/agent/bootstrap/ShardingSphereAgent.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.agent.core.config.loader.AgentConfigurationLoad
import org.apache.shardingsphere.agent.core.config.registry.AgentConfigurationRegistry;
import org.apache.shardingsphere.agent.core.logging.LoggingListener;
import org.apache.shardingsphere.agent.core.plugin.PluginBootServiceManager;
-import org.apache.shardingsphere.agent.core.plugin.AgentAdvisors;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AgentAdvisors;
import org.apache.shardingsphere.agent.core.plugin.loader.AgentPluginLoader;
import org.apache.shardingsphere.agent.core.transformer.AgentTransformer;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentAdvisors.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AgentAdvisors.java
similarity index 97%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentAdvisors.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AgentAdvisors.java
index 89743be49e0..388e5228863 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentAdvisors.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AgentAdvisors.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin;
+package org.apache.shardingsphere.agent.core.plugin.advisor;
import com.google.common.collect.ImmutableMap;
import lombok.Setter;
@@ -26,6 +26,7 @@ import org.apache.shardingsphere.agent.advisor.ClassAdvisor;
import org.apache.shardingsphere.agent.config.AgentConfiguration;
import org.apache.shardingsphere.agent.core.classloader.AgentClassLoader;
import org.apache.shardingsphere.agent.core.config.registry.AgentConfigurationRegistry;
+import org.apache.shardingsphere.agent.core.plugin.PluginJar;
import org.apache.shardingsphere.agent.core.plugin.loader.AdviceInstanceLoader;
import org.apache.shardingsphere.agent.core.spi.PluginServiceLoader;
import org.apache.shardingsphere.agent.spi.AdvisorDefinitionService;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/ClassAdvisorRegistry.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorRegistry.java
similarity index 95%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/ClassAdvisorRegistry.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorRegistry.java
index 6f1a43fe390..ecd731181ca 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/ClassAdvisorRegistry.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorRegistry.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor;
+package org.apache.shardingsphere.agent.core.plugin.advisor;
import org.apache.shardingsphere.agent.advisor.ClassAdvisor;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/ClassAdvisorRegistryFactory.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorRegistryFactory.java
similarity index 96%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/ClassAdvisorRegistryFactory.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorRegistryFactory.java
index 86d283bcf0d..e13c29211bf 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/advisor/ClassAdvisorRegistryFactory.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorRegistryFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor;
+package org.apache.shardingsphere.agent.core.plugin.advisor;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/yaml/entity/YamlAdvisorConfiguration.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAdvisorConfiguration.java
similarity index 95%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/yaml/entity/YamlAdvisorConfiguration.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAdvisorConfiguration.java
index 2fb6c629926..3ce8478200e 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/yaml/entity/YamlAdvisorConfiguration.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAdvisorConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.yaml.entity;
+package org.apache.shardingsphere.agent.core.plugin.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/yaml/entity/YamlAdvisorsConfiguration.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAdvisorsConfiguration.java
similarity index 94%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/yaml/entity/YamlAdvisorsConfiguration.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAdvisorsConfiguration.java
index 75cc83b7d5b..68d054e5a01 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/yaml/entity/YamlAdvisorsConfiguration.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlAdvisorsConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.yaml.entity;
+package org.apache.shardingsphere.agent.core.plugin.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/yaml/entity/YamlPointcutConfiguration.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPointcutConfiguration.java
similarity index 93%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/yaml/entity/YamlPointcutConfiguration.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPointcutConfiguration.java
index 1889255ded3..3df25da936f 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/yaml/entity/YamlPointcutConfiguration.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/entity/YamlPointcutConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.yaml.entity;
+package org.apache.shardingsphere.agent.core.plugin.yaml.entity;
import lombok.Getter;
import lombok.Setter;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/yaml/swapper/YamlAdvisorsConfigurationSwapper.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
similarity index 89%
rename from agent/core/src/main/java/org/apache/shardingsphere/agent/core/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
index 5cf112f11d3..de8f73a73c1 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.yaml.swapper;
+package org.apache.shardingsphere.agent.core.plugin.yaml.swapper;
-import org.apache.shardingsphere.agent.core.yaml.entity.YamlAdvisorsConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorsConfiguration;
import org.yaml.snakeyaml.Yaml;
import java.io.InputStream;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
index 27127617c5e..691e4b5abbf 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
@@ -50,7 +50,7 @@ import org.apache.shardingsphere.agent.core.plugin.interceptor.composed.Composed
import org.apache.shardingsphere.agent.core.plugin.interceptor.composed.ComposedInstanceMethodInterceptorArgsOverride;
import org.apache.shardingsphere.agent.core.plugin.interceptor.composed.ComposedStaticMethodAroundInterceptor;
import org.apache.shardingsphere.agent.core.plugin.interceptor.composed.ComposedStaticMethodInterceptorArgsOverride;
-import org.apache.shardingsphere.agent.core.plugin.AgentAdvisors;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AgentAdvisors;
import java.util.Collection;
import java.util.LinkedList;
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/AgentAdvisorsTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AgentAdvisorsTest.java
similarity index 98%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/AgentAdvisorsTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AgentAdvisorsTest.java
index 1bddd1b4f79..c25ff7a370e 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/AgentAdvisorsTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AgentAdvisorsTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.plugin;
+package org.apache.shardingsphere.agent.core.plugin.advisor;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatchers;
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/ClassAdvisorRegistryFactoryTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorRegistryFactoryTest.java
similarity index 94%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/ClassAdvisorRegistryFactoryTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorRegistryFactoryTest.java
index 1af5cfe9b6c..ab525caf544 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/ClassAdvisorRegistryFactoryTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorRegistryFactoryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor;
+package org.apache.shardingsphere.agent.core.plugin.advisor;
import org.junit.Test;
@@ -23,7 +23,7 @@ import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
public final class ClassAdvisorRegistryFactoryTest {
-
+
@Test
public void assertGetRegistryWithType() {
assertThat(ClassAdvisorRegistryFactory.getRegistry("test"), instanceOf(ClassAdvisorRegistry.class));
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/ClassAdvisorRegistryTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorRegistryTest.java
similarity index 91%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/ClassAdvisorRegistryTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorRegistryTest.java
index 6ff4c4a740a..cdabe5f1b7c 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/advisor/ClassAdvisorRegistryTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/ClassAdvisorRegistryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.advisor;
+package org.apache.shardingsphere.agent.core.plugin.advisor;
import org.apache.shardingsphere.agent.advisor.ClassAdvisor;
import org.junit.Test;
@@ -24,9 +24,9 @@ import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
public final class ClassAdvisorRegistryTest {
-
+
@Test
- public void assertGetAdvisorWithType() {
+ public void assertGetAdvisor() {
assertThat(new ClassAdvisorRegistry().getAdvisor("test"), instanceOf(ClassAdvisor.class));
}
}
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
similarity index 94%
rename from agent/core/src/test/java/org/apache/shardingsphere/agent/core/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
rename to agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
index 4abfc118876..cb7c545dd43 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.core.yaml.swapper;
+package org.apache.shardingsphere.agent.core.plugin.yaml.swapper;
-import org.apache.shardingsphere.agent.core.yaml.entity.YamlAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.yaml.entity.YamlAdvisorsConfiguration;
-import org.apache.shardingsphere.agent.core.yaml.entity.YamlPointcutConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorsConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlPointcutConfiguration;
import org.junit.Test;
import java.util.ArrayList;
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 2ef28a3c52b..7c364228263 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
@@ -35,7 +35,7 @@ import org.apache.shardingsphere.agent.core.mock.advice.MockInstanceMethodAround
import org.apache.shardingsphere.agent.core.mock.advice.MockStaticMethodAroundAdvice;
import org.apache.shardingsphere.agent.core.mock.material.Material;
import org.apache.shardingsphere.agent.core.mock.material.RepeatedAdviceMaterial;
-import org.apache.shardingsphere.agent.core.plugin.AgentAdvisors;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AgentAdvisors;
import org.apache.shardingsphere.agent.core.plugin.loader.AdviceInstanceLoader;
import org.junit.After;
import org.junit.AfterClass;
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 245cc7a3563..798b687c3bf 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
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.plugin.logging.base.definition;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.advisor.ClassAdvisor;
import org.apache.shardingsphere.agent.advisor.StaticMethodAdvisor;
-import org.apache.shardingsphere.agent.core.advisor.ClassAdvisorRegistryFactory;
+import org.apache.shardingsphere.agent.core.plugin.advisor.ClassAdvisorRegistryFactory;
import org.apache.shardingsphere.agent.plugin.logging.base.advice.MetaDataContextsFactoryAdvice;
import org.apache.shardingsphere.agent.spi.AdvisorDefinitionService;
diff --git a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusAdvisorDefinitionService.java b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusAdvisorDefinitionService.java
index 280f896a867..1ba94da7f56 100644
--- a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusAdvisorDefinitionService.java
+++ b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusAdvisorDefinitionService.java
@@ -22,10 +22,10 @@ import org.apache.shardingsphere.agent.advisor.ClassAdvisor;
import org.apache.shardingsphere.agent.advisor.ConstructorAdvisor;
import org.apache.shardingsphere.agent.advisor.InstanceMethodAdvisor;
import org.apache.shardingsphere.agent.advisor.StaticMethodAdvisor;
-import org.apache.shardingsphere.agent.core.advisor.ClassAdvisorRegistryFactory;
-import org.apache.shardingsphere.agent.core.yaml.entity.YamlAdvisorConfiguration;
-import org.apache.shardingsphere.agent.core.yaml.entity.YamlPointcutConfiguration;
-import org.apache.shardingsphere.agent.core.yaml.swapper.YamlAdvisorsConfigurationSwapper;
+import org.apache.shardingsphere.agent.core.plugin.advisor.ClassAdvisorRegistryFactory;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlPointcutConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.yaml.swapper.YamlAdvisorsConfigurationSwapper;
import org.apache.shardingsphere.agent.spi.AdvisorDefinitionService;
import java.util.Collection;
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 42c0da377c7..92fc6ff5f8b 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.advisor.ClassAdvisor;
import org.apache.shardingsphere.agent.advisor.InstanceMethodAdvisor;
-import org.apache.shardingsphere.agent.core.advisor.ClassAdvisorRegistryFactory;
+import org.apache.shardingsphere.agent.core.plugin.advisor.ClassAdvisorRegistryFactory;
import org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.TracingAdviser;
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/JDBCExecutorCallbackAdviser.java
index c7d54827f8f..b4a78896097 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.advisor.ClassAdvisor;
import org.apache.shardingsphere.agent.advisor.InstanceMethodAdvisor;
-import org.apache.shardingsphere.agent.core.advisor.ClassAdvisorRegistryFactory;
+import org.apache.shardingsphere.agent.core.plugin.advisor.ClassAdvisorRegistryFactory;
import org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.TracingAdviser;
diff --git a/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java b/agent/plugins/tracing/core/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/core/advice/adviser/impl/SQLParserEngineAdviser.java
index 84a3f3cb6b8..ffc311becd1 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.advisor.ClassAdvisor;
import org.apache.shardingsphere.agent.advisor.InstanceMethodAdvisor;
-import org.apache.shardingsphere.agent.core.advisor.ClassAdvisorRegistryFactory;
+import org.apache.shardingsphere.agent.core.plugin.advisor.ClassAdvisorRegistryFactory;
import org.apache.shardingsphere.agent.core.plugin.advice.InstanceMethodAroundAdvice;
import org.apache.shardingsphere.agent.plugin.tracing.core.advice.adviser.TracingAdviser;