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 @@ public class EnhancedFeignBeanPostProcessor implements BeanPostProcessor, BeanFa
 					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 @@ public class EnhancedFeignBeanPostProcessor implements BeanPostProcessor, BeanFa
 	}
 
 	private boolean isNeedWrap(Object bean) {
-		return bean instanceof Client && !(bean instanceof EnhancedFeignClient)
+		return bean instanceof Client && !(bean instanceof EnhancedFeignClient);
-				&& !(bean instanceof EnhancedFeignBlockingLoadBalancerClient);
 	}
 
 	private EnhancedFeignClient createPolarisFeignClient(Client delegate) {

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

@@ -1,40 +0,0 @@
-/*
- * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
- *
- * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
- *
- * Licensed under the BSD 3-Clause License (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://opensource.org/licenses/BSD-3-Clause
- *
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package com.tencent.cloud.rpc.enhancement.feign;
-
-import java.util.List;
-
-import feign.Client;
-
-import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
-import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
-import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
-import org.springframework.cloud.openfeign.loadbalancer.LoadBalancerFeignRequestTransformer;
-
-/**
- * Wrap for {@link FeignBlockingLoadBalancerClient}.
- *
- * @author Haotian Zhang
- */
-public class EnhancedFeignBlockingLoadBalancerClient extends FeignBlockingLoadBalancerClient {
-
-	public EnhancedFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
-			LoadBalancerClientFactory loadBalancerClientFactory, List<LoadBalancerFeignRequestTransformer> transformers) {
-		super(delegate, loadBalancerClient, loadBalancerClientFactory, transformers);
-	}
-}

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

@@ -73,9 +73,7 @@ public class EnhancedFeignBeanPostProcessorTest {
 		// isNeedWrap(bean) == false
 		Object bean1 = new Object();
 		Object bean = enhancedFeignBeanPostProcessor.postProcessBeforeInitialization(bean1, "bean1");
-		assertThat(bean).isNotInstanceOfAny(
+		assertThat(bean).isNotInstanceOfAny(EnhancedFeignClient.class);
-				EnhancedFeignClient.class,
-				EnhancedFeignBlockingLoadBalancerClient.class);
 
 		// bean instanceOf Client.class
 		Client bean2 = mock(Client.class);
@@ -86,6 +84,7 @@ public class EnhancedFeignBeanPostProcessorTest {
 		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);
 	}
 }

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

@@ -1,35 +0,0 @@
-/*
- * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
- *
- * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
- *
- * Licensed under the BSD 3-Clause License (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://opensource.org/licenses/BSD-3-Clause
- *
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- */
-
-package com.tencent.cloud.rpc.enhancement.feign;
-
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThatCode;
-
-/**
- * Test for {@link EnhancedFeignBlockingLoadBalancerClient}.
- *
- * @author Haotian Zhang
- */
-public class EnhancedFeignBlockingLoadBalancerClientTest {
-
-	@Test
-	public void testConstructor() {
-		assertThatCode(() -> new EnhancedFeignBlockingLoadBalancerClient(null, null, null, null)).doesNotThrowAnyException();
-	}
-}