Commit 3fc51f80 authored by Andy Wilkinson's avatar Andy Wilkinson

Isolate the effects of initializing Reactor's debug agent in the tests

parent e7efe0cb
...@@ -86,11 +86,6 @@ ...@@ -86,11 +86,6 @@
<artifactId>reactor-netty</artifactId> <artifactId>reactor-netty</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-tools</artifactId>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId> <artifactId>netty-tcnative-boringssl-static</artifactId>
......
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
package org.springframework.boot.reactor; package org.springframework.boot.reactor;
import reactor.tools.agent.ReactorDebugAgent;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.env.EnvironmentPostProcessor; import org.springframework.boot.env.EnvironmentPostProcessor;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
...@@ -46,7 +44,13 @@ public class DebugAgentEnvironmentPostProcessor implements EnvironmentPostProces ...@@ -46,7 +44,13 @@ public class DebugAgentEnvironmentPostProcessor implements EnvironmentPostProces
if (ClassUtils.isPresent(REACTOR_DEBUGAGENT_CLASS, null)) { if (ClassUtils.isPresent(REACTOR_DEBUGAGENT_CLASS, null)) {
Boolean agentEnabled = environment.getProperty(DEBUGAGENT_ENABLED_CONFIG_KEY, Boolean.class); Boolean agentEnabled = environment.getProperty(DEBUGAGENT_ENABLED_CONFIG_KEY, Boolean.class);
if (agentEnabled != Boolean.FALSE) { if (agentEnabled != Boolean.FALSE) {
ReactorDebugAgent.init(); try {
Class<?> debugAgent = Class.forName(REACTOR_DEBUGAGENT_CLASS);
debugAgent.getMethod("init").invoke(null);
}
catch (Exception ex) {
throw new RuntimeException("Failed to init Reactor's debug agent");
}
} }
} }
} }
......
...@@ -20,6 +20,7 @@ import org.junit.jupiter.api.Test; ...@@ -20,6 +20,7 @@ import org.junit.jupiter.api.Test;
import reactor.core.Scannable; import reactor.core.Scannable;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
import org.springframework.mock.env.MockEnvironment; import org.springframework.mock.env.MockEnvironment;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
...@@ -29,6 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; ...@@ -29,6 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* *
* @author Brian Clozel * @author Brian Clozel
*/ */
@ClassPathOverrides("io.projectreactor:reactor-tools:3.3.0.RELEASE")
class DebugAgentEnvironmentPostProcessorTests { class DebugAgentEnvironmentPostProcessorTests {
static { static {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment