fix:fix feign url bug when using sleuth. (#1120)

CHANGELOG.md

@@ -3,3 +3,4 @@
 
 - [fix:the polaris config relation non-daemon thread should stop when application fails to start.](https://github.com/Tencent/spring-cloud-tencent/pull/1102)
 - [Refactoring:remove invalid @AutoConfigureAfter and @AutoConfigureBefore from discovery client automatic configuration.](https://github.com/Tencent/spring-cloud-tencent/pull/1116)
+- [fix:fix feign url bug when using sleuth.](https://github.com/Tencent/spring-cloud-tencent/pull/1120)

spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/EnhancedFeignBeanPostProcessor.java

@@ -62,7 +62,7 @@ private Object wrapper(Object bean) {
 					delegate = ((FeignBlockingLoadBalancerClient) bean).getDelegate();
 				}
 				if (delegate != null) {
-					return new EnhancedFeignBlockingLoadBalancerClient(createPolarisFeignClient(delegate),
+					return new FeignBlockingLoadBalancerClient(createPolarisFeignClient(delegate),
 							factory.getBean(BlockingLoadBalancerClient.class),
 							factory.getBean(LoadBalancerClientFactory.class),
 							factory.getBeanProvider(LoadBalancerFeignRequestTransformer.class).stream().toList()
@@ -75,8 +75,7 @@ private Object wrapper(Object bean) {
 	}
 
 	private boolean isNeedWrap(Object bean) {
-		return bean instanceof Client && !(bean instanceof EnhancedFeignClient)
-				&& !(bean instanceof EnhancedFeignBlockingLoadBalancerClient);
+		return bean instanceof Client && !(bean instanceof EnhancedFeignClient);
 	}
 
 	private EnhancedFeignClient createPolarisFeignClient(Client delegate) {

spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/feign/EnhancedFeignBeanPostProcessorTest.java

@@ -73,9 +73,7 @@ public void testPostProcessBeforeInitialization() {
 		// isNeedWrap(bean) == false
 		Object bean1 = new Object();
 		Object bean = enhancedFeignBeanPostProcessor.postProcessBeforeInitialization(bean1, "bean1");
-		assertThat(bean).isNotInstanceOfAny(
-				EnhancedFeignClient.class,
-				EnhancedFeignBlockingLoadBalancerClient.class);
+		assertThat(bean).isNotInstanceOfAny(EnhancedFeignClient.class);
 
 		// bean instanceOf Client.class
 		Client bean2 = mock(Client.class);
@@ -86,6 +84,7 @@ public void testPostProcessBeforeInitialization() {
 		FeignBlockingLoadBalancerClient bean4 = mock(FeignBlockingLoadBalancerClient.class);
 		doReturn(mock(Client.class)).when(bean4).getDelegate();
 		bean = enhancedFeignBeanPostProcessor.postProcessBeforeInitialization(bean4, "bean4");
-		assertThat(bean).isInstanceOf(EnhancedFeignBlockingLoadBalancerClient.class);
+		assertThat(bean).isInstanceOf(FeignBlockingLoadBalancerClient.class);
+		assertThat(((FeignBlockingLoadBalancerClient) bean).getDelegate()).isInstanceOf(EnhancedFeignClient.class);
 	}
 }