Move AdvisorConfiguration from agent-api to agent-core module (apache…

…#23215) * Refactor PrometheusPluginBootService * Move AdvisorConfiguration from agent-api to agent-core module * Move AdvisorConfiguration from agent-api to agent-core module
Byeongcheol-Kim · Dec 31, 2022 · f42d229 · f42d229
1 parent 1d2194b
commit f42d229
Show file tree

Hide file tree

Showing 31 changed files with 36 additions and 39 deletions.
diff --git a/...nt/config/plugin/PluginConfiguration.java → ...ere/agent/config/PluginConfiguration.java b/...nt/config/plugin/PluginConfiguration.java → ...ere/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
@@ -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
@@ -30,8 +30,8 @@
 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/...in/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoader.java b/...in/java/org/apache/shardingsphere/agent/core/config/loader/PluginConfigurationLoader.java
@@ -23,7 +23,7 @@
 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/...apache/shardingsphere/agent/core/config/yaml/swapper/YamlPluginsConfigurationSwapper.java b/...apache/shardingsphere/agent/core/config/yaml/swapper/YamlPluginsConfigurationSwapper.java
@@ -22,7 +22,7 @@
 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/...e/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java b/...e/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginBootServiceManager.java
@@ -20,7 +20,7 @@
 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/.../config/advisor/AdvisorConfiguration.java → .../plugin/advisor/AdvisorConfiguration.java b/.../config/advisor/AdvisorConfiguration.java → .../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/...ava/org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistry.java b/...ava/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/...g/advisor/MethodAdvisorConfiguration.java → ...n/advisor/MethodAdvisorConfiguration.java b/...g/advisor/MethodAdvisorConfiguration.java → ...n/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/...n/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java b/...n/java/org/apache/shardingsphere/agent/core/plugin/loader/AdvisorConfigurationLoader.java
@@ -26,7 +26,7 @@
 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/...apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorConfigurationSwapper.java b/...apache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorConfigurationSwapper.java
@@ -19,8 +19,8 @@
 
 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/...pache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java b/...pache/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapper.java
@@ -19,7 +19,7 @@
 
 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
@@ -21,7 +21,7 @@
 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/...core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java b/...core/src/main/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformer.java
@@ -30,8 +30,8 @@
 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/...n/java/org/apache/shardingsphere/agent/core/transformer/builder/MethodAdvisorBuilder.java b/...n/java/org/apache/shardingsphere/agent/core/transformer/builder/MethodAdvisorBuilder.java
@@ -31,7 +31,7 @@
 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/...org/apache/shardingsphere/agent/core/plugin/advisor/AdvisorConfigurationRegistryTest.java b/...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/...e/shardingsphere/agent/core/plugin/yaml/swapper/YamlAdvisorsConfigurationSwapperTest.java b/...e/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/.../src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java b/.../src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
@@ -23,8 +23,8 @@
 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/...pache/shardingsphere/agent/plugin/core/config/validator/PluginConfigurationValidator.java b/...pache/shardingsphere/agent/plugin/core/config/validator/PluginConfigurationValidator.java
@@ -21,7 +21,7 @@
 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/...e/shardingsphere/agent/plugin/core/config/validator/PluginConfigurationValidatorTest.java b/...e/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/...ava/org/apache/shardingsphere/agent/plugin/logging/base/BaseLoggingPluginBootService.java b/...ava/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/.../java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootService.java b/.../java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootService.java
@@ -22,7 +22,7 @@
 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 @@ private void startServer(final PluginConfiguration pluginConfig, final boolean i
         }
     }
 
-    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/...a/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootServiceTest.java b/...a/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/...org/apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerTracingPluginBootService.java b/...org/apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerTracingPluginBootService.java
@@ -19,7 +19,7 @@
 
 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/...apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerTracingPluginBootServiceTest.java b/...apache/shardingsphere/agent/plugin/tracing/jaeger/JaegerTracingPluginBootServiceTest.java
@@ -19,7 +19,7 @@
 
 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/...rdingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginBootService.java b/...rdingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginBootService.java
@@ -19,7 +19,7 @@
 
 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/...gsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginBootServiceTest.java b/...gsphere/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/.../apache/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingPluginBootService.java b/.../apache/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingPluginBootService.java
@@ -20,7 +20,7 @@
 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/...che/shardingsphere/agent/plugin/tracing/opentracing/OpenTracingPluginBootServiceTest.java b/...che/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/...org/apache/shardingsphere/agent/plugin/tracing/zipkin/ZipkinTracingPluginBootService.java b/...org/apache/shardingsphere/agent/plugin/tracing/zipkin/ZipkinTracingPluginBootService.java
@@ -21,7 +21,7 @@
 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/...apache/shardingsphere/agent/plugin/tracing/zipkin/ZipkinTracingPluginBootServiceTest.java b/...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;