Merge branch '2020.0' into 2020/add_config_reflect_annotation

CHANGELOG.md

@@ -23,5 +23,7 @@
 - [Feature: Optimized configuration update](https://github.com/Tencent/spring-cloud-tencent/pull/527)
 - [Feature：support pushGateway push metrics](https://github.com/Tencent/spring-cloud-tencent/pull/531)
 - [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/534)
+- [Feature: remove location metadata](https://github.com/Tencent/spring-cloud-tencent/pull/540)
 - [add feature-env plugin & add spring cloud gateway staining plugin](https://github.com/Tencent/spring-cloud-tencent/pull/532)
 - [feature:add @ConditionalOnConfigReflectEnabled annotation](https://github.com/Tencent/spring-cloud-tencent/pull/538)
+- [fix:set error handler named EnhancedRestTemplateReporter for RestTemplate](https://github.com/Tencent/spring-cloud-tencent/pull/544)

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

@@ -214,8 +214,6 @@ 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;
@@ -84,6 +85,14 @@ public final class LoadBalancerUtils {
 		instance.setPort(serviceInstance.getPort());
 		instance.setWeight(DEFAULT_WEIGHT);
 		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;
 	}
 }

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfiguration.java

@@ -17,6 +17,7 @@
 
 package com.tencent.cloud.rpc.enhancement.config;
 
+import java.util.Collections;
 import java.util.List;
 
 import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
@@ -30,13 +31,14 @@ import com.tencent.cloud.rpc.enhancement.resttemplate.EnhancedRestTemplateReport
 import com.tencent.cloud.rpc.enhancement.resttemplate.PolarisResponseErrorHandler;
 import com.tencent.polaris.api.core.ConsumerAPI;
 
+import org.springframework.beans.factory.SmartInitializingSingleton;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.client.loadbalancer.RestTemplateCustomizer;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.client.RestTemplate;
@@ -100,6 +102,10 @@ public class RpcEnhancementAutoConfiguration {
 	@ConditionalOnClass(name = "org.springframework.web.client.RestTemplate")
 	protected static class PolarisRestTemplateAutoConfiguration {
 
+		@LoadBalanced
+		@Autowired(required = false)
+		private List<RestTemplate> restTemplates = Collections.emptyList();
+
 		@Bean
 		public EnhancedRestTemplateReporter polarisRestTemplateResponseErrorHandler(
 				RpcEnhancementReporterProperties properties, ConsumerAPI consumerAPI,
@@ -108,8 +114,12 @@ public class RpcEnhancementAutoConfiguration {
 		}
 
 		@Bean
-		public RestTemplateCustomizer setErrorHandlerCustomizer(EnhancedRestTemplateReporter reporter) {
+		public SmartInitializingSingleton setErrorHandlerForRestTemplate(EnhancedRestTemplateReporter reporter) {
-			return restTemplate -> restTemplate.setErrorHandler(reporter);
+			return () -> {
+				for (RestTemplate restTemplate : restTemplates) {
+					restTemplate.setErrorHandler(reporter);
+				}
+			};
 		}
 	}
 }

spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/config/RpcEnhancementAutoConfigurationTest.java

@@ -17,9 +17,6 @@
 
 package com.tencent.cloud.rpc.enhancement.config;
 
-import java.io.IOException;
-import java.net.URI;
-
 import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
 import com.tencent.cloud.rpc.enhancement.feign.EnhancedFeignBeanPostProcessor;
 import com.tencent.cloud.rpc.enhancement.feign.EnhancedFeignPluginRunner;
@@ -32,12 +29,7 @@ import org.junit.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
-import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerRequest;
-import org.springframework.cloud.client.loadbalancer.Request;
 import org.springframework.cloud.openfeign.loadbalancer.FeignLoadBalancerAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -57,7 +49,6 @@ public class RpcEnhancementAutoConfigurationTest {
 					PolarisContextAutoConfiguration.class,
 					RpcEnhancementAutoConfiguration.class,
 					PolarisRestTemplateAutoConfigurationTester.class,
-					LoadBalancerAutoConfiguration.class,
 					FeignLoadBalancerAutoConfiguration.class))
 			.withPropertyValues("spring.cloud.polaris.circuitbreaker.enabled=true");
 
@@ -85,36 +76,5 @@ public class RpcEnhancementAutoConfigurationTest {
 		RestTemplate restTemplate() {
 			return new RestTemplate();
 		}
-
-		@Bean
-		LoadBalancerClient loadBalancerClient() {
-			return new LoadBalancerClient() {
-
-				@Override
-				public ServiceInstance choose(String serviceId) {
-					return null;
-				}
-
-				@Override
-				public <T> ServiceInstance choose(String serviceId, Request<T> request) {
-					return null;
-				}
-
-				@Override
-				public <T> T execute(String serviceId, LoadBalancerRequest<T> request) throws IOException {
-					return null;
-				}
-
-				@Override
-				public <T> T execute(String serviceId, ServiceInstance serviceInstance, LoadBalancerRequest<T> request) throws IOException {
-					return null;
-				}
-
-				@Override
-				public URI reconstructURI(ServiceInstance instance, URI original) {
-					return null;
-				}
-			};
-		}
 	}
 }