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 2023/04/08 09:09:22 UTC
[shardingsphere] branch master updated: Refactor PluginLifecycleService.close (#25065)
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 5dee0c03f74 Refactor PluginLifecycleService.close (#25065)
5dee0c03f74 is described below
commit 5dee0c03f74bb8ff3e9c2b0bd3567457a9096eda
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Apr 8 17:09:14 2023 +0800
Refactor PluginLifecycleService.close (#25065)
---
.../shardingsphere/agent/spi/PluginLifecycleService.java | 4 ++++
.../agent/core/plugin/PluginLifecycleServiceManager.java | 10 +---------
.../plugin/logging/file/FileLoggingPluginLifecycleService.java | 4 ----
.../OpenTelemetryTracingPluginLifecycleService.java | 4 ----
4 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginLifecycleService.java b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginLifecycleService.java
index aae6c0acfa9..5ff7ae415c8 100644
--- a/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginLifecycleService.java
+++ b/agent/api/src/main/java/org/apache/shardingsphere/agent/spi/PluginLifecycleService.java
@@ -38,4 +38,8 @@ public interface PluginLifecycleService extends AutoCloseable {
* @return plugin type
*/
String getType();
+
+ @Override
+ default void close() {
+ }
}
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLifecycleServiceManager.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLifecycleServiceManager.java
index 2f492f0e6c0..cba79223764 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLifecycleServiceManager.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLifecycleServiceManager.java
@@ -82,15 +82,7 @@ public final class PluginLifecycleServiceManager {
}
private static void close(final Collection<JarFile> pluginJars) {
- AgentServiceLoader.getServiceLoader(PluginLifecycleService.class).getServices().forEach(each -> {
- try {
- each.close();
- // CHECKSTYLE:OFF
- } catch (final Throwable ex) {
- // CHECKSTYLE:ON
- LOGGER.error("Failed to close service.", ex);
- }
- });
+ AgentServiceLoader.getServiceLoader(PluginLifecycleService.class).getServices().forEach(PluginLifecycleService::close);
pluginJars.forEach(each -> {
try {
each.close();
diff --git a/agent/plugins/logging/type/file/src/main/java/org/apache/shardingsphere/agent/plugin/logging/file/FileLoggingPluginLifecycleService.java b/agent/plugins/logging/type/file/src/main/java/org/apache/shardingsphere/agent/plugin/logging/file/FileLoggingPluginLifecycleService.java
index e50c3ce309c..2b1f2518187 100644
--- a/agent/plugins/logging/type/file/src/main/java/org/apache/shardingsphere/agent/plugin/logging/file/FileLoggingPluginLifecycleService.java
+++ b/agent/plugins/logging/type/file/src/main/java/org/apache/shardingsphere/agent/plugin/logging/file/FileLoggingPluginLifecycleService.java
@@ -29,10 +29,6 @@ public final class FileLoggingPluginLifecycleService implements PluginLifecycleS
public void start(final PluginConfiguration pluginConfig, final boolean isEnhancedForProxy) {
}
- @Override
- public void close() {
- }
-
@Override
public String getType() {
return "File";
diff --git a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginLifecycleService.java b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginLifecycleService.java
index 43b7d7a8079..d73bfbaa4a2 100644
--- a/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginLifecycleService.java
+++ b/agent/plugins/tracing/type/opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/OpenTelemetryTracingPluginLifecycleService.java
@@ -40,10 +40,6 @@ public final class OpenTelemetryTracingPluginLifecycleService implements PluginL
System.setProperty(propertyKey, String.valueOf(value));
}
- @Override
- public void close() {
- }
-
@Override
public String getType() {
return "OpenTelemetry";