From 5ff9658d6684a3e4700451383f3c4051ccde2092 Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Wed, 15 Mar 2023 15:37:18 +0800 Subject: [PATCH] fix:remove the secondary report. --- README-zh.md | 2 +- README.md | 2 +- pom.xml | 2 +- spring-cloud-tencent-dependencies/pom.xml | 2 +- .../feign/plugin/reporter/ExceptionPolarisReporter.java | 8 +++----- .../feign/plugin/reporter/SuccessPolarisReporter.java | 6 ++---- .../resttemplate/EnhancedRestTemplateReporter.java | 3 --- .../resttemplate/EnhancedRestTemplateReporterTest.java | 4 ++-- 8 files changed, 11 insertions(+), 18 deletions(-) diff --git a/README-zh.md b/README-zh.md index c8ff0c291..70f0c204f 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.1-2020.0.5 + 1.10.2-2020.0.5 pom import diff --git a/README.md b/README.md index abf853b49..fdd5c57b8 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ For example: com.tencent.cloud spring-cloud-tencent-dependencies - 1.10.1-2020.0.5 + 1.10.2-2020.0.5 pom import diff --git a/pom.xml b/pom.xml index d70048a13..cba23b6be 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ - 1.10.1-2020.0.5 + 1.10.2-2020.0.5 5.3.21 diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 75b8fa450..54e9eddbf 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -70,7 +70,7 @@ - 1.10.1-2020.0.5 + 1.10.2-2020.0.5 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 f0498fac6..a1496fa11 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 @@ -46,7 +46,7 @@ public class ExceptionPolarisReporter implements EnhancedFeignPlugin { private final ConsumerAPI consumerAPI; public ExceptionPolarisReporter(RpcEnhancementReporterProperties reporterProperties, - ConsumerAPI consumerAPI) { + ConsumerAPI consumerAPI) { this.reporterProperties = reporterProperties; this.consumerAPI = consumerAPI; } @@ -75,12 +75,10 @@ public class ExceptionPolarisReporter implements EnhancedFeignPlugin { if (exception instanceof SocketTimeoutException) { retStatus = RetStatus.RetTimeout; } - LOG.debug("Will report result of {}. Request=[{} {}]. Response=[{}].", retStatus.name(), request.httpMethod().name(), request.url(), response.status()); + 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. - resultRequest.setMethod(""); - consumerAPI.updateServiceCallResult(resultRequest); } } 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 933619766..cc009d1b8 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,12 +72,10 @@ 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.httpMethod().name(), request.url(), response.status()); + 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. - resultRequest.setMethod(""); - consumerAPI.updateServiceCallResult(resultRequest); } } diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporter.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporter.java index df1ec9907..b8f842e77 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporter.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporter.java @@ -153,9 +153,6 @@ public class EnhancedRestTemplateReporter extends AbstractPolarisReporterAdapter LOGGER.debug("Will report result of {}. URL=[{}]. Response=[{}].", resultRequest.getRetStatus().name(), url, response); consumerAPI.updateServiceCallResult(resultRequest); - // update result without method for service circuit break. - resultRequest.setMethod(""); - consumerAPI.updateServiceCallResult(resultRequest); } catch (Exception e) { LOGGER.error("RestTemplate response reporter execute failed of {} url {}", response, url, e); diff --git a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporterTest.java b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporterTest.java index 2b54c25f0..a4395b8b6 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporterTest.java +++ b/spring-cloud-tencent-rpc-enhancement/src/test/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporterTest.java @@ -147,7 +147,7 @@ public class EnhancedRestTemplateReporterTest { URI uri = mock(URI.class); enhancedRestTemplateReporter.handleError(uri, HttpMethod.GET, response); - verify(consumerAPI, times(2)).updateServiceCallResult(any()); + verify(consumerAPI, times(1)).updateServiceCallResult(any()); verify(delegate).handleError(uri, HttpMethod.GET, response); } @@ -162,7 +162,7 @@ public class EnhancedRestTemplateReporterTest { URI uri = mock(URI.class); enhancedRestTemplateReporter.handleError(uri, HttpMethod.GET, response); - verify(consumerAPI, times(2)).updateServiceCallResult(any()); + verify(consumerAPI, times(1)).updateServiceCallResult(any()); verify(delegate, times(0)).handleError(uri, HttpMethod.GET, response); }