fix:remove the secondary report.

Haotian Zhang 3 years ago
parent 68264d937b
commit 8ce93f7fa7

@ -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.1-2022.0.1</version> <version>1.10.2-2022.0.1</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.1-2022.0.1</version> <version>1.10.2-2022.0.1</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.1-2022.0.1</revision> <revision>1.10.2-2022.0.1</revision>
<!-- Spring Framework --> <!-- Spring Framework -->
<spring.framework.version>6.0.5</spring.framework.version> <spring.framework.version>6.0.5</spring.framework.version>

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

@ -75,12 +75,10 @@ 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.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); ServiceCallResult resultRequest = ReporterUtils.createServiceCallResult(request, retStatus);
consumerAPI.updateServiceCallResult(resultRequest); consumerAPI.updateServiceCallResult(resultRequest);
// update result without method for service circuit break.
resultRequest.setMethod("");
consumerAPI.updateServiceCallResult(resultRequest);
} }
} }

@ -72,12 +72,10 @@ 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.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); ServiceCallResult resultRequest = ReporterUtils.createServiceCallResult(request, retStatus);
consumerAPI.updateServiceCallResult(resultRequest); consumerAPI.updateServiceCallResult(resultRequest);
// update result without method for service circuit break.
resultRequest.setMethod("");
consumerAPI.updateServiceCallResult(resultRequest);
} }
} }

@ -157,9 +157,6 @@ public class EnhancedRestTemplateReporter extends AbstractPolarisReporterAdapter
LOGGER.debug("Will report result of {}. URL=[{}]. Response=[{}].", resultRequest.getRetStatus().name(), LOGGER.debug("Will report result of {}. URL=[{}]. Response=[{}].", resultRequest.getRetStatus().name(),
url, response); url, response);
consumerAPI.updateServiceCallResult(resultRequest); consumerAPI.updateServiceCallResult(resultRequest);
// update result without method for service circuit break.
resultRequest.setMethod("");
consumerAPI.updateServiceCallResult(resultRequest);
} }
catch (Exception e) { catch (Exception e) {
LOGGER.error("RestTemplate response reporter execute failed of {} url {}", response, url, e); LOGGER.error("RestTemplate response reporter execute failed of {} url {}", response, url, e);

@ -146,7 +146,7 @@ public class EnhancedRestTemplateReporterTest {
URI uri = mock(URI.class); URI uri = mock(URI.class);
enhancedRestTemplateReporter.handleError(uri, HttpMethod.GET, response); 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); verify(delegate).handleError(uri, HttpMethod.GET, response);
} }
@ -161,7 +161,7 @@ public class EnhancedRestTemplateReporterTest {
URI uri = mock(URI.class); URI uri = mock(URI.class);
enhancedRestTemplateReporter.handleError(uri, HttpMethod.GET, response); 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); verify(delegate, times(0)).handleError(uri, HttpMethod.GET, response);
} }

Loading…
Cancel
Save