支持reactor nio event loop

Author: saleson

spring-cloud-gray-plugins/spring-cloud-gray-plugin-gateway/src/main/java/cn/springcloud/gray/client/gateway/GrayGlobalFilter.java

@@ -1,17 +1,17 @@
 package cn.springcloud.gray.client.gateway;
 
 import cn.springcloud.gray.client.config.properties.GrayRequestProperties;
-import cn.springcloud.gray.client.netflix.constants.GrayNetflixClientConstants;
 import cn.springcloud.gray.request.GrayHttpRequest;
+import cn.springcloud.gray.request.GrayTrackInfo;
+import cn.springcloud.gray.request.RequestLocalStorage;
 import cn.springcloud.gray.routing.connectionpoint.RoutingConnectPointContext;
 import cn.springcloud.gray.routing.connectionpoint.RoutingConnectionPoint;
-import org.apache.commons.io.IOUtils;
+import cn.springcloud.gray.web.filter.GrayTrackWebFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.filter.RouteToRequestUrlFilter;
-import org.springframework.cloud.netflix.zuul.filters.support.FilterConstants;
 import org.springframework.core.Ordered;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.server.reactive.ServerHttpRequest;
@@ -34,10 +34,15 @@ public class GrayGlobalFilter implements GlobalFilter, Ordered {
 
     private GrayRequestProperties grayRequestProperties;
     private RoutingConnectionPoint routingConnectionPoint;
+    private RequestLocalStorage requestLocalStorage;
 
-    public GrayGlobalFilter(GrayRequestProperties grayRequestProperties, RoutingConnectionPoint routingConnectionPoint) {
+    public GrayGlobalFilter(
+            GrayRequestProperties grayRequestProperties,
+            RoutingConnectionPoint routingConnectionPoint,
+            RequestLocalStorage requestLocalStorage) {
         this.grayRequestProperties = grayRequestProperties;
         this.routingConnectionPoint = routingConnectionPoint;
+        this.requestLocalStorage = requestLocalStorage;
     }
 
     @Override
@@ -68,19 +73,35 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         ServerHttpRequest.Builder requestBuilder = exchange.getRequest().mutate();
         grayRequest.setAttribute(GRAY_REQUEST_ATTRIBUTE_GATEWAY_HTTPREQUEST_BUILDER, requestBuilder);
 
+        recordGrayTrack(exchange);
+
         RoutingConnectPointContext connectPointContext = RoutingConnectPointContext.builder()
                 .interceptroType("gateway")
                 .grayRequest(grayRequest).build();
+
+
         routingConnectionPoint.executeConnectPoint(connectPointContext);
 
         ServerHttpRequest newRequest = requestBuilder.build();
         ServerWebExchange newExchange = exchange.mutate().request(newRequest).build();
 
-//        try {
-            return chain.filter(newExchange).doFinally(t->routingConnectionPoint.shutdownconnectPoint(connectPointContext));
-//        } finally {
-//            routingConnectionPoint.shutdownconnectPoint(connectPointContext);
-//        }
+        return chain.filter(newExchange).doFinally(t -> routingConnectionPoint.shutdownconnectPoint(connectPointContext));
+    }
+
+
+    /**
+     * 支持reactor nio event loop
+     *
+     * @param exchange
+     */
+    private void recordGrayTrack(ServerWebExchange exchange) {
+        //todo 需优化
+        if (requestLocalStorage.getGrayTrackInfo() == null) {
+            GrayTrackInfo grayTrackInfo = (GrayTrackInfo) exchange.getAttributes().get(GrayTrackWebFilter.GRAY_WEB_TRACK_ATTR_NAME);
+            if (grayTrackInfo != null) {
+                requestLocalStorage.setGrayTrackInfo(grayTrackInfo);
+            }
+        }
     }
 
     @Override

spring-cloud-gray-plugins/spring-cloud-gray-plugin-gateway/src/main/java/cn/springcloud/gray/client/gateway/configuration/GrayGatewayAutoConfiguration.java

@@ -3,6 +3,7 @@
 import cn.springcloud.gray.client.config.properties.GrayRequestProperties;
 import cn.springcloud.gray.client.gateway.GatewayRequestInterceptor;
 import cn.springcloud.gray.client.gateway.GrayGlobalFilter;
+import cn.springcloud.gray.request.RequestLocalStorage;
 import cn.springcloud.gray.routing.connectionpoint.RoutingConnectionPoint;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -17,8 +18,8 @@ public class GrayGatewayAutoConfiguration {
     private GrayRequestProperties grayRequestProperties;
 
     @Bean
-    public GrayGlobalFilter grayGlobalFilter(RoutingConnectionPoint routingConnectionPoint) {
-        return new GrayGlobalFilter(grayRequestProperties, routingConnectionPoint);
+    public GrayGlobalFilter grayGlobalFilter(RoutingConnectionPoint routingConnectionPoint, RequestLocalStorage requestLocalStorage) {
+        return new GrayGlobalFilter(grayRequestProperties, routingConnectionPoint, requestLocalStorage);
     }
 
 

spring-cloud-gray-plugins/spring-cloud-gray-plugin-webflux/src/main/java/cn/springcloud/gray/web/filter/GrayTrackWebFilter.java

@@ -10,9 +10,10 @@
 import reactor.core.publisher.Mono;
 
 
-
 public class GrayTrackWebFilter implements WebFilter {
 
+    public static final String GRAY_WEB_TRACK_ATTR_NAME = "GrayWebTrack";
+
     private RequestLocalStorage requestLocalStorage;
 
     private GrayTrackHolder grayTrackHolder;
@@ -28,10 +29,19 @@ public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
         GrayHttpTrackInfo webTrack = new GrayHttpTrackInfo();
         grayTrackHolder.recordGrayTrack(webTrack, new ServerHttpRequestWrapper(exchange.getRequest()));
         requestLocalStorage.setGrayTrackInfo(webTrack);
-//        try {
-            return chain.filter(exchange).doFinally(t->requestLocalStorage.removeGrayTrackInfo());
-//        } finally {
-//            ;
-//        }
+
+        recordGrayTrack(exchange, webTrack);
+        return chain.filter(exchange).doFinally(t -> requestLocalStorage.removeGrayTrackInfo());
+    }
+
+    /**
+     * 支持reactor nio event loop
+     *
+     * @param exchange
+     * @param webTrack
+     */
+    private void recordGrayTrack(ServerWebExchange exchange, GrayHttpTrackInfo webTrack) {
+        ////todo 需优化
+        exchange.getAttributes().put(GRAY_WEB_TRACK_ATTR_NAME, webTrack);
     }
 }