From 661717fe54fed122cae6a9f46cb292cd31d7dcad Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Wed, 11 Dec 2019 15:05:50 -0500
Subject: [PATCH] Backports more blocking fixes

---
 .../integration/CustomBlockHoundIntegration.java          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spring-cloud-gateway-core/src/test/java/reactor/blockhound/integration/CustomBlockHoundIntegration.java b/spring-cloud-gateway-core/src/test/java/reactor/blockhound/integration/CustomBlockHoundIntegration.java
index 460d29bd..0bd38545 100644
--- a/spring-cloud-gateway-core/src/test/java/reactor/blockhound/integration/CustomBlockHoundIntegration.java
+++ b/spring-cloud-gateway-core/src/test/java/reactor/blockhound/integration/CustomBlockHoundIntegration.java
@@ -25,6 +25,12 @@ public class CustomBlockHoundIntegration implements BlockHoundIntegration {
 
 	@Override
 	public void applyTo(BlockHound.Builder builder) {
+		/*builder.blockingMethodCallback(it -> {
+			Error error = new Error(it.toString());
+			error.printStackTrace();
+			throw error;
+		});*/
+
 		// Uses
 		// ch.qos.logback.classic.spi.PackagingDataCalculator#getImplementationVersion
 		builder.allowBlockingCallsInside(
@@ -62,6 +68,8 @@ public class CustomBlockHoundIntegration implements BlockHoundIntegration {
 		// Uses Unsafe#park
 		builder.allowBlockingCallsInside("io.netty.util.concurrent.GlobalEventExecutor",
 				"execute");
+		builder.allowBlockingCallsInside(
+				"io.netty.util.concurrent.SingleThreadEventExecutor$6", "run");
 
 		// SECURITY RELATED