msb-public
/
spring-cloud-tencent
mirror of https://github.com/Tencent/spring-cloud-tencent
3
1
Code Issues Projects Releases Wiki Activity

feat: support traffic gray lane router

Browse Source
pull/1785/head
fishtailfu 3 weeks ago
parent ebeeefb16e
commit cbb2ad351b
3 changed files with 6 additions and 70 deletions
Show Stats Download Patch File Download Diff File

10
spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/RouterConfigModifier.java
Unescape View File

@ -20,7 +20,6 @@ package com.tencent.cloud.polaris.router;
import com.tencent.cloud.common.constant.OrderConstant;
import com.tencent.cloud.common.tsf.TsfContextUtils;
import com.tencent.cloud.polaris.context.PolarisConfigModifier;
import com.tencent.cloud.polaris.router.config.properties.PolarisLaneRouterProperties;
import com.tencent.cloud.polaris.router.config.properties.PolarisNearByRouterProperties;
import com.tencent.polaris.api.config.consumer.ServiceRouterConfig;
import com.tencent.polaris.api.utils.StringUtils;
@ -40,11 +39,8 @@ public class RouterConfigModifier implements PolarisConfigModifier {
private final PolarisNearByRouterProperties polarisNearByRouterProperties;
private final PolarisLaneRouterProperties polarisLaneRouterProperties;
public RouterConfigModifier(PolarisNearByRouterProperties polarisNearByRouterProperties, PolarisLaneRouterProperties polarisLaneRouterProperties) {
public RouterConfigModifier(PolarisNearByRouterProperties polarisNearByRouterProperties) {
this.polarisNearByRouterProperties = polarisNearByRouterProperties;
this.polarisLaneRouterProperties = polarisLaneRouterProperties;
}
@Override
@ -68,10 +64,10 @@ public class RouterConfigModifier implements PolarisConfigModifier {
}
LaneRouterConfig laneRouterConfig = configuration.getConsumer().getServiceRouter().getPluginConfig(
ServiceRouterConfig.DEFAULT_ROUTER_LANE, LaneRouterConfig.class);
laneRouterConfig.setBaseLaneMode(BaseLaneMode.ONLY_UNTAGGED_INSTANCE);
if (TsfContextUtils.isOnlyTsfConsulEnabled()) {
polarisLaneRouterProperties.setBaseLaneMode(BaseLaneMode.EXCLUDE_ENABLED_LANE_INSTANCE);
laneRouterConfig.setBaseLaneMode(BaseLaneMode.EXCLUDE_ENABLED_LANE_INSTANCE);
}
laneRouterConfig.setBaseLaneMode(polarisLaneRouterProperties.getBaseLaneMode());
configuration.getConsumer().getServiceRouter()
.setPluginConfig(ServiceRouterConfig.DEFAULT_ROUTER_LANE, laneRouterConfig);
}

8
spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/RouterConfigModifierAutoConfiguration.java
Unescape View File

@ -18,7 +18,6 @@
package com.tencent.cloud.polaris.router.config;
import com.tencent.cloud.polaris.router.RouterConfigModifier;
import com.tencent.cloud.polaris.router.config.properties.PolarisLaneRouterProperties;
import com.tencent.cloud.polaris.router.config.properties.PolarisMetadataRouterProperties;
import com.tencent.cloud.polaris.router.config.properties.PolarisNamespaceRouterProperties;
import com.tencent.cloud.polaris.router.config.properties.PolarisNearByRouterProperties;
@ -37,14 +36,13 @@ import org.springframework.context.annotation.Import;
@Configuration(proxyBeanMethods = false)
@ConditionalOnPolarisRouterEnabled
@Import({PolarisNearByRouterProperties.class, PolarisMetadataRouterProperties.class, PolarisRuleBasedRouterProperties.class,
PolarisNamespaceRouterProperties.class, PolarisLaneRouterProperties.class})
PolarisNamespaceRouterProperties.class})
public class RouterConfigModifierAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public RouterConfigModifier routerConfigModifier(PolarisNearByRouterProperties polarisNearByRouterProperties,
PolarisLaneRouterProperties polarisLaneRouterProperties) {
return new RouterConfigModifier(polarisNearByRouterProperties, polarisLaneRouterProperties);
public RouterConfigModifier routerConfigModifier(PolarisNearByRouterProperties polarisNearByRouterProperties) {
return new RouterConfigModifier(polarisNearByRouterProperties);
}
}

58
spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/properties/PolarisLaneRouterProperties.java
Unescape View File

@ -1,58 +0,0 @@
/*
* Tencent is pleased to support the open source community by making spring-cloud-tencent available.
*
* Copyright (C) 2021 Tencent. 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.polaris.router.config.properties;
import com.tencent.polaris.plugins.router.lane.BaseLaneMode;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* the configuration for lane router.
*
* @author Yuwei Fu
*/
@ConfigurationProperties(prefix = "spring.cloud.polaris.router.lane-router")
public class PolarisLaneRouterProperties {
private boolean enabled = true;
private BaseLaneMode baseLaneMode = BaseLaneMode.ONLY_UNTAGGED_INSTANCE;
public boolean isEnabled() {
return enabled;
}
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
public BaseLaneMode getBaseLaneMode() {
return baseLaneMode;
}
public void setBaseLaneMode(BaseLaneMode baseLaneMode) {
this.baseLaneMode = baseLaneMode;
}
@Override
public String toString() {
return "PolarisLaneRouterProperties{" +
"enabled=" + enabled +
", baseLaneMode=" + baseLaneMode +
'}';
}
}
Write Preview
Loading…
Cancel
Save