remove location metadata (#542)

CHANGELOG.md

@@ -24,4 +24,5 @@
 - [Feature: Optimized configuration update](https://github.com/Tencent/spring-cloud-tencent/pull/528)
 - [Feature：support pushGateway push metrics](https://github.com/Tencent/spring-cloud-tencent/pull/529)
 - [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/536)
+- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/542)
 - [add feature-env plugin & add spring cloud gateway staining plugin](https://github.com/Tencent/spring-cloud-tencent/pull/533)

spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/metadata/StaticMetadataManager.java

@@ -214,8 +214,7 @@ public class StaticMetadataManager {
 		mergedMetadataResult.putAll(configMetadata);
 		mergedMetadataResult.putAll(envMetadata);
 		mergedMetadataResult.putAll(customSPIMetadata);
-		// set location info as metadata
+
-		mergedMetadataResult.putAll(getLocationMetadata());
 		this.mergedStaticMetadata = Collections.unmodifiableMap(mergedMetadataResult);
 
 		Map<String, String> mergedTransitiveMetadataResult = new HashMap<>();

spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/StaticMetadataManagerTest.java

@@ -128,9 +128,6 @@ public class StaticMetadataManagerTest {
 		Assert.assertEquals("v1", metadata.get("k1"));
 		Assert.assertEquals("v22", metadata.get("k2"));
 		Assert.assertEquals("v33", metadata.get("k3"));
-		Assert.assertEquals("zone2", metadata.get("zone"));
-		Assert.assertEquals("region1", metadata.get("region"));
-		Assert.assertEquals("campus1", metadata.get("campus"));
 
 		Map<String, String> transitiveMetadata = metadataManager.getMergedStaticTransitiveMetadata();
 		Assert.assertEquals(2, transitiveMetadata.size());

spring-cloud-tencent-polaris-loadbalancer/src/main/java/com/tencent/cloud/polaris/loadbalancer/LoadBalancerUtils.java

@@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 import com.tencent.cloud.common.metadata.MetadataContext;
+import com.tencent.cloud.common.pojo.PolarisServiceInstance;
 import com.tencent.polaris.api.pojo.DefaultInstance;
 import com.tencent.polaris.api.pojo.DefaultServiceInstances;
 import com.tencent.polaris.api.pojo.Instance;
@@ -57,6 +58,14 @@ public final class LoadBalancerUtils {
 				instance.setPort(serviceInstance.getPort());
 				instance.setWeight(100);
 				instance.setMetadata(serviceInstance.getMetadata());
+
+				if (serviceInstance instanceof PolarisServiceInstance) {
+					PolarisServiceInstance polarisServiceInstance = (PolarisServiceInstance) serviceInstance;
+					instance.setRegion(polarisServiceInstance.getPolarisInstance().getRegion());
+					instance.setZone(polarisServiceInstance.getPolarisInstance().getZone());
+					instance.setCampus(polarisServiceInstance.getPolarisInstance().getCampus());
+				}
+
 				return instance;
 			}).collect(Collectors.toList()));
 		});