You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/12/31 05:59:55 UTC
[shardingsphere] branch master updated: Move AdvisorConfiguration from agent-api to agent-core module (#23215)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new f42d2296f75 Move AdvisorConfiguration from agent-api to agent-core module (#23215)
f42d2296f75 is described below
commit f42d2296f75f2d70fdb04302b3b31072f29169dd
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Dec 31 13:59:48 2022 +0800
Move AdvisorConfiguration from agent-api to agent-core module (#23215)
* Refactor PrometheusPluginBootService
* Move AdvisorConfiguration from agent-api to agent-core module
* Move AdvisorConfiguration from agent-api to agent-core module
---
.../agent/config/{plugin => }/PluginConfiguration.java | 2 +-
.../java/org/apache/shardingsphere/agent/spi/PluginBootService.java | 2 +-
.../org/apache/shardingsphere/agent/core/ShardingSphereAgent.java | 4 ++--
.../agent/core/config/loader/PluginConfigurationLoader.java | 2 +-
.../core/config/yaml/swapper/YamlPluginsConfigurationSwapper.java | 2 +-
.../shardingsphere/agent/core/plugin/PluginBootServiceManager.java | 2 +-
.../agent/core/plugin}/advisor/AdvisorConfiguration.java | 2 +-
.../agent/core/plugin/advisor/AdvisorConfigurationRegistry.java | 2 --
.../agent/core/plugin}/advisor/MethodAdvisorConfiguration.java | 2 +-
.../agent/core/plugin/loader/AdvisorConfigurationLoader.java | 2 +-
.../core/plugin/yaml/swapper/YamlAdvisorConfigurationSwapper.java | 4 ++--
.../core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java | 2 +-
.../apache/shardingsphere/agent/core/transformer/AgentJunction.java | 2 +-
.../shardingsphere/agent/core/transformer/AgentTransformer.java | 4 ++--
.../agent/core/transformer/builder/MethodAdvisorBuilder.java | 2 +-
.../agent/core/plugin/advisor/AdvisorConfigurationRegistryTest.java | 1 -
.../plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java | 4 ++--
.../shardingsphere/agent/core/transformer/AgentTransformerTest.java | 4 ++--
.../plugin/core/config/validator/PluginConfigurationValidator.java | 2 +-
.../core/config/validator/PluginConfigurationValidatorTest.java | 2 +-
.../agent/plugin/logging/base/BaseLoggingPluginBootService.java | 2 +-
.../agent/metrics/prometheus/PrometheusPluginBootService.java | 6 +++---
.../agent/metrics/prometheus/PrometheusPluginBootServiceTest.java | 2 +-
.../agent/plugin/tracing/jaeger/JaegerTracingPluginBootService.java | 2 +-
.../plugin/tracing/jaeger/JaegerTracingPluginBootServiceTest.java | 2 +-
.../opentelemetry/OpenTelemetryTracingPluginBootService.java | 2 +-
.../opentelemetry/OpenTelemetryTracingPluginBootServiceTest.java | 2 +-
.../plugin/tracing/opentracing/OpenTracingPluginBootService.java | 2 +-
.../tracing/opentracing/OpenTracingPluginBootServiceTest.java | 2 +-
.../agent/plugin/tracing/zipkin/ZipkinTracingPluginBootService.java | 2 +-
.../plugin/tracing/zipkin/ZipkinTracingPluginBootServiceTest.java | 2 +-
31 files changed, 36 insertions(+), 39 deletions(-)
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/config/plugin/PluginConfiguration.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/config/PluginConfiguration.java
similarity index 95%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/config/plugin/PluginConfiguration.java
rename to agent/api/src/main/java/org/apache/shardingsphere/agent/config/PluginConfiguration.java
index 3ab8d2dc6e8..cf5abe99155 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/config/plugin/PluginConfiguration.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/config/PluginConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.config.plugin;
+package org.apache.shardingsphere.agent.config;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginBootService.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginBootService.java
index 5f21a712060..e5109c61839 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginBootService.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginBootService.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.spi;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
/**
* Plugin boot service that the lifecycle is from the agent start to shutdown.
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereAgent.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereAgent.java
index 59def2e88f0..e0b2ffb2045 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereAgent.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/ShardingSphereAgent.java
@@ -30,8 +30,8 @@ import org.apache.shardingsphere.agent.core.plugin.loader.AdvisorConfigurationLo
import org.apache.shardingsphere.agent.core.plugin.loader.AgentPluginLoader;
import org.apache.shardingsphere.agent.core.transformer.AgentJunction;
import org.apache.shardingsphere.agent.core.transformer.AgentTransformer;
-import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import java.io.IOException;
import java.lang.instrument.Instrumentation;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoader.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoader.java
index ea55577c3f9..d6c4f5f66f3 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoader.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoader.java
@@ -23,7 +23,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.core.config.yaml.entity.YamlPluginsConfiguration;
import org.apache.shardingsphere.agent.core.config.yaml.swapper.YamlPluginsConfigurationSwapper;
import org.apache.shardingsphere.agent.core.path.AgentPathBuilder;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.yaml.snakeyaml.Yaml;
import java.io.File;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/swapper/YamlPluginsConfigurationSwapper.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
index af7097da6e3..4d7b2eae4c5 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.core.config.yaml.entity.YamlPluginCategoryConfiguration;
import org.apache.shardingsphere.agent.core.config.yaml.entity.YamlPluginConfiguration;
import org.apache.shardingsphere.agent.core.config.yaml.entity.YamlPluginsConfiguration;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java
index 69f7d0faa3b..dc6501d6fd9 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.core.plugin;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.core.spi.PluginBootServiceRegistry;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/config/advisor/AdvisorConfiguration.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfiguration.java
similarity index 95%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/config/advisor/AdvisorConfiguration.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfiguration.java
index 633842810e7..e953818b68e 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/config/advisor/AdvisorConfiguration.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.config.advisor;
+package org.apache.shardingsphere.agent.core.plugin.advisor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistry.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistry.java
index 96b4dc82a31..455404c7b22 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistry.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistry.java
@@ -17,8 +17,6 @@
package org.apache.shardingsphere.agent.core.plugin.advisor;
-import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
-
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/config/advisor/MethodAdvisorConfiguration.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/MethodAdvisorConfiguration.java
similarity index 95%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/config/advisor/MethodAdvisorConfiguration.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/MethodAdvisorConfiguration.java
index 5a4a125023a..9507b6ac299 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/config/advisor/MethodAdvisorConfiguration.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/advisor/MethodAdvisorConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.config.advisor;
+package org.apache.shardingsphere.agent.core.plugin.advisor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
index de76a7f450f..ed3a2836bdc 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.agent.core.logging.LoggerFactory.Logger;
import org.apache.shardingsphere.agent.core.plugin.PluginJar;
import org.apache.shardingsphere.agent.core.plugin.yaml.loader.YamlAdvisorsConfigurationLoader;
import org.apache.shardingsphere.agent.core.plugin.yaml.swapper.YamlAdvisorsConfigurationSwapper;
-import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
import java.io.InputStream;
import java.util.Collection;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorConfigurationSwapper.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorConfigurationSwapper.java
index 00a4e9acad2..e0ebb1e1bec 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorConfigurationSwapper.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorConfigurationSwapper.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.agent.core.plugin.yaml.swapper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
-import org.apache.shardingsphere.agent.config.advisor.MethodAdvisorConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.advisor.MethodAdvisorConfiguration;
import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfigurationRegistryFactory;
import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorConfiguration;
import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlPointcutConfiguration;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
index fa8136f0685..00b1e4ed395 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.agent.core.plugin.yaml.swapper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorConfiguration;
import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorsConfiguration;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentJunction.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentJunction.java
index 8c5b0a620d8..574cf1cf609 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentJunction.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentJunction.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.matcher.ElementMatcher;
import net.bytebuddy.matcher.ElementMatcher.Junction;
-import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
import java.util.Map;
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 1e0ae89dac8..17ab5c99cb5 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
@@ -30,8 +30,8 @@ import org.apache.shardingsphere.agent.core.plugin.PluginBootServiceManager;
import org.apache.shardingsphere.agent.core.plugin.PluginJar;
import org.apache.shardingsphere.agent.core.transformer.builder.MethodAdvisorBuilder;
import org.apache.shardingsphere.agent.core.transformer.builder.advise.AdviceFactory;
-import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import java.util.Collection;
import java.util.Map;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/MethodAdvisorBuilder.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/MethodAdvisorBuilder.java
index 6ad9a6bbb63..173fc916ebc 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/MethodAdvisorBuilder.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/transformer/builder/MethodAdvisorBuilder.java
@@ -31,7 +31,7 @@ import org.apache.shardingsphere.agent.core.plugin.executor.type.ConstructorAdvi
import org.apache.shardingsphere.agent.core.plugin.executor.type.InstanceMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.plugin.executor.type.StaticMethodAdviceExecutor;
import org.apache.shardingsphere.agent.core.transformer.MethodAdvisor;
-import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.advisor.AdvisorConfiguration;
import org.apache.shardingsphere.agent.core.transformer.builder.advise.AdviceFactory;
import java.util.Collection;
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryTest.java
index 05471dc8b1b..24917d3cab3 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.agent.core.plugin.advisor;
-import org.apache.shardingsphere.agent.config.advisor.AdvisorConfiguration;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
index 123e83c974c..001151cd3a8 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.agent.core.plugin.yaml.swapper;
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.AdvisorConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.advisor.MethodAdvisorConfiguration;
import org.apache.shardingsphere.agent.core.plugin.yaml.entity.YamlAdvisorsConfiguration;
import org.apache.shardingsphere.agent.core.plugin.yaml.fixture.YamlAdviceFixture;
import org.apache.shardingsphere.agent.core.plugin.yaml.fixture.YamlTargetObjectFixture;
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 86c6ac484be..c7b1038e0c6 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
@@ -23,8 +23,8 @@ import net.bytebuddy.agent.builder.AgentBuilder;
import net.bytebuddy.agent.builder.ResettableClassFileTransformer;
import net.bytebuddy.dynamic.scaffold.TypeValidation;
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.AdvisorConfiguration;
+import org.apache.shardingsphere.agent.core.plugin.advisor.MethodAdvisorConfiguration;
import org.apache.shardingsphere.agent.core.logging.LoggingListener;
import org.apache.shardingsphere.agent.core.transformer.fixture.advice.BarAdvice;
import org.apache.shardingsphere.agent.core.transformer.fixture.advice.FooAdvice;
diff --git a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/config/validator/PluginConfigurationValidator.java b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/config/validator/PluginConfigurationValidator.java
index d2877ffafbd..1af4f1e9c6d 100644
--- a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/config/validator/PluginConfigurationValidator.java
+++ b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/config/validator/PluginConfigurationValidator.java
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
/**
* Remote plugin configuration validator.
diff --git a/agent/plugins/core/src/test/java/org/apache/shardingsphere/agent/plugin/core/config/validator/PluginConfigurationValidatorTest.java b/agent/plugins/core/src/test/java/org/apache/shardingsphere/agent/plugin/core/config/validator/PluginConfigurationValidatorTest.java
index 6beec7eea59..d0711438257 100644
--- a/agent/plugins/core/src/test/java/org/apache/shardingsphere/agent/plugin/core/config/validator/PluginConfigurationValidatorTest.java
+++ b/agent/plugins/core/src/test/java/org/apache/shardingsphere/agent/plugin/core/config/validator/PluginConfigurationValidatorTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.plugin.core.config.validator;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.junit.Test;
import static org.junit.Assert.assertThrows;
diff --git a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/BaseLoggingPluginBootService.java b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/BaseLoggingPluginBootService.java
index 08e5f5ac360..9e9ba18039e 100644
--- a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/BaseLoggingPluginBootService.java
+++ b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/BaseLoggingPluginBootService.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.plugin.logging.base;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.apache.shardingsphere.agent.spi.PluginBootService;
/**
diff --git a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootService.java b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootService.java
index bb95af19e97..e82c7c8a2ce 100644
--- a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootService.java
+++ b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootService.java
@@ -22,7 +22,7 @@ import io.prometheus.client.CollectorRegistry;
import io.prometheus.client.exporter.HTTPServer;
import io.prometheus.client.hotspot.DefaultExports;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.apache.shardingsphere.agent.metrics.core.MetricsPool;
import org.apache.shardingsphere.agent.metrics.prometheus.collector.BuildInfoCollector;
import org.apache.shardingsphere.agent.metrics.prometheus.collector.MetaDataInfoCollector;
@@ -62,13 +62,13 @@ public final class PrometheusPluginBootService implements PluginBootService {
}
}
- private void registerCollector(final boolean isJVMInformationCollection, final boolean isEnhancedForProxy) {
+ private void registerCollector(final boolean isCollectJVMInformation, final boolean isEnhancedForProxy) {
new BuildInfoCollector(isEnhancedForProxy).register();
if (isEnhancedForProxy) {
new ProxyInfoCollector().register();
new MetaDataInfoCollector().register();
}
- if (isJVMInformationCollection) {
+ if (isCollectJVMInformation) {
DefaultExports.initialize();
}
}
diff --git a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootServiceTest.java b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootServiceTest.java
index 5e530168741..a8c10c8e85b 100644
--- a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootServiceTest.java
+++ b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootServiceTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.metrics.prometheus;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
import org.apache.shardingsphere.infra.instance.InstanceContext;
diff --git a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerTracingPluginBootService.java b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerTracingPluginBootService.java
index 513628d025c..757dea8342f 100644
--- a/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerTracingPluginBootService.java
+++ b/agent/plugins/tracing/type/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerTracingPluginBootService.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.jaeger;
import io.jaegertracing.Configuration;
import io.opentracing.util.GlobalTracer;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.apache.shardingsphere.agent.plugin.core.config.validator.PluginConfigurationValidator;
import org.apache.shardingsphere.agent.spi.PluginBootService;
diff --git a/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerTracingPluginBootServiceTest.java b/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerTracingPluginBootServiceTest.java
index 3de061e5526..91c43ea67ff 100644
--- a/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerTracingPluginBootServiceTest.java
+++ b/agent/plugins/tracing/type/jaeger/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerTracingPluginBootServiceTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.jaeger;
import io.opentracing.noop.NoopTracerFactory;
import io.opentracing.util.GlobalTracer;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.junit.After;
import org.junit.Test;
import org.mockito.internal.configuration.plugins.Plugins;
diff --git a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginBootService.java b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginBootService.java
index 5d66279a1a4..c938bc2b9f8 100644
--- a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginBootService.java
+++ b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginBootService.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.opentelemetry;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.autoconfigure.OpenTelemetrySdkAutoConfiguration;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.apache.shardingsphere.agent.spi.PluginBootService;
public class OpenTelemetryTracingPluginBootService implements PluginBootService {
diff --git a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginBootServiceTest.java b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginBootServiceTest.java
index 9dcf55305f8..491b6e81ec1 100644
--- a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginBootServiceTest.java
+++ b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginBootServiceTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.opentelemetry;
import io.opentelemetry.api.GlobalOpenTelemetry;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.junit.After;
import org.junit.Test;
diff --git a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingPluginBootService.java b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingPluginBootService.java
index 6efc943677c..c199f0bf447 100644
--- a/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingPluginBootService.java
+++ b/agent/plugins/tracing/type/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingPluginBootService.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.opentracing;
import com.google.common.base.Preconditions;
import io.opentracing.Tracer;
import io.opentracing.util.GlobalTracer;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.apache.shardingsphere.agent.spi.PluginBootService;
/**
diff --git a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingPluginBootServiceTest.java b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingPluginBootServiceTest.java
index b54a9847606..4f55fa111e8 100644
--- a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingPluginBootServiceTest.java
+++ b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingPluginBootServiceTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.opentracing;
import io.opentracing.util.GlobalTracer;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.junit.After;
import org.junit.Test;
diff --git a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/ZipkinTracingPluginBootService.java b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/ZipkinTracingPluginBootService.java
index 66a88f4db08..fcc1001d63a 100644
--- a/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/ZipkinTracingPluginBootService.java
+++ b/agent/plugins/tracing/type/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/ZipkinTracingPluginBootService.java
@@ -21,7 +21,7 @@ import brave.Tracing;
import brave.sampler.BoundarySampler;
import brave.sampler.RateLimitingSampler;
import brave.sampler.Sampler;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.apache.shardingsphere.agent.plugin.core.config.validator.PluginConfigurationValidator;
import org.apache.shardingsphere.agent.spi.PluginBootService;
import zipkin2.reporter.brave.AsyncZipkinSpanHandler;
diff --git a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/ZipkinTracingPluginBootServiceTest.java b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/ZipkinTracingPluginBootServiceTest.java
index d81566ce51e..5d08a465b1e 100644
--- a/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/ZipkinTracingPluginBootServiceTest.java
+++ b/agent/plugins/tracing/type/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/ZipkinTracingPluginBootServiceTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.zipkin;
import brave.Tracing;
-import org.apache.shardingsphere.agent.config.plugin.PluginConfiguration;
+import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.junit.After;
import org.junit.Test;
import org.mockito.internal.configuration.plugins.Plugins;