feat:issue 818

spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilterTest.java

@@ -27,7 +27,9 @@ import java.util.concurrent.CountDownLatch;
 import java.util.stream.Collectors;
 
 import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.StringValue;
 import com.google.protobuf.util.JsonFormat;
+import com.tencent.cloud.common.constant.HeaderConstant;
 import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.cloud.polaris.context.ServiceRuleManager;
 import com.tencent.cloud.polaris.ratelimit.config.PolarisRateLimitProperties;
@@ -95,7 +97,7 @@ public class QuotaCheckReactiveFilterTest {
 			}
 			else if (serviceName.equals("TestApp3")) {
 				QuotaResponse response = new QuotaResponse(new QuotaResult(QuotaResult.Code.QuotaResultLimited, 0, "QuotaResultLimited"));
-				response.setActiveRule(RateLimitProto.Rule.newBuilder().build());
+				response.setActiveRule(RateLimitProto.Rule.newBuilder().setName(StringValue.newBuilder().setValue("MOCK_RULE").build()).build());
 				return response;
 			}
 			else {
@@ -183,6 +185,7 @@ public class QuotaCheckReactiveFilterTest {
 		ServerHttpResponse response = testApp3Exchange.getResponse();
 		assertThat(response.getRawStatusCode()).isEqualTo(419);
 		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE);
+		assertThat(response.getHeaders().get(HeaderConstant.INTERNAL_ACTIVE_RULE_NAME)).isEqualTo(Collections.singletonList("MOCK_RULE"));
 
 		// Exception
 		MetadataContext.LOCAL_SERVICE = "TestApp4";

spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilterTest.java

@@ -27,7 +27,9 @@ import java.util.Collections;
 import java.util.stream.Collectors;
 
 import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.StringValue;
 import com.google.protobuf.util.JsonFormat;
+import com.tencent.cloud.common.constant.HeaderConstant;
 import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.cloud.polaris.context.ServiceRuleManager;
 import com.tencent.cloud.polaris.ratelimit.config.PolarisRateLimitProperties;
@@ -94,7 +96,7 @@ public class QuotaCheckServletFilterTest {
 			}
 			else if (serviceName.equals("TestApp3")) {
 				QuotaResponse response = new QuotaResponse(new QuotaResult(QuotaResult.Code.QuotaResultLimited, 0, "QuotaResultLimited"));
-				response.setActiveRule(RateLimitProto.Rule.newBuilder().build());
+				response.setActiveRule(RateLimitProto.Rule.newBuilder().setName(StringValue.newBuilder().setValue("MOCK_RULE").build()).build());
 				return response;
 			}
 			else {
@@ -181,6 +183,7 @@ public class QuotaCheckServletFilterTest {
 			quotaCheckServletFilter.doFilterInternal(request, testApp3Response, filterChain);
 			assertThat(testApp3Response.getStatus()).isEqualTo(419);
 			assertThat(testApp3Response.getContentAsString()).isEqualTo("RejectRequestTips提示消息");
+			assertThat(testApp3Response.getHeader(HeaderConstant.INTERNAL_ACTIVE_RULE_NAME)).isEqualTo("MOCK_RULE");
 
 			MockHttpServletResponse testApp3Response2 = new MockHttpServletResponse();
 			quotaCheckWithHtmlRejectTipsServletFilter.doFilterInternal(request, testApp3Response2, filterChain);

spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/src/main/resources/META-INF/spring.factories

@@ -1,2 +0,0 @@
-org.springframework.cloud.bootstrap.BootstrapConfiguration=\
-  com.tencent.cloud.plugin.pushgateway.PolarisStatPushGatewayBootstrapConfiguration

spring-cloud-tencent-plugin-starters/spring-cloud-tencent-pushgateway-plugin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +0,0 @@
-com.tencent.cloud.plugin.pushgateway.PolarisStatPushGatewayAutoConfiguration

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

@@ -124,6 +124,10 @@ public class AbstractPolarisReporterAdapterTest {
 		headers.set(HeaderConstant.INTERNAL_CALLEE_RET_STATUS, RetStatus.RetFlowControl.getDesc());
 		ret = adapter.getRetStatusFromRequest(headers, RetStatus.RetFail);
 		Assertions.assertThat(ret).isEqualTo(RetStatus.RetFlowControl);
+
+		headers.set(HeaderConstant.INTERNAL_CALLEE_RET_STATUS, RetStatus.RetReject.getDesc());
+		ret = adapter.getRetStatusFromRequest(headers, RetStatus.RetFail);
+		Assertions.assertThat(ret).isEqualTo(RetStatus.RetReject);
 	}
 
 	@Test