You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/12/11 04:34:52 UTC
[shardingsphere] branch master updated: Move AbstractPluginDefinitionService to agent-core module (#22794)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 12aaf54a1d4 Move AbstractPluginDefinitionService to agent-core module (#22794)
12aaf54a1d4 is described below
commit 12aaf54a1d42e3efc584fea065ff192dca0309cb
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Dec 11 12:34:45 2022 +0800
Move AbstractPluginDefinitionService to agent-core module (#22794)
* Move AbstractPluginDefinitionService to agent-core module
* Move spi package
---
.../apache/shardingsphere/agent/spi/{boot => }/PluginBootService.java | 3 +--
.../agent/spi/{definition => }/PluginDefinitionService.java | 3 +--
.../agent/core}/definition/AbstractPluginDefinitionService.java | 3 ++-
.../agent/core}/definition/InterceptorPointRegistry.java | 2 +-
.../org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java | 2 +-
.../shardingsphere/agent/core/plugin/PluginBootServiceManager.java | 2 +-
.../logging/base/definition/BaseLoggingPluginDefinitionService.java | 2 +-
.../plugin/logging/base/service/BaseLoggingPluginBootService.java | 2 +-
...otService => org.apache.shardingsphere.agent.spi.PluginBootService} | 0
...ice => org.apache.shardingsphere.agent.spi.PluginDefinitionService} | 0
.../prometheus/definition/PrometheusPluginDefinitionService.java | 2 +-
.../agent/metrics/prometheus/service/PrometheusPluginBootService.java | 2 +-
...otService => org.apache.shardingsphere.agent.spi.PluginBootService} | 0
...ice => org.apache.shardingsphere.agent.spi.PluginDefinitionService} | 0
.../tracing/jaeger/definition/JaegerPluginDefinitionService.java | 2 +-
.../plugin/tracing/jaeger/service/JaegerTracingPluginBootService.java | 2 +-
...otService => org.apache.shardingsphere.agent.spi.PluginBootService} | 0
...ice => org.apache.shardingsphere.agent.spi.PluginDefinitionService} | 0
.../definition/OpenTelemetryTracingPluginDefinitionService.java | 2 +-
.../opentelemetry/service/OpenTelemetryTracingPluginBootService.java | 2 +-
...otService => org.apache.shardingsphere.agent.spi.PluginBootService} | 0
...ice => org.apache.shardingsphere.agent.spi.PluginDefinitionService} | 0
.../opentracing/definition/OpenTracingPluginDefinitionService.java | 2 +-
.../tracing/opentracing/service/OpenTracingPluginBootService.java | 2 +-
...otService => org.apache.shardingsphere.agent.spi.PluginBootService} | 0
...ice => org.apache.shardingsphere.agent.spi.PluginDefinitionService} | 0
.../tracing/zipkin/definition/ZipkinPluginDefinitionService.java | 2 +-
.../plugin/tracing/zipkin/service/ZipkinTracingPluginBootService.java | 2 +-
...otService => org.apache.shardingsphere.agent.spi.PluginBootService} | 0
...ice => org.apache.shardingsphere.agent.spi.PluginDefinitionService} | 0
30 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/boot/PluginBootService.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginBootService.java
similarity index 92%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/spi/boot/PluginBootService.java
rename to agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginBootService.java
index 3f385da43d8..8f7f61620f3 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/boot/PluginBootService.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginBootService.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.spi.boot;
+package org.apache.shardingsphere.agent.spi;
import org.apache.shardingsphere.agent.config.PluginConfiguration;
-import org.apache.shardingsphere.agent.spi.AgentSPI;
/**
* Plugin boot service that the lifecycle is from the agent start to shutdown.
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/PluginDefinitionService.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginDefinitionService.java
similarity index 91%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/PluginDefinitionService.java
rename to agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginDefinitionService.java
index a2b299d3515..37b04c3e19c 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/PluginDefinitionService.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginDefinitionService.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.spi.definition;
+package org.apache.shardingsphere.agent.spi;
import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
-import org.apache.shardingsphere.agent.spi.AgentSPI;
import java.util.Collection;
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/AbstractPluginDefinitionService.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/definition/AbstractPluginDefinitionService.java
similarity index 93%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/AbstractPluginDefinitionService.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/definition/AbstractPluginDefinitionService.java
index 47cc9ff8391..f54314ef8e6 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/AbstractPluginDefinitionService.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/definition/AbstractPluginDefinitionService.java
@@ -15,10 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.spi.definition;
+package org.apache.shardingsphere.agent.core.definition;
import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint.Builder;
+import org.apache.shardingsphere.agent.spi.PluginDefinitionService;
import java.util.Collection;
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/InterceptorPointRegistry.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/definition/InterceptorPointRegistry.java
similarity index 97%
rename from agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/InterceptorPointRegistry.java
rename to agent/core/src/main/java/org/apache/shardingsphere/agent/core/definition/InterceptorPointRegistry.java
index 9da66f39f09..9ed30108b4e 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/definition/InterceptorPointRegistry.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/definition/InterceptorPointRegistry.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.agent.spi.definition;
+package org.apache.shardingsphere.agent.core.definition;
import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint.Builder;
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java
index a33d3f8f33b..14dfcc1cca8 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/AgentPluginLoader.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.agent.core.config.path.AgentPathBuilder;
import org.apache.shardingsphere.agent.core.config.registry.AgentConfigurationRegistry;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.spi.PluginServiceLoader;
-import org.apache.shardingsphere.agent.spi.definition.PluginDefinitionService;
+import org.apache.shardingsphere.agent.spi.PluginDefinitionService;
import java.io.File;
import java.io.IOException;
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 3f50c989d75..ad8290690a3 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
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.agent.config.PluginConfiguration;
import org.apache.shardingsphere.agent.core.logging.LoggerFactory;
import org.apache.shardingsphere.agent.core.spi.AgentSPIRegistry;
-import org.apache.shardingsphere.agent.spi.boot.PluginBootService;
+import org.apache.shardingsphere.agent.spi.PluginBootService;
import java.io.IOException;
import java.util.Map;
diff --git a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingPluginDefinitionService.java b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingPluginDefinitionService.java
index d10ed1d1586..ff7ee25839f 100644
--- a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingPluginDefinitionService.java
+++ b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/definition/BaseLoggingPluginDefinitionService.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.agent.plugin.logging.base.definition;
import net.bytebuddy.matcher.ElementMatchers;
import org.apache.shardingsphere.agent.plugin.logging.base.advice.MetaDataContextsFactoryAdvice;
-import org.apache.shardingsphere.agent.spi.definition.AbstractPluginDefinitionService;
+import org.apache.shardingsphere.agent.core.definition.AbstractPluginDefinitionService;
/**
* Base logging plugin definition service.
diff --git a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/service/BaseLoggingPluginBootService.java b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/service/BaseLoggingPluginBootService.java
index 1ae973a93fc..ae95b359cc0 100644
--- a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/service/BaseLoggingPluginBootService.java
+++ b/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/service/BaseLoggingPluginBootService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.logging.base.service;
import org.apache.shardingsphere.agent.config.PluginConfiguration;
-import org.apache.shardingsphere.agent.spi.boot.PluginBootService;
+import org.apache.shardingsphere.agent.spi.PluginBootService;
/**
* Base logging plugin boot service.
diff --git a/agent/plugins/logging/base/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.boot.PluginBootService b/agent/plugins/logging/base/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
similarity index 100%
rename from agent/plugins/logging/base/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.boot.PluginBootService
rename to agent/plugins/logging/base/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
diff --git a/agent/plugins/logging/base/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.definition.PluginDefinitionService b/agent/plugins/logging/base/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginDefinitionService
similarity index 100%
rename from agent/plugins/logging/base/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.definition.PluginDefinitionService
rename to agent/plugins/logging/base/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginDefinitionService
diff --git a/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionService.java b/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionService.java
index 6a32d73c1b7..bf4f956bd42 100644
--- a/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionService.java
+++ b/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/definition/PrometheusPluginDefinitionService.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint.Builder;
import org.apache.shardingsphere.agent.core.entity.Interceptor;
import org.apache.shardingsphere.agent.core.entity.Interceptors;
import org.apache.shardingsphere.agent.core.entity.TargetPoint;
-import org.apache.shardingsphere.agent.spi.definition.AbstractPluginDefinitionService;
+import org.apache.shardingsphere.agent.core.definition.AbstractPluginDefinitionService;
import org.yaml.snakeyaml.Yaml;
import java.io.InputStream;
diff --git a/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/service/PrometheusPluginBootService.java b/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/service/PrometheusPluginBootService.java
index dfcceff26c5..8925bf39049 100644
--- a/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/service/PrometheusPluginBootService.java
+++ b/agent/plugins/metrics/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/service/PrometheusPluginBootService.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.agent.metrics.prometheus.collector.BuildInfoCol
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.spi.boot.PluginBootService;
+import org.apache.shardingsphere.agent.spi.PluginBootService;
import java.io.IOException;
import java.net.InetSocketAddress;
diff --git a/agent/plugins/metrics/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.boot.PluginBootService b/agent/plugins/metrics/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
similarity index 100%
rename from agent/plugins/metrics/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.boot.PluginBootService
rename to agent/plugins/metrics/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
diff --git a/agent/plugins/metrics/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.definition.PluginDefinitionService b/agent/plugins/metrics/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginDefinitionService
similarity index 100%
rename from agent/plugins/metrics/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.definition.PluginDefinitionService
rename to agent/plugins/metrics/prometheus/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginDefinitionService
diff --git a/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionService.java b/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionService.java
index f9eef03bed9..e3cda34644e 100644
--- a/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionService.java
+++ b/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/definition/JaegerPluginDefinitionService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.jaeger.definition;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.spi.definition.AbstractPluginDefinitionService;
+import org.apache.shardingsphere.agent.core.definition.AbstractPluginDefinitionService;
/**
* Jaeger plugin definition service.
diff --git a/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/service/JaegerTracingPluginBootService.java b/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/service/JaegerTracingPluginBootService.java
index 435ddf9da7e..f3f21beb961 100644
--- a/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/service/JaegerTracingPluginBootService.java
+++ b/agent/plugins/tracing/jaeger/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/jaeger/service/JaegerTracingPluginBootService.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.jaeger.service;
import io.jaegertracing.Configuration;
import io.opentracing.util.GlobalTracer;
import org.apache.shardingsphere.agent.config.PluginConfiguration;
-import org.apache.shardingsphere.agent.spi.boot.PluginBootService;
+import org.apache.shardingsphere.agent.spi.PluginBootService;
import java.util.Optional;
diff --git a/agent/plugins/tracing/jaeger/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.boot.PluginBootService b/agent/plugins/tracing/jaeger/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
similarity index 100%
rename from agent/plugins/tracing/jaeger/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.boot.PluginBootService
rename to agent/plugins/tracing/jaeger/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
diff --git a/agent/plugins/tracing/jaeger/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.definition.PluginDefinitionService b/agent/plugins/tracing/jaeger/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginDefinitionService
similarity index 100%
rename from agent/plugins/tracing/jaeger/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.definition.PluginDefinitionService
rename to agent/plugins/tracing/jaeger/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginDefinitionService
diff --git a/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingPluginDefinitionService.java b/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingPluginDefinitionService.java
index e1ece1c2572..8a108f47ffc 100644
--- a/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingPluginDefinitionService.java
+++ b/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/definition/OpenTelemetryTracingPluginDefinitionService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.definition;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.spi.definition.AbstractPluginDefinitionService;
+import org.apache.shardingsphere.agent.core.definition.AbstractPluginDefinitionService;
/**
* OpenTelemetry plugin definition service.
diff --git a/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/service/OpenTelemetryTracingPluginBootService.java b/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/service/OpenTelemetryTracingPluginBootService.java
index 55184bc59f2..252cd02f2e0 100644
--- a/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/service/OpenTelemetryTracingPluginBootService.java
+++ b/agent/plugins/tracing/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/service/OpenTelemetryTracingPluginBootService.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.service;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.autoconfigure.OpenTelemetrySdkAutoConfiguration;
import org.apache.shardingsphere.agent.config.PluginConfiguration;
-import org.apache.shardingsphere.agent.spi.boot.PluginBootService;
+import org.apache.shardingsphere.agent.spi.PluginBootService;
public class OpenTelemetryTracingPluginBootService implements PluginBootService {
diff --git a/agent/plugins/tracing/opentelemetry/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.boot.PluginBootService b/agent/plugins/tracing/opentelemetry/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
similarity index 100%
rename from agent/plugins/tracing/opentelemetry/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.boot.PluginBootService
rename to agent/plugins/tracing/opentelemetry/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
diff --git a/agent/plugins/tracing/opentelemetry/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.definition.PluginDefinitionService b/agent/plugins/tracing/opentelemetry/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginDefinitionService
similarity index 100%
rename from agent/plugins/tracing/opentelemetry/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.definition.PluginDefinitionService
rename to agent/plugins/tracing/opentelemetry/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginDefinitionService
diff --git a/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionService.java b/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionService.java
index 6f7b54b7c1a..52bba28003e 100644
--- a/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionService.java
+++ b/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/definition/OpenTracingPluginDefinitionService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.opentracing.definition;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.spi.definition.AbstractPluginDefinitionService;
+import org.apache.shardingsphere.agent.core.definition.AbstractPluginDefinitionService;
/**
* Open tracing plugin definition service.
diff --git a/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/service/OpenTracingPluginBootService.java b/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/service/OpenTracingPluginBootService.java
index b6ec60ed663..cbcfb655097 100644
--- a/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/service/OpenTracingPluginBootService.java
+++ b/agent/plugins/tracing/opentracing/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/service/OpenTracingPluginBootService.java
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
import io.opentracing.Tracer;
import io.opentracing.util.GlobalTracer;
import org.apache.shardingsphere.agent.config.PluginConfiguration;
-import org.apache.shardingsphere.agent.spi.boot.PluginBootService;
+import org.apache.shardingsphere.agent.spi.PluginBootService;
/**
* Open tracing plugin boot service.
diff --git a/agent/plugins/tracing/opentracing/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.boot.PluginBootService b/agent/plugins/tracing/opentracing/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
similarity index 100%
rename from agent/plugins/tracing/opentracing/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.boot.PluginBootService
rename to agent/plugins/tracing/opentracing/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
diff --git a/agent/plugins/tracing/opentracing/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.definition.PluginDefinitionService b/agent/plugins/tracing/opentracing/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginDefinitionService
similarity index 100%
rename from agent/plugins/tracing/opentracing/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.definition.PluginDefinitionService
rename to agent/plugins/tracing/opentracing/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginDefinitionService
diff --git a/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionService.java b/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionService.java
index d76c1154b6c..770dd6aac07 100644
--- a/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionService.java
+++ b/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/definition/ZipkinPluginDefinitionService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.agent.plugin.tracing.zipkin.definition;
import net.bytebuddy.matcher.ElementMatchers;
-import org.apache.shardingsphere.agent.spi.definition.AbstractPluginDefinitionService;
+import org.apache.shardingsphere.agent.core.definition.AbstractPluginDefinitionService;
/**
* Zipkin plugin definition service.
diff --git a/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/service/ZipkinTracingPluginBootService.java b/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/service/ZipkinTracingPluginBootService.java
index 9e5c4ae5f49..a2ed4bb1055 100644
--- a/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/service/ZipkinTracingPluginBootService.java
+++ b/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/service/ZipkinTracingPluginBootService.java
@@ -22,7 +22,7 @@ import brave.sampler.BoundarySampler;
import brave.sampler.RateLimitingSampler;
import brave.sampler.Sampler;
import org.apache.shardingsphere.agent.config.PluginConfiguration;
-import org.apache.shardingsphere.agent.spi.boot.PluginBootService;
+import org.apache.shardingsphere.agent.spi.PluginBootService;
import zipkin2.reporter.brave.AsyncZipkinSpanHandler;
import zipkin2.reporter.okhttp3.OkHttpSender;
diff --git a/agent/plugins/tracing/zipkin/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.boot.PluginBootService b/agent/plugins/tracing/zipkin/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
similarity index 100%
rename from agent/plugins/tracing/zipkin/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.boot.PluginBootService
rename to agent/plugins/tracing/zipkin/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
diff --git a/agent/plugins/tracing/zipkin/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.definition.PluginDefinitionService b/agent/plugins/tracing/zipkin/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginDefinitionService
similarity index 100%
rename from agent/plugins/tracing/zipkin/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.definition.PluginDefinitionService
rename to agent/plugins/tracing/zipkin/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginDefinitionService