Dubbo 3.3 logs refine (#14579)

* Dubbo 3.3 logs refine * Fix ut
apache · Aug 30, 2024 · 720f981 · 720f981
1 parent 611de81
commit 720f981
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 18 deletions.
diff --git a/...onfig-api/src/main/java/org/apache/dubbo/config/deploy/DefaultMetricsServiceExporter.java b/...onfig-api/src/main/java/org/apache/dubbo/config/deploy/DefaultMetricsServiceExporter.java
@@ -32,6 +32,7 @@
 import java.util.concurrent.ExecutorService;
 
 import static org.apache.dubbo.common.constants.LoggerCodeConstants.COMMON_METRICS_COLLECTOR_EXCEPTION;
+import static org.apache.dubbo.common.constants.MetricsConstants.PROTOCOL_DEFAULT;
 import static org.apache.dubbo.common.constants.MetricsConstants.PROTOCOL_PROMETHEUS;
 
 /**
@@ -56,7 +57,7 @@ private void initialize() {
         // TODO compatible with old usage of metrics, remove protocol check after new metrics is ready for use.
         if (metricsConfig != null && metricsService == null) {
             String protocol = Optional.ofNullable(metricsConfig.getProtocol()).orElse(PROTOCOL_PROMETHEUS);
-            if (PROTOCOL_PROMETHEUS.equals(protocol)) {
+            if (PROTOCOL_DEFAULT.equals(protocol) || PROTOCOL_PROMETHEUS.equals(protocol)) {
                 this.metricsService = applicationModel
                         .getExtensionLoader(MetricsService.class)
                         .getDefaultExtension();

diff --git a/...dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceV2Detector.java b/...dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceV2Detector.java
@@ -20,8 +20,6 @@
 import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.rpc.model.BuiltinServiceDetector;
 
-import static org.apache.dubbo.common.constants.LoggerCodeConstants.COMMON_CLASS_NOT_FOUND;
-
 public class MetadataServiceV2Detector implements BuiltinServiceDetector {
 
     private static final ErrorTypeAwareLogger logger =
@@ -32,10 +30,7 @@ public class MetadataServiceV2Detector implements BuiltinServiceDetector {
     @Override
     public Class<?> getService() {
         if (!support()) {
-            logger.warn(
-                    COMMON_CLASS_NOT_FOUND,
-                    "",
-                    "",
+            logger.info(
                     "To use MetadataServiceV2, Protobuf dependencies are required. Fallback to MetadataService(V1).");
             return null;
         }

diff --git a/...src/main/java/org/apache/dubbo/metrics/config/collector/ConfigCenterMetricsCollector.java b/...src/main/java/org/apache/dubbo/metrics/config/collector/ConfigCenterMetricsCollector.java
@@ -68,7 +68,7 @@ public boolean isCollectEnabled() {
             ConfigManager configManager = applicationModel.getApplicationConfigManager();
             configManager.getMetrics().ifPresent(metricsConfig -> setCollectEnabled(metricsConfig.getEnableMetadata()));
         }
-        return Optional.ofNullable(collectEnabled).orElse(true);
+        return Optional.ofNullable(collectEnabled).orElse(false);
     }
 
     public void increase(String key, String group, String protocol, String changeTypeName, int size) {

diff --git a/...s-default/src/main/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java b/...s-default/src/main/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollector.java
@@ -121,7 +121,7 @@ public boolean isCollectEnabled() {
                     .ifPresent(metricsConfig ->
                             setCollectEnabled(metricsConfig.getAggregation().getEnabled()));
         }
-        return Optional.ofNullable(collectEnabled).orElse(true);
+        return Optional.ofNullable(collectEnabled).orElse(false);
     }
 
     @Override

diff --git a/...cs/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/filter/MetricsFilter.java b/...cs/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/filter/MetricsFilter.java
@@ -55,7 +55,7 @@ public void setApplicationModel(ApplicationModel applicationModel) {
                 .getApplicationConfigManager()
                 .getMetrics()
                 .map(MetricsConfig::getEnableRpc)
-                .orElse(true);
+                .orElse(false);
         this.appName = applicationModel.tryGetApplicationName();
         this.metricsDispatcher = applicationModel.getBeanFactory().getBean(MetricsDispatcher.class);
         this.defaultMetricsCollector = applicationModel.getBeanFactory().getBean(DefaultMetricsCollector.class);
@@ -87,7 +87,9 @@ public Result invoke(Invoker<?> invoker, Invocation invocation, boolean isProvid
     }
 
     public void onResponse(Result result, Invoker<?> invoker, Invocation invocation) {
-        onResponse(result, invoker, invocation, PROVIDER.equals(MetricsSupport.getSide(invocation)));
+        if (rpcMetricsEnable) {
+            onResponse(result, invoker, invocation, PROVIDER.equals(MetricsSupport.getSide(invocation)));
+        }
     }
 
     public void onResponse(Result result, Invoker<?> invoker, Invocation invocation, boolean isProvider) {
@@ -102,7 +104,9 @@ public void onResponse(Result result, Invoker<?> invoker, Invocation invocation,
     }
 
     public void onError(Throwable t, Invoker<?> invoker, Invocation invocation) {
-        onError(t, invoker, invocation, PROVIDER.equals(MetricsSupport.getSide(invocation)));
+        if (rpcMetricsEnable) {
+            onError(t, invoker, invocation, PROVIDER.equals(MetricsSupport.getSide(invocation)));
+        }
     }
 
     public void onError(Throwable t, Invoker<?> invoker, Invocation invocation, boolean isProvider) {

diff --git a/...fault/src/test/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollectorTest.java b/...fault/src/test/java/org/apache/dubbo/metrics/collector/AggregateMetricsCollectorTest.java
@@ -110,6 +110,7 @@ public void setup() {
         aggregationConfig.setBucketNum(12);
         aggregationConfig.setTimeWindowSeconds(120);
         metricsConfig.setAggregation(aggregationConfig);
+        metricsConfig.setEnableRpc(true);
         applicationModel.getApplicationConfigManager().setMetrics(metricsConfig);
         metricsDispatcher = applicationModel.getBeanFactory().getOrRegisterBean(MetricsDispatcher.class);
         defaultCollector = applicationModel.getBeanFactory().getBean(DefaultMetricsCollector.class);

diff --git a/...etrics-default/src/test/java/org/apache/dubbo/metrics/collector/DefaultCollectorTest.java b/...etrics-default/src/test/java/org/apache/dubbo/metrics/collector/DefaultCollectorTest.java
@@ -21,6 +21,7 @@
 import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
 import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.config.ApplicationConfig;
+import org.apache.dubbo.config.MetricsConfig;
 import org.apache.dubbo.metrics.TestMetricsInvoker;
 import org.apache.dubbo.metrics.event.MetricsDispatcher;
 import org.apache.dubbo.metrics.event.RequestEvent;
@@ -87,7 +88,11 @@ public void setup() {
         ApplicationConfig config = new ApplicationConfig();
         config.setName("MockMetrics");
 
+        MetricsConfig metricsConfig = new MetricsConfig();
+        metricsConfig.setEnableRpc(true);
+
         applicationModel.getApplicationConfigManager().setApplication(config);
+        applicationModel.getApplicationConfigManager().setMetrics(metricsConfig);
         metricsDispatcher = applicationModel.getBeanFactory().getOrRegisterBean(MetricsDispatcher.class);
         defaultCollector = applicationModel.getBeanFactory().getBean(DefaultMetricsCollector.class);
         defaultCollector.setCollectEnabled(true);

diff --git a/...ubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/filter/MetricsFilterTest.java b/...ubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/filter/MetricsFilterTest.java
@@ -19,6 +19,7 @@
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.config.ApplicationConfig;
+import org.apache.dubbo.config.MetricsConfig;
 import org.apache.dubbo.metrics.TestMetricsInvoker;
 import org.apache.dubbo.metrics.collector.DefaultMetricsCollector;
 import org.apache.dubbo.metrics.event.MetricsEventBus;
@@ -80,7 +81,10 @@ public void setup() {
         ApplicationConfig config = new ApplicationConfig();
         config.setName("MockMetrics");
         applicationModel = ApplicationModel.defaultModel();
+        MetricsConfig metricsConfig = new MetricsConfig();
+        metricsConfig.setEnableRpc(true);
         applicationModel.getApplicationConfigManager().setApplication(config);
+        applicationModel.getApplicationConfigManager().setMetrics(metricsConfig);
         invocation = new RpcInvocation();
         filter = new MetricsFilter();
 

diff --git a/...a/src/main/java/org/apache/dubbo/metrics/metadata/collector/MetadataMetricsCollector.java b/...a/src/main/java/org/apache/dubbo/metrics/metadata/collector/MetadataMetricsCollector.java
@@ -84,7 +84,7 @@ public boolean isCollectEnabled() {
             ConfigManager configManager = applicationModel.getApplicationConfigManager();
             configManager.getMetrics().ifPresent(metricsConfig -> setCollectEnabled(metricsConfig.getEnableMetadata()));
         }
-        return Optional.ofNullable(collectEnabled).orElse(true);
+        return Optional.ofNullable(collectEnabled).orElse(false);
     }
 
     @Override

diff --git a/...etty/src/main/java/org/apache/dubbo/metrics/registry/collector/NettyMetricsCollector.java b/...etty/src/main/java/org/apache/dubbo/metrics/registry/collector/NettyMetricsCollector.java
@@ -78,7 +78,7 @@ public boolean isCollectEnabled() {
             ConfigManager configManager = applicationModel.getApplicationConfigManager();
             configManager.getMetrics().ifPresent(metricsConfig -> setCollectEnabled(metricsConfig.getEnableNetty()));
         }
-        return Optional.ofNullable(collectEnabled).orElse(true);
+        return Optional.ofNullable(collectEnabled).orElse(false);
     }
 
     @Override

diff --git a/...y/src/main/java/org/apache/dubbo/metrics/registry/collector/RegistryMetricsCollector.java b/...y/src/main/java/org/apache/dubbo/metrics/registry/collector/RegistryMetricsCollector.java
@@ -100,7 +100,7 @@ public boolean isCollectEnabled() {
             ConfigManager configManager = applicationModel.getApplicationConfigManager();
             configManager.getMetrics().ifPresent(metricsConfig -> setCollectEnabled(metricsConfig.getEnableRegistry()));
         }
-        return Optional.ofNullable(collectEnabled).orElse(true);
+        return Optional.ofNullable(collectEnabled).orElse(false);
     }
 
     @Override

diff --git a/...o-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java b/...o-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java
@@ -70,9 +70,8 @@ public class MetadataUtils {
     public static void publishServiceDefinition(
             URL url, ServiceDescriptor serviceDescriptor, ApplicationModel applicationModel) {
         if (getMetadataReports(applicationModel).isEmpty()) {
-            String msg =
-                    "Remote Metadata Report Server is not provided or unavailable, will stop registering service definition to remote center!";
-            logger.warn(REGISTRY_FAILED_LOAD_METADATA, "", "", msg);
+            logger.info("Remote Metadata Report Server is not provided or unavailable, "
+                    + "will stop registering service definition to remote center!");
             return;
         }