This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new 720f981b3a Dubbo 3.3 logs refine (#14579)
720f981b3a is described below
commit 720f981b3a8eeb5fd626e58de049ec94500454b2
Author: Albumen Kevin <[email protected]>
AuthorDate: Fri Aug 30 10:55:44 2024 +0800
Dubbo 3.3 logs refine (#14579)
* Dubbo 3.3 logs refine
* Fix ut
---
.../dubbo/config/deploy/DefaultMetricsServiceExporter.java | 3 ++-
.../org/apache/dubbo/metadata/MetadataServiceV2Detector.java | 7 +------
.../metrics/config/collector/ConfigCenterMetricsCollector.java | 2 +-
.../dubbo/metrics/collector/AggregateMetricsCollector.java | 2 +-
.../java/org/apache/dubbo/metrics/filter/MetricsFilter.java | 10 +++++++---
.../dubbo/metrics/collector/AggregateMetricsCollectorTest.java | 1 +
.../apache/dubbo/metrics/collector/DefaultCollectorTest.java | 5 +++++
.../org/apache/dubbo/metrics/filter/MetricsFilterTest.java | 4 ++++
.../metrics/metadata/collector/MetadataMetricsCollector.java | 2 +-
.../metrics/registry/collector/NettyMetricsCollector.java | 2 +-
.../metrics/registry/collector/RegistryMetricsCollector.java | 2 +-
.../apache/dubbo/registry/client/metadata/MetadataUtils.java | 5 ++---
12 files changed, 27 insertions(+), 18 deletions(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultMetricsServiceExporter.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultMetricsServiceExporter.java
index a350110244..a84d4674e0 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultMetricsServiceExporter.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultMetricsServiceExporter.java
@@ -32,6 +32,7 @@ import java.util.Optional;
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 @@ public class DefaultMetricsServiceExporter implements
MetricsServiceExporter, Sc
// 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/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceV2Detector.java
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceV2Detector.java
index 3cd78c4c2a..5996228156 100644
---
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceV2Detector.java
+++
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataServiceV2Detector.java
@@ -20,8 +20,6 @@ import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
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/dubbo-metrics/dubbo-metrics-config-center/src/main/java/org/apache/dubbo/metrics/config/collector/ConfigCenterMetricsCollector.java
b/dubbo-metrics/dubbo-metrics-config-center/src/main/java/org/apache/dubbo/metrics/config/collector/ConfigCenterMetricsCollector.java
index 3840862f68..66ce47b6ef 100644
---
a/dubbo-metrics/dubbo-metrics-config-center/src/main/java/org/apache/dubbo/metrics/config/collector/ConfigCenterMetricsCollector.java
+++
b/dubbo-metrics/dubbo-metrics-config-center/src/main/java/org/apache/dubbo/metrics/config/collector/ConfigCenterMetricsCollector.java
@@ -68,7 +68,7 @@ public class ConfigCenterMetricsCollector extends
CombMetricsCollector<ConfigCen
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/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 25ad926a6c..eccef2a24e 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
@@ -121,7 +121,7 @@ public class AggregateMetricsCollector implements
MetricsCollector<RequestEvent>
.ifPresent(metricsConfig ->
setCollectEnabled(metricsConfig.getAggregation().getEnabled()));
}
- return Optional.ofNullable(collectEnabled).orElse(true);
+ return Optional.ofNullable(collectEnabled).orElse(false);
}
@Override
diff --git
a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/filter/MetricsFilter.java
b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/filter/MetricsFilter.java
index 900dc7002b..244b1af403 100644
---
a/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/filter/MetricsFilter.java
+++
b/dubbo-metrics/dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/filter/MetricsFilter.java
@@ -55,7 +55,7 @@ public class MetricsFilter implements ScopeModelAware {
.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 class MetricsFilter implements ScopeModelAware {
}
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 class MetricsFilter implements ScopeModelAware {
}
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/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 ef049eb49c..e445a1289b 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
@@ -110,6 +110,7 @@ class AggregateMetricsCollectorTest {
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/dubbo-metrics/dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/collector/DefaultCollectorTest.java
b/dubbo-metrics/dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/collector/DefaultCollectorTest.java
index 9105d1b518..dbba77edf3 100644
---
a/dubbo-metrics/dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/collector/DefaultCollectorTest.java
+++
b/dubbo-metrics/dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/collector/DefaultCollectorTest.java
@@ -21,6 +21,7 @@ import org.apache.dubbo.common.constants.CommonConstants;
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 @@ class DefaultCollectorTest {
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/dubbo-metrics/dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/filter/MetricsFilterTest.java
b/dubbo-metrics/dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/filter/MetricsFilterTest.java
index b668c77024..e4b71db661 100644
---
a/dubbo-metrics/dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/filter/MetricsFilterTest.java
+++
b/dubbo-metrics/dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/filter/MetricsFilterTest.java
@@ -19,6 +19,7 @@ package org.apache.dubbo.metrics.filter;
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 @@ class MetricsFilterTest {
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/dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/collector/MetadataMetricsCollector.java
b/dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/collector/MetadataMetricsCollector.java
index 82dcc7cd97..909fab02dc 100644
---
a/dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/collector/MetadataMetricsCollector.java
+++
b/dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/collector/MetadataMetricsCollector.java
@@ -84,7 +84,7 @@ public class MetadataMetricsCollector extends
CombMetricsCollector<MetadataEvent
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/dubbo-metrics/dubbo-metrics-netty/src/main/java/org/apache/dubbo/metrics/registry/collector/NettyMetricsCollector.java
b/dubbo-metrics/dubbo-metrics-netty/src/main/java/org/apache/dubbo/metrics/registry/collector/NettyMetricsCollector.java
index 0a30e63fe4..b23ba1c8a4 100644
---
a/dubbo-metrics/dubbo-metrics-netty/src/main/java/org/apache/dubbo/metrics/registry/collector/NettyMetricsCollector.java
+++
b/dubbo-metrics/dubbo-metrics-netty/src/main/java/org/apache/dubbo/metrics/registry/collector/NettyMetricsCollector.java
@@ -78,7 +78,7 @@ public class NettyMetricsCollector extends
CombMetricsCollector<NettyEvent> {
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/dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/collector/RegistryMetricsCollector.java
b/dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/collector/RegistryMetricsCollector.java
index c10bca41dd..888e1bf340 100644
---
a/dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/collector/RegistryMetricsCollector.java
+++
b/dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/collector/RegistryMetricsCollector.java
@@ -100,7 +100,7 @@ public class RegistryMetricsCollector extends
CombMetricsCollector<RegistryEvent
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/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java
index 9c170eb835..b5c2b54ee4 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java
+++
b/dubbo-registry/dubbo-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;
}
