fix(nacos): fix issue #859
chuntaojun
5 years ago
commit
f0f86868b2
@ -0,0 +1,73 @@
|
||||
=== Circuit Breaker: Spring Cloud Circuit Breaker With Sentinel & Configuring Sentinel Circuit Breakers
|
||||
|
||||
==== Default Configuration
|
||||
|
||||
To provide a default configuration for all of your circuit breakers create a `Customizer` bean that is passed a
|
||||
`SentinelCircuitBreakerFactory` or `ReactiveSentinelCircuitBreakerFactory`.
|
||||
The `configureDefault` method can be used to provide a default configuration.
|
||||
|
||||
====
|
||||
[source,java]
|
||||
----
|
||||
@Bean
|
||||
public Customizer<SentinelCircuitBreakerFactory> defaultCustomizer() {
|
||||
return factory -> factory.configureDefault(id -> new SentinelConfigBuilder(id)
|
||||
.build());
|
||||
}
|
||||
----
|
||||
====
|
||||
|
||||
You can choose to provide default circuit breaking rules via `SentinelConfigBuilder#rules(rules)`.
|
||||
You can also choose to load circuit breaking rules later elsewhere using
|
||||
`DegradeRuleManager.loadRules(rules)` API of Sentinel, or via Sentinel dashboard.
|
||||
|
||||
===== Reactive Example
|
||||
|
||||
====
|
||||
[source,java]
|
||||
----
|
||||
@Bean
|
||||
public Customizer<ReactiveSentinelCircuitBreakerFactory> defaultCustomizer() {
|
||||
return factory -> factory.configureDefault(id -> new SentinelConfigBuilder(id)
|
||||
.build());
|
||||
}
|
||||
----
|
||||
====
|
||||
|
||||
==== Specific Circuit Breaker Configuration
|
||||
|
||||
Similarly to providing a default configuration, you can create a `Customizer` bean this is passed a
|
||||
`SentinelCircuitBreakerFactory`.
|
||||
|
||||
====
|
||||
[source,java]
|
||||
----
|
||||
@Bean
|
||||
public Customizer<SentinelCircuitBreakerFactory> slowCustomizer() {
|
||||
String slowId = "slow";
|
||||
List<DegradeRule> rules = Collections.singletonList(
|
||||
new DegradeRule(slowId).setGrade(RuleConstant.DEGRADE_GRADE_RT)
|
||||
.setCount(100)
|
||||
.setTimeWindow(10)
|
||||
);
|
||||
return factory -> factory.configure(builder -> builder.rules(rules), slowId);
|
||||
}
|
||||
----
|
||||
====
|
||||
|
||||
===== Reactive Example
|
||||
|
||||
====
|
||||
[source,java]
|
||||
----
|
||||
@Bean
|
||||
public Customizer<ReactiveSentinelCircuitBreakerFactory> customizer() {
|
||||
List<DegradeRule> rules = Collections.singletonList(
|
||||
new DegradeRule().setGrade(RuleConstant.DEGRADE_GRADE_RT)
|
||||
.setCount(100)
|
||||
.setTimeWindow(10)
|
||||
);
|
||||
return factory -> factory.configure(builder -> builder.rules(rules), "foo", "bar");
|
||||
}
|
||||
----
|
||||
====
|
||||
@ -0,0 +1,37 @@
|
||||
/*
|
||||
* Copyright (C) 2018 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.alibaba.cloud.dubbo.metadata.repository;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import org.springframework.cloud.client.ServiceInstance;
|
||||
|
||||
/**
|
||||
* metadata service instance selector
|
||||
*
|
||||
* @author <a href="mailto:liuxx-u@outlook.com">liuxx</a>
|
||||
*/
|
||||
public interface MetadataServiceInstanceSelector {
|
||||
|
||||
/**
|
||||
* choose a service instance to get metadata
|
||||
* @param serviceInstances all service instance
|
||||
* @return the service instance to get metadata
|
||||
*/
|
||||
Optional<ServiceInstance> choose(List<ServiceInstance> serviceInstances);
|
||||
}
|
||||
@ -0,0 +1,271 @@
|
||||
/*
|
||||
* Copyright (C) 2018 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.alibaba.cloud.nacos;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertNull;
|
||||
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
|
||||
|
||||
import java.lang.reflect.InvocationHandler;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.Map;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.powermock.api.mockito.PowerMockito;
|
||||
import org.powermock.api.support.MethodProxy;
|
||||
import org.powermock.core.classloader.annotations.PowerMockIgnore;
|
||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||
import org.powermock.modules.junit4.PowerMockRunner;
|
||||
import org.powermock.modules.junit4.PowerMockRunnerDelegate;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.context.EnvironmentAware;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.core.env.CompositePropertySource;
|
||||
import org.springframework.core.env.Environment;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import com.alibaba.cloud.nacos.client.NacosPropertySourceLocator;
|
||||
import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpoint;
|
||||
import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
|
||||
import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory;
|
||||
import com.alibaba.nacos.client.config.NacosConfigService;
|
||||
|
||||
/**
|
||||
* @author zkz
|
||||
*/
|
||||
|
||||
@RunWith(PowerMockRunner.class)
|
||||
@PowerMockIgnore("javax.management.*")
|
||||
@PowerMockRunnerDelegate(SpringRunner.class)
|
||||
@PrepareForTest({ NacosConfigService.class })
|
||||
@SpringBootTest(classes = NacosConfigurationNoSuffixTest.TestConfig.class, properties = {
|
||||
"spring.application.name=app-no-suffix", "spring.profiles.active=dev",
|
||||
"spring.cloud.nacos.config.server-addr=127.0.0.1:8848",
|
||||
"spring.cloud.nacos.config.namespace=test-namespace",
|
||||
"spring.cloud.nacos.config.encode=utf-8",
|
||||
"spring.cloud.nacos.config.timeout=1000",
|
||||
"spring.cloud.nacos.config.group=test-group",
|
||||
"spring.cloud.nacos.config.name=test-no-suffix-name",
|
||||
"spring.cloud.nacos.config.cluster-name=test-cluster",
|
||||
"spring.cloud.nacos.config.contextPath=test-contextpath",
|
||||
"spring.cloud.nacos.config.ext-config[0].data-id=ext-json-test.json",
|
||||
"spring.cloud.nacos.config.ext-config[1].data-id=ext-common02.properties",
|
||||
"spring.cloud.nacos.config.ext-config[1].group=GLOBAL_GROUP",
|
||||
"spring.cloud.nacos.config.shared-dataids=shared-data1.properties,shared-data2.xml",
|
||||
"spring.cloud.nacos.config.accessKey=test-accessKey",
|
||||
"spring.cloud.nacos.config.secretKey=test-secretKey" }, webEnvironment = NONE)
|
||||
public class NacosConfigurationNoSuffixTest {
|
||||
|
||||
static {
|
||||
|
||||
try {
|
||||
|
||||
Method method = PowerMockito.method(NacosConfigService.class, "getConfig",
|
||||
String.class, String.class, long.class);
|
||||
MethodProxy.proxy(method, new InvocationHandler() {
|
||||
@Override
|
||||
public Object invoke(Object proxy, Method method, Object[] args)
|
||||
throws Throwable {
|
||||
|
||||
if ("app-no-suffix".equals(args[0]) && "test-group".equals(args[1])) {
|
||||
return "test-no-suffix=value-no-suffix-1";
|
||||
}
|
||||
if ("app-no-suffix.properties".equals(args[0])
|
||||
&& "test-group".equals(args[1])) {
|
||||
return "test-no-suffix=value-no-suffix-2";
|
||||
}
|
||||
|
||||
if ("test-no-suffix-name".equals(args[0])
|
||||
&& "test-group".equals(args[1])) {
|
||||
return "test-no-suffix-assign=assign-value-no-suffix-111";
|
||||
}
|
||||
if ("test-no-suffix-name.properties".equals(args[0])
|
||||
&& "test-group".equals(args[1])) {
|
||||
return "test-no-suffix-assign=assign-value-no-suffix-222";
|
||||
}
|
||||
if ("test-no-suffix-name-dev.properties".equals(args[0])
|
||||
&& "test-group".equals(args[1])) {
|
||||
return "test-no-suffix-assign=assign-dev-value-no-suffix-333";
|
||||
}
|
||||
|
||||
if ("ext-json-test.json".equals(args[0])
|
||||
&& "DEFAULT_GROUP".equals(args[1])) {
|
||||
return "{\n" + " \"people\":{\n"
|
||||
+ " \"firstName\":\"Brett\",\n"
|
||||
+ " \"lastName\":\"McLaughlin\"\n" + " }\n"
|
||||
+ "}";
|
||||
}
|
||||
|
||||
if ("ext-config-common02.properties".equals(args[0])
|
||||
&& "GLOBAL_GROUP".equals(args[1])) {
|
||||
return "global-ext-config=global-config-value-2";
|
||||
}
|
||||
|
||||
if ("shared-data1.properties".equals(args[0])
|
||||
&& "DEFAULT_GROUP".equals(args[1])) {
|
||||
return "shared-name=shared-value-1";
|
||||
}
|
||||
|
||||
if ("shared-data2.xml".equals(args[0])
|
||||
&& "DEFAULT_GROUP".equals(args[1])) {
|
||||
return "<Server port=\"8005\" shutdown=\"SHUTDOWN\"> \n"
|
||||
+ " <Service name=\"Catalina\"> \n"
|
||||
+ " <Connector value=\"第二个连接器\"> \n"
|
||||
+ " <open>开启服务</open> \n"
|
||||
+ " <init>初始化一下</init> \n"
|
||||
+ " <process>\n" + " <top>\n"
|
||||
+ " <first>one</first>\n"
|
||||
+ " <sencond value=\"two\">\n"
|
||||
+ " <third>three</third>\n"
|
||||
+ " </sencond>\n"
|
||||
+ " </top>\n" + " </process> \n"
|
||||
+ " <destory>销毁一下</destory> \n"
|
||||
+ " <close>关闭服务</close> \n"
|
||||
+ " </Connector> \n" + " </Service> \n"
|
||||
+ "</Server> ";
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
catch (Exception ignore) {
|
||||
ignore.printStackTrace();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Autowired
|
||||
private NacosPropertySourceLocator locator;
|
||||
|
||||
@Autowired
|
||||
private NacosConfigProperties properties;
|
||||
|
||||
@Autowired
|
||||
private NacosRefreshHistory refreshHistory;
|
||||
@Autowired
|
||||
private Environment environment;
|
||||
|
||||
@Test
|
||||
public void contextLoads() throws Exception {
|
||||
|
||||
assertNotNull("NacosPropertySourceLocator was not created", locator);
|
||||
assertNotNull("NacosConfigProperties was not created", properties);
|
||||
|
||||
checkoutNacosConfigServerAddr();
|
||||
checkoutNacosConfigNamespace();
|
||||
checkoutNacosConfigClusterName();
|
||||
checkoutNacosConfigAccessKey();
|
||||
checkoutNacosConfigSecrectKey();
|
||||
checkoutNacosConfigName();
|
||||
checkoutNacosConfigGroup();
|
||||
checkoutNacosConfigContextPath();
|
||||
checkoutNacosConfigFileExtension();
|
||||
checkoutNacosConfigTimeout();
|
||||
checkoutNacosConfigEncode();
|
||||
|
||||
checkoutEndpoint();
|
||||
checkEnvironmentProperties();
|
||||
}
|
||||
|
||||
private void checkEnvironmentProperties() {
|
||||
assertNull(
|
||||
"The configuration of `spring.cloud.nacos.config.name` must be used first",
|
||||
environment.getProperty("test-no-suffix"));
|
||||
assertEquals(
|
||||
"Priority of configuration is wrong , should be in this order : `profile->hasSuffix->noSuffix`",
|
||||
"assign-dev-value-no-suffix-333",
|
||||
environment.getProperty("test-no-suffix-assign"));
|
||||
|
||||
}
|
||||
|
||||
private void checkoutNacosConfigServerAddr() {
|
||||
assertEquals("NacosConfigProperties server address is wrong", "127.0.0.1:8848",
|
||||
properties.getServerAddr());
|
||||
}
|
||||
|
||||
private void checkoutNacosConfigNamespace() {
|
||||
assertEquals("NacosConfigProperties namespace is wrong", "test-namespace",
|
||||
properties.getNamespace());
|
||||
}
|
||||
|
||||
private void checkoutNacosConfigClusterName() {
|
||||
assertEquals("NacosConfigProperties' cluster is wrong", "test-cluster",
|
||||
properties.getClusterName());
|
||||
}
|
||||
|
||||
private void checkoutNacosConfigAccessKey() {
|
||||
assertEquals("NacosConfigProperties' is access key is wrong", "test-accessKey",
|
||||
properties.getAccessKey());
|
||||
}
|
||||
|
||||
private void checkoutNacosConfigSecrectKey() {
|
||||
assertEquals("NacosConfigProperties' is secret key is wrong", "test-secretKey",
|
||||
properties.getSecretKey());
|
||||
}
|
||||
|
||||
private void checkoutNacosConfigContextPath() {
|
||||
assertEquals("NacosConfigProperties' context path is wrong", "test-contextpath",
|
||||
properties.getContextPath());
|
||||
}
|
||||
|
||||
private void checkoutNacosConfigName() {
|
||||
assertEquals("NacosConfigProperties' name is wrong", "test-no-suffix-name",
|
||||
properties.getName());
|
||||
}
|
||||
|
||||
private void checkoutNacosConfigGroup() {
|
||||
assertEquals("NacosConfigProperties' group is wrong", "test-group",
|
||||
properties.getGroup());
|
||||
}
|
||||
|
||||
private void checkoutNacosConfigFileExtension() {
|
||||
assertEquals("NacosConfigProperties' file extension is wrong", "properties",
|
||||
properties.getFileExtension());
|
||||
}
|
||||
|
||||
private void checkoutNacosConfigTimeout() {
|
||||
assertEquals("NacosConfigProperties' timeout is wrong", 1000,
|
||||
properties.getTimeout());
|
||||
}
|
||||
|
||||
private void checkoutNacosConfigEncode() {
|
||||
assertEquals("NacosConfigProperties' encode is wrong", "utf-8",
|
||||
properties.getEncode());
|
||||
}
|
||||
|
||||
private void checkoutEndpoint() throws Exception {
|
||||
NacosConfigEndpoint nacosConfigEndpoint = new NacosConfigEndpoint(properties,
|
||||
refreshHistory);
|
||||
Map<String, Object> map = nacosConfigEndpoint.invoke();
|
||||
assertEquals(map.get("NacosConfigProperties"), properties);
|
||||
assertEquals(map.get("RefreshHistory"), refreshHistory.getRecords());
|
||||
}
|
||||
|
||||
@Configuration
|
||||
@EnableAutoConfiguration
|
||||
@ImportAutoConfiguration({ NacosConfigEndpointAutoConfiguration.class,
|
||||
NacosConfigAutoConfiguration.class, NacosConfigBootstrapConfiguration.class })
|
||||
public static class TestConfig {
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,57 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
|
||||
<parent>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-alibaba</artifactId>
|
||||
<version>2.2.0.BUILD-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>spring-cloud-circuitbreaker-sentinel</artifactId>
|
||||
<name>Spring Cloud Circuit Breaker Sentinel</name>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-commons</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.alibaba.csp</groupId>
|
||||
<artifactId>sentinel-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.alibaba.csp</groupId>
|
||||
<artifactId>sentinel-reactor-adapter</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.projectreactor</groupId>
|
||||
<artifactId>reactor-core</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-webflux</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.projectreactor</groupId>
|
||||
<artifactId>reactor-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
@ -0,0 +1,104 @@
|
||||
/*
|
||||
* Copyright 2013-2019 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.alibaba.cloud.circuitbreaker.sentinel;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.function.Function;
|
||||
|
||||
import com.alibaba.csp.sentinel.EntryType;
|
||||
import com.alibaba.csp.sentinel.adapter.reactor.EntryConfig;
|
||||
import com.alibaba.csp.sentinel.adapter.reactor.SentinelReactorTransformer;
|
||||
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
|
||||
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import org.springframework.cloud.client.circuitbreaker.ReactiveCircuitBreaker;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
/**
|
||||
* Sentinel implementation of {@link ReactiveCircuitBreaker}.
|
||||
*
|
||||
* @author Eric Zhao
|
||||
*/
|
||||
public class ReactiveSentinelCircuitBreaker implements ReactiveCircuitBreaker {
|
||||
|
||||
private final String resourceName;
|
||||
|
||||
private final EntryType entryType;
|
||||
|
||||
private final List<DegradeRule> rules;
|
||||
|
||||
public ReactiveSentinelCircuitBreaker(String resourceName, EntryType entryType,
|
||||
List<DegradeRule> rules) {
|
||||
Assert.hasText(resourceName, "resourceName cannot be blank");
|
||||
Assert.notNull(rules, "rules should not be null");
|
||||
this.resourceName = resourceName;
|
||||
this.entryType = entryType;
|
||||
this.rules = Collections.unmodifiableList(rules);
|
||||
|
||||
applyToSentinelRuleManager();
|
||||
}
|
||||
|
||||
public ReactiveSentinelCircuitBreaker(String resourceName, List<DegradeRule> rules) {
|
||||
this(resourceName, EntryType.OUT, rules);
|
||||
}
|
||||
|
||||
public ReactiveSentinelCircuitBreaker(String resourceName) {
|
||||
this(resourceName, EntryType.OUT, Collections.emptyList());
|
||||
}
|
||||
|
||||
private void applyToSentinelRuleManager() {
|
||||
if (this.rules == null || this.rules.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
Set<DegradeRule> ruleSet = new HashSet<>(DegradeRuleManager.getRules());
|
||||
for (DegradeRule rule : this.rules) {
|
||||
if (rule == null) {
|
||||
continue;
|
||||
}
|
||||
rule.setResource(resourceName);
|
||||
ruleSet.add(rule);
|
||||
}
|
||||
DegradeRuleManager.loadRules(new ArrayList<>(ruleSet));
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> Mono<T> run(Mono<T> toRun, Function<Throwable, Mono<T>> fallback) {
|
||||
Mono<T> toReturn = toRun.transform(new SentinelReactorTransformer<>(
|
||||
new EntryConfig(resourceName, entryType)));
|
||||
if (fallback != null) {
|
||||
toReturn = toReturn.onErrorResume(fallback);
|
||||
}
|
||||
return toReturn;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> Flux<T> run(Flux<T> toRun, Function<Throwable, Flux<T>> fallback) {
|
||||
Flux<T> toReturn = toRun.transform(new SentinelReactorTransformer<>(
|
||||
new EntryConfig(resourceName, entryType)));
|
||||
if (fallback != null) {
|
||||
toReturn = toReturn.onErrorResume(fallback);
|
||||
}
|
||||
return toReturn;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,64 @@
|
||||
/*
|
||||
* Copyright 2013-2019 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.alibaba.cloud.circuitbreaker.sentinel;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.PostConstruct;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.cloud.client.circuitbreaker.Customizer;
|
||||
import org.springframework.cloud.client.circuitbreaker.ReactiveCircuitBreakerFactory;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/**
|
||||
* @author Eric Zhao
|
||||
*/
|
||||
@Configuration
|
||||
@ConditionalOnClass(name = { "reactor.core.publisher.Mono",
|
||||
"reactor.core.publisher.Flux" })
|
||||
public class ReactiveSentinelCircuitBreakerAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean(ReactiveCircuitBreakerFactory.class)
|
||||
public ReactiveCircuitBreakerFactory reactiveSentinelCircuitBreakerFactory() {
|
||||
return new ReactiveSentinelCircuitBreakerFactory();
|
||||
}
|
||||
|
||||
@Configuration
|
||||
@ConditionalOnClass(name = { "reactor.core.publisher.Mono",
|
||||
"reactor.core.publisher.Flux" })
|
||||
public static class ReactiveSentinelCustomizerConfiguration {
|
||||
|
||||
@Autowired(required = false)
|
||||
private List<Customizer<ReactiveSentinelCircuitBreakerFactory>> customizers = new ArrayList<>();
|
||||
|
||||
@Autowired(required = false)
|
||||
private ReactiveSentinelCircuitBreakerFactory factory;
|
||||
|
||||
@PostConstruct
|
||||
public void init() {
|
||||
customizers.forEach(customizer -> customizer.customize(factory));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,58 @@
|
||||
/*
|
||||
* Copyright 2013-2019 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.alibaba.cloud.circuitbreaker.sentinel;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.function.Function;
|
||||
|
||||
import com.alibaba.cloud.circuitbreaker.sentinel.SentinelConfigBuilder.SentinelCircuitBreakerConfiguration;
|
||||
import org.springframework.cloud.client.circuitbreaker.ReactiveCircuitBreaker;
|
||||
import org.springframework.cloud.client.circuitbreaker.ReactiveCircuitBreakerFactory;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
/**
|
||||
* Factory for {@link ReactiveSentinelCircuitBreaker}.
|
||||
*
|
||||
* @author Eric Zhao
|
||||
*/
|
||||
public class ReactiveSentinelCircuitBreakerFactory extends
|
||||
ReactiveCircuitBreakerFactory<SentinelCircuitBreakerConfiguration, SentinelConfigBuilder> {
|
||||
|
||||
private Function<String, SentinelConfigBuilder.SentinelCircuitBreakerConfiguration> defaultConfiguration = id -> new SentinelConfigBuilder()
|
||||
.resourceName(id).rules(new ArrayList<>()).build();
|
||||
|
||||
@Override
|
||||
public ReactiveCircuitBreaker create(String id) {
|
||||
Assert.hasText(id, "A CircuitBreaker must have an id.");
|
||||
SentinelConfigBuilder.SentinelCircuitBreakerConfiguration conf = getConfigurations()
|
||||
.computeIfAbsent(id, defaultConfiguration);
|
||||
return new ReactiveSentinelCircuitBreaker(id, conf.getEntryType(),
|
||||
conf.getRules());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected SentinelConfigBuilder configBuilder(String id) {
|
||||
return new SentinelConfigBuilder(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void configureDefault(
|
||||
Function<String, SentinelCircuitBreakerConfiguration> defaultConfiguration) {
|
||||
this.defaultConfiguration = defaultConfiguration;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,114 @@
|
||||
/*
|
||||
* Copyright 2013-2019 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.alibaba.cloud.circuitbreaker.sentinel;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
import com.alibaba.csp.sentinel.Entry;
|
||||
import com.alibaba.csp.sentinel.EntryType;
|
||||
import com.alibaba.csp.sentinel.SphU;
|
||||
import com.alibaba.csp.sentinel.Tracer;
|
||||
import com.alibaba.csp.sentinel.slots.block.BlockException;
|
||||
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
|
||||
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager;
|
||||
|
||||
import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
/**
|
||||
* Sentinel implementation of {@link CircuitBreaker}.
|
||||
*
|
||||
* @author Eric Zhao
|
||||
*/
|
||||
public class SentinelCircuitBreaker implements CircuitBreaker {
|
||||
|
||||
private final String resourceName;
|
||||
|
||||
private final EntryType entryType;
|
||||
|
||||
private final List<DegradeRule> rules;
|
||||
|
||||
public SentinelCircuitBreaker(String resourceName, EntryType entryType,
|
||||
List<DegradeRule> rules) {
|
||||
Assert.hasText(resourceName, "resourceName cannot be blank");
|
||||
Assert.notNull(rules, "rules should not be null");
|
||||
this.resourceName = resourceName;
|
||||
this.entryType = entryType;
|
||||
this.rules = Collections.unmodifiableList(rules);
|
||||
|
||||
applyToSentinelRuleManager();
|
||||
}
|
||||
|
||||
public SentinelCircuitBreaker(String resourceName, List<DegradeRule> rules) {
|
||||
this(resourceName, EntryType.OUT, rules);
|
||||
}
|
||||
|
||||
public SentinelCircuitBreaker(String resourceName) {
|
||||
this(resourceName, EntryType.OUT, Collections.emptyList());
|
||||
}
|
||||
|
||||
private void applyToSentinelRuleManager() {
|
||||
if (this.rules == null || this.rules.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
Set<DegradeRule> ruleSet = new HashSet<>(DegradeRuleManager.getRules());
|
||||
for (DegradeRule rule : this.rules) {
|
||||
if (rule == null) {
|
||||
continue;
|
||||
}
|
||||
rule.setResource(resourceName);
|
||||
ruleSet.add(rule);
|
||||
}
|
||||
DegradeRuleManager.loadRules(new ArrayList<>(ruleSet));
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> T run(Supplier<T> toRun, Function<Throwable, T> fallback) {
|
||||
Entry entry = null;
|
||||
try {
|
||||
entry = SphU.entry(resourceName, entryType);
|
||||
// If the SphU.entry() does not throw `BlockException`, it means that the
|
||||
// request can pass.
|
||||
return toRun.get();
|
||||
}
|
||||
catch (BlockException ex) {
|
||||
// SphU.entry() may throw BlockException which indicates that
|
||||
// the request was rejected (flow control or circuit breaking triggered).
|
||||
// So it should not be counted as the business exception.
|
||||
return fallback.apply(ex);
|
||||
}
|
||||
catch (Exception ex) {
|
||||
// For other kinds of exceptions, we'll trace the exception count via
|
||||
// Tracer.trace(ex).
|
||||
Tracer.trace(ex);
|
||||
return fallback.apply(ex);
|
||||
}
|
||||
finally {
|
||||
// Guarantee the invocation has been completed.
|
||||
if (entry != null) {
|
||||
entry.exit();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,65 @@
|
||||
/*
|
||||
* Copyright 2013-2019 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.alibaba.cloud.circuitbreaker.sentinel;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.PostConstruct;
|
||||
|
||||
import com.alibaba.csp.sentinel.SphU;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
|
||||
import org.springframework.cloud.client.circuitbreaker.Customizer;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/**
|
||||
* Auto configuration for {@link SentinelCircuitBreaker}.
|
||||
*
|
||||
* @author Eric Zhao
|
||||
*/
|
||||
@Configuration
|
||||
@ConditionalOnClass({ SphU.class })
|
||||
public class SentinelCircuitBreakerAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean(CircuitBreakerFactory.class)
|
||||
public CircuitBreakerFactory sentinelCircuitBreakerFactory() {
|
||||
return new SentinelCircuitBreakerFactory();
|
||||
}
|
||||
|
||||
@Configuration
|
||||
public static class SentinelCustomizerConfiguration {
|
||||
|
||||
@Autowired(required = false)
|
||||
private List<Customizer<SentinelCircuitBreakerFactory>> customizers = new ArrayList<>();
|
||||
|
||||
@Autowired(required = false)
|
||||
private SentinelCircuitBreakerFactory factory;
|
||||
|
||||
@PostConstruct
|
||||
public void init() {
|
||||
customizers.forEach(customizer -> customizer.customize(factory));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,57 @@
|
||||
/*
|
||||
* Copyright 2013-2019 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.alibaba.cloud.circuitbreaker.sentinel;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.function.Function;
|
||||
|
||||
import com.alibaba.csp.sentinel.EntryType;
|
||||
|
||||
import com.alibaba.cloud.circuitbreaker.sentinel.SentinelConfigBuilder.SentinelCircuitBreakerConfiguration;
|
||||
import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
|
||||
import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
/**
|
||||
* @author Eric Zhao
|
||||
*/
|
||||
public class SentinelCircuitBreakerFactory extends
|
||||
CircuitBreakerFactory<SentinelCircuitBreakerConfiguration, SentinelConfigBuilder> {
|
||||
|
||||
private Function<String, SentinelConfigBuilder.SentinelCircuitBreakerConfiguration> defaultConfiguration = id -> new SentinelConfigBuilder()
|
||||
.resourceName(id).entryType(EntryType.OUT).rules(new ArrayList<>()).build();
|
||||
|
||||
@Override
|
||||
public CircuitBreaker create(String id) {
|
||||
Assert.hasText(id, "A CircuitBreaker must have an id.");
|
||||
SentinelConfigBuilder.SentinelCircuitBreakerConfiguration conf = getConfigurations()
|
||||
.computeIfAbsent(id, defaultConfiguration);
|
||||
return new SentinelCircuitBreaker(id, conf.getEntryType(), conf.getRules());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected SentinelConfigBuilder configBuilder(String id) {
|
||||
return new SentinelConfigBuilder(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void configureDefault(
|
||||
Function<String, SentinelCircuitBreakerConfiguration> defaultConfiguration) {
|
||||
this.defaultConfiguration = defaultConfiguration;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,112 @@
|
||||
/*
|
||||
* Copyright 2013-2019 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.alibaba.cloud.circuitbreaker.sentinel;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import com.alibaba.csp.sentinel.EntryType;
|
||||
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
|
||||
|
||||
import org.springframework.cloud.client.circuitbreaker.ConfigBuilder;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
/**
|
||||
* @author Eric Zhao
|
||||
*/
|
||||
public class SentinelConfigBuilder implements
|
||||
ConfigBuilder<SentinelConfigBuilder.SentinelCircuitBreakerConfiguration> {
|
||||
|
||||
private String resourceName;
|
||||
|
||||
private EntryType entryType;
|
||||
|
||||
private List<DegradeRule> rules;
|
||||
|
||||
public SentinelConfigBuilder() {
|
||||
}
|
||||
|
||||
public SentinelConfigBuilder(String resourceName) {
|
||||
this.resourceName = resourceName;
|
||||
}
|
||||
|
||||
public SentinelConfigBuilder resourceName(String resourceName) {
|
||||
this.resourceName = resourceName;
|
||||
return this;
|
||||
}
|
||||
|
||||
public SentinelConfigBuilder entryType(EntryType entryType) {
|
||||
this.entryType = entryType;
|
||||
return this;
|
||||
}
|
||||
|
||||
public SentinelConfigBuilder rules(List<DegradeRule> rules) {
|
||||
this.rules = rules;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SentinelCircuitBreakerConfiguration build() {
|
||||
Assert.hasText(resourceName, "resourceName cannot be empty");
|
||||
List<DegradeRule> rules = Optional.ofNullable(this.rules)
|
||||
.orElse(new ArrayList<>());
|
||||
|
||||
EntryType entryType = Optional.ofNullable(this.entryType).orElse(EntryType.OUT);
|
||||
return new SentinelCircuitBreakerConfiguration()
|
||||
.setResourceName(this.resourceName).setEntryType(entryType)
|
||||
.setRules(rules);
|
||||
}
|
||||
|
||||
public static class SentinelCircuitBreakerConfiguration {
|
||||
|
||||
private String resourceName;
|
||||
|
||||
private EntryType entryType;
|
||||
|
||||
private List<DegradeRule> rules;
|
||||
|
||||
public String getResourceName() {
|
||||
return resourceName;
|
||||
}
|
||||
|
||||
public SentinelCircuitBreakerConfiguration setResourceName(String resourceName) {
|
||||
this.resourceName = resourceName;
|
||||
return this;
|
||||
}
|
||||
|
||||
public EntryType getEntryType() {
|
||||
return entryType;
|
||||
}
|
||||
|
||||
public SentinelCircuitBreakerConfiguration setEntryType(EntryType entryType) {
|
||||
this.entryType = entryType;
|
||||
return this;
|
||||
}
|
||||
|
||||
public List<DegradeRule> getRules() {
|
||||
return rules;
|
||||
}
|
||||
|
||||
public SentinelCircuitBreakerConfiguration setRules(List<DegradeRule> rules) {
|
||||
this.rules = rules;
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,3 @@
|
||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
||||
com.alibaba.cloud.circuitbreaker.sentinel.SentinelCircuitBreakerAutoConfiguration,\
|
||||
com.alibaba.cloud.circuitbreaker.sentinel.ReactiveSentinelCircuitBreakerAutoConfiguration
|
||||
@ -0,0 +1,208 @@
|
||||
/*
|
||||
* Copyright 2013-2018 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.alibaba.cloud.circuitbreaker.sentinel;
|
||||
|
||||
import java.time.Duration;
|
||||
import java.util.Collections;
|
||||
|
||||
import com.alibaba.csp.sentinel.slots.block.RuleConstant;
|
||||
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
import reactor.test.StepVerifier;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.boot.web.server.LocalServerPort;
|
||||
import org.springframework.cloud.client.circuitbreaker.Customizer;
|
||||
import org.springframework.cloud.client.circuitbreaker.ReactiveCircuitBreakerFactory;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.core.ParameterizedTypeReference;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.test.annotation.DirtiesContext;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.reactive.function.client.WebClient;
|
||||
|
||||
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
|
||||
|
||||
/**
|
||||
* @author Ryan Baxter
|
||||
*/
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest(webEnvironment = RANDOM_PORT, classes = ReactiveSentinelCircuitBreakerIntegrationTest.Application.class, properties = {
|
||||
"spring.cloud.discovery.client.health-indicator.enabled=false" })
|
||||
@DirtiesContext
|
||||
public class ReactiveSentinelCircuitBreakerIntegrationTest {
|
||||
|
||||
@LocalServerPort
|
||||
private int port = 0;
|
||||
|
||||
@Autowired
|
||||
private ReactiveSentinelCircuitBreakerIntegrationTest.Application.DemoControllerService service;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
service.setPort(port);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test() throws Exception {
|
||||
StepVerifier.create(service.normal()).expectNext("normal").verifyComplete();
|
||||
StepVerifier.create(service.slow()).expectNext("slow").verifyComplete();
|
||||
StepVerifier.create(service.slow()).expectNext("slow").verifyComplete();
|
||||
StepVerifier.create(service.slow()).expectNext("slow").verifyComplete();
|
||||
StepVerifier.create(service.slow()).expectNext("slow").verifyComplete();
|
||||
StepVerifier.create(service.slow()).expectNext("slow").verifyComplete();
|
||||
|
||||
// Then in the next 5s, the fallback method should be called.
|
||||
for (int i = 0; i < 5; i++) {
|
||||
StepVerifier.create(service.slow()).expectNext("fallback").verifyComplete();
|
||||
Thread.sleep(1000);
|
||||
}
|
||||
|
||||
// Recovered.
|
||||
StepVerifier.create(service.slow()).expectNext("slow").verifyComplete();
|
||||
|
||||
StepVerifier.create(service.normalFlux()).expectNext("normalflux")
|
||||
.verifyComplete();
|
||||
StepVerifier.create(service.slowFlux()).expectNext("slowflux").verifyComplete();
|
||||
StepVerifier.create(service.slowFlux()).expectNext("slowflux").verifyComplete();
|
||||
StepVerifier.create(service.slowFlux()).expectNext("slowflux").verifyComplete();
|
||||
StepVerifier.create(service.slowFlux()).expectNext("slowflux").verifyComplete();
|
||||
StepVerifier.create(service.slowFlux()).expectNext("slowflux").verifyComplete();
|
||||
// Then in the next 5s, the fallback method should be called.
|
||||
for (int i = 0; i < 5; i++) {
|
||||
StepVerifier.create(service.slowFlux()).expectNext("flux_fallback")
|
||||
.verifyComplete();
|
||||
Thread.sleep(1000);
|
||||
}
|
||||
|
||||
// Recovered.
|
||||
StepVerifier.create(service.slowFlux()).expectNext("slowflux").verifyComplete();
|
||||
}
|
||||
|
||||
@Configuration
|
||||
@EnableAutoConfiguration
|
||||
@RestController
|
||||
protected static class Application {
|
||||
|
||||
@GetMapping("/slow")
|
||||
public Mono<String> slow() {
|
||||
return Mono.just("slow").delayElement(Duration.ofMillis(500));
|
||||
}
|
||||
|
||||
@GetMapping("/normal")
|
||||
public Mono<String> normal() {
|
||||
return Mono.just("normal");
|
||||
}
|
||||
|
||||
@GetMapping("/slow_flux")
|
||||
public Flux<String> slowFlux() {
|
||||
return Flux.just("slow", "flux").delayElements(Duration.ofMillis(500));
|
||||
}
|
||||
|
||||
@GetMapping("normal_flux")
|
||||
public Flux<String> normalFlux() {
|
||||
return Flux.just("normal", "flux");
|
||||
}
|
||||
|
||||
@Bean
|
||||
public Customizer<ReactiveSentinelCircuitBreakerFactory> slowCustomizer() {
|
||||
return factory -> {
|
||||
factory.configure(builder -> builder
|
||||
.rules(Collections.singletonList(new DegradeRule("slow_mono")
|
||||
.setGrade(RuleConstant.DEGRADE_GRADE_RT).setCount(100)
|
||||
.setTimeWindow(5))),
|
||||
"slow_mono");
|
||||
factory.configure(builder -> builder
|
||||
.rules(Collections.singletonList(new DegradeRule("slow_flux")
|
||||
.setGrade(RuleConstant.DEGRADE_GRADE_RT).setCount(100)
|
||||
.setTimeWindow(5))),
|
||||
"slow_flux");
|
||||
factory.configureDefault(id -> new SentinelConfigBuilder()
|
||||
.resourceName(id)
|
||||
.rules(Collections.singletonList(new DegradeRule(id)
|
||||
.setGrade(RuleConstant.DEGRADE_GRADE_EXCEPTION_COUNT)
|
||||
.setCount(0.5).setTimeWindow(10)))
|
||||
.build());
|
||||
};
|
||||
}
|
||||
|
||||
@Service
|
||||
public static class DemoControllerService {
|
||||
|
||||
private int port = 0;
|
||||
|
||||
private ReactiveCircuitBreakerFactory cbFactory;
|
||||
|
||||
DemoControllerService(ReactiveCircuitBreakerFactory cbFactory) {
|
||||
this.cbFactory = cbFactory;
|
||||
}
|
||||
|
||||
public Mono<String> slow() {
|
||||
return WebClient.builder().baseUrl("http://localhost:" + port).build()
|
||||
.get().uri("/slow").retrieve().bodyToMono(String.class)
|
||||
.transform(it -> cbFactory.create("slow_mono").run(it, t -> {
|
||||
t.printStackTrace();
|
||||
return Mono.just("fallback");
|
||||
}));
|
||||
}
|
||||
|
||||
public Mono<String> normal() {
|
||||
return WebClient.builder().baseUrl("http://localhost:" + port).build()
|
||||
.get().uri("/normal").retrieve().bodyToMono(String.class)
|
||||
.transform(it -> cbFactory.create("normal_mono").run(it, t -> {
|
||||
t.printStackTrace();
|
||||
return Mono.just("fallback");
|
||||
}));
|
||||
}
|
||||
|
||||
public Flux<String> slowFlux() {
|
||||
return WebClient.builder().baseUrl("http://localhost:" + port).build()
|
||||
.get().uri("/slow_flux").retrieve()
|
||||
.bodyToFlux(new ParameterizedTypeReference<String>() {
|
||||
}).transform(it -> cbFactory.create("slow_flux").run(it, t -> {
|
||||
t.printStackTrace();
|
||||
return Flux.just("flux_fallback");
|
||||
}));
|
||||
}
|
||||
|
||||
public Flux<String> normalFlux() {
|
||||
return WebClient.builder().baseUrl("http://localhost:" + port).build()
|
||||
.get().uri("/normal_flux").retrieve().bodyToFlux(String.class)
|
||||
.transform(it -> cbFactory.create("normal_flux").run(it, t -> {
|
||||
t.printStackTrace();
|
||||
return Flux.just("flux_fallback");
|
||||
}));
|
||||
}
|
||||
|
||||
public void setPort(int port) {
|
||||
this.port = port;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,80 @@
|
||||
/*
|
||||
* Copyright 2013-2019 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.alibaba.cloud.circuitbreaker.sentinel;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
|
||||
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager;
|
||||
import org.junit.Test;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import org.springframework.cloud.client.circuitbreaker.ReactiveCircuitBreaker;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* @author Eric Zhao
|
||||
*/
|
||||
public class ReactiveSentinelCircuitBreakerTest {
|
||||
|
||||
@Test
|
||||
public void testCreateWithNullRule() {
|
||||
String id = "testCreateReactiveCbWithNullRule";
|
||||
ReactiveSentinelCircuitBreaker cb = new ReactiveSentinelCircuitBreaker(id,
|
||||
Collections.singletonList(null));
|
||||
assertThat(Mono.just("foobar").transform(it -> cb.run(it)).block())
|
||||
.isEqualTo("foobar");
|
||||
assertThat(DegradeRuleManager.hasConfig(id)).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void runMono() {
|
||||
ReactiveCircuitBreaker cb = new ReactiveSentinelCircuitBreakerFactory()
|
||||
.create("foo");
|
||||
assertThat(Mono.just("foobar").transform(it -> cb.run(it)).block())
|
||||
.isEqualTo("foobar");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void runMonoWithFallback() {
|
||||
ReactiveCircuitBreaker cb = new ReactiveSentinelCircuitBreakerFactory()
|
||||
.create("foo");
|
||||
assertThat(Mono.error(new RuntimeException("boom"))
|
||||
.transform(it -> cb.run(it, t -> Mono.just("fallback"))).block())
|
||||
.isEqualTo("fallback");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void runFlux() {
|
||||
ReactiveCircuitBreaker cb = new ReactiveSentinelCircuitBreakerFactory()
|
||||
.create("foo");
|
||||
assertThat(Flux.just("foobar", "hello world").transform(it -> cb.run(it))
|
||||
.collectList().block()).isEqualTo(Arrays.asList("foobar", "hello world"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void runFluxWithFallback() {
|
||||
ReactiveCircuitBreaker cb = new ReactiveSentinelCircuitBreakerFactory()
|
||||
.create("foo");
|
||||
assertThat(Flux.error(new RuntimeException("boom"))
|
||||
.transform(it -> cb.run(it, t -> Flux.just("fallback"))).collectList()
|
||||
.block()).isEqualTo(Arrays.asList("fallback"));
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,154 @@
|
||||
/*
|
||||
* Copyright 2013-2019 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.alibaba.cloud.circuitbreaker.sentinel;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import com.alibaba.csp.sentinel.slots.block.RuleConstant;
|
||||
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
|
||||
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.boot.test.web.client.TestRestTemplate;
|
||||
import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
|
||||
import org.springframework.cloud.client.circuitbreaker.Customizer;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.test.annotation.DirtiesContext;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
|
||||
|
||||
/**
|
||||
* @author Eric Zhao
|
||||
*/
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest(webEnvironment = RANDOM_PORT, classes = SentinelCircuitBreakerIntegrationTest.Application.class, properties = {
|
||||
"spring.cloud.discovery.client.health-indicator.enabled=false" })
|
||||
@DirtiesContext
|
||||
public class SentinelCircuitBreakerIntegrationTest {
|
||||
|
||||
@Autowired
|
||||
private Application.DemoControllerService service;
|
||||
|
||||
@Test
|
||||
public void testSlow() throws Exception {
|
||||
// The first 5 requests should pass.
|
||||
assertThat(service.slow()).isEqualTo("slow");
|
||||
assertThat(service.slow()).isEqualTo("slow");
|
||||
assertThat(service.slow()).isEqualTo("slow");
|
||||
assertThat(service.slow()).isEqualTo("slow");
|
||||
assertThat(service.slow()).isEqualTo("slow");
|
||||
|
||||
// Then in the next 10s, the fallback method should be called.
|
||||
for (int i = 0; i < 10; i++) {
|
||||
assertThat(service.slow()).isEqualTo("fallback");
|
||||
Thread.sleep(1000);
|
||||
}
|
||||
|
||||
// Recovered.
|
||||
assertThat(service.slow()).isEqualTo("slow");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNormal() {
|
||||
assertThat(service.normal()).isEqualTo("normal");
|
||||
}
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
DegradeRuleManager.loadRules(new ArrayList<>());
|
||||
}
|
||||
|
||||
@Before
|
||||
public void tearDown() {
|
||||
DegradeRuleManager.loadRules(new ArrayList<>());
|
||||
}
|
||||
|
||||
@Configuration
|
||||
@EnableAutoConfiguration
|
||||
@RestController
|
||||
protected static class Application {
|
||||
|
||||
@GetMapping("/slow")
|
||||
public String slow() throws InterruptedException {
|
||||
Thread.sleep(500);
|
||||
return "slow";
|
||||
}
|
||||
|
||||
@GetMapping("/normal")
|
||||
public String normal() {
|
||||
return "normal";
|
||||
}
|
||||
|
||||
@Bean
|
||||
public Customizer<SentinelCircuitBreakerFactory> slowCustomizer() {
|
||||
String slowId = "slow";
|
||||
List<DegradeRule> rules = Collections.singletonList(
|
||||
new DegradeRule(slowId).setGrade(RuleConstant.DEGRADE_GRADE_RT)
|
||||
.setCount(100).setTimeWindow(10));
|
||||
return factory -> {
|
||||
factory.configure(builder -> builder.rules(rules), slowId);
|
||||
factory.configureDefault(id -> new SentinelConfigBuilder()
|
||||
.resourceName(id)
|
||||
.rules(Collections.singletonList(new DegradeRule(id)
|
||||
.setGrade(RuleConstant.DEGRADE_GRADE_EXCEPTION_COUNT)
|
||||
.setCount(0.5).setTimeWindow(10)))
|
||||
.build());
|
||||
};
|
||||
}
|
||||
|
||||
@Service
|
||||
public static class DemoControllerService {
|
||||
|
||||
private TestRestTemplate rest;
|
||||
|
||||
private CircuitBreakerFactory cbFactory;
|
||||
|
||||
DemoControllerService(TestRestTemplate rest,
|
||||
CircuitBreakerFactory cbFactory) {
|
||||
this.rest = rest;
|
||||
this.cbFactory = cbFactory;
|
||||
}
|
||||
|
||||
public String slow() {
|
||||
return cbFactory.create("slow").run(
|
||||
() -> rest.getForObject("/slow", String.class), t -> "fallback");
|
||||
}
|
||||
|
||||
public String normal() {
|
||||
return cbFactory.create("normal").run(
|
||||
() -> rest.getForObject("/normal", String.class),
|
||||
t -> "fallback");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,86 @@
|
||||
/*
|
||||
* Copyright 2013-2019 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.alibaba.cloud.circuitbreaker.sentinel;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
|
||||
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
|
||||
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Test;
|
||||
|
||||
import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* @author Eric Zhao
|
||||
*/
|
||||
public class SentinelCircuitBreakerTest {
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
// Clear the rules.
|
||||
DegradeRuleManager.loadRules(new ArrayList<>());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCreateDirectlyThenRun() {
|
||||
// Create a circuit breaker without any circuit breaking rules.
|
||||
CircuitBreaker cb = new SentinelCircuitBreaker(
|
||||
"testSentinelCreateDirectlyThenRunA");
|
||||
assertThat(cb.run(() -> "Sentinel")).isEqualTo("Sentinel");
|
||||
assertThat(DegradeRuleManager.hasConfig("testSentinelCreateDirectlyThenRunA"))
|
||||
.isFalse();
|
||||
|
||||
CircuitBreaker cb2 = new SentinelCircuitBreaker(
|
||||
"testSentinelCreateDirectlyThenRunB",
|
||||
Collections.singletonList(
|
||||
new DegradeRule("testSentinelCreateDirectlyThenRunB")
|
||||
.setCount(100).setTimeWindow(10)));
|
||||
assertThat(cb2.run(() -> "Sentinel")).isEqualTo("Sentinel");
|
||||
assertThat(DegradeRuleManager.hasConfig("testSentinelCreateDirectlyThenRunB"))
|
||||
.isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCreateWithNullRule() {
|
||||
String id = "testCreateCbWithNullRule";
|
||||
CircuitBreaker cb = new SentinelCircuitBreaker(id,
|
||||
Collections.singletonList(null));
|
||||
assertThat(cb.run(() -> "Sentinel")).isEqualTo("Sentinel");
|
||||
assertThat(DegradeRuleManager.hasConfig(id)).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCreateFromFactoryThenRun() {
|
||||
CircuitBreaker cb = new SentinelCircuitBreakerFactory().create("testSentinelRun");
|
||||
assertThat(cb.run(() -> "foobar")).isEqualTo("foobar");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRunWithFallback() {
|
||||
CircuitBreaker cb = new SentinelCircuitBreakerFactory()
|
||||
.create("testSentinelRunWithFallback");
|
||||
assertThat(cb.<String> run(() -> {
|
||||
throw new RuntimeException("boom");
|
||||
}, t -> "fallback")).isEqualTo("fallback");
|
||||
}
|
||||
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue