From 335733b4fc82ab7168f3286d4e15c92eccdce601 Mon Sep 17 00:00:00 2001 From: Albumen Kevin Date: Tue, 25 Apr 2023 20:51:26 +0800 Subject: [PATCH] Disable Aggregation by default (#12184) * Disable Aggregation by default * Fix uts --- .../collector/AggregateMetricsCollector.java | 2 +- .../AggregateMetricsCollectorTest.java | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java index fad110a90a..dc2ce7bb5f 100644 --- a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java +++ b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java @@ -66,7 +66,7 @@ public class AggregateMetricsCollector implements MetricsCollector, MetricsListe this.applicationModel = applicationModel; ConfigManager configManager = applicationModel.getApplicationConfigManager(); MetricsConfig config = configManager.getMetrics().orElse(null); - if (config != null && config.getAggregation() != null && (config.getAggregation().getEnabled() == null || Boolean.TRUE.equals(config.getAggregation().getEnabled()))) { + if (config != null && config.getAggregation() != null && (Boolean.TRUE.equals(config.getAggregation().getEnabled()))) { // only registered when aggregation is enabled. registerListener(); diff --git a/dubbo-metrics/dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollectorTest.java b/dubbo-metrics/dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollectorTest.java index d4fbd1e571..fe1a8c4a06 100644 --- a/dubbo-metrics/dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollectorTest.java +++ b/dubbo-metrics/dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollectorTest.java @@ -22,9 +22,7 @@ import org.apache.dubbo.common.beans.factory.ScopeBeanFactory; import org.apache.dubbo.common.constants.CommonConstants; import org.apache.dubbo.common.utils.ReflectionUtils; import org.apache.dubbo.config.ApplicationConfig; - import org.apache.dubbo.config.MetricsConfig; - import org.apache.dubbo.config.context.ConfigManager; import org.apache.dubbo.config.nested.AggregationConfig; import org.apache.dubbo.metrics.TestMetricsInvoker; @@ -39,27 +37,30 @@ import org.apache.dubbo.metrics.model.sample.MetricSample; import org.apache.dubbo.rpc.RpcContext; import org.apache.dubbo.rpc.RpcInvocation; import org.apache.dubbo.rpc.model.ApplicationModel; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.Collections; import java.util.concurrent.ConcurrentHashMap; - import java.util.stream.Collectors; import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY; import static org.apache.dubbo.common.constants.CommonConstants.VERSION_KEY; -import static org.apache.dubbo.common.constants.MetricsConstants.*; +import static org.apache.dubbo.common.constants.MetricsConstants.TAG_GROUP_KEY; +import static org.apache.dubbo.common.constants.MetricsConstants.TAG_INTERFACE_KEY; +import static org.apache.dubbo.common.constants.MetricsConstants.TAG_METHOD_KEY; +import static org.apache.dubbo.common.constants.MetricsConstants.TAG_VERSION_KEY; import static org.apache.dubbo.metrics.model.MetricsCategory.QPS; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; class AggregateMetricsCollectorTest { @@ -93,7 +94,9 @@ class AggregateMetricsCollectorTest { configManager.setMetrics(metricsConfig); - when(metricsConfig.getAggregation()).thenReturn(new AggregationConfig()); + AggregationConfig aggregationConfig = spy(new AggregationConfig()); + when(aggregationConfig.getEnabled()).thenReturn(true); + when(metricsConfig.getAggregation()).thenReturn(aggregationConfig); when(applicationModel.getApplicationConfigManager()).thenReturn(configManager); ScopeBeanFactory beanFactory = mock(ScopeBeanFactory.class);