Configure BlockHound

build.gradle

@@ -15,7 +15,7 @@ buildscript {
 		curatorVersion = '2.11.1'
 		docResourcesVersion = '0.1.1.RELEASE'
 		awaitilityVersion = '3.1.6'
-		reactorBlockHoundVersion = '1.0.0.M3'
+		reactorBlockHoundVersion = '1.0.1.RELEASE'
 	}
 	repositories {
 		maven { url 'https://repo.springsource.org/libs-release'}
@@ -106,6 +106,7 @@ configure(allprojects) {
 			dependency "org.apache.curator:curator-recipes:$curatorVersion"
 			dependency "org.apache.curator:curator-test:$curatorVersion"
 			dependency "org.awaitility:awaitility:$awaitilityVersion"
+			dependency "io.projectreactor.tools:blockhound:$reactorBlockHoundVersion"
 			dependency "io.projectreactor.tools:blockhound-junit-platform:$reactorBlockHoundVersion"
 		}
 	}
@@ -136,6 +137,7 @@ configure(subprojects) { subproject ->
 
 	dependencies {
 		testCompile("org.junit.jupiter:junit-jupiter-api")
+		testCompile("io.projectreactor.tools:blockhound")
 		testRuntime("org.junit.jupiter:junit-jupiter-engine")
 		if (project.hasProperty('statemachineBlockHound') && statemachineBlockHound.toBoolean()) {
 			testRuntime("org.junit.platform:junit-platform-launcher")

spring-statemachine-core/src/test/java/org/springframework/statemachine/StateMachineBlockHoundIntegration.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.springframework.statemachine;
+
+import reactor.blockhound.BlockHound.Builder;
+import reactor.blockhound.integration.BlockHoundIntegration;
+
+public class StateMachineBlockHoundIntegration implements BlockHoundIntegration {
+
+	@Override
+	public void applyTo(Builder builder) {
+		// whitelisting some blocking calls in tests
+		builder
+			.allowBlockingCallsInside("org.springframework.statemachine.AbstractStateMachineTests$TestSleepAction", "execute")
+			.allowBlockingCallsInside("org.springframework.statemachine.monitor.StateMachineMonitorTests$LatchAction", "execute")
+			.allowBlockingCallsInside("org.springframework.statemachine.state.CompletionEventTests$Config1$1", "execute")
+			.allowBlockingCallsInside("org.apache.commons.logging.LogAdapter$Log4jLog", "debug")
+			.allowBlockingCallsInside("org.springframework.statemachine.state.ObjectStateTests$TestBlockingAction", "sleep");
+	}
+}

spring-statemachine-core/src/test/java/org/springframework/statemachine/state/ObjectStateTests.java

@@ -153,15 +153,33 @@ public class ObjectStateTests {
 
 		@Override
 		public Mono<Void> apply(StateContext<String, String> context) {
+			// TODO: leaving this here as I had to extract sleep to
+			//       its own method for BlockHound to find it change
+			//       allowBlockingCallsInside from 'apply' to 'sleep'
+
+			// return Mono.fromRunnable(() -> {
+			// 	countBefore.incrementAndGet();
+			// 	try {
+			// 		Thread.sleep(1000);
+			// 	} catch (Exception e) {
+			// 		countInterrupt.incrementAndGet();
+			// 	}
+			// 	countAfter.incrementAndGet();
+			// });
+
 			return Mono.fromRunnable(() -> {
-				countBefore.incrementAndGet();
-				try {
-					Thread.sleep(1000);
-				} catch (Exception e) {
-					countInterrupt.incrementAndGet();
-				}
-				countAfter.incrementAndGet();
+				sleep();
 			});
 		}
+
+		private void sleep() {
+			countBefore.incrementAndGet();
+			try {
+				Thread.sleep(1000);
+			} catch (Exception e) {
+				countInterrupt.incrementAndGet();
+			}
+			countAfter.incrementAndGet();
+		}
 	}
 }

spring-statemachine-core/src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration

@@ -0,0 +1 @@
+org.springframework.statemachine.StateMachineBlockHoundIntegration

spring-statemachine-recipes/src/test/java/org/springframework/statemachine/recipes/StateMachineBlockHoundIntegration.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.springframework.statemachine.recipes;
+
+import reactor.blockhound.BlockHound.Builder;
+import reactor.blockhound.integration.BlockHoundIntegration;
+
+public class StateMachineBlockHoundIntegration implements BlockHoundIntegration {
+
+	@Override
+	public void applyTo(Builder builder) {
+		// whitelisting some blocking calls in tests
+		builder
+			.allowBlockingCallsInside("java.util.concurrent.locks.LockSupport", "park")
+			.allowBlockingCallsInside("org.springframework.statemachine.recipes.TasksHandlerTests$1", "run");
+	}
+}

spring-statemachine-recipes/src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration

@@ -0,0 +1 @@
+org.springframework.statemachine.recipes.StateMachineBlockHoundIntegration

spring-statemachine-samples/tasks/src/test/java/demo/tasks/StateMachineBlockHoundIntegration.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 demo.tasks;
+
+import reactor.blockhound.BlockHound.Builder;
+import reactor.blockhound.integration.BlockHoundIntegration;
+
+public class StateMachineBlockHoundIntegration implements BlockHoundIntegration {
+
+	@Override
+	public void applyTo(Builder builder) {
+		// whitelisting some blocking calls in tests
+		builder
+			.allowBlockingCallsInside("demo.tasks.Tasks", "sleep")
+			.allowBlockingCallsInside("java.util.concurrent.locks.LockSupport", "park");
+	}
+}

spring-statemachine-samples/tasks/src/test/resources/META-INF/services/reactor.blockhound.integration.BlockHoundIntegration

@@ -0,0 +1 @@
+demo.tasks.StateMachineBlockHoundIntegration