diff --git a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/MetricsPool.java b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsPool.java similarity index 96% rename from agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/MetricsPool.java rename to agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsPool.java index 98de944056617..1cbdf6e4570a8 100644 --- a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/MetricsPool.java +++ b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsPool.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core; +package org.apache.shardingsphere.agent.plugin.metrics.core; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; diff --git a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/MetricsWrapper.java b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapper.java similarity index 97% rename from agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/MetricsWrapper.java rename to agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapper.java index 426aa020bb8ff..73f122322ac47 100644 --- a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/MetricsWrapper.java +++ b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core; +package org.apache.shardingsphere.agent.plugin.metrics.core; /** * Metrics wrapper. diff --git a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/MetricsWrapperFactory.java b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapperFactory.java similarity index 94% rename from agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/MetricsWrapperFactory.java rename to agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapperFactory.java index 15b175659014e..a5bc732f7eaa2 100644 --- a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/MetricsWrapperFactory.java +++ b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapperFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core; +package org.apache.shardingsphere.agent.plugin.metrics.core; import java.util.Optional; diff --git a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/ChannelHandlerAdvice.java b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/ChannelHandlerAdvice.java similarity index 87% rename from agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/ChannelHandlerAdvice.java rename to agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/ChannelHandlerAdvice.java index ea9a42e9ad07a..a497b39d79be1 100644 --- a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/ChannelHandlerAdvice.java +++ b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/ChannelHandlerAdvice.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.advice; +package org.apache.shardingsphere.agent.plugin.metrics.core.advice; import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject; import org.apache.shardingsphere.agent.api.advice.type.InstanceMethodAdvice; -import org.apache.shardingsphere.agent.metrics.core.MetricsPool; -import org.apache.shardingsphere.agent.metrics.core.MetricsWrapper; -import org.apache.shardingsphere.agent.metrics.core.constant.MetricIds; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsPool; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.constant.MetricIds; import java.lang.reflect.Method; diff --git a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/CommandExecutorTaskAdvice.java b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/CommandExecutorTaskAdvice.java similarity index 88% rename from agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/CommandExecutorTaskAdvice.java rename to agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/CommandExecutorTaskAdvice.java index a2cabcf8a946a..8046bcddde587 100644 --- a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/CommandExecutorTaskAdvice.java +++ b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/CommandExecutorTaskAdvice.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.advice; +package org.apache.shardingsphere.agent.plugin.metrics.core.advice; import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject; import org.apache.shardingsphere.agent.api.advice.type.InstanceMethodAdvice; -import org.apache.shardingsphere.agent.metrics.core.MetricsPool; -import org.apache.shardingsphere.agent.metrics.core.MetricsWrapper; -import org.apache.shardingsphere.agent.metrics.core.constant.MetricIds; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsPool; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.constant.MetricIds; import org.apache.shardingsphere.agent.plugin.core.util.TimeRecorder; import java.lang.reflect.Method; diff --git a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/MetaDataContextsFactoryAdvice.java b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/MetaDataContextsFactoryAdvice.java similarity index 93% rename from agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/MetaDataContextsFactoryAdvice.java rename to agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/MetaDataContextsFactoryAdvice.java index ac18f25e09db7..8e82599f5a182 100644 --- a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/MetaDataContextsFactoryAdvice.java +++ b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/MetaDataContextsFactoryAdvice.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.advice; +package org.apache.shardingsphere.agent.plugin.metrics.core.advice; import org.apache.shardingsphere.agent.api.advice.type.StaticMethodAdvice; diff --git a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/SQLParserEngineAdvice.java b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParserEngineAdvice.java similarity index 94% rename from agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/SQLParserEngineAdvice.java rename to agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParserEngineAdvice.java index d1155ad87781c..bb7a2e01e614f 100644 --- a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/SQLParserEngineAdvice.java +++ b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParserEngineAdvice.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.advice; +package org.apache.shardingsphere.agent.plugin.metrics.core.advice; import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject; import org.apache.shardingsphere.agent.api.advice.type.InstanceMethodAdvice; -import org.apache.shardingsphere.agent.metrics.core.MetricsPool; -import org.apache.shardingsphere.agent.metrics.core.MetricsWrapper; -import org.apache.shardingsphere.agent.metrics.core.constant.MetricIds; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsPool; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.constant.MetricIds; import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement; import org.apache.shardingsphere.distsql.parser.statement.rdl.RDLStatement; import org.apache.shardingsphere.distsql.parser.statement.rql.RQLStatement; diff --git a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/SQLRouteEngineAdvice.java b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteEngineAdvice.java similarity index 92% rename from agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/SQLRouteEngineAdvice.java rename to agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteEngineAdvice.java index 098bf9aac41d2..87281191ea660 100644 --- a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/SQLRouteEngineAdvice.java +++ b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteEngineAdvice.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.advice; +package org.apache.shardingsphere.agent.plugin.metrics.core.advice; import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject; import org.apache.shardingsphere.agent.api.advice.type.InstanceMethodAdvice; -import org.apache.shardingsphere.agent.metrics.core.MetricsPool; -import org.apache.shardingsphere.agent.metrics.core.MetricsWrapper; -import org.apache.shardingsphere.agent.metrics.core.constant.MetricIds; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsPool; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.constant.MetricIds; import org.apache.shardingsphere.infra.binder.QueryContext; import org.apache.shardingsphere.infra.route.context.RouteContext; import org.apache.shardingsphere.infra.route.context.RouteMapper; diff --git a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/TransactionAdvice.java b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/TransactionAdvice.java similarity index 86% rename from agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/TransactionAdvice.java rename to agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/TransactionAdvice.java index 2a9d563016f83..b6306ce35dbb7 100644 --- a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/advice/TransactionAdvice.java +++ b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/TransactionAdvice.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.advice; +package org.apache.shardingsphere.agent.plugin.metrics.core.advice; import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject; import org.apache.shardingsphere.agent.api.advice.type.InstanceMethodAdvice; -import org.apache.shardingsphere.agent.metrics.core.MetricsPool; -import org.apache.shardingsphere.agent.metrics.core.MetricsWrapper; -import org.apache.shardingsphere.agent.metrics.core.constant.MetricIds; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsPool; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.constant.MetricIds; import java.lang.reflect.Method; diff --git a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/constant/MetricIds.java b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/constant/MetricIds.java similarity index 97% rename from agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/constant/MetricIds.java rename to agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/constant/MetricIds.java index cae241e9b2a7f..639c248a5fc50 100644 --- a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/metrics/core/constant/MetricIds.java +++ b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/constant/MetricIds.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.constant; +package org.apache.shardingsphere.agent.plugin.metrics.core.constant; /** * Metric IDs. diff --git a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/MetricsPoolTest.java b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsPoolTest.java similarity index 88% rename from agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/MetricsPoolTest.java rename to agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsPoolTest.java index 45e103c1d13f9..38a8f07efbd4d 100644 --- a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/MetricsPoolTest.java +++ b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsPoolTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core; +package org.apache.shardingsphere.agent.plugin.metrics.core; -import org.apache.shardingsphere.agent.metrics.core.fixture.FixtureWrapperFactory; +import org.apache.shardingsphere.agent.plugin.metrics.core.fixture.FixtureWrapperFactory; import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/MetricsWrapperTest.java b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapperTest.java similarity index 94% rename from agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/MetricsWrapperTest.java rename to agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapperTest.java index 37ab10db1c834..7251d0b4008be 100644 --- a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/MetricsWrapperTest.java +++ b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/MetricsWrapperTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core; +package org.apache.shardingsphere.agent.plugin.metrics.core; -import org.apache.shardingsphere.agent.metrics.core.fixture.FixtureWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.fixture.FixtureWrapper; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/ChannelHandlerAdviceTest.java b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/ChannelHandlerAdviceTest.java similarity index 90% rename from agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/ChannelHandlerAdviceTest.java rename to agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/ChannelHandlerAdviceTest.java index 802df6247e486..76797df79e470 100644 --- a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/ChannelHandlerAdviceTest.java +++ b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/ChannelHandlerAdviceTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.advice; +package org.apache.shardingsphere.agent.plugin.metrics.core.advice; -import org.apache.shardingsphere.agent.metrics.core.MetricsPool; -import org.apache.shardingsphere.agent.metrics.core.constant.MetricIds; -import org.apache.shardingsphere.agent.metrics.core.fixture.FixtureWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsPool; +import org.apache.shardingsphere.agent.plugin.metrics.core.constant.MetricIds; +import org.apache.shardingsphere.agent.plugin.metrics.core.fixture.FixtureWrapper; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/CommandExecutorTaskAdviceTest.java b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/CommandExecutorTaskAdviceTest.java similarity index 90% rename from agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/CommandExecutorTaskAdviceTest.java rename to agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/CommandExecutorTaskAdviceTest.java index 3f9e433badf46..b5d03d4f99768 100644 --- a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/CommandExecutorTaskAdviceTest.java +++ b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/CommandExecutorTaskAdviceTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.advice; +package org.apache.shardingsphere.agent.plugin.metrics.core.advice; -import org.apache.shardingsphere.agent.metrics.core.MetricsPool; -import org.apache.shardingsphere.agent.metrics.core.constant.MetricIds; -import org.apache.shardingsphere.agent.metrics.core.fixture.FixtureWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsPool; +import org.apache.shardingsphere.agent.plugin.metrics.core.constant.MetricIds; +import org.apache.shardingsphere.agent.plugin.metrics.core.fixture.FixtureWrapper; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/MetricsAdviceBaseTest.java b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/MetricsAdviceBaseTest.java similarity index 81% rename from agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/MetricsAdviceBaseTest.java rename to agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/MetricsAdviceBaseTest.java index 40f727ba1f27c..bbd6998a0842d 100644 --- a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/MetricsAdviceBaseTest.java +++ b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/MetricsAdviceBaseTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.advice; +package org.apache.shardingsphere.agent.plugin.metrics.core.advice; -import org.apache.shardingsphere.agent.metrics.core.MetricsPool; -import org.apache.shardingsphere.agent.metrics.core.fixture.FixtureWrapperFactory; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsPool; +import org.apache.shardingsphere.agent.plugin.metrics.core.fixture.FixtureWrapperFactory; import org.junit.BeforeClass; public abstract class MetricsAdviceBaseTest { diff --git a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/MockTargetAdviceObject.java b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/MockTargetAdviceObject.java similarity index 94% rename from agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/MockTargetAdviceObject.java rename to agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/MockTargetAdviceObject.java index 9902b297e664b..e76c33f03b16d 100644 --- a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/MockTargetAdviceObject.java +++ b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/MockTargetAdviceObject.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.advice; +package org.apache.shardingsphere.agent.plugin.metrics.core.advice; import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject; diff --git a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/SQLParserEngineAdviceTest.java b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParserEngineAdviceTest.java similarity index 93% rename from agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/SQLParserEngineAdviceTest.java rename to agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParserEngineAdviceTest.java index da5eac73c8573..3d3637c2435aa 100644 --- a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/SQLParserEngineAdviceTest.java +++ b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParserEngineAdviceTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.advice; +package org.apache.shardingsphere.agent.plugin.metrics.core.advice; -import org.apache.shardingsphere.agent.metrics.core.MetricsPool; -import org.apache.shardingsphere.agent.metrics.core.constant.MetricIds; -import org.apache.shardingsphere.agent.metrics.core.fixture.FixtureWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsPool; +import org.apache.shardingsphere.agent.plugin.metrics.core.constant.MetricIds; +import org.apache.shardingsphere.agent.plugin.metrics.core.fixture.FixtureWrapper; import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement; import org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowStorageUnitsStatement; import org.apache.shardingsphere.migration.distsql.statement.ShowMigrationListStatement; diff --git a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/SQLRouteEngineAdviceTest.java b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteEngineAdviceTest.java similarity index 93% rename from agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/SQLRouteEngineAdviceTest.java rename to agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteEngineAdviceTest.java index a7500c4cb2b3e..86fe338f299d6 100644 --- a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/SQLRouteEngineAdviceTest.java +++ b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteEngineAdviceTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.advice; +package org.apache.shardingsphere.agent.plugin.metrics.core.advice; -import org.apache.shardingsphere.agent.metrics.core.MetricsPool; -import org.apache.shardingsphere.agent.metrics.core.constant.MetricIds; -import org.apache.shardingsphere.agent.metrics.core.fixture.FixtureWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsPool; +import org.apache.shardingsphere.agent.plugin.metrics.core.constant.MetricIds; +import org.apache.shardingsphere.agent.plugin.metrics.core.fixture.FixtureWrapper; import org.apache.shardingsphere.infra.binder.QueryContext; import org.apache.shardingsphere.infra.binder.statement.CommonSQLStatementContext; import org.apache.shardingsphere.infra.context.ConnectionContext; diff --git a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/TransactionAdviceTest.java b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/TransactionAdviceTest.java similarity index 88% rename from agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/TransactionAdviceTest.java rename to agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/TransactionAdviceTest.java index 4625197f9e7ac..c07fb28ce8c46 100644 --- a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/advice/TransactionAdviceTest.java +++ b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/TransactionAdviceTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.advice; +package org.apache.shardingsphere.agent.plugin.metrics.core.advice; -import org.apache.shardingsphere.agent.metrics.core.MetricsPool; -import org.apache.shardingsphere.agent.metrics.core.constant.MetricIds; -import org.apache.shardingsphere.agent.metrics.core.fixture.FixtureWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsPool; +import org.apache.shardingsphere.agent.plugin.metrics.core.constant.MetricIds; +import org.apache.shardingsphere.agent.plugin.metrics.core.fixture.FixtureWrapper; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; diff --git a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/fixture/FixtureWrapper.java b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/FixtureWrapper.java similarity index 91% rename from agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/fixture/FixtureWrapper.java rename to agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/FixtureWrapper.java index 3cc7b70e03ef3..acece0c8c434e 100644 --- a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/fixture/FixtureWrapper.java +++ b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/FixtureWrapper.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.fixture; +package org.apache.shardingsphere.agent.plugin.metrics.core.fixture; import lombok.Getter; -import org.apache.shardingsphere.agent.metrics.core.MetricsWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsWrapper; /** * Fixed metric wrapper. diff --git a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/fixture/FixtureWrapperFactory.java b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/FixtureWrapperFactory.java similarity index 82% rename from agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/fixture/FixtureWrapperFactory.java rename to agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/FixtureWrapperFactory.java index 2c710168ff367..665f7c983f1f8 100644 --- a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/metrics/core/fixture/FixtureWrapperFactory.java +++ b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/fixture/FixtureWrapperFactory.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.core.fixture; +package org.apache.shardingsphere.agent.plugin.metrics.core.fixture; -import org.apache.shardingsphere.agent.metrics.core.MetricsWrapper; -import org.apache.shardingsphere.agent.metrics.core.MetricsWrapperFactory; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsWrapperFactory; import java.util.Optional; 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/plugin/metrics/prometheus/PrometheusPluginBootService.java similarity index 87% rename from agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootService.java rename to agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/PrometheusPluginBootService.java index 15ef48c40df5e..3fb9b776edee9 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/plugin/metrics/prometheus/PrometheusPluginBootService.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus; import com.google.common.base.Strings; import io.prometheus.client.CollectorRegistry; @@ -23,11 +23,11 @@ import io.prometheus.client.hotspot.DefaultExports; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.agent.api.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; -import org.apache.shardingsphere.agent.metrics.prometheus.collector.ProxyInfoCollector; -import org.apache.shardingsphere.agent.metrics.prometheus.wrapper.PrometheusWrapperFactory; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsPool; +import org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.BuildInfoCollector; +import org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.MetaDataInfoCollector; +import org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector.ProxyInfoCollector; +import org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.PrometheusWrapperFactory; import org.apache.shardingsphere.agent.plugin.core.config.validator.PluginConfigurationValidator; import org.apache.shardingsphere.agent.spi.PluginBootService; diff --git a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/BuildInfoCollector.java b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/BuildInfoCollector.java similarity index 89% rename from agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/BuildInfoCollector.java rename to agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/BuildInfoCollector.java index 9c91327b0fe1c..5b63e66d8622e 100644 --- a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/BuildInfoCollector.java +++ b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/BuildInfoCollector.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.collector; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector; import io.prometheus.client.Collector; import io.prometheus.client.GaugeMetricFamily; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.agent.metrics.core.constant.MetricIds; -import org.apache.shardingsphere.agent.metrics.prometheus.wrapper.PrometheusWrapperFactory; +import org.apache.shardingsphere.agent.plugin.metrics.core.constant.MetricIds; +import org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.PrometheusWrapperFactory; import org.apache.shardingsphere.proxy.Bootstrap; import java.util.Arrays; diff --git a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/MetaDataInfoCollector.java b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/MetaDataInfoCollector.java similarity index 94% rename from agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/MetaDataInfoCollector.java rename to agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/MetaDataInfoCollector.java index c55105a0631f4..208d1f82120cd 100644 --- a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/MetaDataInfoCollector.java +++ b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/MetaDataInfoCollector.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.collector; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector; import io.prometheus.client.Collector; import io.prometheus.client.GaugeMetricFamily; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.agent.metrics.core.constant.MetricIds; -import org.apache.shardingsphere.agent.metrics.prometheus.wrapper.PrometheusWrapperFactory; +import org.apache.shardingsphere.agent.plugin.metrics.core.constant.MetricIds; +import org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.PrometheusWrapperFactory; import org.apache.shardingsphere.infra.datasource.props.DataSourcePropertiesCreator; import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase; import org.apache.shardingsphere.mode.metadata.MetaDataContexts; diff --git a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/ProxyInfoCollector.java b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/ProxyInfoCollector.java similarity index 90% rename from agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/ProxyInfoCollector.java rename to agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/ProxyInfoCollector.java index e8e781a0192aa..81cac90448943 100644 --- a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/ProxyInfoCollector.java +++ b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/ProxyInfoCollector.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.collector; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector; import io.prometheus.client.Collector; import io.prometheus.client.GaugeMetricFamily; -import org.apache.shardingsphere.agent.metrics.core.constant.MetricIds; -import org.apache.shardingsphere.agent.metrics.prometheus.wrapper.PrometheusWrapperFactory; +import org.apache.shardingsphere.agent.plugin.metrics.core.constant.MetricIds; +import org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.PrometheusWrapperFactory; import org.apache.shardingsphere.infra.state.StateContext; import org.apache.shardingsphere.infra.state.StateType; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; diff --git a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/PrometheusWrapperFactory.java b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/PrometheusWrapperFactory.java similarity index 92% rename from agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/PrometheusWrapperFactory.java rename to agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/PrometheusWrapperFactory.java index 558dbbcf02edf..1a565a877413b 100644 --- a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/PrometheusWrapperFactory.java +++ b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/PrometheusWrapperFactory.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.wrapper; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper; import io.prometheus.client.Counter; import io.prometheus.client.Gauge; import io.prometheus.client.GaugeMetricFamily; import io.prometheus.client.Histogram; import io.prometheus.client.Summary; -import org.apache.shardingsphere.agent.metrics.core.MetricsWrapper; -import org.apache.shardingsphere.agent.metrics.core.MetricsWrapperFactory; -import org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type.CounterWrapper; -import org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type.GaugeWrapper; -import org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type.HistogramWrapper; -import org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type.SummaryWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsWrapperFactory; +import org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.type.CounterWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.type.GaugeWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.type.HistogramWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.type.SummaryWrapper; import org.yaml.snakeyaml.Yaml; import java.io.InputStream; diff --git a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/CounterWrapper.java b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/CounterWrapper.java similarity index 89% rename from agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/CounterWrapper.java rename to agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/CounterWrapper.java index f9914ed878c25..6f5e84ba6218a 100644 --- a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/CounterWrapper.java +++ b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/CounterWrapper.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.type; import io.prometheus.client.Counter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.agent.metrics.core.MetricsWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsWrapper; /** * Prometheus counter wrapper. diff --git a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/GaugeWrapper.java b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/GaugeWrapper.java similarity index 90% rename from agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/GaugeWrapper.java rename to agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/GaugeWrapper.java index 187753829ab0d..a51dbc399c2f2 100644 --- a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/GaugeWrapper.java +++ b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/GaugeWrapper.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.type; import io.prometheus.client.Gauge; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.agent.metrics.core.MetricsWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsWrapper; /** * Prometheus gauge wrapper. diff --git a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/HistogramWrapper.java b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/HistogramWrapper.java similarity index 88% rename from agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/HistogramWrapper.java rename to agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/HistogramWrapper.java index 90f2175b8d59c..27e70fc303fb0 100644 --- a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/HistogramWrapper.java +++ b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/HistogramWrapper.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.type; import io.prometheus.client.Histogram; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.agent.metrics.core.MetricsWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsWrapper; /** * Prometheus histogram wrapper. diff --git a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/SummaryWrapper.java b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/SummaryWrapper.java similarity index 88% rename from agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/SummaryWrapper.java rename to agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/SummaryWrapper.java index 95867c8876522..f615172f8bf58 100644 --- a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/SummaryWrapper.java +++ b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/SummaryWrapper.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.type; import io.prometheus.client.Summary; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.agent.metrics.core.MetricsWrapper; +import org.apache.shardingsphere.agent.plugin.metrics.core.MetricsWrapper; /** * Prometheus summary wrapper. diff --git a/agent/plugins/metrics/type/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService b/agent/plugins/metrics/type/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService index d7509db9dddcf..00624d3151fbf 100644 --- a/agent/plugins/metrics/type/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService +++ b/agent/plugins/metrics/type/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService @@ -15,4 +15,4 @@ # limitations under the License. # -org.apache.shardingsphere.agent.metrics.prometheus.PrometheusPluginBootService +org.apache.shardingsphere.agent.plugin.metrics.prometheus.PrometheusPluginBootService diff --git a/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/jdbc-advisors.yaml b/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/jdbc-advisors.yaml index aa4272008f85b..9564dd26b84fc 100644 --- a/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/jdbc-advisors.yaml +++ b/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/jdbc-advisors.yaml @@ -17,7 +17,7 @@ advisors: - target: org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory - advice: org.apache.shardingsphere.agent.metrics.core.advice.MetaDataContextsFactoryAdvice + advice: org.apache.shardingsphere.agent.plugin.metrics.core.advice.MetaDataContextsFactoryAdvice pointcuts: - name: create type: method diff --git a/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/proxy-advisors.yaml b/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/proxy-advisors.yaml index 9d651a363d66a..49fc3c92a24f9 100644 --- a/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/proxy-advisors.yaml +++ b/agent/plugins/metrics/type/prometheus/src/main/resources/prometheus/proxy-advisors.yaml @@ -17,14 +17,14 @@ advisors: - target: org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask - advice: org.apache.shardingsphere.agent.metrics.core.advice.CommandExecutorTaskAdvice + advice: org.apache.shardingsphere.agent.plugin.metrics.core.advice.CommandExecutorTaskAdvice pointcuts: - name: run type: method - name: processException type: method - target: org.apache.shardingsphere.proxy.frontend.netty.FrontendChannelInboundHandler - advice: org.apache.shardingsphere.agent.metrics.core.advice.ChannelHandlerAdvice + advice: org.apache.shardingsphere.agent.plugin.metrics.core.advice.ChannelHandlerAdvice pointcuts: - name: channelActive type: method @@ -33,24 +33,24 @@ advisors: - name: channelInactive type: method - target: org.apache.shardingsphere.infra.route.engine.SQLRouteEngine - advice: org.apache.shardingsphere.agent.metrics.core.advice.SQLRouteEngineAdvice + advice: org.apache.shardingsphere.agent.plugin.metrics.core.advice.SQLRouteEngineAdvice pointcuts: - name: route type: method - target: org.apache.shardingsphere.proxy.backend.communication.jdbc.transaction.BackendTransactionManager - advice: org.apache.shardingsphere.agent.metrics.core.advice.TransactionAdvice + advice: org.apache.shardingsphere.agent.plugin.metrics.core.advice.TransactionAdvice pointcuts: - name: commit type: method - name: rollback type: method - target: org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine - advice: org.apache.shardingsphere.agent.metrics.core.advice.SQLParserEngineAdvice + advice: org.apache.shardingsphere.agent.plugin.metrics.core.advice.SQLParserEngineAdvice pointcuts: - name: parse type: method - target: org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory - advice: org.apache.shardingsphere.agent.metrics.core.advice.MetaDataContextsFactoryAdvice + advice: org.apache.shardingsphere.agent.plugin.metrics.core.advice.MetaDataContextsFactoryAdvice pointcuts: - name: create type: method 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/plugin/metrics/prometheus/PrometheusPluginBootServiceTest.java similarity index 97% rename from agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootServiceTest.java rename to agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/PrometheusPluginBootServiceTest.java index 1c50a1fda1531..23d9f776ed3ca 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/plugin/metrics/prometheus/PrometheusPluginBootServiceTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus; import org.apache.shardingsphere.agent.api.PluginConfiguration; import org.apache.shardingsphere.infra.config.mode.ModeConfiguration; diff --git a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/ProxyContextRestorer.java b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/ProxyContextRestorer.java similarity index 95% rename from agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/ProxyContextRestorer.java rename to agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/ProxyContextRestorer.java index ad1ef1c442a2c..8a322a81ce70d 100644 --- a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/ProxyContextRestorer.java +++ b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/ProxyContextRestorer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus; import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; diff --git a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/BuildInfoCollectorTest.java b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/BuildInfoCollectorTest.java similarity index 93% rename from agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/BuildInfoCollectorTest.java rename to agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/BuildInfoCollectorTest.java index 1996cbbe3c509..78b167a401471 100644 --- a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/BuildInfoCollectorTest.java +++ b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/BuildInfoCollectorTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.collector; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector; import org.junit.Test; diff --git a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/MetaDataInfoCollectorTest.java b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/MetaDataInfoCollectorTest.java similarity index 89% rename from agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/MetaDataInfoCollectorTest.java rename to agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/MetaDataInfoCollectorTest.java index 8e611f177b81a..e530b5d7e19bc 100644 --- a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/MetaDataInfoCollectorTest.java +++ b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/MetaDataInfoCollectorTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.collector; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector; -import org.apache.shardingsphere.agent.metrics.prometheus.ProxyContextRestorer; +import org.apache.shardingsphere.agent.plugin.metrics.prometheus.ProxyContextRestorer; import org.apache.shardingsphere.mode.manager.ContextManager; import org.apache.shardingsphere.proxy.backend.context.ProxyContext; import org.junit.Test; diff --git a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/ProxyInfoCollectorTest.java b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/ProxyInfoCollectorTest.java similarity index 93% rename from agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/ProxyInfoCollectorTest.java rename to agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/ProxyInfoCollectorTest.java index f290d64a06a33..1bda8bcfce1e8 100644 --- a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/ProxyInfoCollectorTest.java +++ b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/collector/ProxyInfoCollectorTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.collector; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.collector; -import org.apache.shardingsphere.agent.metrics.prometheus.ProxyContextRestorer; +import org.apache.shardingsphere.agent.plugin.metrics.prometheus.ProxyContextRestorer; 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/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/PrometheusWrapperFactoryTest.java b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/PrometheusWrapperFactoryTest.java similarity index 94% rename from agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/PrometheusWrapperFactoryTest.java rename to agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/PrometheusWrapperFactoryTest.java index 4dbab26a26e65..aa5e97a874351 100644 --- a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/PrometheusWrapperFactoryTest.java +++ b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/PrometheusWrapperFactoryTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.wrapper; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper; import org.junit.Test; diff --git a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/CounterWrapperTest.java b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/CounterWrapperTest.java similarity index 95% rename from agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/CounterWrapperTest.java rename to agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/CounterWrapperTest.java index 8437c68f1b9e4..7f918c0466561 100644 --- a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/CounterWrapperTest.java +++ b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/CounterWrapperTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.type; import io.prometheus.client.Counter; import org.junit.Test; diff --git a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/GaugeWrapperTest.java b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/GaugeWrapperTest.java similarity index 94% rename from agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/GaugeWrapperTest.java rename to agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/GaugeWrapperTest.java index 31325d8f207ee..a875eb09c5620 100644 --- a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/GaugeWrapperTest.java +++ b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/GaugeWrapperTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.type; import io.prometheus.client.Gauge; import org.junit.Test; diff --git a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/HistogramWrapperTest.java b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/HistogramWrapperTest.java similarity index 95% rename from agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/HistogramWrapperTest.java rename to agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/HistogramWrapperTest.java index 3b3564f310f0b..0fef3b9e61d57 100644 --- a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/HistogramWrapperTest.java +++ b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/HistogramWrapperTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.type; import io.prometheus.client.Histogram; import org.junit.Test; diff --git a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/SummaryWrapperTest.java b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/SummaryWrapperTest.java similarity index 94% rename from agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/SummaryWrapperTest.java rename to agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/SummaryWrapperTest.java index abc2221d39e54..b01975c77213e 100644 --- a/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/wrapper/type/SummaryWrapperTest.java +++ b/agent/plugins/metrics/type/prometheus/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/type/SummaryWrapperTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type; +package org.apache.shardingsphere.agent.plugin.metrics.prometheus.wrapper.type; import io.prometheus.client.Summary; import org.junit.Test;