Merge branch 'main' into h/ratelimit

CHANGELOG.md

@@ -3,3 +3,5 @@
 
 - [Bugfix: fix router bug and add router example](https://github.com/Tencent/spring-cloud-tencent/pull/89)
 - [feat:add custom label resolver spi for rate limit](https://github.com/Tencent/spring-cloud-tencent/pull/105)
+- [feat:fix discovery weight param not set to register request bug](https://github.com/Tencent/spring-cloud-tencent/pull/102)
+- [Bugfix: fix causing cpu 100% when set ScheduledThreadPoolExecutor corePoolSize=0](https://github.com/Tencent/spring-cloud-tencent/pull/98)

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/PolarisDiscoveryProperties.java

@@ -56,7 +56,7 @@ public class PolarisDiscoveryProperties {
 	 * Load balance weight.
 	 */
 	@Value("${spring.cloud.polaris.discovery.weight:#{100}}")
-	private float weight;
+	private int weight;
 
 	/**
 	 * Version number.
@@ -134,11 +134,11 @@ public class PolarisDiscoveryProperties {
 		this.namespace = namespace;
 	}
 
-	public float getWeight() {
+	public int getWeight() {
 		return weight;
 	}
 
-	public void setWeight(float weight) {
+	public void setWeight(int weight) {
 		this.weight = weight;
 	}
 

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java

@@ -18,8 +18,8 @@
 
 package com.tencent.cloud.polaris.registry;
 
+import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import com.tencent.cloud.common.metadata.config.MetadataLocalProperties;
@@ -71,13 +71,11 @@ public class PolarisServiceRegistry implements ServiceRegistry<Registration> {
 		this.polarisDiscoveryProperties = polarisDiscoveryProperties;
 		this.polarisDiscoveryHandler = polarisDiscoveryHandler;
 		this.metadataLocalProperties = metadataLocalProperties;
+
 		if (polarisDiscoveryProperties.isHeartbeatEnabled()) {
-			ScheduledThreadPoolExecutor heartbeatExecutor = new ScheduledThreadPoolExecutor(
+			this.heartbeatExecutor = Executors
-					0, new NamedThreadFactory("spring-cloud-heartbeat"));
+					.newSingleThreadScheduledExecutor(new NamedThreadFactory("spring-cloud-heartbeat"));
-			heartbeatExecutor.setMaximumPoolSize(1);
+		} else {
-			this.heartbeatExecutor = heartbeatExecutor;
-		}
-		else {
 			this.heartbeatExecutor = null;
 		}
 	}
@@ -95,6 +93,7 @@ public class PolarisServiceRegistry implements ServiceRegistry<Registration> {
 		instanceRegisterRequest.setService(registration.getServiceId());
 		instanceRegisterRequest.setHost(registration.getHost());
 		instanceRegisterRequest.setPort(registration.getPort());
+		instanceRegisterRequest.setWeight(polarisDiscoveryProperties.getWeight());
 		instanceRegisterRequest.setToken(polarisDiscoveryProperties.getToken());
 		if (null != heartbeatExecutor) {
 			instanceRegisterRequest.setTtl(ttl);

spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -50,7 +50,7 @@
     },
     {
       "name": "spring.cloud.polaris.weight",
-      "type": "java.lang.String",
+      "type": "java.lang.Integer",
       "defaultValue": 100,
       "description": "the weight of polaris instance , use to load-balance."
     }

spring-cloud-tencent-examples/polaris-router-example/router-callee-service2/src/main/resources/bootstrap.yml

@@ -7,8 +7,7 @@ spring:
     tencent:
       metadata:
         content:
-          version: v2
+          label1: value2
-          xx: zz
     polaris:
       address: grpc://127.0.0.1:8091
       namespace: default