feat: support lossless register and deregister (#1242)
shedfreewu
9 months ago
committed by
GitHub
parent
aca2982657
commit
261ebea29a
@ -1,2 +1,4 @@
|
||||
# Change Log
|
||||
---
|
||||
|
||||
- [feat: support lossless register and deregister](https://github.com/Tencent/spring-cloud-tencent/issues/977)
|
||||
|
||||
@ -0,0 +1,75 @@
|
||||
<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>spring-cloud-tencent-plugin-starters</artifactId>
|
||||
<groupId>com.tencent.cloud</groupId>
|
||||
<version>${revision}</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>spring-cloud-tencent-lossless-plugin</artifactId>
|
||||
<name>Spring Cloud Tencent Lossless Plugin</name>
|
||||
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.tencent.cloud</groupId>
|
||||
<artifactId>spring-cloud-tencent-polaris-context</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.tencent.cloud</groupId>
|
||||
<artifactId>spring-cloud-tencent-commons</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.tencent.polaris</groupId>
|
||||
<artifactId>lossless-register</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.tencent.polaris</groupId>
|
||||
<artifactId>lossless-deregister</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-aop</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.tencent.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-tencent-polaris-discovery</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.tencent.polaris</groupId>
|
||||
<artifactId>polaris-test-mock-discovery</artifactId>
|
||||
<scope>test</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
@ -0,0 +1,105 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
||||
*
|
||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
||||
*
|
||||
* Licensed under the BSD 3-Clause License (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*
|
||||
* 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.tencent.cloud.plugin.lossless;
|
||||
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import com.tencent.cloud.plugin.lossless.config.LosslessProperties;
|
||||
import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
|
||||
import com.tencent.polaris.api.pojo.BaseInstance;
|
||||
import org.aspectj.lang.ProceedingJoinPoint;
|
||||
import org.aspectj.lang.annotation.Around;
|
||||
import org.aspectj.lang.annotation.Aspect;
|
||||
import org.aspectj.lang.annotation.Pointcut;
|
||||
|
||||
import org.springframework.cloud.client.serviceregistry.Registration;
|
||||
import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
|
||||
|
||||
/**
|
||||
* Intercept for of register and deregister.
|
||||
*
|
||||
* @author Shedfree Wu
|
||||
*/
|
||||
@Aspect
|
||||
public class LosslessRegistryAspect {
|
||||
|
||||
private ServiceRegistry serviceRegistry;
|
||||
|
||||
private Registration registration;
|
||||
|
||||
private LosslessProperties losslessProperties;
|
||||
|
||||
private PolarisSDKContextManager polarisSDKContextManager;
|
||||
|
||||
private final AtomicBoolean doneDeregister = new AtomicBoolean(false);
|
||||
|
||||
|
||||
public LosslessRegistryAspect(ServiceRegistry serviceRegistry, Registration registration,
|
||||
LosslessProperties losslessProperties, PolarisSDKContextManager polarisSDKContextManager) {
|
||||
this.serviceRegistry = serviceRegistry;
|
||||
this.registration = registration;
|
||||
this.losslessProperties = losslessProperties;
|
||||
this.polarisSDKContextManager = polarisSDKContextManager;
|
||||
}
|
||||
|
||||
@Pointcut("execution(public * org.springframework.cloud.client.serviceregistry.ServiceRegistry.register(..))")
|
||||
public void registerPointcut() {
|
||||
|
||||
}
|
||||
|
||||
@Pointcut("execution(public * org.springframework.cloud.client.serviceregistry.ServiceRegistry.deregister(..))")
|
||||
public void deregisterPointcut() {
|
||||
|
||||
}
|
||||
|
||||
@Around("registerPointcut()")
|
||||
public Object invokeRegister(ProceedingJoinPoint joinPoint) throws Throwable {
|
||||
|
||||
// web started, get port from registration
|
||||
BaseInstance instance = SpringCloudLosslessActionProvider.getBaseInstance(registration);
|
||||
|
||||
Runnable registerAction = () -> executeJoinPoint(joinPoint);
|
||||
|
||||
SpringCloudLosslessActionProvider losslessActionProvider =
|
||||
new SpringCloudLosslessActionProvider(serviceRegistry, registration, losslessProperties, registerAction);
|
||||
|
||||
polarisSDKContextManager.getLosslessAPI().setLosslessActionProvider(instance, losslessActionProvider);
|
||||
polarisSDKContextManager.getLosslessAPI().losslessRegister(instance);
|
||||
// return void
|
||||
return null;
|
||||
}
|
||||
|
||||
@Around("deregisterPointcut()")
|
||||
public Object invokeDeregister(ProceedingJoinPoint joinPoint) throws Throwable {
|
||||
if (doneDeregister.compareAndSet(false, true)) {
|
||||
return joinPoint.proceed();
|
||||
}
|
||||
else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public void executeJoinPoint(ProceedingJoinPoint joinPoint) {
|
||||
try {
|
||||
joinPoint.proceed();
|
||||
}
|
||||
catch (Throwable e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,104 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
||||
*
|
||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
||||
*
|
||||
* Licensed under the BSD 3-Clause License (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*
|
||||
* 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.tencent.cloud.plugin.lossless;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import com.tencent.cloud.common.util.OkHttpUtil;
|
||||
import com.tencent.cloud.plugin.lossless.config.LosslessProperties;
|
||||
import com.tencent.polaris.api.plugin.lossless.InstanceProperties;
|
||||
import com.tencent.polaris.api.plugin.lossless.LosslessActionProvider;
|
||||
import com.tencent.polaris.api.pojo.BaseInstance;
|
||||
import com.tencent.polaris.api.pojo.DefaultBaseInstance;
|
||||
import com.tencent.polaris.api.utils.StringUtils;
|
||||
|
||||
import org.springframework.cloud.client.serviceregistry.Registration;
|
||||
import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
|
||||
/**
|
||||
* LosslessActionProvider for Spring Cloud.
|
||||
*
|
||||
* @author Shedfree Wu
|
||||
*/
|
||||
public class SpringCloudLosslessActionProvider implements LosslessActionProvider {
|
||||
private ServiceRegistry<Registration> serviceRegistry;
|
||||
|
||||
private LosslessProperties losslessProperties;
|
||||
|
||||
private Runnable originalRegisterAction;
|
||||
|
||||
private Registration registration;
|
||||
|
||||
public SpringCloudLosslessActionProvider(ServiceRegistry<Registration> serviceRegistry, Registration registration,
|
||||
LosslessProperties losslessProperties, Runnable originalRegisterAction) {
|
||||
this.serviceRegistry = serviceRegistry;
|
||||
this.registration = registration;
|
||||
this.losslessProperties = losslessProperties;
|
||||
this.originalRegisterAction = originalRegisterAction;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return "spring-cloud";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doRegister(InstanceProperties instanceProperties) {
|
||||
// use lambda to do original register
|
||||
originalRegisterAction.run();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doDeregister() {
|
||||
serviceRegistry.deregister(registration);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check whether health check is enable.
|
||||
* @return true: register after passing doHealthCheck, false: register after delayRegisterInterval.
|
||||
*/
|
||||
@Override
|
||||
public boolean isEnableHealthCheck() {
|
||||
return StringUtils.isNotBlank(losslessProperties.getHealthCheckPath());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean doHealthCheck() {
|
||||
Map<String, String> headers = new HashMap<>(1);
|
||||
headers.put(HttpHeaders.USER_AGENT, "polaris");
|
||||
|
||||
return OkHttpUtil.checkUrl("localhost", registration.getPort(),
|
||||
losslessProperties.getHealthCheckPath(), headers);
|
||||
}
|
||||
|
||||
public static BaseInstance getBaseInstance(Registration registration) {
|
||||
return getBaseInstance(registration, registration.getPort());
|
||||
}
|
||||
|
||||
public static BaseInstance getBaseInstance(Registration registration, Integer port) {
|
||||
// for common spring cloud registration, not set namespace
|
||||
DefaultBaseInstance baseInstance = new DefaultBaseInstance();
|
||||
baseInstance.setService(registration.getServiceId());
|
||||
// before web start, port in registration not init
|
||||
baseInstance.setPort(port);
|
||||
baseInstance.setHost(registration.getHost());
|
||||
return baseInstance;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,48 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
||||
*
|
||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
||||
*
|
||||
* Licensed under the BSD 3-Clause License (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*
|
||||
* 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.tencent.cloud.plugin.lossless.config;
|
||||
|
||||
import com.tencent.cloud.plugin.lossless.LosslessRegistryAspect;
|
||||
import com.tencent.cloud.polaris.context.ConditionalOnPolarisEnabled;
|
||||
import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
|
||||
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.cloud.client.serviceregistry.Registration;
|
||||
import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Import;
|
||||
|
||||
/**
|
||||
* Autoconfiguration of lossless.
|
||||
*
|
||||
* @author Shedfree Wu
|
||||
*/
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
@ConditionalOnPolarisEnabled
|
||||
@Import(LosslessPropertiesAutoConfiguration.class)
|
||||
public class LosslessAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
public LosslessRegistryAspect losslessRegistryAspect(ServiceRegistry serviceRegistry, Registration registration,
|
||||
LosslessProperties losslessProperties, PolarisSDKContextManager polarisSDKContextManager) {
|
||||
return new LosslessRegistryAspect(serviceRegistry, registration, losslessProperties, polarisSDKContextManager);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,59 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
||||
*
|
||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
||||
*
|
||||
* Licensed under the BSD 3-Clause License (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*
|
||||
* 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.tencent.cloud.plugin.lossless.config;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import com.tencent.cloud.common.constant.OrderConstant.Modifier;
|
||||
import com.tencent.cloud.polaris.context.PolarisConfigModifier;
|
||||
import com.tencent.polaris.factory.config.ConfigurationImpl;
|
||||
import com.tencent.polaris.factory.config.provider.LosslessConfigImpl;
|
||||
|
||||
/**
|
||||
* Config modifier for lossless.
|
||||
*
|
||||
* @author Shedfree Wu
|
||||
*/
|
||||
public class LosslessConfigModifier implements PolarisConfigModifier {
|
||||
|
||||
private final LosslessProperties losslessProperties;
|
||||
|
||||
public LosslessConfigModifier(LosslessProperties losslessProperties) {
|
||||
this.losslessProperties = losslessProperties;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void modify(ConfigurationImpl configuration) {
|
||||
if (losslessProperties.isEnabled()) {
|
||||
LosslessConfigImpl losslessConfig = (LosslessConfigImpl) configuration.getProvider().getLossless();
|
||||
losslessConfig.setEnable(true);
|
||||
losslessConfig.setPort(losslessProperties.getPort());
|
||||
if (Objects.nonNull(losslessProperties.getDelayRegisterInterval())) {
|
||||
losslessConfig.setDelayRegisterInterval(losslessProperties.getDelayRegisterInterval());
|
||||
}
|
||||
if (Objects.nonNull(losslessProperties.getHealthCheckInterval())) {
|
||||
losslessConfig.setHealthCheckInterval(losslessProperties.getHealthCheckInterval());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getOrder() {
|
||||
return Modifier.LOSSLESS_ORDER;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
||||
*
|
||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
||||
*
|
||||
* Licensed under the BSD 3-Clause License (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*
|
||||
* 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.tencent.cloud.plugin.lossless.config;
|
||||
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
|
||||
@ConfigurationProperties("spring.cloud.polaris.lossless")
|
||||
public class LosslessProperties {
|
||||
|
||||
private boolean enabled = true;
|
||||
|
||||
private int port = 28080;
|
||||
|
||||
private String healthCheckPath;
|
||||
|
||||
private Long delayRegisterInterval;
|
||||
|
||||
private Long healthCheckInterval;
|
||||
|
||||
public boolean isEnabled() {
|
||||
return enabled;
|
||||
}
|
||||
|
||||
public void setEnabled(boolean enabled) {
|
||||
this.enabled = enabled;
|
||||
}
|
||||
|
||||
public int getPort() {
|
||||
return port;
|
||||
}
|
||||
|
||||
public void setPort(int port) {
|
||||
this.port = port;
|
||||
}
|
||||
|
||||
public String getHealthCheckPath() {
|
||||
return healthCheckPath;
|
||||
}
|
||||
|
||||
public void setHealthCheckPath(String healthCheckPath) {
|
||||
this.healthCheckPath = healthCheckPath;
|
||||
}
|
||||
|
||||
public Long getDelayRegisterInterval() {
|
||||
return delayRegisterInterval;
|
||||
}
|
||||
|
||||
public void setDelayRegisterInterval(Long delayRegisterInterval) {
|
||||
this.delayRegisterInterval = delayRegisterInterval;
|
||||
}
|
||||
|
||||
public Long getHealthCheckInterval() {
|
||||
return healthCheckInterval;
|
||||
}
|
||||
|
||||
public void setHealthCheckInterval(Long healthCheckInterval) {
|
||||
this.healthCheckInterval = healthCheckInterval;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
||||
*
|
||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
||||
*
|
||||
* Licensed under the BSD 3-Clause License (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*
|
||||
* 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.tencent.cloud.plugin.lossless.config;
|
||||
|
||||
import com.tencent.cloud.polaris.context.ConditionalOnPolarisEnabled;
|
||||
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/**
|
||||
* Autoconfiguration of lossless properties.
|
||||
*
|
||||
* @author Shedfree Wu
|
||||
*/
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
@ConditionalOnPolarisEnabled
|
||||
@EnableConfigurationProperties(LosslessProperties.class)
|
||||
public class LosslessPropertiesAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
public LosslessConfigModifier losslessConfigModifier(LosslessProperties losslessProperties) {
|
||||
return new LosslessConfigModifier(losslessProperties);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
||||
*
|
||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
||||
*
|
||||
* Licensed under the BSD 3-Clause License (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*
|
||||
* 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.tencent.cloud.plugin.lossless.config;
|
||||
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Import;
|
||||
|
||||
|
||||
/**
|
||||
* BootstrapConfiguration of lossless properties.
|
||||
*
|
||||
* @author Shedfree Wu
|
||||
*/
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
@ConditionalOnProperty("spring.cloud.polaris.enabled")
|
||||
@Import(LosslessPropertiesAutoConfiguration.class)
|
||||
public class LosslessPropertiesBootstrapConfiguration {
|
||||
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
{
|
||||
"properties": [
|
||||
{
|
||||
"name": "spring.cloud.polaris.lossless.enabled",
|
||||
"type": "java.lang.Boolean",
|
||||
"defaultValue": true,
|
||||
"description": "the switch for lossless plugin."
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
org.springframework.cloud.bootstrap.BootstrapConfiguration=\
|
||||
com.tencent.cloud.plugin.lossless.config.LosslessPropertiesBootstrapConfiguration
|
||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
||||
com.tencent.cloud.plugin.lossless.config.LosslessAutoConfiguration
|
||||
@ -0,0 +1,89 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
||||
*
|
||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
||||
*
|
||||
* Licensed under the BSD 3-Clause License (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*
|
||||
* 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.tencent.cloud.plugin.lossless;
|
||||
|
||||
import com.tencent.cloud.plugin.lossless.config.LosslessConfigModifier;
|
||||
import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
|
||||
import com.tencent.polaris.api.config.provider.LosslessConfig;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.boot.autoconfigure.AutoConfigurations;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Test for {@link LosslessConfigModifier}.
|
||||
*
|
||||
* @author Shedfree Wu
|
||||
*/
|
||||
public class LosslessConfigModifierTest {
|
||||
|
||||
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
|
||||
.withConfiguration(AutoConfigurations.of(TestApplication.class))
|
||||
.withPropertyValues("spring.cloud.polaris.enabled=true")
|
||||
.withPropertyValues("spring.cloud.polaris.lossless.enabled=true")
|
||||
.withPropertyValues("spring.cloud.polaris.lossless.port=20000")
|
||||
.withPropertyValues("spring.cloud.polaris.lossless.healthCheckPath=/xxx")
|
||||
.withPropertyValues("spring.cloud.polaris.lossless.delayRegisterInterval=10")
|
||||
.withPropertyValues("spring.cloud.polaris.lossless.healthCheckInterval=5")
|
||||
.withPropertyValues("spring.application.name=test")
|
||||
.withPropertyValues("spring.cloud.gateway.enabled=false");
|
||||
private final ApplicationContextRunner disabledContextRunner = new ApplicationContextRunner()
|
||||
.withConfiguration(AutoConfigurations.of(TestApplication.class))
|
||||
.withPropertyValues("spring.cloud.polaris.enabled=true")
|
||||
.withPropertyValues("spring.cloud.polaris.lossless.enabled=false")
|
||||
.withPropertyValues("spring.application.name=test")
|
||||
.withPropertyValues("spring.cloud.gateway.enabled=false");
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
PolarisSDKContextManager.innerDestroy();
|
||||
}
|
||||
|
||||
@Test
|
||||
void testModify() {
|
||||
contextRunner.run(context -> {
|
||||
PolarisSDKContextManager polarisSDKContextManager = context.getBean(PolarisSDKContextManager.class);
|
||||
LosslessConfig losslessConfig = polarisSDKContextManager.getSDKContext().
|
||||
getConfig().getProvider().getLossless();
|
||||
assertThat(losslessConfig.getHost()).isEqualTo("0.0.0.0");
|
||||
assertThat(losslessConfig.getPort()).isEqualTo(20000);
|
||||
assertThat(losslessConfig.getDelayRegisterInterval()).isEqualTo(10);
|
||||
assertThat(losslessConfig.getHealthCheckInterval()).isEqualTo(5);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
void testDisabled() {
|
||||
disabledContextRunner.run(context -> {
|
||||
PolarisSDKContextManager polarisSDKContextManager = context.getBean(PolarisSDKContextManager.class);
|
||||
LosslessConfig losslessConfig = polarisSDKContextManager.getSDKContext().
|
||||
getConfig().getProvider().getLossless();
|
||||
assertThat(losslessConfig.isEnable()).isFalse();
|
||||
});
|
||||
}
|
||||
|
||||
@SpringBootApplication
|
||||
protected static class TestApplication {
|
||||
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
||||
*
|
||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
||||
*
|
||||
* Licensed under the BSD 3-Clause License (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*
|
||||
* 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.tencent.cloud.plugin.lossless;
|
||||
|
||||
import com.tencent.cloud.plugin.lossless.config.LosslessProperties;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Test for {@link LosslessProperties}.
|
||||
*
|
||||
* @author Shedfree Wu
|
||||
*/
|
||||
public class LosslessPropertiesTest {
|
||||
|
||||
@Test
|
||||
void testGetAndSet() {
|
||||
LosslessProperties polarisStatProperties = new LosslessProperties();
|
||||
|
||||
// healthCheckPath
|
||||
polarisStatProperties.setHealthCheckPath("/xxx");
|
||||
assertThat(polarisStatProperties.getHealthCheckPath()).isEqualTo("/xxx");
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,190 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
||||
*
|
||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
||||
*
|
||||
* Licensed under the BSD 3-Clause License (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*
|
||||
* 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.tencent.cloud.plugin.lossless;
|
||||
|
||||
import java.util.Collections;
|
||||
|
||||
import com.tencent.cloud.common.util.OkHttpUtil;
|
||||
import com.tencent.cloud.plugin.lossless.config.LosslessAutoConfiguration;
|
||||
import com.tencent.cloud.plugin.lossless.config.LosslessPropertiesBootstrapConfiguration;
|
||||
import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
|
||||
import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
|
||||
import com.tencent.cloud.polaris.discovery.PolarisDiscoveryAutoConfiguration;
|
||||
import com.tencent.cloud.polaris.discovery.PolarisDiscoveryClientConfiguration;
|
||||
import com.tencent.cloud.polaris.registry.PolarisRegistration;
|
||||
import com.tencent.cloud.polaris.registry.PolarisServiceRegistry;
|
||||
import com.tencent.polaris.api.pojo.ServiceKey;
|
||||
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.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import org.springframework.boot.autoconfigure.AutoConfigurations;
|
||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
|
||||
import org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration;
|
||||
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationUtils;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatCode;
|
||||
|
||||
/**
|
||||
* Test for {@link LosslessRegistryAspect}.
|
||||
*
|
||||
* @author Shedfree Wu
|
||||
*/
|
||||
public class LosslessRegistryAspectTest {
|
||||
|
||||
private static String NAMESPACE_TEST = "Test";
|
||||
|
||||
private static String SERVICE_PROVIDER = "java_provider_test";
|
||||
|
||||
private static String HOST = "127.0.0.1";
|
||||
|
||||
private static int APPLICATION_PORT = 19091;
|
||||
|
||||
private static int LOSSLESS_PORT_1 = 28083;
|
||||
|
||||
private static NamingServer namingServer;
|
||||
|
||||
private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
|
||||
.withConfiguration(AutoConfigurations.of(
|
||||
LosslessAutoConfiguration.class,
|
||||
LosslessPropertiesBootstrapConfiguration.class,
|
||||
PolarisContextAutoConfiguration.class,
|
||||
PolarisPropertiesConfiguration.class,
|
||||
PolarisDiscoveryClientConfiguration.class,
|
||||
PolarisDiscoveryAutoConfiguration.class))
|
||||
.withPropertyValues("spring.cloud.polaris.lossless.delayRegisterInterval=5000")
|
||||
.withPropertyValues("spring.cloud.polaris.lossless.healthCheckPath=")
|
||||
.withPropertyValues("spring.cloud.polaris.lossless.port=" + LOSSLESS_PORT_1)
|
||||
.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER)
|
||||
.withPropertyValues("server.port=" + APPLICATION_PORT)
|
||||
.withPropertyValues("spring.cloud.polaris.localIpAddress=" + HOST)
|
||||
.withPropertyValues("spring.cloud.polaris.localPort=" + APPLICATION_PORT)
|
||||
.withPropertyValues("spring.cloud.polaris.address=grpc://127.0.0.1:10081")
|
||||
.withPropertyValues("spring.cloud.polaris.discovery.namespace=" + NAMESPACE_TEST)
|
||||
.withPropertyValues("spring.cloud.polaris.discovery.token=xxxxxx");
|
||||
|
||||
private final WebApplicationContextRunner contextRunner2 = new WebApplicationContextRunner()
|
||||
.withConfiguration(AutoConfigurations.of(
|
||||
LosslessAutoConfiguration.class,
|
||||
LosslessPropertiesBootstrapConfiguration.class,
|
||||
PolarisContextAutoConfiguration.class,
|
||||
PolarisPropertiesConfiguration.class,
|
||||
PolarisDiscoveryClientConfiguration.class,
|
||||
PolarisDiscoveryAutoConfiguration.class))
|
||||
.withPropertyValues("spring.cloud.polaris.lossless.healthCheckInterval=1000")
|
||||
.withPropertyValues("spring.cloud.polaris.lossless.healthCheckPath=/test")
|
||||
.withPropertyValues("spring.cloud.polaris.lossless.port=28082")
|
||||
.withPropertyValues("spring.application.name=" + SERVICE_PROVIDER)
|
||||
.withPropertyValues("server.port=" + APPLICATION_PORT)
|
||||
.withPropertyValues("spring.cloud.polaris.localIpAddress=" + HOST)
|
||||
.withPropertyValues("spring.cloud.polaris.localPort=" + APPLICATION_PORT)
|
||||
.withPropertyValues("spring.cloud.polaris.address=grpc://127.0.0.1:10081")
|
||||
.withPropertyValues("spring.cloud.polaris.discovery.namespace=" + NAMESPACE_TEST)
|
||||
.withPropertyValues("spring.cloud.polaris.discovery.token=xxxxxx");
|
||||
|
||||
@BeforeAll
|
||||
static void beforeAll() throws Exception {
|
||||
namingServer = NamingServer.startNamingServer(10081);
|
||||
|
||||
// add service
|
||||
namingServer.getNamingService().addService(new ServiceKey(NAMESPACE_TEST, SERVICE_PROVIDER));
|
||||
}
|
||||
|
||||
@AfterAll
|
||||
static void afterAll() {
|
||||
if (null != namingServer) {
|
||||
namingServer.terminate();
|
||||
}
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
PolarisSDKContextManager.innerDestroy();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRegister() {
|
||||
this.contextRunner.run(context -> {
|
||||
|
||||
AbstractAutoServiceRegistration autoServiceRegistration = context.getBean(AbstractAutoServiceRegistration.class);
|
||||
|
||||
assertThatCode(() -> {
|
||||
AutoServiceRegistrationUtils.register(autoServiceRegistration);
|
||||
}).doesNotThrowAnyException();
|
||||
Thread.sleep(1000);
|
||||
// before register online status is false
|
||||
assertThatCode(() -> {
|
||||
assertThat(OkHttpUtil.checkUrl(HOST, LOSSLESS_PORT_1, "/online", Collections.EMPTY_MAP)).isFalse();
|
||||
}).doesNotThrowAnyException();
|
||||
// delay register after 5s
|
||||
Thread.sleep(5000);
|
||||
PolarisServiceRegistry registry = context.getBean(PolarisServiceRegistry.class);
|
||||
PolarisRegistration registration = context.getBean(PolarisRegistration.class);
|
||||
|
||||
assertThatCode(() -> {
|
||||
assertThat(registry.getStatus(registration)).isEqualTo("DOWN");
|
||||
}).doesNotThrowAnyException();
|
||||
|
||||
assertThatCode(() -> {
|
||||
assertThat(OkHttpUtil.checkUrl(HOST, LOSSLESS_PORT_1, "/online", Collections.EMPTY_MAP)).isTrue();
|
||||
}).doesNotThrowAnyException();
|
||||
|
||||
assertThatCode(() -> {
|
||||
assertThat(OkHttpUtil.checkUrl(HOST, LOSSLESS_PORT_1, "/offline", Collections.EMPTY_MAP)).isTrue();
|
||||
}).doesNotThrowAnyException();
|
||||
|
||||
assertThatCode(() -> {
|
||||
AutoServiceRegistrationUtils.deRegister(autoServiceRegistration);
|
||||
}).doesNotThrowAnyException();
|
||||
|
||||
assertThatCode(() -> {
|
||||
assertThat(registry.getStatus(registration)).isEqualTo("DOWN");
|
||||
}).doesNotThrowAnyException();
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRegister2() {
|
||||
this.contextRunner2.run(context -> {
|
||||
|
||||
AbstractAutoServiceRegistration autoServiceRegistration = context.getBean(AbstractAutoServiceRegistration.class);
|
||||
|
||||
assertThatCode(() -> {
|
||||
AutoServiceRegistrationUtils.register(autoServiceRegistration);
|
||||
}).doesNotThrowAnyException();
|
||||
|
||||
Thread.sleep(2000);
|
||||
|
||||
assertThatCode(() -> {
|
||||
AutoServiceRegistrationUtils.deRegister(autoServiceRegistration);
|
||||
}).doesNotThrowAnyException();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@Configuration
|
||||
@EnableAutoConfiguration
|
||||
static class PolarisPropertiesConfiguration {
|
||||
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
/*
|
||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
||||
*
|
||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
||||
*
|
||||
* Licensed under the BSD 3-Clause License (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://opensource.org/licenses/BSD-3-Clause
|
||||
*
|
||||
* 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 org.springframework.cloud.client.serviceregistry;
|
||||
|
||||
public class AutoServiceRegistrationUtils {
|
||||
|
||||
public static void register(AbstractAutoServiceRegistration autoServiceRegistration) {
|
||||
autoServiceRegistration.register();
|
||||
}
|
||||
|
||||
public static void deRegister(AbstractAutoServiceRegistration autoServiceRegistration) {
|
||||
autoServiceRegistration.deregister();
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue