From 1cd9da024cb3d4afcdca26a7328d3ea10362a026 Mon Sep 17 00:00:00 2001 From: "Shanyou Yu (Sean Yu)" Date: Wed, 15 Mar 2023 12:54:16 +0800 Subject: [PATCH] fix: fix log feign response stream close bug --- README-zh.md | 2 +- README.md | 2 +- pom.xml | 2 +- spring-cloud-tencent-dependencies/pom.xml | 2 +- .../feign/plugin/reporter/ExceptionPolarisReporter.java | 2 +- .../feign/plugin/reporter/SuccessPolarisReporter.java | 2 +- .../feign/plugin/reporter/ExceptionPolarisReporterTest.java | 4 +++- .../feign/plugin/reporter/SuccessPolarisReporterTest.java | 4 +++- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/README-zh.md b/README-zh.md index fd5d2a3b9..ae2e058fe 100644 --- a/README-zh.md +++ b/README-zh.md @@ -79,7 +79,7 @@ Spring Cloud Tencent 所有组件都已上传到 Maven 中央仓库，只需要 com.tencent.cloud spring-cloud-tencent-dependencies - 1.10.0-2021.0.6 + 1.10.1-2021.0.6 pom import diff --git a/README.md b/README.md index b2f9e9dda..4b1f9a571 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ For example: com.tencent.cloud spring-cloud-tencent-dependencies - 1.10.0-2021.0.6 + 1.10.1-2021.0.6 pom import diff --git a/pom.xml b/pom.xml index 02e9d641d..0ed58ad32 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ - 1.10.0-2021.0.6 + 1.10.1-2021.0.6 5.3.25 diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 10b4adbc0..a71f484ad 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -70,7 +70,7 @@ - 1.10.0-2021.0.6 + 1.10.1-2021.0.6 1.11.1 diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ExceptionPolarisReporter.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ExceptionPolarisReporter.java index 0e1b2c87a..f0498fac6 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ExceptionPolarisReporter.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ExceptionPolarisReporter.java @@ -75,7 +75,7 @@ public class ExceptionPolarisReporter implements EnhancedFeignPlugin { if (exception instanceof SocketTimeoutException) { 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); consumerAPI.updateServiceCallResult(resultRequest); // update result without method for service circuit break. diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/SuccessPolarisReporter.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/SuccessPolarisReporter.java index 2fefd6dcf..933619766 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/SuccessPolarisReporter.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/SuccessPolarisReporter.java @@ -72,7 +72,7 @@ public class SuccessPolarisReporter extends AbstractPolarisReporterAdapter imple if (apply(HttpStatus.resolve(response.status()))) { 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); consumerAPI.updateServiceCallResult(resultRequest); // update result without method for service circuit break. diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ExceptionPolarisReporterTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ExceptionPolarisReporterTest.java index a123e8490..997f9b37f 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ExceptionPolarisReporterTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/ExceptionPolarisReporterTest.java @@ -17,6 +17,8 @@ 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.feign.plugin.EnhancedFeignContext; import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPluginType; @@ -83,7 +85,7 @@ public class ExceptionPolarisReporterTest { @Test public void testRun() { // mock request - Request request = mock(Request.class); + Request request = Request.create(Request.HttpMethod.GET, "/", new HashMap<>(), null, null, null); // mock response Response response = mock(Response.class); diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/SuccessPolarisReporterTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/SuccessPolarisReporterTest.java index 841592986..2970baa8c 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/SuccessPolarisReporterTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/feign/plugin/reporter/SuccessPolarisReporterTest.java @@ -17,6 +17,8 @@ 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.feign.plugin.EnhancedFeignContext; import com.tencent.cloud.rpc.enhancement.feign.plugin.EnhancedFeignPluginType; @@ -83,7 +85,7 @@ public class SuccessPolarisReporterTest { @Test public void testRun() { // mock request - Request request = mock(Request.class); + Request request = Request.create(Request.HttpMethod.GET, "/", new HashMap<>(), null, null, null); // mock response Response response = mock(Response.class); doReturn(502).when(response).status();