feat:add admin http handler.

Tencent · Oct 29, 2024 · db54039 · db54039
1 parent 90e129c
commit db54039
Show file tree

Hide file tree

Showing 45 changed files with 561 additions and 541 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,3 +35,4 @@
 - [fix:fix actuator name warning from #1428 .](https://github.com/Tencent/spring-cloud-tencent/pull/1429)
 - [feat:upgrade api circuit breaker.](https://github.com/Tencent/spring-cloud-tencent/pull/1438)
 - [feat: support lossless config from console & support warmup.](https://github.com/Tencent/spring-cloud-tencent/pull/1435)
+- [feat:add admin http handler.](https://github.com/Tencent/spring-cloud-tencent/pull/1448)
diff --git a/pom.xml b/pom.xml
@@ -89,7 +89,7 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>2.0.0.0-2022.0.5-RC3</revision>
+		<revision>2.0.0.0-2022.0.5-SNAPSHOT</revision>
 
 		<!-- Spring Framework -->
 		<spring.framework.version>6.0.22</spring.framework.version>

diff --git a/...st/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerMockServerTest.java b/...st/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerMockServerTest.java
@@ -37,6 +37,7 @@
 import com.tencent.polaris.api.pojo.ServiceKey;
 import com.tencent.polaris.circuitbreak.api.CircuitBreakAPI;
 import com.tencent.polaris.circuitbreak.factory.CircuitBreakAPIFactory;
+import com.tencent.polaris.client.api.SDKContext;
 import com.tencent.polaris.client.util.Utils;
 import com.tencent.polaris.factory.api.DiscoveryAPIFactory;
 import com.tencent.polaris.specification.api.v1.fault.tolerance.CircuitBreakerProto;
@@ -71,6 +72,8 @@ public class PolarisCircuitBreakerMockServerTest {
 	private static MockedStatic<ApplicationContextAwareUtils> mockedApplicationContextAwareUtils;
 	private static NamingServer namingServer;
 
+	private static SDKContext context;
+
 	@BeforeAll
 	public static void beforeAll() throws IOException {
 		mockedApplicationContextAwareUtils = Mockito.mockStatic(ApplicationContextAwareUtils.class);
@@ -79,18 +82,23 @@ public static void beforeAll() throws IOException {
 		mockedApplicationContextAwareUtils.when(() -> ApplicationContextAwareUtils.getProperties("spring.cloud.polaris.service"))
 				.thenReturn(SERVICE_CIRCUIT_BREAKER);
 		PolarisSDKContextManager.innerDestroy();
+
 		namingServer = NamingServer.startNamingServer(-1);
 		System.setProperty(SERVER_ADDRESS_ENV, String.format("127.0.0.1:%d", namingServer.getPort()));
-
 		ServiceKey serviceKey = new ServiceKey(NAMESPACE_TEST, SERVICE_CIRCUIT_BREAKER);
-
-		CircuitBreakerProto.CircuitBreakerRule.Builder circuitBreakerRuleBuilder =  CircuitBreakerProto.CircuitBreakerRule.newBuilder();
-		InputStream inputStream = PolarisCircuitBreakerMockServerTest.class.getClassLoader().getResourceAsStream("circuitBreakerRule.json");
-		String json = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines().collect(Collectors.joining(""));
+		CircuitBreakerProto.CircuitBreakerRule.Builder circuitBreakerRuleBuilder = CircuitBreakerProto.CircuitBreakerRule.newBuilder();
+		InputStream inputStream = PolarisCircuitBreakerMockServerTest.class.getClassLoader()
+				.getResourceAsStream("circuitBreakerRule.json");
+		String json = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines()
+				.collect(Collectors.joining(""));
 		JsonFormat.parser().ignoringUnknownFields().merge(json, circuitBreakerRuleBuilder);
 		CircuitBreakerProto.CircuitBreakerRule circuitBreakerRule = circuitBreakerRuleBuilder.build();
-		CircuitBreakerProto.CircuitBreaker circuitBreaker = CircuitBreakerProto.CircuitBreaker.newBuilder().addRules(circuitBreakerRule).build();
+		CircuitBreakerProto.CircuitBreaker circuitBreaker = CircuitBreakerProto.CircuitBreaker.newBuilder()
+				.addRules(circuitBreakerRule).build();
 		namingServer.getNamingService().setCircuitBreaker(serviceKey, circuitBreaker);
+
+		Configuration configuration = TestUtils.configWithEnvAddress();
+		context = SDKContext.initContextByConfig(configuration);
 	}
 
 	@AfterAll
@@ -101,14 +109,15 @@ public static void afterAll() {
 		if (null != mockedApplicationContextAwareUtils) {
 			mockedApplicationContextAwareUtils.close();
 		}
+		if (null != context) {
+			context.close();
+		}
 	}
 
 	@Test
 	public void testCircuitBreaker() {
-		Configuration configuration = TestUtils.configWithEnvAddress();
-		CircuitBreakAPI circuitBreakAPI = CircuitBreakAPIFactory.createCircuitBreakAPIByConfig(configuration);
-
-		ConsumerAPI consumerAPI = DiscoveryAPIFactory.createConsumerAPIByConfig(configuration);
+		CircuitBreakAPI circuitBreakAPI = CircuitBreakAPIFactory.createCircuitBreakAPIByContext(context);
+		ConsumerAPI consumerAPI = DiscoveryAPIFactory.createConsumerAPIByContext(context);
 		PolarisCircuitBreakerProperties polarisCircuitBreakerProperties = new PolarisCircuitBreakerProperties();
 		PolarisCircuitBreakerFactory polarisCircuitBreakerFactory = new PolarisCircuitBreakerFactory(circuitBreakAPI, consumerAPI, polarisCircuitBreakerProperties);
 		CircuitBreaker cb = polarisCircuitBreakerFactory.create(SERVICE_CIRCUIT_BREAKER);
@@ -140,7 +149,8 @@ public void testCircuitBreaker() {
 		assertThat(Mono.error(new RuntimeException("boom")).transform(it -> rcb.run(it, t -> Mono.just("fallback")))
 				.block()).isEqualTo("fallback");
 
-		assertThat(Flux.just("foobar", "hello world").transform(it -> rcb.run(it, t -> Flux.just("fallback", "fallback")))
+		assertThat(Flux.just("foobar", "hello world")
+				.transform(it -> rcb.run(it, t -> Flux.just("fallback", "fallback")))
 				.collectList().block())
 				.isEqualTo(Arrays.asList("fallback", "fallback"));
 

diff --git a/.../cloud/polaris/circuitbreaker/config/PolarisCircuitBreakerBootstrapConfigurationTest.java b/.../cloud/polaris/circuitbreaker/config/PolarisCircuitBreakerBootstrapConfigurationTest.java
@@ -17,8 +17,10 @@
 
 package com.tencent.cloud.polaris.circuitbreaker.config;
 
+import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
 import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
 import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementAutoConfiguration;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -42,6 +44,11 @@ public class PolarisCircuitBreakerBootstrapConfigurationTest {
 			.withPropertyValues("spring.cloud.polaris.enabled=true")
 			.withPropertyValues("spring.cloud.polaris.circuitbreaker.enabled=true");
 
+	@BeforeAll
+	static void beforeAll() {
+		PolarisSDKContextManager.innerDestroy();
+	}
+
 	@Test
 	public void testDefaultInitialization() {
 		this.contextRunner.run(context -> {

diff --git a/...tencent/cloud/polaris/circuitbreaker/feign/PolarisCircuitBreakerFeignIntegrationTest.java b/...tencent/cloud/polaris/circuitbreaker/feign/PolarisCircuitBreakerFeignIntegrationTest.java
@@ -19,42 +19,28 @@
 
 
 import java.io.BufferedReader;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.stream.Collectors;
 
 import com.google.protobuf.util.JsonFormat;
-import com.tencent.cloud.polaris.circuitbreaker.PolarisCircuitBreakerFactory;
 import com.tencent.cloud.polaris.circuitbreaker.config.PolarisCircuitBreakerFeignClientAutoConfiguration;
-import com.tencent.cloud.polaris.circuitbreaker.config.PolarisCircuitBreakerProperties;
-import com.tencent.cloud.polaris.circuitbreaker.reporter.ExceptionCircuitBreakerReporter;
-import com.tencent.cloud.polaris.circuitbreaker.reporter.SuccessCircuitBreakerReporter;
-import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
-import com.tencent.polaris.api.core.ConsumerAPI;
+import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
 import com.tencent.polaris.api.pojo.ServiceKey;
-import com.tencent.polaris.circuitbreak.api.CircuitBreakAPI;
-import com.tencent.polaris.circuitbreak.factory.CircuitBreakAPIFactory;
 import com.tencent.polaris.client.util.Utils;
-import com.tencent.polaris.factory.api.DiscoveryAPIFactory;
 import com.tencent.polaris.specification.api.v1.fault.tolerance.CircuitBreakerProto;
-import com.tencent.polaris.test.common.TestUtils;
 import com.tencent.polaris.test.mock.discovery.NamingServer;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
-import org.springframework.cloud.client.circuitbreaker.Customizer;
 import org.springframework.cloud.client.circuitbreaker.NoFallbackAvailableException;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -67,7 +53,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
 import static com.tencent.polaris.test.common.Consts.NAMESPACE_TEST;
-import static com.tencent.polaris.test.common.TestUtils.SERVER_ADDRESS_ENV;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@@ -80,6 +65,7 @@
 		classes = PolarisCircuitBreakerFeignIntegrationTest.TestConfig.class,
 		properties = {
 				"spring.cloud.gateway.enabled=false",
+				"spring.cloud.polaris.address=grpc://127.0.0.1:10081",
 				"spring.cloud.openfeign.circuitbreaker.enabled=true",
 				"spring.cloud.polaris.namespace=" + NAMESPACE_TEST,
 				"spring.cloud.polaris.service=test"
@@ -88,6 +74,8 @@ public class PolarisCircuitBreakerFeignIntegrationTest {
 
 	private static final String TEST_SERVICE_NAME = "test-service-callee";
 
+	private static NamingServer namingServer;
+
 	@Autowired
 	private EchoService echoService;
 
@@ -100,6 +88,31 @@ public class PolarisCircuitBreakerFeignIntegrationTest {
 	@Autowired
 	private BazService bazService;
 
+	@BeforeAll
+	static void beforeAll() throws Exception {
+		PolarisSDKContextManager.innerDestroy();
+		namingServer = NamingServer.startNamingServer(10081);
+		ServiceKey serviceKey = new ServiceKey(NAMESPACE_TEST, TEST_SERVICE_NAME);
+
+		CircuitBreakerProto.CircuitBreakerRule.Builder circuitBreakerRuleBuilder = CircuitBreakerProto.CircuitBreakerRule.newBuilder();
+		InputStream inputStream = PolarisCircuitBreakerFeignIntegrationTest.class.getClassLoader()
+				.getResourceAsStream("circuitBreakerRule.json");
+		String json = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines()
+				.collect(Collectors.joining(""));
+		JsonFormat.parser().ignoringUnknownFields().merge(json, circuitBreakerRuleBuilder);
+		CircuitBreakerProto.CircuitBreakerRule circuitBreakerRule = circuitBreakerRuleBuilder.build();
+		CircuitBreakerProto.CircuitBreaker circuitBreaker = CircuitBreakerProto.CircuitBreaker.newBuilder()
+				.addRules(circuitBreakerRule).build();
+		namingServer.getNamingService().setCircuitBreaker(serviceKey, circuitBreaker);
+	}
+
+	@AfterAll
+	static void afterAll() {
+		if (null != namingServer) {
+			namingServer.terminate();
+		}
+	}
+
 	@Test
 	public void contextLoads() {
 		assertThat(echoService).isNotNull();
@@ -168,9 +181,6 @@ public interface BazClient extends BazService {
 	@EnableFeignClients
 	public static class TestConfig {
 
-		@Autowired(required = false)
-		private List<Customizer<PolarisCircuitBreakerFactory>> customizers = new ArrayList<>();
-
 		@Bean
 		public EchoServiceFallback echoServiceFallback() {
 			return new EchoServiceFallback();
@@ -180,65 +190,6 @@ public EchoServiceFallback echoServiceFallback() {
 		public CustomFallbackFactory customFallbackFactory() {
 			return new CustomFallbackFactory();
 		}
-
-		@Bean
-		public PreDestroy preDestroy(NamingServer namingServer) {
-			return new PreDestroy(namingServer);
-		}
-
-		@Bean
-		public NamingServer namingServer() throws IOException {
-			NamingServer namingServer = NamingServer.startNamingServer(-1);
-			System.setProperty(SERVER_ADDRESS_ENV, String.format("127.0.0.1:%d", namingServer.getPort()));
-			ServiceKey serviceKey = new ServiceKey(NAMESPACE_TEST, TEST_SERVICE_NAME);
-
-			CircuitBreakerProto.CircuitBreakerRule.Builder circuitBreakerRuleBuilder = CircuitBreakerProto.CircuitBreakerRule.newBuilder();
-			InputStream inputStream = PolarisCircuitBreakerFeignIntegrationTest.class.getClassLoader()
-					.getResourceAsStream("circuitBreakerRule.json");
-			String json = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines()
-					.collect(Collectors.joining(""));
-			JsonFormat.parser().ignoringUnknownFields().merge(json, circuitBreakerRuleBuilder);
-			CircuitBreakerProto.CircuitBreakerRule circuitBreakerRule = circuitBreakerRuleBuilder.build();
-			CircuitBreakerProto.CircuitBreaker circuitBreaker = CircuitBreakerProto.CircuitBreaker.newBuilder()
-					.addRules(circuitBreakerRule).build();
-			namingServer.getNamingService().setCircuitBreaker(serviceKey, circuitBreaker);
-			return namingServer;
-		}
-
-		@Bean
-		public CircuitBreakAPI circuitBreakAPI(NamingServer namingServer) {
-			com.tencent.polaris.api.config.Configuration configuration = TestUtils.configWithEnvAddress();
-			return CircuitBreakAPIFactory.createCircuitBreakAPIByConfig(configuration);
-		}
-
-		@Bean
-		public ConsumerAPI consumerAPI(NamingServer namingServer) {
-			com.tencent.polaris.api.config.Configuration configuration = TestUtils.configWithEnvAddress();
-			return DiscoveryAPIFactory.createConsumerAPIByConfig(configuration);
-		}
-
-		@Bean
-		@ConditionalOnMissingBean(SuccessCircuitBreakerReporter.class)
-		public SuccessCircuitBreakerReporter successCircuitBreakerReporter(RpcEnhancementReporterProperties properties,
-				CircuitBreakAPI circuitBreakAPI) {
-			return new SuccessCircuitBreakerReporter(properties, circuitBreakAPI);
-		}
-
-		@Bean
-		@ConditionalOnMissingBean(ExceptionCircuitBreakerReporter.class)
-		public ExceptionCircuitBreakerReporter exceptionCircuitBreakerReporter(RpcEnhancementReporterProperties properties,
-				CircuitBreakAPI circuitBreakAPI) {
-			return new ExceptionCircuitBreakerReporter(properties, circuitBreakAPI);
-		}
-
-		@Bean
-		@ConditionalOnMissingBean(CircuitBreakerFactory.class)
-		public CircuitBreakerFactory polarisCircuitBreakerFactory(CircuitBreakAPI circuitBreakAPI,
-				ConsumerAPI consumerAPI, PolarisCircuitBreakerProperties polarisCircuitBreakerProperties) {
-			PolarisCircuitBreakerFactory factory = new PolarisCircuitBreakerFactory(circuitBreakAPI, consumerAPI, polarisCircuitBreakerProperties);
-			customizers.forEach(customizer -> customizer.customize(factory));
-			return factory;
-		}
 	}
 
 	public static class EchoServiceFallback implements EchoService {
@@ -273,19 +224,4 @@ public FooService create(Throwable throwable) {
 		}
 
 	}
-
-	public static class PreDestroy implements DisposableBean {
-
-		private final NamingServer namingServer;
-
-		public PreDestroy(NamingServer namingServer) {
-			this.namingServer = namingServer;
-		}
-
-		@Override
-		public void destroy() throws Exception {
-			namingServer.terminate();
-		}
-	}
-
 }