fix: fix log feign response stream close bug

Shanyou Yu (Sean Yu) 3 years ago committed by Haotian Zhang
parent 9faf1fe26c
commit 1cd9da024c

@ -79,7 +79,7 @@ Spring Cloud Tencent 所有组件都已上传到 Maven 中央仓库,只需要
<groupId>com.tencent.cloud</groupId> <groupId>com.tencent.cloud</groupId>
<artifactId>spring-cloud-tencent-dependencies</artifactId> <artifactId>spring-cloud-tencent-dependencies</artifactId>
<!--version number--> <!--version number-->
<version>1.10.0-2021.0.6</version> <version>1.10.1-2021.0.6</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

@ -76,7 +76,7 @@ For example:
<groupId>com.tencent.cloud</groupId> <groupId>com.tencent.cloud</groupId>
<artifactId>spring-cloud-tencent-dependencies</artifactId> <artifactId>spring-cloud-tencent-dependencies</artifactId>
<!--version number--> <!--version number-->
<version>1.10.0-2021.0.6</version> <version>1.10.1-2021.0.6</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

@ -88,7 +88,7 @@
<properties> <properties>
<!-- Project revision --> <!-- Project revision -->
<revision>1.10.0-2021.0.6</revision> <revision>1.10.1-2021.0.6</revision>
<!-- Spring Framework --> <!-- Spring Framework -->
<spring.framework.version>5.3.25</spring.framework.version> <spring.framework.version>5.3.25</spring.framework.version>

@ -70,7 +70,7 @@
</developers> </developers>
<properties> <properties>
<revision>1.10.0-2021.0.6</revision> <revision>1.10.1-2021.0.6</revision>
<!-- Dependencies --> <!-- Dependencies -->
<polaris.version>1.11.1</polaris.version> <polaris.version>1.11.1</polaris.version>

@ -75,7 +75,7 @@ public class ExceptionPolarisReporter implements EnhancedFeignPlugin {
if (exception instanceof SocketTimeoutException) { if (exception instanceof SocketTimeoutException) {
retStatus = RetStatus.RetTimeout; retStatus = RetStatus.RetTimeout;
} }
LOG.debug("Will report result of {}. Request=[{}]. Response=[{}].", retStatus.name(), request, response); LOG.debug("Will report result of {}. Request=[{} {}]. Response=[{}].", retStatus.name(), request.httpMethod().name(), request.url(), response.status());
ServiceCallResult resultRequest = ReporterUtils.createServiceCallResult(request, retStatus); ServiceCallResult resultRequest = ReporterUtils.createServiceCallResult(request, retStatus);
consumerAPI.updateServiceCallResult(resultRequest); consumerAPI.updateServiceCallResult(resultRequest);
// update result without method for service circuit break. // update result without method for service circuit break.

@ -72,7 +72,7 @@ public class SuccessPolarisReporter extends AbstractPolarisReporterAdapter imple
if (apply(HttpStatus.resolve(response.status()))) { if (apply(HttpStatus.resolve(response.status()))) {
retStatus = RetStatus.RetFail; retStatus = RetStatus.RetFail;
} }
LOG.debug("Will report result of {}. Request=[{}]. Response=[{}].", retStatus.name(), request, response); LOG.debug("Will report result of {}. Request=[{} {}]. Response=[{}].", retStatus.name(), request.httpMethod().name(), request.url(), response.status());
ServiceCallResult resultRequest = ReporterUtils.createServiceCallResult(request, retStatus); ServiceCallResult resultRequest = ReporterUtils.createServiceCallResult(request, retStatus);
consumerAPI.updateServiceCallResult(resultRequest); consumerAPI.updateServiceCallResult(resultRequest);
// update result without method for service circuit break. // update result without method for service circuit break.

@ -17,6 +17,8 @@
package com.tencent.cloud.rpc.enhancement.feign.plugin.reporter; package com.tencent.cloud.rpc.enhancement.feign.plugin.reporter;
import java.util.HashMap;
import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties; import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignContext; import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignContext;
import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPluginType; import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPluginType;
@ -83,7 +85,7 @@ public class ExceptionPolarisReporterTest {
@Test @Test
public void testRun() { public void testRun() {
// mock request // mock request
Request request = mock(Request.class); Request request = Request.create(Request.HttpMethod.GET, "/", new HashMap<>(), null, null, null);
// mock response // mock response
Response response = mock(Response.class); Response response = mock(Response.class);

@ -17,6 +17,8 @@
package com.tencent.cloud.rpc.enhancement.feign.plugin.reporter; package com.tencent.cloud.rpc.enhancement.feign.plugin.reporter;
import java.util.HashMap;
import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties; import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignContext; import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignContext;
import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPluginType; import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPluginType;
@ -83,7 +85,7 @@ public class SuccessPolarisReporterTest {
@Test @Test
public void testRun() { public void testRun() {
// mock request // mock request
Request request = mock(Request.class); Request request = Request.create(Request.HttpMethod.GET, "/", new HashMap<>(), null, null, null);
// mock response // mock response
Response response = mock(Response.class); Response response = mock(Response.class);
doReturn(502).when(response).status(); doReturn(502).when(response).status();

Loading…
Cancel
Save