From 1c38fea81aab62881f1c5a064531fb54c4495823 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Mon, 27 Feb 2023 13:46:35 +0800
Subject: [PATCH] feat:enable stat reporting as default.

---
 .../tencent/cloud/polaris/registry/PolarisServiceRegistry.java | 3 ++-
 .../rpc/enhancement/stat/config/PolarisStatPropertiesTest.java | 2 +-
 .../src/test/resources/application-test.properties             | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java
index eeb10c50e..da0963e5c 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java
@@ -18,6 +18,7 @@
 
 package com.tencent.cloud.polaris.registry;
 
+import java.util.Objects;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
@@ -126,7 +127,7 @@ public class PolarisServiceRegistry implements ServiceRegistry<PolarisRegistrati
 			LOGGER.info("polaris registry, {} {} {}:{} {} register finished", polarisDiscoveryProperties.getNamespace(),
 					registration.getServiceId(), registration.getHost(), registration.getPort(),
 					staticMetadataManager.getMergedStaticMetadata());
-			if (polarisStatProperties.isEnabled()) {
+			if (Objects.nonNull(polarisStatProperties) && polarisStatProperties.isEnabled()) {
 				try {
 					StatReporter statReporter = (StatReporter) polarisDiscoveryHandler.getSdkContext().getPlugins()
 							.getPlugin(PluginTypes.STAT_REPORTER.getBaseType(), StatReporterConfig.DEFAULT_REPORTER_PROMETHEUS);
diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/PolarisStatPropertiesTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/PolarisStatPropertiesTest.java
index 453a9534b..9adc4f65f 100644
--- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/PolarisStatPropertiesTest.java
+++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/stat/config/PolarisStatPropertiesTest.java
@@ -46,7 +46,7 @@ public class PolarisStatPropertiesTest {
 		assertThat(polarisStatProperties).isNotNull();
 		assertThat(polarisStatProperties.isEnabled()).isTrue();
 		assertThat(polarisStatProperties.getHost()).isNotBlank();
-		assertThat(polarisStatProperties.getPort()).isGreaterThanOrEqualTo(0);
+		assertThat(polarisStatProperties.getPort()).isEqualTo(20000);
 		assertThat(polarisStatProperties.getPath()).isEqualTo("/xxx");
 	}
 
diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/resources/application-test.properties b/spring-cloud-tencent-rpc-enhancement/src/test/resources/application-test.properties
index 828d434b6..34e566e79 100644
--- a/spring-cloud-tencent-rpc-enhancement/src/test/resources/application-test.properties
+++ b/spring-cloud-tencent-rpc-enhancement/src/test/resources/application-test.properties
@@ -1,3 +1,5 @@
+spring.cloud.polaris.stat.enabled=true
+spring.cloud.polaris.stat.port=20000
 spring.cloud.polaris.stat.path=/xxx
 spring.cloud.tencent.rpc-enhancement.reporter.ignore-internal-server-error=false
 spring.cloud.tencent.rpc-enhancement.reporter.series[0]=CLIENT_ERROR