From 31eb8fd2f679431248d3ac4863260af109651058 Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Sun, 23 Jun 2024 19:52:35 +0800 Subject: [PATCH] Enhance --- .../java/org/apache/dubbo/common/store/DataStore.java | 1 - .../dubbo/common/store/support/SimpleDataStore.java | 7 ++++++- .../main/java/org/apache/dubbo/config/Constants.java | 4 ++++ .../collector/sample/ThreadPoolMetricsSampler.java | 11 ++++++----- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/store/DataStore.java b/dubbo-common/src/main/java/org/apache/dubbo/common/store/DataStore.java index e4b8ee4c9d..d0c20b9e8b 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/store/DataStore.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/store/DataStore.java @@ -36,5 +36,4 @@ public interface DataStore { void remove(String componentName, String key); default void addListener(DataStoreUpdateListener dataStoreUpdateListener) {} - ; } diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/store/support/SimpleDataStore.java b/dubbo-common/src/main/java/org/apache/dubbo/common/store/support/SimpleDataStore.java index 5ec9ba0587..6bda3cfada 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/store/support/SimpleDataStore.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/store/support/SimpleDataStore.java @@ -82,7 +82,12 @@ public class SimpleDataStore implements DataStore { listener.onUpdate(componentName, key, value); } catch (Throwable t) { logger.warn( - LoggerCodeConstants.INTERNAL_ERROR, "", "", "Failed to notify data store update listener", t); + LoggerCodeConstants.INTERNAL_ERROR, + "", + "", + "Failed to notify data store update listener. " + "ComponentName: " + componentName + " Key: " + + key, + t); } } } diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/Constants.java b/dubbo-common/src/main/java/org/apache/dubbo/config/Constants.java index da6ab9f5d7..a281cb2d7b 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/config/Constants.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/config/Constants.java @@ -149,7 +149,11 @@ public interface Constants { String SERVER_THREAD_POOL_NAME = "DubboServerHandler"; + String SERVER_THREAD_POOL_PREFIX = SERVER_THREAD_POOL_NAME + "-"; + String CLIENT_THREAD_POOL_NAME = "DubboClientHandler"; + String CLIENT_THREAD_POOL_PREFIX = CLIENT_THREAD_POOL_NAME + "-"; + String REST_PROTOCOL = "rest"; } diff --git a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/ThreadPoolMetricsSampler.java b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/ThreadPoolMetricsSampler.java index 389e5be7ff..d7d26d448a 100644 --- a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/ThreadPoolMetricsSampler.java +++ b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/sample/ThreadPoolMetricsSampler.java @@ -43,8 +43,9 @@ import java.util.concurrent.atomic.AtomicBoolean; import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER_SHARED_EXECUTOR_SERVICE_COMPONENT_KEY; import static org.apache.dubbo.common.constants.CommonConstants.EXECUTOR_SERVICE_COMPONENT_KEY; import static org.apache.dubbo.common.constants.LoggerCodeConstants.COMMON_METRICS_COLLECTOR_EXCEPTION; -import static org.apache.dubbo.config.Constants.CLIENT_THREAD_POOL_NAME; +import static org.apache.dubbo.config.Constants.CLIENT_THREAD_POOL_PREFIX; import static org.apache.dubbo.config.Constants.SERVER_THREAD_POOL_NAME; +import static org.apache.dubbo.config.Constants.SERVER_THREAD_POOL_PREFIX; import static org.apache.dubbo.metrics.model.MetricsCategory.THREAD_POOL; public class ThreadPoolMetricsSampler implements MetricsSampler, DataStoreUpdateListener { @@ -66,11 +67,11 @@ public class ThreadPoolMetricsSampler implements MetricsSampler, DataStoreUpdate public void onUpdate(String componentName, String key, Object value) { if (EXECUTOR_SERVICE_COMPONENT_KEY.equals(componentName)) { if (value instanceof ThreadPoolExecutor) { - addExecutors(SERVER_THREAD_POOL_NAME + "-" + key, (ThreadPoolExecutor) value); + addExecutors(SERVER_THREAD_POOL_PREFIX + key, (ThreadPoolExecutor) value); } } else if (CONSUMER_SHARED_EXECUTOR_SERVICE_COMPONENT_KEY.equals(componentName)) { if (value instanceof ThreadPoolExecutor) { - addExecutors(CLIENT_THREAD_POOL_NAME + "-" + key, (ThreadPoolExecutor) value); + addExecutors(CLIENT_THREAD_POOL_PREFIX + key, (ThreadPoolExecutor) value); } } } @@ -173,14 +174,14 @@ public class ThreadPoolMetricsSampler implements MetricsSampler, DataStoreUpdate for (Map.Entry entry : executors.entrySet()) { ExecutorService executor = (ExecutorService) entry.getValue(); if (executor instanceof ThreadPoolExecutor) { - this.addExecutors(SERVER_THREAD_POOL_NAME + "-" + entry.getKey(), executor); + this.addExecutors(SERVER_THREAD_POOL_PREFIX + entry.getKey(), executor); } } executors = dataStore.get(CONSUMER_SHARED_EXECUTOR_SERVICE_COMPONENT_KEY); for (Map.Entry entry : executors.entrySet()) { ExecutorService executor = (ExecutorService) entry.getValue(); if (executor instanceof ThreadPoolExecutor) { - this.addExecutors(CLIENT_THREAD_POOL_NAME + "-" + entry.getKey(), executor); + this.addExecutors(CLIENT_THREAD_POOL_PREFIX + entry.getKey(), executor); } }