优化注册中心及ribbon server和"破窗"相关的代码

Author: saleson

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/configuration/NetflixRibbonGrayAutoConfiguration.java

@@ -4,6 +4,7 @@
 import cn.springcloud.gray.GrayManager;
 import cn.springcloud.gray.choose.GrayPredicate;
 import cn.springcloud.gray.client.netflix.RibbonServerChooser;
+import cn.springcloud.gray.client.netflix.ribbon.RibbonServerExplainer;
 import cn.springcloud.gray.routing.connectionpoint.DefaultRoutingConnectionPoint;
 import cn.springcloud.gray.routing.connectionpoint.RoutingConnectionPoint;
 import cn.springcloud.gray.client.netflix.ribbon.configuration.GrayRibbonClientsConfiguration;
@@ -16,6 +17,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.netflix.ribbon.RibbonClients;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -47,4 +49,11 @@ public RibbonServerChooser ribbonServerChooser(
                 grayPredicate, serverExplainer, serverListProcess);
     }
 
+
+    @Bean
+    @ConditionalOnMissingBean
+    public ServerExplainer<Server> ribbonServerExplainer(SpringClientFactory springClientFactory){
+        return new RibbonServerExplainer(springClientFactory);
+    }
+
 }

spring-cloud-gray-client-netflix/src/main/java/cn/springcloud/gray/client/netflix/ribbon/RibbonServerExplainer.java

@@ -0,0 +1,50 @@
+package cn.springcloud.gray.client.netflix.ribbon;
+
+import cn.springcloud.gray.servernode.ServerExplainer;
+import cn.springcloud.gray.servernode.ServerSpec;
+import com.netflix.loadbalancer.Server;
+import org.springframework.cloud.netflix.ribbon.DefaultServerIntrospector;
+import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+
+import java.util.Map;
+
+public class RibbonServerExplainer implements ServerExplainer<Server> {
+
+    private SpringClientFactory springClientFactory;
+
+    public RibbonServerExplainer(SpringClientFactory springClientFactory) {
+        this.springClientFactory = springClientFactory;
+    }
+
+    @Override
+    public ServerSpec apply(Server server) {
+        Map metadata = getServerMetadata(server.getMetaInfo().getServiceIdForDiscovery(), server);
+        return ServerSpec.builder().instanceId(server.getMetaInfo().getInstanceId())
+                .serviceId(server.getMetaInfo().getServiceIdForDiscovery())
+                .metadatas(metadata).build();
+    }
+
+    public ServerIntrospector serverIntrospector(String serviceId) {
+        if (springClientFactory == null) {
+            return new DefaultServerIntrospector();
+        }
+        ServerIntrospector serverIntrospector = this.springClientFactory.getInstance(serviceId,
+                ServerIntrospector.class);
+        if (serverIntrospector == null) {
+            serverIntrospector = new DefaultServerIntrospector();
+        }
+        return serverIntrospector;
+    }
+
+    /**
+     * 获取实例的metadata信息
+     *
+     * @param serviceId 服务id
+     * @param server    ribbon服务器(服务实例)
+     * @return 服务实例的metadata信息
+     */
+    public Map<String, String> getServerMetadata(String serviceId, Server server) {
+        return serverIntrospector(serviceId).getMetadata(server);
+    }
+}

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/client/config/GrayClientDiscoveryAutoConfiguration.java

@@ -0,0 +1,30 @@
+package cn.springcloud.gray.client.config;
+
+import cn.springcloud.gray.local.DefaultInstanceLocalInfoInitiralizer;
+import cn.springcloud.gray.local.InstanceLocalInfoInitiralizer;
+import cn.springcloud.gray.servernode.DefaultInstanceDiscoveryClient;
+import cn.springcloud.gray.servernode.InstanceDiscoveryClient;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConditionalOnProperty(value = "gray.enabled")
+public class GrayClientDiscoveryAutoConfiguration {
+
+
+    @Bean
+    @ConditionalOnMissingBean
+    public InstanceDiscoveryClient instanceDiscoveryClient(){
+        return new DefaultInstanceDiscoveryClient();
+    }
+
+
+    @Bean
+    @ConditionalOnMissingBean
+    public InstanceLocalInfoInitiralizer instanceLocalInfoInitiralizer(){
+        return new DefaultInstanceLocalInfoInitiralizer();
+    }
+
+}

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/local/DefaultInstanceLocalInfoInitiralizer.java

@@ -0,0 +1,10 @@
+package cn.springcloud.gray.local;
+
+
+public class DefaultInstanceLocalInfoInitiralizer extends LazyInstanceLocalInfoInitiralizer {
+
+    @Override
+    protected String getLocalInstanceId() {
+        return "";
+    }
+}

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/local/LazyInstanceLocalInfoInitiralizer.java

@@ -0,0 +1,38 @@
+package cn.springcloud.gray.local;
+
+import org.springframework.cloud.client.serviceregistry.Registration;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+public abstract class LazyInstanceLocalInfoInitiralizer implements InstanceLocalInfoInitiralizer, ApplicationContextAware {
+
+    protected ApplicationContext applicationContext;
+    protected InstanceLocalInfo instanceLocalInfo;
+
+
+    @Override
+    public InstanceLocalInfo getInstanceLocalInfo() {
+        if(instanceLocalInfo==null){
+            instanceLocalInfo = createInstanceLocalInfo();
+        }
+        return instanceLocalInfo;
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) {
+        this.applicationContext = applicationContext;
+    }
+
+    protected InstanceLocalInfo createInstanceLocalInfo() {
+        Registration registration = applicationContext.getBean(Registration.class);
+        return InstanceLocalInfo.builder()
+                .instanceId(getLocalInstanceId())
+                .serviceId(registration.getServiceId())
+                .host(registration.getHost())
+                .port(registration.getPort())
+                .build();
+    }
+
+    protected abstract String getLocalInstanceId();
+
+}

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/servernode/AbstractServerListProcessor.java

@@ -0,0 +1,31 @@
+package cn.springcloud.gray.servernode;
+
+import cn.springcloud.gray.client.config.properties.GrayHoldoutServerProperties;
+import cn.springcloud.gray.model.InstanceStatus;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.util.List;
+
+public abstract class AbstractServerListProcessor<S> implements ServerListProcessor<S> {
+
+    protected GrayHoldoutServerProperties grayHoldoutServerProperties;
+
+    public AbstractServerListProcessor(GrayHoldoutServerProperties grayHoldoutServerProperties) {
+        this.grayHoldoutServerProperties = grayHoldoutServerProperties;
+    }
+
+    @Override
+    public List<S> process(String serviceId, List<S> servers) {
+        if (!grayHoldoutServerProperties.isEnabled() || CollectionUtils.isEmpty(getHoldoutInstanceStatus(serviceId))) {
+            return servers;
+        }
+
+        return getServers(serviceId, servers);
+    }
+
+    protected List<InstanceStatus> getHoldoutInstanceStatus(String serviceId){
+        return grayHoldoutServerProperties.getServices().get(serviceId);
+    }
+
+    protected abstract List<S> getServers(String serviceId, List<S> servers);
+}

spring-cloud-gray-client/src/main/java/cn/springcloud/gray/servernode/DefaultInstanceDiscoveryClient.java

@@ -0,0 +1,34 @@
+package cn.springcloud.gray.servernode;
+
+import cn.springcloud.gray.model.InstanceStatus;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.cloud.client.serviceregistry.Registration;
+import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+public class DefaultInstanceDiscoveryClient implements InstanceDiscoveryClient, ApplicationContextAware, InitializingBean{
+
+    private ServiceRegistry<Registration> serviceRegistry;
+    private Registration registration;
+    private ApplicationContext applicationContext;
+
+
+
+    @Override
+    public void setStatus(InstanceStatus status) {
+        serviceRegistry.setStatus(registration, status.name());
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        registration = applicationContext.getBean(Registration.class);
+        serviceRegistry = applicationContext.getBean(ServiceRegistry.class);
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        this.applicationContext = applicationContext;
+    }
+}

spring-cloud-gray-plugins/spring-cloud-gray-plugin-eureka/src/main/java/cn/springcloud/gray/client/netflix/eureka/EurekaServerListProcessor.java

@@ -47,7 +47,7 @@ public EurekaServerListProcessor(GrayHoldoutServerProperties grayHoldoutServerPr
 
     @Override
     public List<Server> process(String serviceId, List<Server> servers) {
-        if (!grayHoldoutServerProperties.isEnabled() || !grayHoldoutServerProperties.getServices().containsKey(serviceId)) {
+        if (!grayHoldoutServerProperties.isEnabled() || CollectionUtils.isEmpty(grayHoldoutServerProperties.getServices().get(serviceId))) {
             return servers;
         }
 

spring-cloud-gray-plugins/spring-cloud-gray-plugin-eureka/src/main/java/cn/springcloud/gray/client/netflix/eureka/configuration/GrayClientEurekaAutoConfiguration.java

@@ -7,6 +7,7 @@
 import com.netflix.discovery.EurekaClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
@@ -16,22 +17,20 @@
 @Configuration
 //@ConditionalOnBean({GrayManager.class})
 @ConditionalOnProperty(value = "gray.enabled")
-@ConditionalOnBean({EurekaClient.class})
+@ConditionalOnClass({EurekaClient.class})
 public class GrayClientEurekaAutoConfiguration {
 
 
     @Autowired
     private SpringClientFactory springClientFactory;
 
     @Bean
-    @ConditionalOnMissingBean
-    public EurekaInstanceLocalInfoInitiralizer eurekaInstanceLocalInfoInitiralizer() {
+    public EurekaInstanceLocalInfoInitiralizer instanceLocalInfoInitiralizer() {
         return new EurekaInstanceLocalInfoInitiralizer();
     }
 
-    @Bean
-    @ConditionalOnMissingBean
-    public EurekaServerExplainer eurekaServerExplainer() {
+//    @Bean
+    public ServerExplainer<Server> serverExplainer() {
         return new EurekaServerExplainer(springClientFactory);
     }
 
@@ -43,7 +42,7 @@ public InstanceDiscoveryClient instanceDiscoveryClient() {
 
 
     @Bean
-    @ConditionalOnProperty(value = "gray.holdoutServer.enabled")
+    @ConditionalOnProperty(value = "gray.holdout-server.enabled")
     @ConditionalOnMissingBean
     public ServerListProcessor serverListProcessor(GrayHoldoutServerProperties grayHoldoutServerProperties, EurekaClient eurekaClient) {
         if(grayHoldoutServerProperties.isZoneAffinity()){

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/discovery/ServiceDiscovery.java

@@ -3,6 +3,8 @@
 import cn.springcloud.gray.model.InstanceInfo;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -18,4 +20,7 @@ public interface ServiceDiscovery {
 
     InstanceInfo getInstanceInfo(String serviceId, String instanceId);
 
+    default Map<String, InstanceInfo> getInstanceInfos(String serviceId) {
+        return listInstanceInfos(serviceId).stream().collect(Collectors.toMap(info -> info.getInstanceId(), info -> info));
+    }
 }