Remove concatMap in lookupRoute to improve throughput

Fixes gh-3291
spring-cloud · Oct 31, 2024 · 3f62607 · 3f62607
1 parent 4cbd756
commit 3f62607
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/...src/main/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMapping.java b/...src/main/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMapping.java
@@ -128,21 +128,17 @@ private String getExchangeDesc(ServerWebExchange exchange) {
 	}
 
 	protected Mono<Route> lookupRoute(ServerWebExchange exchange) {
-		return this.routeLocator.getRoutes()
-			// individually filter routes so that filterWhen error delaying is not a
-			// problem
-			.concatMap(route -> Mono.just(route).filterWhen(r -> {
-				// add the current route we are testing
-				exchange.getAttributes().put(GATEWAY_PREDICATE_ROUTE_ATTR, r.getId());
-				return r.getPredicate().apply(exchange);
-			})
-				// instead of immediately stopping main flux due to error, log and
-				// swallow it
-				.doOnError(e -> logger.error("Error applying predicate for route: " + route.getId(), e))
-				.onErrorResume(e -> Mono.empty()))
-			// .defaultIfEmpty() put a static Route not found
-			// or .switchIfEmpty()
-			// .switchIfEmpty(Mono.<Route>empty().log("noroute"))
+		return this.routeLocator.getRoutes().filterWhen(route -> {
+			// add the current route we are testing
+			exchange.getAttributes().put(GATEWAY_PREDICATE_ROUTE_ATTR, route.getId());
+			try {
+				return route.getPredicate().apply(exchange);
+			}
+			catch (Exception e) {
+				logger.error("Error applying predicate for route: " + route.getId(), e);
+			}
+			return Mono.just(false);
+		})
 			.next()
 			// TODO: error handling
 			.map(route -> {

diff --git a/...est/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingTests.java b/...est/java/org/springframework/cloud/gateway/handler/RoutePredicateHandlerMappingTests.java
@@ -71,7 +71,7 @@ public void lookupRouteFromAsyncPredicates(CapturedOutput capturedOutput) {
 		Route routeError = Route.async()
 			.id("routeError")
 			.uri("http://localhost")
-			.asyncPredicate(swe -> Mono.error(new IllegalStateException("boom1")))
+			.asyncPredicate(swe -> Mono.just(boom1()))
 			.build();
 		Route routeFail = Route.async().id("routeFail").uri("http://localhost").asyncPredicate(swe -> {
 			throw new IllegalStateException("boom2");
@@ -96,4 +96,8 @@ public void lookupRouteFromAsyncPredicates(CapturedOutput capturedOutput) {
 		Assertions.assertTrue(capturedOutput.getOut().contains("java.lang.IllegalStateException: boom2"));
 	}
 
+	boolean boom1() {
+		throw new IllegalStateException("boom1");
+	}
+
 }